authlogic_rpx 1.1.1 → 1.2.0

data/lib/authlogic_rpx/version.rb

@@ -1,51 +1,51 @@
-module AuthlogicRpx
-  # A class for describing the current version of a library. The version
-  # consists of three parts: the +major+ number, the +minor+ number, and the
-  # +tiny+ (or +patch+) number.
-  class Version
-    include Comparable
-  
-    # A convenience method for instantiating a new Version instance with the
-    # given +major+, +minor+, and +tiny+ components.
-    def self.[](major, minor, tiny)
-      new(major, minor, tiny)
-    end
-
-    attr_reader :major, :minor, :tiny
-
-    # Create a new Version object with the given components.
-    def initialize(major, minor, tiny)
-      @major, @minor, @tiny = major, minor, tiny
-    end
-
-    # Compare this version to the given +version+ object.
-    def <=>(version)
-      to_i <=> version.to_i
-    end
-
-    # Converts this version object to a string, where each of the three
-    # version components are joined by the '.' character. E.g., 2.0.0.
-    def to_s
-      @to_s ||= [@major, @minor, @tiny].join(".")
-    end
-
-    # Converts this version to a canonical integer that may be compared
-    # against other version objects.
-    def to_i
-      @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
-    end
-    
-    def to_a
-      [@major, @minor, @tiny]
-    end
-
-    MAJOR = 1
-    MINOR = 1
-    TINY  = 1
-
-    # The current version as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
-    # The current version as a String
-    STRING = CURRENT.to_s
-  end
+module AuthlogicRpx
+  # A class for describing the current version of a library. The version
+  # consists of three parts: the +major+ number, the +minor+ number, and the
+  # +tiny+ (or +patch+) number.
+  class Version
+    include Comparable
+  
+    # A convenience method for instantiating a new Version instance with the
+    # given +major+, +minor+, and +tiny+ components.
+    def self.[](major, minor, tiny)
+      new(major, minor, tiny)
+    end
+
+    attr_reader :major, :minor, :tiny
+
+    # Create a new Version object with the given components.
+    def initialize(major, minor, tiny)
+      @major, @minor, @tiny = major, minor, tiny
+    end
+
+    # Compare this version to the given +version+ object.
+    def <=>(version)
+      to_i <=> version.to_i
+    end
+
+    # Converts this version object to a string, where each of the three
+    # version components are joined by the '.' character. E.g., 2.0.0.
+    def to_s
+      @to_s ||= [@major, @minor, @tiny].join(".")
+    end
+
+    # Converts this version to a canonical integer that may be compared
+    # against other version objects.
+    def to_i
+      @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
+    end
+    
+    def to_a
+      [@major, @minor, @tiny]
+    end
+
+    MAJOR = 1
+    MINOR = 2
+    TINY  = 0
+
+    # The current version as a Version instance
+    CURRENT = new(MAJOR, MINOR, TINY)
+    # The current version as a String
+    STRING = CURRENT.to_s
+  end
 end

data/test/fixtures/rpxresponses.yml

@@ -1,20 +1,20 @@
-valid_rpx_auth_user_one:
-  identifier : http://provider.one/valid_rpx_auth_user_one
-  provider_name: provider.one
-  username: valid_rpx_auth_user_one
-  verified_email: valid_rpx_auth_user_one@provider.one
-  display_name: valid rpx auth user one
-
-valid_rpx_auth_user_two:
-  identifier : http://provider.one/valid_rpx_auth_user_two
-  provider_name: provider.one
-  username: valid_rpx_auth_user_two
-  verified_email: valid_rpx_auth_user_two@provider.one
-  display_name: valid rpx auth user two
-
-unregistered_rpx_auth_user_one:
-  identifier : http://provider.one/unregistered_rpx_auth_user_one
-  provider_name: provider.one
-  username: unregistered_rpx_auth_user_one
-  verified_email: unregistered_rpx_auth_user_one@provider.one
-  display_name: unregistered rpx auth user one
+valid_rpx_auth_user_one:
+  identifier : http://provider.one/valid_rpx_auth_user_one
+  provider_name: provider.one
+  username: valid_rpx_auth_user_one
+  verified_email: valid_rpx_auth_user_one@provider.one
+  display_name: valid rpx auth user one
+
+valid_rpx_auth_user_two:
+  identifier : http://provider.one/valid_rpx_auth_user_two
+  provider_name: provider.one
+  username: valid_rpx_auth_user_two
+  verified_email: valid_rpx_auth_user_two@provider.one
+  display_name: valid rpx auth user two
+
+unregistered_rpx_auth_user_one:
+  identifier : http://provider.one/unregistered_rpx_auth_user_one
+  provider_name: provider.one
+  username: unregistered_rpx_auth_user_one
+  verified_email: unregistered_rpx_auth_user_one@provider.one
+  display_name: unregistered rpx auth user one

