Empact-authlogic_rpx 1.1.7 → 1.1.8

data/Empact-authlogic_rpx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Empact-authlogic_rpx}
-  s.version = "1.1.7"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Gallagher / tardate"]
-  s.date = %q{2010-05-22}
+  s.date = %q{2010-07-03}
   s.description = %q{Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support}
   s.email = %q{gallagher.paul@gmail.com}
   s.extra_rdoc_files = [
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tardate/authlogic_rpx}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Authlogic plug-in for RPX support}
   s.test_files = [
     "test/integration/basic_authentication_and_registration_test.rb",
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<Empact-authlogic>, [">= 2.1.3"])
       s.add_runtime_dependency(%q<Empact-rpx_now>, [">= 0.6.12"])
     else

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/authlogic_rpx/acts_as_authentic.rb

@@ -32,6 +32,7 @@ module AuthlogicRpx
 			end      
 			alias_method :account_merge_enabled=,:account_merge_enabled
 			
+
 			# account_mapping_mode is used to explicitly set/override the mapping behaviour.
 			#
 			# * <tt>Default:</tt> :auto
@@ -77,18 +78,30 @@ module AuthlogicRpx
 		
 		module Methods
 		
-			# Mix-in the required methods based on mapping mode
-			#
+			# Set up some simple validations
 			def self.included(klass)
 				klass.class_eval do
 				  
 				  case
 				  when using_no_mapping?
-				    include AuthlogicRpx::MethodSet_NoMapping
+				    alias_method :using_rpx?, :using_rpx__nomap?
+				    alias_method :add_rpx_identifier, :add_rpx_identifier__nomap
+				    alias_method :identified_by?, :identified_by__nomap?
+				    alias_method :merge_user_id, :merge_user_id__nomap
+				    
+				    # Uses default find_by_rpx_identifier class method
+				    
+				    # Add an rpx_identifier collection method
+				    def rpx_identifiers
+				      [{ :identifier => rpx_identifier, :provider_name => "Unknown" }]
+				    end
 				    
           when using_internal_mapping? 
-            include AuthlogicRpx::MethodSet_InternalMapping
-            has_many :rpx_identifiers, :class_name => 'RPXIdentifier', :dependent => :destroy
+				    alias_method :using_rpx?, :using_rpx__internal?
+				    alias_method :add_rpx_identifier, :add_rpx_identifier__internal
+				    alias_method :identified_by?, :identified_by__internal?
+				    alias_method :merge_user_id, :merge_user_id__internal
+            has_many :rpx_identifiers, :class_name => 'RPXIdentifier', :validate => false, :dependent => :destroy
             
         		# Add custom find_by_rpx_identifier class method
         		#
@@ -114,10 +127,9 @@ module AuthlogicRpx
             raise AuthlogicRpx::ActsAsAuthentic::ConfigurationError.new( "invalid or unsupported account_mapping_mode" )
           end
 
-          # Set up some fundamental conditional validations
-					validates_length_of_password_field_options validates_length_of_password_field_options.merge(:if => :validate_password_not_rpx?)
-					validates_confirmation_of_password_field_options validates_confirmation_of_password_field_options.merge(:if => :validate_password_not_rpx?)
-					validates_length_of_password_confirmation_field_options validates_length_of_password_confirmation_field_options.merge(:if => :validate_password_not_rpx?)
+					validates_length_of_password_field_options validates_length_of_password_field_options.merge(:if => :validate_password_with_rpx?)
+					validates_confirmation_of_password_field_options validates_confirmation_of_password_field_options.merge(:if => :validate_password_with_rpx?)
+					validates_length_of_password_confirmation_field_options validates_length_of_password_confirmation_field_options.merge(:if => :validate_password_with_rpx?)
 					
 					before_validation :adding_rpx_identifier
 				end
@@ -130,11 +142,13 @@ module AuthlogicRpx
 				end
 			end
 
-			# support a block given to the save
-			def save(perform_validation = true, &block)
-				result = super perform_validation
-				yield(result) if block_given?
-				result
+			# test if account it using RPX authentication
+			# aliased to using_rpx based on authlogic_rpx configuration mode
+			def using_rpx__nomap?
+			  !rpx_identifier.blank?
+			end
+			def using_rpx__internal?
+			  !rpx_identifiers.empty?
 			end
 			
 			# test if account it using normal password authentication
@@ -142,11 +156,30 @@ module AuthlogicRpx
 				!send(crypted_password_field).blank?
 			end
 
