authlogic_rpx 1.0.3 → 1.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 1.0.4 released 2009-10-10
+
+* added new hooks for profile mapping (Session.map_rpx_data_each_login, ActsAsAuthentic.map_added_rpx_data) based on suggestion by trosser (github issue #5)
+* now supporting obtrusive (javascript pop-over) and unobtrusive (link) RPX pop-up sign-in forms. See rpx_popup method. (github issue #4)
+* updated support for rpx_now gem version 0.6.6
+* documentation updates
+
 == 1.0.3 released 2009-10-07
 
 * added general error handler for session validation to give clean 'failure' when underlying errors encountered (e.g. user model database constraint violation)

data/README.rdoc

@@ -35,14 +35,14 @@ Three gems are required: authlogic, grosser-rpx_now, and authlogic_rpx. Install
 
 Currently tested versions:
 * authlogic 2.1.2,2.1.1
-* grosser-rpx_now 0.5.10
-* authlogic_rpx 1.0.3
+* rpx_now 0.6.6
+* authlogic_rpx 1.0.4
 
 
 === 1. Direct gem installation
 
   sudo gem install authlogic
-  sudo gem install grosser-rpx_now --source http://gems.github.com
+  sudo gem install rpx_now --source http://gemcutter.org
   sudo gem install authlogic_rpx --source http://gemcutter.org
 
 
@@ -50,9 +50,9 @@ Currently tested versions:
 
 Include in config/environment.rb:
   
-  config.gem "authlogic"
-  config.gem "grosser-rpx_now", :lib => "rpx_now", :source => 'http://gems.github.com'
-  config.gem "authlogic_rpx", :source => 'http://gemcutter.org'
+  config.gem 'authlogic', :version => '>= 2.1.1'
+  config.gem 'rpx_now', :version => '>= 0.6.6', :source => 'http://gemcutter.org'
+  config.gem 'authlogic_rpx', :version => '>= 1.0.4', :source => 'http://gemcutter.org'
 
 Then to install, run from the command line:
 
@@ -63,9 +63,9 @@ Then to install, run from the command line:
 
 Include in RAILS_ROOT/.gems:
   
-  authlogic
-  grosser-rpx_now --source gems.github.com
-  authlogic_rpx --source gemcutter.org
+  authlogic --version '>= 2.1.1'
+  rpx_now --version '>= 0.6.6' --source gemcutter.org
+  authlogic_rpx --version '>= 1.0.4' --source gemcutter.org
 
 
 == Using Authlogic RPX
@@ -79,7 +79,7 @@ An important capability to be aware of is "auto registration". This means that w
 The main steps for enabling Authlogic RPX: 
 * 1. Enable RPX for your user model
 * 2. Add RPX configuration for the Authlogic session model
-* 3 Add custom user profile mapping (optional)
+* 3. Add custom user profile mapping (optional)
 * 4. Add application controller helpers: current_user, current_user_session
 * 5. Setup the Authlogic session controller
 * 6. Setup the Authlogic user controller
@@ -90,7 +90,9 @@ The main steps for enabling Authlogic RPX:
 === 1. Enable RPX for your user model
 
 The user model requires an additional field called "rpx_identifier". Creat a migration to add this. 
-You may need to remove database constraints on other fields if they will be unused in the RPX case (e.g. crypted_password and password_salt to make password authentication optional)
+You may need to remove database constraints on other fields if they will be unused in the RPX case (e.g. crypted_password and password_salt to make password authentication optional).
+
+If you are using auto-registration, you must also remove any database constraints for fields that will be automatically mapped (see notes in "3. Add custom user profile mapping during auto-registration")
 
   class AddUsersRpxIdentifier < ActiveRecord::Migration
     def self.up
@@ -156,19 +158,20 @@ For example, to disable auto-registration and enable extended info:
 
 {See the source for the sample user_session.rb}[http://github.com/tardate/rails-authlogic-rpx-sample/blob/master/app/models/user_session.rb].
 
-=== 3. Add custom user profile mapping during auto-registration (optional)
+=== 3. Add custom user profile mapping (optional)
 
-When users auto-register, profile data from RPX is available to be inserted in the user's record on your site. By default, authlogic_rpx will map the username and email fields.
+Authlogic_rpx provides three hooks for mapping information from the RPX profile into your application's user model:
+  
+* map_rpx_data: user profile mapping during auto-registration
+* map_rpx_data_each_login: user profile mapping during login
+* map_added_rpx_data: user profile mapping when adding RPX to an existing account
+ 
+See https://rpxnow.com/docs#profile_data for the definition of available attributes in the RPX profile.
 
-WARNING: if you are using auto-registration, any fields you map should NOT have unique constraints enforced at the database level.
-Authlogic_rpx will optimistically attempt to save the user record during registration, and violating a unique constraint will cause the authentication/registration to fail.
+=== 3a. map_rpx_data: user profile mapping during auto-registration
 
-You can/should enforce any required validations at the model level e.g.
+When users auto-register, profile data from RPX is available to be inserted in the user's record on your site. By default, authlogic_rpx will map the username and email fields.
 
-  validates_uniqueness_of   :username, :case_sensitive => false
-  
-This will allow the auto-registration to proceed, and the user can be given a chance to rectify the validation errors on your user profile page.
-			
 If you have other fields you want to map, you can provide your own implementation of the map_rpx_data method in the UserSession model. In that method, you will be updating the "self.attempted_record" object, with information from the "@rpx_data" object. See the {RPX documentation}[https://rpxnow.com/docs#profile_data] to find out about the set of information that is available. 
 
   class UserSession < Authlogic::Session::Base
@@ -196,6 +199,62 @@ If you have other fields you want to map, you can provide your own implementatio
   	
   end
 
+{See the source for the sample user_session.rb}[http://github.com/tardate/rails-authlogic-rpx-sample/blob/master/app/models/user_session.rb].
+
+WARNING: if you are using auto-registration, any fields you map should NOT have constraints enforced at the database level.
+Authlogic_rpx will optimistically attempt to save the user record during registration, and violating a database constraint will cause the authentication/registration to fail.
+
+You can/should enforce any required validations at the model level e.g.
+
+  validates_uniqueness_of   :username, :case_sensitive => false
+  
+This will allow the auto-registration to proceed, and the user can be given a chance to rectify the validation errors on your user profile page.
+
+If it is not acceptable in your application to have user records created with potential validation errors in auto-populated fields, you will need to override map_rpx_data and implement whatever special handling makes sense in your case. For example:
+  
+* directly check for uniqueness and other validation requirements
+* automatically "uniquify" certain fields like username
+* save conflicting profile information to "pending user review" columns or a seperate table
+
+
+==== 3b. map_rpx_data_each_login: user profile mapping during login
+
+map_rpx_data_each_login provides a hook to allow you to map RPX profile information every time the user logs in.
+
+By default, nothing is mapped. If you have other fields you want to map, you can provide your own implementation of the map_rpx_data_each_login method in the UserSession model.
+
+This would mainly be used to update relatively volatile information that you are maintaining in the user model (such as profile image url)
+
+In the map_rpx_data_each_login procedure, you will be writing to fields of the "self.attempted_record" object, pulling data from the @rpx_data object. For example:
+			
+	def map_rpx_data_each_login
+		# we'll always update photo_url
+		self.attempted_record.photo_url = @rpx_data['profile']['photo']
+	end
+
+{See the source for the sample user_session.rb}[http://github.com/tardate/rails-authlogic-rpx-sample/blob/master/app/models/user_session.rb].
+
+
+==== 3c. map_added_rpx_data: user profile mapping when adding RPX to an existing account
+
+map_added_rpx_data maps additional fields from the RPX response into the user object during the "add RPX to existing account" process.
+
+By default, it only maps the rpx_identifier field. If you have other fields you want to map, you can provide your own implementation of the map_added_rpx_data method in the User model (NOT UserSession, unlike for map_rpx_data and map_rpx_data_each_login).
+
+NB: If you override this method, you will be responsible for also mapping the rpx_identifier.
+
+In the map_added_rpx_data procedure, you will be writing to fields of the "self" object, pulling data from the rpx_data parameter. For example:
+
+	def map_added_rpx_data( rpx_data )
+		self.rpx_identifier = rpx_data['profile']['identifier']
+
+		# map some additional fields, e.g. photo_url
+		self.photo_url = rpx_data['profile']['photo'] if photo_url.blank?
+	end
+
+{See the source for the sample user.rb}[http://github.com/tardate/rails-authlogic-rpx-sample/blob/master/app/models/user.rb].
+
+
 === 4. Add application controller helpers: current_user, current_user_session
 
 We'll add current_user and current_user_session helpers. These can then be used in controllers and views to get a handle on the "current" logged in user.
@@ -367,6 +426,7 @@ Each takes an options hash:
 * <tt>app_name:</tt> name of the application you set when registering your service at rpxnow.com (will be prepended to RPX domain and used in RPX dialogues)
 * <tt>return_url:</tt> url for the RPX callback (e.g. user_sessions_url)
 * <tt>add_rpx:</tt> Optional. If true, requests RPX callback to add to current session. Else runs normal authentication process (default). See "7. Allow users to "Add RPX" to existing accounts"
+* <tt>unobtrusive:</tt> true/false; sets javascript style for link. unobtrusive=true links directly to rpxnow site, whereas unobtrusive=false does a javascript pop-over. Default: true (only used by rpx_popup)
 
 For example, to insert a login link in a navigation bar is as simple as this:
 
@@ -376,7 +436,7 @@ For example, to insert a login link in a navigation bar is as simple as this:
 				&lt;%= link_to "Profile", user_path(:current) %&gt; |
 				&lt;%= link_to "Sign out", signout_path %&gt;
 			&lt;% else %&gt;
-				&lt;%= rpx_popup( :link_text => "Register/Sign in with RPX..", :app_name => "rails-authlogic-rpx-sample", :return_url => user_sessions_url ) %>&gt;
+				&lt;%= rpx_popup( :link_text => "Register/Sign in with RPX..", :app_name => "rails-authlogic-rpx-sample", :return_url => user_sessions_url, :unobtrusive => false ) %>&gt;
 			&lt;% end %&gt;
 		&lt;/div&gt;
 
@@ -407,6 +467,11 @@ You'll note this is almost identical to the "update". The main difference is tha
 
   map.addrpxauth "addrpxauth", :controller => "users", :action => "addrpxauth", :method => :post
 
+To make an "Add RPX authentication for this account.." link, use rpx_popup as for normal RPX login, but set the return_url to the "addrpxauth" callback you have provided, and set the option :add_rpx to tru:
+      
+  &lt;%= rpx_popup( :link_text =&gt; "Add RPX authentication for this account..", :app_name =&gt; RPX_APP_NAME, :return_url =&gt; addrpxauth_url, :add_rpx =&gt; true, :unobtrusive =&gt; false ) %&gt; 
+
+
 === 9. There is no 9
 
 That's all there is. To see Authlogic_RPX in action, check out the demonstration Rails application:
@@ -451,16 +516,14 @@ Some design principles:
 
   # update manifest file
   $ rake manifest
-  
   # update gemspec
   $ rake build_gemspec
-  
   # build the gem
   gem build authlogic_rpx.gemspec
-  
   # push the gem to gemcutter (e.g. for version 1.0.3)
   gem push authlogic_rpx-1.0.3.gem
 
+
 == Kudos and Kopywrite
 
 Thanks to {binarylogic}[http://github.com/binarylogic] for cleaning up authentication in rails by creating Authlogic in the first place and offering it to the community.

data/Rakefile

@@ -10,11 +10,11 @@ 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.1", "grosser-rpx_now >=0.5.10" ]
+  p.runtime_dependencies = ["authlogic >=2.1.1", "rpx_now >=0.6.6" ]
   p.development_dependencies = []
 
   p.author = "Paul Gallagher / tardate"
-  p.email  = 'gallagher.paul@gmail.com'
+  p.email  = "gallagher.paul@gmail.com"
 
-  p.extra_deps = %w(authlogic >= 0)
+  p.install_message = ""
 end

data/authlogic_rpx.gemspec

@@ -2,16 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic_rpx}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Gallagher / tardate"]
-  s.date = %q{2009-10-07}
+  s.date = %q{2009-10-15}
   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/session.rb", "lib/authlogic_rpx/version.rb"]
   s.files = ["CHANGELOG.rdoc", "MIT-LICENSE", "Manifest", "README.rdoc", "Rakefile", "authlogic_rpx.gemspec", "init.rb", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb", "rails/init.rb", "test/acts_as_authentic_test.rb", "test/fixtures/users.yml", "test/libs/rails_trickery.rb", "test/libs/user.rb", "test/libs/user_session.rb", "test/session_test.rb", "test/test_helper.rb"]
   s.homepage = %q{http://github.com/tardate/authlogic_rpx}
+  s.post_install_message = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Authlogic_rpx", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{authlogic_rpx}
@@ -25,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.1"])
-      s.add_runtime_dependency(%q<grosser-rpx_now>, [">= 0.5.10"])
+      s.add_runtime_dependency(%q<rpx_now>, [">= 0.6.6"])
     else
       s.add_dependency(%q<authlogic>, [">= 2.1.1"])
-      s.add_dependency(%q<grosser-rpx_now>, [">= 0.5.10"])
+      s.add_dependency(%q<rpx_now>, [">= 0.6.6"])
     end
   else
     s.add_dependency(%q<authlogic>, [">= 2.1.1"])
-    s.add_dependency(%q<grosser-rpx_now>, [">= 0.5.10"])
+    s.add_dependency(%q<rpx_now>, [">= 0.6.6"])
   end
 end

data/lib/authlogic_rpx/acts_as_authentic.rb

@@ -64,16 +64,36 @@ module AuthlogicRpx
 				!using_rpx? && require_password?
 			end
 			
+			# hook for adding RPX identifier to an existing account. This is invoked prior to model validation.
+			# RPX information is plucked from the controller session object (where it was placed by the session model as a result
+			# of the RPX callback)
+			# The minimal action taken is to populate the rpx_identifier field in the user model.
+			#
+			# This procedure chains to the map_added_rpx_data, which may be over-ridden in your project to perform
+			# additional mapping of RPX information to the user model as may be desired.
+			#
 			def adding_rpx_identifier
 				return true unless session_class && session_class.controller
-				new_rpx_id = session_class.controller.session['added_rpx_identifier']	
-				unless new_rpx_id.blank?
-					session_class.controller.session['added_rpx_identifier'] = nil		
-					self.rpx_identifier = new_rpx_id 
+				added_rpx_data = session_class.controller.session['added_rpx_data']	
+				unless added_rpx_data.blank?
+					session_class.controller.session['added_rpx_data'] = nil
+					map_added_rpx_data( added_rpx_data ) 
 				end
 				return true
 			end
 			
+			# map_added_rpx_data maps additional fields from the RPX response into the user object during the "add RPX to existing account" process.
+			# Override this in your user model to perform field mapping as may be desired
+			# See https://rpxnow.com/docs#profile_data for the definition of available attributes
+			#
+			# By default, it only maps the rpx_identifier field.
+			#
+			def map_added_rpx_data( rpx_data )
+			  self.rpx_identifier = rpx_data['profile']['identifier']
+			end
+			
+			
+			
 			# experimental - a feature of RPX paid accounts and not properly developed/tested yet
 			def map_id?
 				self.class.map_id

data/lib/authlogic_rpx/helper.rb

@@ -6,6 +6,7 @@ module AuthlogicRpx
 		#   * <tt>app_name:</tt> name of the application (will be prepended to RPX domain and used in RPX dialogues)
 		#   * <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)
+		#
 		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] }
@@ -19,17 +20,22 @@ module AuthlogicRpx
 		#   * <tt>app_name:</tt> name of the application (will be prepended to RPX domain and used in RPX dialogues)
 		#   * <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)
+		#   * <tt>unobtrusive:</tt> true/false; sets javascript style for link. Default: true
+		#
+		# NB: i18n considerations? supports a :language parameter (not tested)
 		def rpx_popup(options = {})
 			params = (
 				{ :authenticity_token => form_authenticity_token, :add_rpx => options[:add_rpx] }.collect { |n| "#{n[0]}=#{ u(n[1]) }" if n[1] }
 			).compact.join('&')
+			unobtrusive = options[:unobtrusive].nil? ? true : options[:unobtrusive]
+			return_url = options[:return_url] + '?' + params 
+			return_url = u( return_url ) if unobtrusive # double-encoding required only if unobtrusive mode used
 			RPXNow.popup_code(
-				options[:link_text], 
-				options[:app_name],
-				u( options[:return_url] + '?' + params ),
-				:unobtrusive=>true
-				) 
-				# NB: i18n considerations? supports a :language parameter (not tested)
+  				options[:link_text], 
+  				options[:app_name],
+  				return_url,
+  				:unobtrusive=>unobtrusive
+  			) 
 		end
 
 	end

data/lib/authlogic_rpx/session.rb

@@ -62,7 +62,6 @@ module AuthlogicRpx
 				klass.class_eval do
 					attr_accessor :new_registration
 					attr_accessor :rpx_identifier
-					attr_accessor :rpx_data
 					after_persisting :add_rpx_identifier, :if => :adding_rpx_identifier?
 					validate :validate_by_rpx, :if => :authenticating_with_rpx?
 				end
@@ -83,10 +82,14 @@ module AuthlogicRpx
 			end
 
 		private
+		  # Tests if current request is for RPX authentication
+		  #
 			def authenticating_with_rpx?
 				controller.params[:token] && !controller.params[:add_rpx]
 			end
 
+      # hook instance finder method to class
+      #
 			def find_by_rpx_identifier_method
 				self.class.find_by_rpx_identifier_method
 			end
@@ -103,25 +106,25 @@ module AuthlogicRpx
 				self.class.rpx_extended_info_value
 			end
 
+      # Tests if current request is the special case of adding RPX to an existing account
+      #
 			def adding_rpx_identifier?
 				controller.params[:token] && controller.params[:add_rpx]
 			end
 			
-			# the main RPX magic. At this pont, a session is being validated and we know RPX identifier
-			# has been provided. We'll callback to RPX to verify the token, and authenticate the matching 
-			# user. 
-			# If no user is found, and we have auto_register enabled (default) this method will also 
-			# create the user registration stub.
-			#
-			# On return to the controller, you can test for new_registration? and registration_complete?
-			# to determine the most appropriate action
+			# Handles the special case of RPX being added to an existing account. 
+			# At this point, a session has been established as a result of a "save" on the user model (which indirectly triggers user session validation).
+			# We do not directly add the RPX details to the user record here in order to avoid getting
+			# into a recursive dance between the session and user models.
+			# Rather, it uses the trick of adding the necessary RPX information to the session object, 
+			# and the user model will pluck these values out before completing its validation step.
 			#
 			def add_rpx_identifier
-				data = RPXNow.user_data(controller.params[:token])
-				controller.session['added_rpx_identifier'] = data[:identifier] if data
+				data = RPXNow.user_data(controller.params[:token], :extended=> rpx_extended_info? ) {|raw| raw }
+				controller.session['added_rpx_data'] = data if data
 			end
 			
-			# the main RPX magic. At this pont, a session is being validated and we know RPX identifier
+			# the main RPX magic. At this point, a session is being validated and we know RPX identifier
 			# has been provided. We'll callback to RPX to verify the token, and authenticate the matching 
 			# user. 
 			# If no user is found, and we have auto_register enabled (default) this method will also 
@@ -158,30 +161,50 @@ module AuthlogicRpx
 						errors.add_to_base("We did not find any accounts with that login. Enter your details and create an account.")
 						return false
 					end
+				else
+				  map_rpx_data_each_login
 				end
 			
-			rescue	
-				errors.add_to_base("There was an error in authentication. Please try again or contact the system administrators for assistance")
-				return false
 			end
 
 			# map_rpx_data maps additional fields from the RPX response into the user object during auto-registration.
-			# Override this in your session controller to change the field mapping
+			# Override this in your session model to change the field mapping
 			# See https://rpxnow.com/docs#profile_data for the definition of available attributes
 			#
-			# WARNING: if you are using auto-registration, any fields you map should NOT have unique constraints enforced at the database level.
+			# In this procedure, you will be writing to fields of the "self.attempted_record" object, pulling data from the @rpx_data object.
+			#
+			# WARNING: if you are using auto-registration, any fields you map should NOT have constraints enforced at the database level.
 			# authlogic_rpx will optimistically attempt to save the user record during registration, and 
-			# violating a unique constraint will cause the authentication/registration to fail.
+			# violating a database constraint will cause the authentication/registration to fail.
 			#
 			# You can/should enforce any required validations at the model level e.g.
 			#   validates_uniqueness_of   :username, :case_sensitive => false
 			# This will allow the auto-registration to proceed, and the user can be given a chance to rectify the validation errors
 			# on your user profile page.
 			#
+			# If it is not acceptable in your application to have user records created with potential validation errors in auto-populated fields, you
+			# will need to override map_rpx_data and implement whatever special handling makes sense in your case. For example:
+			#   - directly check for uniqueness and other validation requirements
+			#   - automatically "uniquify" fields like username
+			#   - save conflicting profile information to "pending user review" columns or a seperate table
+			#
 			def map_rpx_data
 				self.attempted_record.send("#{klass.login_field}=", @rpx_data['profile']['preferredUsername'] ) if attempted_record.send(klass.login_field).blank?
 				self.attempted_record.send("#{klass.email_field}=", @rpx_data['profile']['email'] ) if attempted_record.send(klass.email_field).blank?
 			end
+
+			# map_rpx_data_each_login provides a hook to allow you to map RPX profile information every time the user
+			# logs in.
+			# By default, nothing is mapped. 
+			#
+			# This would mainly be used to update relatively volatile information that you are maintaining in the user model (such as profile image url)
+			#
+			# In this procedure, you will be writing to fields of the "self.attempted_record" object, pulling data from the @rpx_data object.
+			#
+			#
+			def map_rpx_data_each_login
+
+			end
 	
 		end
 		

data/lib/authlogic_rpx/version.rb

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

data/test/fixtures/users.yml

@@ -0,0 +1,5 @@
+john:
+  persistence_token: 6cde0674657a8a313ce952df979de2830309aa4c11ca65805dd00bfdc65dbcc2f5e36718660a1d2e68c1a08c276d996763985d2f06fd3d076eb7bc4d97b1e317
+  single_access_token: <%= Authlogic::Random.friendly_token %>
+  perishable_token: <%= Authlogic::Random.friendly_token %>
+  rpx_identifier : johns_rpx_identifier

data/test/libs/user_session.rb

@@ -1,2 +1,3 @@
 class UserSession < Authlogic::Session::Base
+  
 end

data/test/session_test.rb

@@ -1,5 +1,10 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class SessionTest < ActiveSupport::TestCase
-
+  def test_authenticate_by_record
+    session = UserSession.new
+    assert session.respond_to?(:record)
+    session.record = users(:john)
+    assert_equal users(:john), session.record
+  end
 end

data/test/test_helper.rb

@@ -2,9 +2,10 @@ require "test/unit"
 require "rubygems"
 require "ruby-debug"
 require "active_record"
+require "action_controller"
 
 ActiveRecord::Schema.verbose = false
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.configurations = true
 ActiveRecord::Schema.define(:version => 1) do
   
@@ -33,13 +34,21 @@ ActiveRecord::Schema.define(:version => 1) do
 end
 
 require "active_record/fixtures"
-require "openid"
-require File.dirname(__FILE__) + "/../../authlogic/lib/authlogic"
-require File.dirname(__FILE__) + "/../../authlogic/lib/authlogic/test_case"
-require File.dirname(__FILE__) + "/libs/rails_trickery"
+Rails = true
+
+require "authlogic/test_case"
+
+include Authlogic::TestCase
+
+
+#require File.dirname(__FILE__) + "/../../authlogic/lib/authlogic"
+#require File.dirname(__FILE__) + "/../../authlogic/lib/authlogic/test_case"
+#require File.dirname(__FILE__) + "/libs/rails_trickery"
 require File.dirname(__FILE__) + '/libs/user'
 require File.dirname(__FILE__) + '/libs/user_session'
 
+require File.dirname(__FILE__) + "./../rails/init.rb"
+
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
   self.fixture_path = File.dirname(__FILE__) + "/fixtures"
@@ -57,5 +66,8 @@ class ActiveSupport::TestCase
     def controller
       @controller ||= Authlogic::TestCase::ControllerAdapter.new(ActionController.new)
     end
-    
+
+    def redirecting_to_rpx?
+      controller.redirecting_to.to_s =~ /^http:\/\/rpxnow.com/
+    end    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_rpx
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Paul Gallagher / tardate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 +08:00
+date: 2009-10-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: grosser-rpx_now
+  name: rpx_now
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.10
+        version: 0.6.6
     version: 
 description: Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support
 email: gallagher.paul@gmail.com
@@ -71,7 +71,7 @@ has_rdoc: true
 homepage: http://github.com/tardate/authlogic_rpx
 licenses: []
 
-post_install_message: 
+post_install_message: ""
 rdoc_options: 
 - --line-numbers
 - --inline-source