authlogic_rpx 1.1.1 → 1.2.0

data/test/libs/rails_trickery.rb

@@ -1,41 +1,41 @@
-# The only reason I am doing all of this non sense is becuase the openid_authentication requires that
-# these constants be present. The only other alternative is to use an entire rails application for testing
-# which is a little too overboard for this, I think.
-
-#RAILS_ROOT = ''
-
-class ActionControllerEx < Authlogic::TestCase::MockController
-  class Request < Authlogic::TestCase::MockRequest
-    def request_method
-      ""
-    end
-  end
-  
-  def root_url
-    ''
-  end
-  
-  def request
-    return @request if defined?(@request)
-    super
-    # Rails does some crazy s#!t with the "method" method. If I don't do this I get a "wrong arguments (0 for 1) error"
-    @request.class.class_eval do
-      def method
-        nil
-      end
-    end
-    @request
-  end
-  
-  def url_for(*args)
-    ''
-  end
-  
-  def redirecting_to
-    @redirect_to
-  end
-  
-  def redirect_to(*args)
-    @redirect_to = args
-  end
+# The only reason I am doing all of this non sense is becuase the openid_authentication requires that
+# these constants be present. The only other alternative is to use an entire rails application for testing
+# which is a little too overboard for this, I think.
+
+#RAILS_ROOT = ''
+
+class ActionControllerEx < Authlogic::TestCase::MockController
+  class Request < Authlogic::TestCase::MockRequest
+    def request_method
+      ""
+    end
+  end
+  
+  def root_url
+    ''
+  end
+  
+  def request
+    return @request if defined?(@request)
+    super
+    # Rails does some crazy s#!t with the "method" method. If I don't do this I get a "wrong arguments (0 for 1) error"
+    @request.class.class_eval do
+      def method
+        nil
+      end
+    end
+    @request
+  end
+  
+  def url_for(*args)
+    ''
+  end
+  
+  def redirecting_to
+    @redirect_to
+  end
+  
+  def redirect_to(*args)
+    @redirect_to = args
+  end
 end

data/test/libs/rpxresponse.rb

@@ -1,3 +1,3 @@
-class Rpxresponse < ActiveRecord::Base
-
+class Rpxresponse < ActiveRecord::Base
+
 end

data/test/libs/user.rb

@@ -1,3 +1,3 @@
-class User < ActiveRecord::Base
-  acts_as_authentic
+class User < ActiveRecord::Base
+  acts_as_authentic
 end

data/test/libs/user_session.rb

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

data/test/test_helper.rb

