rack-openid 1.2.0 → 1.3.0

data/README.rdoc

@@ -53,7 +53,7 @@ On competition, the OpenID response is automatically verified and assigned to
     end
   end
 
-  use_in_file_templates!
+  enable :inline_templates
 
   __END__
 

data/lib/rack/openid.rb

@@ -115,15 +115,16 @@ module Rack #:nodoc:
           raise RuntimeError, "Rack::OpenID requires a session"
         end
 
-        consumer = ::OpenID::Consumer.new(session, @store)
+        consumer   = ::OpenID::Consumer.new(session, @store)
         identifier = params['identifier'] || params['identity']
+        immediate  = params['immediate'] == 'true'
 
         begin
           oidreq = consumer.begin(identifier)
           add_simple_registration_fields(oidreq, params)
           add_attribute_exchange_fields(oidreq, params)
           add_oauth_fields(oidreq, params)
-          url = open_id_redirect_url(req, oidreq, params["trust_root"], params["return_to"], params["method"])
+          url = open_id_redirect_url(req, oidreq, params["trust_root"], params["return_to"], params["method"], immediate)
           return redirect_to(url)
         rescue ::OpenID::OpenIDError, Timeout::Error => e
           env[RESPONSE] = MissingResponse.new
@@ -204,7 +205,7 @@ module Rack #:nodoc:
         [303, {"Content-Type" => "text/html", "Location" => url}, []]
       end
 
-      def open_id_redirect_url(req, oidreq, trust_root = nil, return_to = nil, method = nil)
+      def open_id_redirect_url(req, oidreq, trust_root, return_to, method, immediate)
         request_url = request_url(req)
 
         if return_to
@@ -216,7 +217,7 @@ module Rack #:nodoc:
 
         method = method.to_s.downcase
         oidreq.return_to_args['_method'] = method unless method == "get"
-        oidreq.redirect_url(trust_root || realm_url(req), return_to || request_url)
+        oidreq.redirect_url(trust_root || realm_url(req), return_to || request_url, immediate)
       end
 
       def add_simple_registration_fields(oidreq, fields)
@@ -238,12 +239,19 @@ module Rack #:nodoc:
         axreq = ::OpenID::AX::FetchRequest.new
 
         required = Array(fields['required']).select(&URL_FIELD_SELECTOR)
-        required.each { |field| axreq.add(::OpenID::AX::AttrInfo.new(field, nil, true)) }
-
         optional = Array(fields['optional']).select(&URL_FIELD_SELECTOR)
-        optional.each { |field| axreq.add(::OpenID::AX::AttrInfo.new(field, nil, false)) }
 
-        oidreq.add_extension(axreq)
+        if required.any? || optional.any?
+          required.each do |field|
+            axreq.add(::OpenID::AX::AttrInfo.new(field, nil, true))
+          end
+
+          optional.each do |field|
+            axreq.add(::OpenID::AX::AttrInfo.new(field, nil, false))
+          end
+
+          oidreq.add_extension(axreq)
+        end
       end
 
       def add_oauth_fields(oidreq, fields)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-openid
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Joshua Peek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -05:00
+date: 2011-02-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,18 +50,19 @@ dependencies:
         version: 2.1.8
   type: :runtime
   version_requirements: *id002
-description: Provides a more HTTPish API around the ruby-openid library
+description: "    Provides a more HTTPish API around the ruby-openid library\n"
 email: josh@joshpeek.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - lib/rack/openid.rb
 - lib/rack/openid/simple_auth.rb
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/josh/rack-openid
 licenses: []
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Provides a more HTTPish API around the ruby-openid library