authlogic_rpx 1.1.0 → 1.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.1.1 released 2010-01-17
+
+* updated gem support to rpx_now 0.6.12 (includes url encoding fix)
+
 == 1.1.0 released 2010-01-05
 
 * added identity mapping and merging support  [GH#10,GH#13]

data/README.rdoc

@@ -36,8 +36,8 @@ Three gems are required: authlogic, rpx_now, and authlogic_rpx. Install these as
 
 Currently tested versions:
 * authlogic 2.1.3,2.1.2,2.1.1
-* rpx_now 0.6.11,0.6.6
-* authlogic_rpx 1.1.0
+* rpx_now 0.6.12 (0.6.11,0.6.6 support is deprecated)
+* authlogic_rpx 1.1.1
 
 
 === 1. Direct gem installation
@@ -52,8 +52,8 @@ Currently tested versions:
 Include in config/environment.rb:
   
   config.gem 'authlogic', :version => '>= 2.1.3'
-  config.gem 'rpx_now', :version => '>= 0.6.11', :source => 'http://gemcutter.org'
-  config.gem 'authlogic_rpx', :version => '>= 1.1.0', :source => 'http://gemcutter.org'
+  config.gem 'rpx_now', :version => '>= 0.6.12', :source => 'http://gemcutter.org'
+  config.gem 'authlogic_rpx', :version => '>= 1.1.1', :source => 'http://gemcutter.org'
 
 Then to install, run from the command line:
 
@@ -65,8 +65,8 @@ Then to install, run from the command line:
 Include in RAILS_ROOT/.gems:
   
   authlogic --version '>= 2.1.3'
-  rpx_now --version '>= 0.6.11' --source gemcutter.org
-  authlogic_rpx --version '>= 1.1.0' --source gemcutter.org
+  rpx_now --version '>= 0.6.12' --source gemcutter.org
+  authlogic_rpx --version '>= 1.1.1' --source gemcutter.org
 
 
 == About Authlogic_RPX

data/Rakefile

@@ -10,7 +10,7 @@ Echoe.new("authlogic_rpx") do |p|
   p.summary = "Authlogic plug-in for RPX support"
   p.description = "Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support"
 
-  p.runtime_dependencies = ["authlogic >=2.1.3", "rpx_now >=0.6.11" ]
+  p.runtime_dependencies = ["authlogic >=2.1.3", "rpx_now >=0.6.12" ]
   p.development_dependencies = []
 
   p.author = "Paul Gallagher / tardate"

data/authlogic_rpx.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic_rpx}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Gallagher / tardate"]
-  s.date = %q{2010-01-05}
+  s.date = %q{2010-01-17}
   s.description = %q{Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support}
   s.email = %q{gallagher.paul@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/rpx_identifier.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb"]
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<authlogic>, [">= 2.1.3"])
-      s.add_runtime_dependency(%q<rpx_now>, [">= 0.6.11"])
+      s.add_runtime_dependency(%q<rpx_now>, [">= 0.6.12"])
     else
       s.add_dependency(%q<authlogic>, [">= 2.1.3"])
-      s.add_dependency(%q<rpx_now>, [">= 0.6.11"])
+      s.add_dependency(%q<rpx_now>, [">= 0.6.12"])
     end
   else
     s.add_dependency(%q<authlogic>, [">= 2.1.3"])
-    s.add_dependency(%q<rpx_now>, [">= 0.6.11"])
+    s.add_dependency(%q<rpx_now>, [">= 0.6.12"])
   end
 end

data/lib/authlogic_rpx/helper.rb

@@ -7,11 +7,12 @@ module AuthlogicRpx
 		#   * <tt>return_url:</tt> url for the RPX callback (e.g. user_sessions_url)
 		#   * <tt>add_rpx:</tt> if true, requests RPX callback to add to current session. Else runs normal authentication process (default)
 		#
+		# The options hash may include other options as supported by rpx_now (see http://github.com/grosser/rpx_now)
+		#
 		def rpx_embed(options = {})
-			params = (
-				{ :authenticity_token => form_authenticity_token, :add_rpx => options[:add_rpx] }.collect { |n| "#{n[0]}=#{ u(n[1]) }" if n[1] }
-			).compact.join('&')
-			RPXNow.embed_code(options[:app_name], u( options[:return_url] + '?' + params ) )
+		  app_name = options.delete( :app_name )
+			token_url = build_token_url!( options )
+			RPXNow.embed_code(app_name, token_url, options )
 		end
 
 		# helper to insert a link to pop-up RPX login
@@ -26,25 +27,18 @@ module AuthlogicRpx
 		#
 		def rpx_popup(options = {})
 			options = { :unobtrusive => true, :add_rpx => false }.merge( options )
-			unobtrusive = options[:unobtrusive]
-			add_rpx = options.delete( :add_rpx )
 			app_name = options.delete( :app_name )
 			link_text = options.delete( :link_text )
-			return_url = options.delete( :return_url ) + '?' + (
-				{ :authenticity_token => form_authenticity_token, :add_rpx => add_rpx }.collect { |n| "#{n[0]}=#{ u(n[1]) }" if n[1] }
-			).compact.join('&') 
-			
-			# as of rpx_now 0.6.11, there is still an issue with url-encoding of the return path containing additional parameters 
-			# (as we are using here to get the form_authenticity_token returned.
-			# To get around this, we need to ensure hrefs are url-encoded, 
-			# while the link provided to the rpx_now javascript popup should _not_ be url-encoded
-			if unobtrusive
-  			RPXNow.popup_code( link_text, app_name,	u( return_url ), options	)
-			else
-  			RPXNow.popup_code( link_text, app_name,	u( return_url ), options.merge( :unobtrusive => true )	) +
-        RPXNow.popup_source(app_name, return_url, options ) 
-      end
+			token_url = build_token_url!( options ) 
+			RPXNow.popup_code( link_text, app_name,	token_url, options	)
 		end
 
+    private
+    
+    def build_token_url!( options )
+      options.delete( :return_url ) + '?' + (
+        { :authenticity_token => form_authenticity_token, :add_rpx => options.delete( :add_rpx ) }.collect { |n| "#{n[0]}=#{ u(n[1]) }" if n[1] }
+			).compact.join('&')
+    end
 	end
 end

data/lib/authlogic_rpx/version.rb

@@ -41,7 +41,7 @@ module AuthlogicRpx
 
     MAJOR = 1
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_rpx
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Paul Gallagher / tardate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +08:00
+date: 2010-01-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.11
+        version: 0.6.12
     version: 
 description: Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support
 email: gallagher.paul@gmail.com