@@ -1,87 +1,85 @@
-require "rubygems"
-begin
-  gem 'test-unit'
-  require "test/unit"
-  require File.dirname(__FILE__) + "/libs/ext_test_unit"
-rescue Gem::LoadError
-  # assume using stdlib Test:Unit
-  require "test/unit"
-  require File.dirname(__FILE__) + "/libs/ext_test_unit"
-end
-
-require "ruby-debug"
-require "active_record"
-require "action_controller"
-
-ActiveRecord::Schema.verbose = false
-
-begin
-  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-rescue ArgumentError
-  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
-end
-
-ActiveRecord::Base.configurations = true
-ActiveRecord::Schema.define(:version => 1) do
-
-  create_table :rpxresponses do |t|
-    t.string    :identifier
-    t.string    :provider_name
-    t.string    :username
-    t.string    :verified_email
-    t.string    :display_name
-  end
-    
-  create_table :users do |t|
-    t.datetime  :created_at
-    t.datetime  :updated_at
-    t.integer   :lock_version, :default => 0
-    t.string    :login
-    t.string    :crypted_password
-    t.string    :password_salt
-    t.string    :persistence_token
-    t.string    :single_access_token
-    t.string    :perishable_token
-    t.string    :rpx_identifier
-    t.string    :email
-    t.string    :first_name
-    t.string    :last_name
-    t.integer   :login_count, :default => 0, :null => false
-    t.integer   :failed_login_count, :default => 0, :null => false
-    t.datetime  :last_request_at
-    t.datetime  :current_login_at
-    t.datetime  :last_login_at
-    t.string    :current_login_ip
-    t.string    :last_login_ip
-  end
-
-end
-
-require "active_record/fixtures"
-require "authlogic"
-require "authlogic/test_case"
-
-require "rpx_now"
-RPX_API_KEY = 'abcdefghijklmnopqrstuvwxyz' unless defined? RPX_API_KEY
-
-require File.dirname(__FILE__) + "/../lib/authlogic_rpx"
-
-require File.dirname(__FILE__) + "/libs/rails_trickery"
-require File.dirname(__FILE__) + '/libs/rpxresponse'
-require File.dirname(__FILE__) + '/libs/mock_rpx_now'
-require File.dirname(__FILE__) + '/libs/user'
-require File.dirname(__FILE__) + '/libs/user_session'
-
-class ActiveSupport::TestCase
-  include ActiveRecord::TestFixtures
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures"
-  self.use_transactional_fixtures = false
-  self.use_instantiated_fixtures  = false
-  self.pre_loaded_fixtures = false
-  fixtures :all
-  setup :activate_authlogic
-  
-  private
-
-    
+begin
+  require 'rubygems'
+  gem 'test-unit'
+  require 'test/unit'
+rescue LoadError
+  # assume using stdlib Test:Unit
+  require 'test/unit'
+end
+require 'ext_test_unit'
+
+require "active_record"
+require "action_controller"
+
+ActiveRecord::Schema.verbose = false
+
+begin
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+rescue ArgumentError
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+end
+
+ActiveRecord::Base.configurations = true
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table :rpxresponses do |t|
+    t.string    :identifier
+    t.string    :provider_name
+    t.string    :username
+    t.string    :verified_email
+    t.string    :display_name
+  end
+    
+  create_table :users do |t|
+    t.datetime  :created_at
+    t.datetime  :updated_at
+    t.integer   :lock_version, :default => 0
+    t.string    :login
+    t.string    :crypted_password
+    t.string    :password_salt
+    t.string    :persistence_token
+    t.string    :single_access_token
+    t.string    :perishable_token
+    t.string    :rpx_identifier
+    t.string    :email
+    t.string    :first_name
+    t.string    :last_name
+    t.integer   :login_count, :default => 0, :null => false
+    t.integer   :failed_login_count, :default => 0, :null => false
+    t.datetime  :last_request_at
+    t.datetime  :current_login_at
+    t.datetime  :last_login_at
+    t.string    :current_login_ip
+    t.string    :last_login_ip
+  end
+
+end
+
+require "active_record/fixtures"
+require "authlogic"
+require "authlogic/test_case"
+
+require "rpx_now"
+RPX_API_KEY = 'abcdefghijklmnopqrstuvwxyz' unless defined? RPX_API_KEY
+
+require 'authlogic_rpx'
+
+require 'rails_trickery'
+require 'rpxresponse'
+require 'mock_rpx_now'
+require 'user'
+require 'user_session'
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  self.fixture_path = File.dirname(__FILE__) + "/fixtures"
+  self.use_transactional_fixtures = false
+  self.use_instantiated_fixtures  = false
+  self.pre_loaded_fixtures = false
+  fixtures :all
+  setup :activate_authlogic
+  
+  private
+
+    
 end

data/test/test_internal_mapping_helper.rb