data/test/fixtures/users.yml

@@ -1,20 +1,20 @@
-valid_rpx_auth_user_one:
-  login: valid_rpx_auth_user_one
-  email: valid_rpx_auth_user_one@provider.one
-  persistence_token: 6cde0674657a8a313ce952df979de2830309aa4c11ca65805dd00bfdc65dbcc2f5e36718660a1d2e68c1a08c276d996763985d2f06fd3d076eb7bc4d97b1e317
-  single_access_token: <%= Authlogic::Random.friendly_token %>
-  perishable_token: <%= Authlogic::Random.friendly_token %>
-  rpx_identifier : http://provider.one/valid_rpx_auth_user_one
-  
-valid_rpx_auth_user_two:
-  login: valid_rpx_auth_user_two
-  email: valid_rpx_auth_user_two@provider.one
-  persistence_token: 6cde0674657a8a313ce952df979de2830309aa4c11ca65805dd00bfdc65dbcc2f5e36718660a1d2e68c1a08c276d996763985d2f06fd3d076eb7bc4d97b1e317
-  single_access_token: <%= Authlogic::Random.friendly_token %>
-  perishable_token: <%= Authlogic::Random.friendly_token %>
-  rpx_identifier : http://provider.one/valid_rpx_auth_user_two 
-  
-invalid_rpx_auth_user_one:
-  login: invalid_rpx_auth_user_one
-
+valid_rpx_auth_user_one:
+  login: valid_rpx_auth_user_one
+  email: valid_rpx_auth_user_one@provider.one
+  persistence_token: 6cde0674657a8a313ce952df979de2830309aa4c11ca65805dd00bfdc65dbcc2f5e36718660a1d2e68c1a08c276d996763985d2f06fd3d076eb7bc4d97b1e317
+  single_access_token: <%= Authlogic::Random.friendly_token %>
+  perishable_token: <%= Authlogic::Random.friendly_token %>
+  rpx_identifier : http://provider.one/valid_rpx_auth_user_one
+  
+valid_rpx_auth_user_two:
+  login: valid_rpx_auth_user_two
+  email: valid_rpx_auth_user_two@provider.one
+  persistence_token: 6cde0674657a8a313ce952df979de2830309aa4c11ca65805dd00bfdc65dbcc2f5e36718660a1d2e68c1a08c276d996763985d2f06fd3d076eb7bc4d97b1e317
+  single_access_token: <%= Authlogic::Random.friendly_token %>
+  perishable_token: <%= Authlogic::Random.friendly_token %>
+  rpx_identifier : http://provider.one/valid_rpx_auth_user_two 
+  
+invalid_rpx_auth_user_one:
+  login: invalid_rpx_auth_user_one
+
  

data/test/integration/basic_authentication_and_registration_test.rb