+      # adds RPX identification to the instance.
+      # Abstracts how the RPX identifier is added to allow for multiplicity of underlying implementations
+			# aliased to add_rpx_identifier based on authlogic_rpx configuration mode
+      def add_rpx_identifier__nomap( rpx_id, rpx_provider_name )
+			  self.rpx_identifier = rpx_id
+			  #TODO: make rpx_provider_name a std param?
+      end
+      def add_rpx_identifier__internal( rpx_id, rpx_provider_name )
+			  self.rpx_identifiers.build(:identifier => rpx_id, :provider_name => rpx_provider_name )
+      end
+      
+      # Checks if given identifier is an identity for this account
+      # aliased to identified_by based on authlogic_rpx configuration mode
+			def identified_by__nomap?( id )
+				self.rpx_identifier == id
+			end
+			def identified_by__internal?( id )
+				self.rpx_identifiers.find_by_identifier( id )
+			end
 			
 		private
 			
-			# tests if password authentication should be checked instead of rpx (i.e. if rpx is enabled but not used by this user) 
-			def validate_password_not_rpx?
+			# tests if password authentication should be checked: if rpx is enabled (but not used by this user) 
+			def validate_password_with_rpx?
 				!using_rpx? && require_password?
 			end
 
@@ -194,6 +227,19 @@ module AuthlogicRpx
 				end
 			end	
 			
+			# merge_user_id is an internal method used to merge the actual RPX identifiers
+			# aliased to merge_user_id based on authlogic_rpx configuration mode
+			def merge_user_id__nomap( from_user )
+			  self.rpx_identifier = from_user.rpx_identifier
+			  from_user.rpx_identifier = nil
+			  from_user.save
+			  from_user.reload		
+			end		
+			def merge_user_id__internal( from_user )
+				self.rpx_identifiers << from_user.rpx_identifiers	
+				from_user.reload
+			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
@@ -227,78 +273,4 @@ module AuthlogicRpx
 			
 		end
 	end
-	
-	# Mix-in collection of methods that are specific to no-mapping mode of operation
-	#
-	module MethodSet_NoMapping
-		# test if account it using RPX authentication
-		# 
-		def using_rpx?
-		  !rpx_identifier.blank?
-		end
-		
-    # adds RPX identification to the instance.
-    # Abstracts how the RPX identifier is added to allow for multiplicity of underlying implementations
-		# 
-    def add_rpx_identifier( rpx_id, rpx_provider_name )
-		  self.rpx_identifier = rpx_id
-		  #TODO: make rpx_provider_name a std param?
-    end
-    
-    # Checks if given identifier is an identity for this account
-    # 
-		def identified_by?( id )
-			self.rpx_identifier == id
-		end
-
-		# merge_user_id is an internal method used to merge the actual RPX identifiers
-		# 
-		def merge_user_id( from_user )
-		  self.rpx_identifier = from_user.rpx_identifier
-		  from_user.rpx_identifier = nil
-		  from_user.save
-		  from_user.reload		
-		end
-
-    # Uses default find_by_rpx_identifier class method
-    
-    # Add an rpx_identifier collection method
-    def rpx_identifiers
-      [{ :identifier => rpx_identifier, :provider_name => "Unknown" }]
-    end
-	end
-	
-	
-	# Mix-in collection of methods that are specific to internal mapping mode of operation
-	#
-	module MethodSet_InternalMapping
-		# test if account it using RPX authentication
-		# 
-		def using_rpx?
-		  !rpx_identifiers.empty?
-		end	
-
-    # adds RPX identification to the instance.
-    # Abstracts how the RPX identifier is added to allow for multiplicity of underlying implementations
-		# 
-    def add_rpx_identifier( rpx_id, rpx_provider_name )
-		  self.rpx_identifiers.build(:identifier => rpx_id, :provider_name => rpx_provider_name )
-    end
-
-    # Checks if given identifier is an identity for this account
-    # 
-		def identified_by?( id )
-			self.rpx_identifiers.find_by_identifier( id )
-		end
-		
-		# merge_user_id is an internal method used to merge the actual RPX identifiers
-		# 
-		def merge_user_id( from_user )
-			self.rpx_identifiers << from_user.rpx_identifiers	
-			from_user.reload
-		end
-		
-
-	end
-	
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Empact-authlogic_rpx
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Paul Gallagher / tardate
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 -04:00
+date: 2010-07-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: Empact-authlogic
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 1
@@ -35,9 +38,11 @@ dependencies:
   name: Empact-rpx_now
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 6
@@ -104,23 +109,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Authlogic plug-in for RPX support