@@ -1,95 +1,93 @@
-require "rubygems"
-begin
-  gem 'test-unit'
-  require "test/unit"
-  require File.dirname(__FILE__) + "/libs/ext_test_unit"
-rescue Gem::LoadError
-  # assume using stdlib Test:Unit
-  require "test/unit"
-  require File.dirname(__FILE__) + "/libs/ext_test_unit"
-end
-
-require "ruby-debug"
-require "active_record"
-require "action_controller"
-
-ActiveRecord::Schema.verbose = false
-
-begin
-  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-rescue ArgumentError
-  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
-end
-
-ActiveRecord::Base.configurations = true
-ActiveRecord::Schema.define(:version => 1) do
-
-  create_table :rpxresponses do |t|
-    t.string    :identifier
-    t.string    :provider_name
-    t.string    :username
-    t.string    :verified_email
-    t.string    :display_name
-  end
-    
-  create_table :users do |t|
-    t.datetime  :created_at
-    t.datetime  :updated_at
-    t.integer   :lock_version, :default => 0
-    t.string    :login
-    t.string    :crypted_password
-    t.string    :password_salt
-    t.string    :persistence_token
-    t.string    :single_access_token
-    t.string    :perishable_token
-    t.string    :rpx_identifier
-    t.string    :email
-    t.string    :first_name
-    t.string    :last_name
-    t.integer   :login_count, :default => 0, :null => false
-    t.integer   :failed_login_count, :default => 0, :null => false
-    t.datetime  :last_request_at
-    t.datetime  :current_login_at
-    t.datetime  :last_login_at
-    t.string    :current_login_ip
-    t.string    :last_login_ip
-  end
-
-  create_table :rpx_identifiers do |t|
-    t.string  :identifier
-    t.string  :provider_name
-    t.integer :user_id
-    t.timestamps
-  end    
-
-end
-
-require "active_record/fixtures"
-require "authlogic"
-require "authlogic/test_case"
-
-require "rpx_now"
-RPX_API_KEY = 'abcdefghijklmnopqrstuvwxyz' unless defined? RPX_API_KEY
-
-require File.dirname(__FILE__) + "/../lib/authlogic_rpx"
-
-require File.dirname(__FILE__) + "/libs/rails_trickery"
-require File.dirname(__FILE__) + '/libs/rpxresponse'
-require File.dirname(__FILE__) + '/libs/mock_rpx_now'
-require File.dirname(__FILE__) + '/libs/user'
-require File.dirname(__FILE__) + '/libs/user_session'
-
-class ActiveSupport::TestCase
-  include ActiveRecord::TestFixtures
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures"
-  self.use_transactional_fixtures = false
-  self.use_instantiated_fixtures  = false
-  self.pre_loaded_fixtures = false
-  fixtures :all
-  setup :activate_authlogic
-  
-  private
-
-    
-end
-
+begin
+  require 'rubygems'
+  gem 'test-unit'
+  require 'test/unit'
+rescue LoadError
+  # assume using stdlib Test:Unit
+  require 'test/unit'
+end
+require 'ext_test_unit'
+
+require "active_record"
+require "action_controller"
+
+ActiveRecord::Schema.verbose = false
+
+begin
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+rescue ArgumentError
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+end
+
+ActiveRecord::Base.configurations = true
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table :rpxresponses do |t|
+    t.string    :identifier
+    t.string    :provider_name
+    t.string    :username
+    t.string    :verified_email
+    t.string    :display_name
+  end
+    
+  create_table :users do |t|
+    t.datetime  :created_at
+    t.datetime  :updated_at
+    t.integer   :lock_version, :default => 0
+    t.string    :login
+    t.string    :crypted_password
+    t.string    :password_salt
+    t.string    :persistence_token
+    t.string    :single_access_token
+    t.string    :perishable_token
+    t.string    :rpx_identifier
+    t.string    :email
+    t.string    :first_name
+    t.string    :last_name
+    t.integer   :login_count, :default => 0, :null => false
+    t.integer   :failed_login_count, :default => 0, :null => false
+    t.datetime  :last_request_at
+    t.datetime  :current_login_at
+    t.datetime  :last_login_at
+    t.string    :current_login_ip
+    t.string    :last_login_ip
+  end
+
+  create_table :rpx_identifiers do |t|
+    t.string  :identifier
+    t.string  :provider_name
+    t.integer :user_id
+    t.timestamps
+  end    
+
+end
+
+require "active_record/fixtures"
+require "authlogic"
+require "authlogic/test_case"
+
+require "rpx_now"
+RPX_API_KEY = 'abcdefghijklmnopqrstuvwxyz' unless defined? RPX_API_KEY
+
+require 'authlogic_rpx'
+
+require 'rails_trickery'
+require 'rpxresponse'
+require 'mock_rpx_now'
+require 'user'
+require 'user_session'
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  self.fixture_path = File.dirname(__FILE__) + "/fixtures"
+  self.use_transactional_fixtures = false
+  self.use_instantiated_fixtures  = false
+  self.pre_loaded_fixtures = false
+  fixtures :all
+  setup :activate_authlogic
+  
+  private
+
+    
+end
+