@@ -1,53 +1,53 @@
-# requires test_helper to be loaded first
-
-class BasicAuthenticationAndRegistrationTest < ActiveSupport::TestCase
-
-  must "authenticate valid existing user" do
-    test_user = users(:valid_rpx_auth_user_one)
-    controller.params[:token] = test_user.login
-    session = UserSession.new
-    assert_true session.save, "should be a valid session"
-    assert_false session.new_registration?, "should not be a new registration"
-    assert_true session.registration_complete?, "registration should be complete"
-    assert_equal test_user, session.record
-  end
- 
-  must "do not authenticate invalidate non-existent user" do
-    controller.params[:token] = ''
-    session = UserSession.new
-    assert_false session.save, "should not be a valid session"
-  end
-
-
-  must "auto-register an unregistered user" do
-    # enforce Authlogic settings required for test
-    UserSession.auto_register true
-    User.account_merge_enabled false
-    User.account_mapping_mode :none
-    
-    # get response template. set the controller token (used by RPX mock to match mock response)
-    test_user = rpxresponses(:unregistered_rpx_auth_user_one)
-    controller.params[:token] = test_user.username
-    
-    session = UserSession.new
-    assert_true session.save, "should be a valid session"
-    assert_true session.new_registration?, "should be a new registration"
-    assert_true session.registration_complete?, "registration should be complete"
-  end
- 
-
-  must "auto-register disabled for an unregistered user" do
-    # enforce Authlogic settings required for test
-    UserSession.auto_register false
-    User.account_merge_enabled false
-    User.account_mapping_mode :none
-    
-    # get response template. set the controller token (used by RPX mock to match mock response)
-    test_user = rpxresponses(:unregistered_rpx_auth_user_one)
-    controller.params[:token] = test_user.username
-    
-    session = UserSession.new
-    assert_false session.save, "should not be a valid session"
-  end
-
+# requires test_helper to be loaded first
+
+class BasicAuthenticationAndRegistrationTest < ActiveSupport::TestCase
+
+  must "authenticate valid existing user" do
+    test_user = users(:valid_rpx_auth_user_one)
+    controller.params[:token] = test_user.login
+    session = UserSession.new
+    assert_true session.save, "should be a valid session"
+    assert_false session.new_registration?, "should not be a new registration"
+    assert_true session.registration_complete?, "registration should be complete"
+    assert_equal test_user, session.record
+  end
+ 
+  must "do not authenticate invalidate non-existent user" do
+    controller.params[:token] = ''
+    session = UserSession.new
+    assert_false session.save, "should not be a valid session"
+  end
+
+
+  must "auto-register an unregistered user" do
+    # enforce Authlogic settings required for test
+    UserSession.auto_register true
+    User.account_merge_enabled false
+    User.account_mapping_mode :none
+    
+    # get response template. set the controller token (used by RPX mock to match mock response)
+    test_user = rpxresponses(:unregistered_rpx_auth_user_one)
+    controller.params[:token] = test_user.username
+    
+    session = UserSession.new
+    assert_true session.save, "should be a valid session"
+    assert_true session.new_registration?, "should be a new registration"
+    assert_true session.registration_complete?, "registration should be complete"
+  end
+ 
+
+  must "auto-register disabled for an unregistered user" do
+    # enforce Authlogic settings required for test
+    UserSession.auto_register false
+    User.account_merge_enabled false
+    User.account_mapping_mode :none
+    
+    # get response template. set the controller token (used by RPX mock to match mock response)
+    test_user = rpxresponses(:unregistered_rpx_auth_user_one)
+    controller.params[:token] = test_user.username
+    
+    session = UserSession.new
+    assert_false session.save, "should not be a valid session"
+  end
+
 end

data/test/integration/internal_mapping/basic_authentication_and_registration_test.rb

@@ -1,3 +1,3 @@
-require File.dirname(__FILE__) + '/../../test_internal_mapping_helper.rb'
-require File.dirname(__FILE__) + '/../basic_authentication_and_registration_test.rb'
-
+require File.dirname(__FILE__) + '/../../test_internal_mapping_helper.rb'
+require File.dirname(__FILE__) + '/../basic_authentication_and_registration_test.rb'
+

data/test/integration/internal_mapping/settings_test.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../test_internal_mapping_helper.rb'
-
-class SettingsTest < ActiveSupport::TestCase
-
-  must "account_mapping_mode :auto should resolve to :internal" do
-    assert_equal :auto, User.account_mapping_mode
-    assert_equal :internal, User.account_mapping_mode_used
-  end 
- 
+require File.dirname(__FILE__) + '/../../test_internal_mapping_helper.rb'
+
+class SettingsTest < ActiveSupport::TestCase
+
+  must "account_mapping_mode :auto should resolve to :internal" do
+    assert_equal :auto, User.account_mapping_mode
+    assert_equal :internal, User.account_mapping_mode_used
+  end 
+ 
 end

data/test/integration/no_mapping/basic_authentication_and_registration_test.rb

