Changeset 1177
- Timestamp:
- 07/03/08 10:31:13 (6 months ago)
- Files:
-
- trunk/vendor/openid/examples/consumer.rb (modified) (1 diff)
- trunk/vendor/openid/examples/rails_openid_login_generator/templates/controller.rb (modified) (1 diff)
- trunk/vendor/openid/examples/rails_server/app/controllers/server_controller.rb (modified) (1 diff)
- trunk/vendor/openid/lib/openid/discovery.rb (modified) (8 diffs)
- trunk/vendor/openid/lib/openid/service.rb (modified) (1 diff)
- trunk/vendor/plugins/openid_consumer/lib/open_id_consumer/active_record_open_id_store.rb (modified) (1 diff)
- trunk/vendor/plugins/openid_consumer/lib/open_id_consumer/association.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/vendor/openid/examples/consumer.rb
r1105 r1177 12 12 rescue LoadError 13 13 require "rubygems" 14 require_gem "ruby-openid"14 gem "ruby-openid" 15 15 end 16 16 trunk/vendor/openid/examples/rails_openid_login_generator/templates/controller.rb
r1105 r1177 5 5 begin 6 6 require "rubygems" 7 require_gem "ruby-openid", ">= 1.0.2"7 gem "ruby-openid", ">= 1.0.2" 8 8 rescue LoadError 9 9 require "openid" trunk/vendor/openid/examples/rails_server/app/controllers/server_controller.rb
r1105 r1177 4 4 begin 5 5 require "rubygems" 6 require_gem "ruby-openid", ">= 1.0"6 gem "ruby-openid", ">= 1.0" 7 7 rescue LoadError 8 8 require "openid" trunk/vendor/openid/lib/openid/discovery.rb
r1105 r1177 6 6 begin 7 7 require 'rubygems' 8 require_gem 'ruby-yadis', ">=0.3.3"8 gem 'ruby-yadis', ">=0.3.3" 9 9 rescue LoadError 10 10 require "yadis" … … 22 22 23 23 # OpenID::Discovery encapsulates the logic for doing Yadis and OpenID 1.0 24 # style server discovery. This class uses a session object to manage 24 # style server discovery. This class uses a session object to manage 25 25 # a list of tried OpenID servers for implemeting server fallback. This is 26 26 # useful the case when a user's primary server(s) is not available, and … … 40 40 filter = lambda {|s| OpenIDServiceEndpoint.from_endpoint(s)} 41 41 end 42 42 43 43 begin 44 44 # do yadis discover, filtering out OpenID services … … 62 62 ret = @fetcher.get(url) 63 63 return [HTTP_FAILURE, nil] if ret.nil? 64 64 65 65 consumer_id, data = ret 66 66 server = nil … … 72 72 server = href unless href.nil? 73 73 end 74 74 75 75 if rel == "openid.delegate" and delegate.nil? 76 76 href = attrs["href"] … … 80 80 81 81 return [PARSE_ERROR, nil] if server.nil? 82 82 83 83 server_id = delegate.nil? ? consumer_id : delegate 84 84 … … 86 86 server_id = OpenID::Util.normalize_url(server_id) 87 87 server_url = OpenID::Util.normalize_url(server) 88 88 89 89 service = OpenID::FakeOpenIDServiceEndpoint.new(consumer_id, 90 90 server_id, 91 91 server_url) 92 92 return [SUCCESS, service] 93 end 93 end 94 94 95 95 end … … 115 115 end 116 116 } 117 return [@url, endpoints] 117 return [@url, endpoints] 118 118 end 119 119 trunk/vendor/openid/lib/openid/service.rb
r1105 r1177 5 5 rescue LoadError 6 6 require 'rubygems' 7 require_gem 'ruby-yadis'7 gem 'ruby-yadis' 8 8 end 9 9 trunk/vendor/plugins/openid_consumer/lib/open_id_consumer/active_record_open_id_store.rb
r985 r1177 17 17 18 18 begin 19 require_gem "ruby-openid", ">= 1.0"19 gem "ruby-openid", ">= 1.0" 20 20 rescue LoadError 21 21 require "openid" trunk/vendor/plugins/openid_consumer/lib/open_id_consumer/association.rb
r985 r1177 17 17 18 18 begin 19 require_gem "ruby-openid", ">= 1.0"19 gem "ruby-openid", ">= 1.0" 20 20 rescue LoadError 21 21 require "openid"