@@ -1,3 +1,3 @@
-require File.dirname(__FILE__) + '/../../test_helper.rb'
-require File.dirname(__FILE__) + '/../basic_authentication_and_registration_test.rb'
-
+require File.dirname(__FILE__) + '/../../test_helper.rb'
+require File.dirname(__FILE__) + '/../basic_authentication_and_registration_test.rb'
+

data/test/integration/no_mapping/settings_test.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/../../test_helper.rb'
-
-class SettingsTest < ActiveSupport::TestCase
-
-  must "account_mapping_mode :auto should resolve to :none" do
-    assert_equal :auto, User.account_mapping_mode
-    assert_equal :none, User.account_mapping_mode_used
-  end 
- 
+require File.dirname(__FILE__) + '/../../test_helper.rb'
+
+class SettingsTest < ActiveSupport::TestCase
+
+  must "account_mapping_mode :auto should resolve to :none" do
+    assert_equal :auto, User.account_mapping_mode
+    assert_equal :none, User.account_mapping_mode_used
+  end 
+ 
 end

data/test/libs/ext_test_unit.rb

@@ -1,30 +1,30 @@
-module Test::Unit
- 
-  class TestCase
-   
-    def self.must(name, &block)
-      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-      defined = instance_method(test_name) rescue false
-      raise "#{test_name} is already defined in #{self}" if defined
-      if block_given?
-        define_method(test_name, &block)
-      else
-        define_method(test_name) do
-          flunk "No implementation provided for #{name}"
-        end
-      end
-    end
- 
-  end
-end
-
-
-module Test::Unit::Assertions
-  def assert_false(object, message="")
-    assert_equal(false, object, message)
-  end
-  def assert_true(object, message="")
-    assert_equal(true, object, message)
-  end
-end
-
+module Test::Unit
+ 
+  class TestCase
+   
+    def self.must(name, &block)
+      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+      defined = instance_method(test_name) rescue false
+      raise "#{test_name} is already defined in #{self}" if defined
+      if block_given?
+        define_method(test_name, &block)
+      else
+        define_method(test_name) do
+          flunk "No implementation provided for #{name}"
+        end
+      end
+    end
+ 
+  end
+end
+
+
+module Test::Unit::Assertions
+  def assert_false(object, message="")
+    assert_equal(false, object, message)
+  end
+  def assert_true(object, message="")
+    assert_equal(true, object, message)
+  end
+end
+

data/test/libs/mock_rpx_now.rb

@@ -1,34 +1,34 @@
-require File.dirname(__FILE__) + '/rpxresponse.rb'
-
-module RPXNow
-
-  def self.user_data(token, options={})
-    data = get_test_data(token)
-    if block_given? then yield(data) else parse_user_data(data) end
-  end
-
-  def self.parse_user_data(data)
-    data
-  end
-  
-  def self.get_test_data(token)
-
-    response = Rpxresponse.find_by_username(token)    
-    if response
-      data = {}
-      data['profile'] = {}
-      data['profile']['identifier'] = response.identifier
-      data['profile']['providerName'] = response.provider_name
-      data['profile']['preferredUsername'] = response.username
-      data['profile']['email'] = response.verified_email
-      
-      data[:identifier] = data['profile']['identifier']
-      data[:providerName] = data['profile']['providerName']
-      data[:email] = response.verified_email
-      data[:username] = data['profile']['preferredUsername']
-      data[:name] = response.display_name
-    end
-    
-    data
-  end
+require File.dirname(__FILE__) + '/rpxresponse.rb'
+
+module RPXNow
+
+  def self.user_data(token, options={})
+    data = get_test_data(token)
+    if block_given? then yield(data) else parse_user_data(data) end
+  end
+
+  def self.parse_user_data(data)
+    data
+  end
+  
+  def self.get_test_data(token)
+
+    response = Rpxresponse.find_by_username(token)    
+    if response
+      data = {}
+      data['profile'] = {}
+      data['profile']['identifier'] = response.identifier
+      data['profile']['providerName'] = response.provider_name
+      data['profile']['preferredUsername'] = response.username
+      data['profile']['email'] = response.verified_email
+      
+      data[:identifier] = data['profile']['identifier']
+      data[:providerName] = data['profile']['providerName']
+      data[:email] = response.verified_email
+      data[:username] = data['profile']['preferredUsername']
+      data[:name] = response.display_name
+    end
+    
+    data
+  end
 end