Empact-authlogic 2.1.5 → 3.0.3

data/test/session_test/id_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class IdTest < ActiveSupport::TestCase

data/test/session_test/klass_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module KlassTest

data/test/session_test/magic_columns_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module MagicColumnsTest

data/test/session_test/magic_states_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module SessionTest

data/test/session_test/params_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ParamsTest

data/test/session_test/password_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module PasswordTest

data/test/session_test/perishability_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class PerishabilityTest < ActiveSupport::TestCase

data/test/session_test/persistence_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class PersistenceTest < ActiveSupport::TestCase

data/test/session_test/scopes_test.rb

@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class ScopesTest < ActiveSupport::TestCase
     def test_scope_method
       assert_nil Authlogic::Session::Base.scope
-      
+
       thread1 = Thread.new do
         scope = {:id => :scope1}
         Authlogic::Session::Base.send(:scope=, scope)
         assert_equal scope, Authlogic::Session::Base.scope
       end
       thread1.join
-      
+
       assert_nil Authlogic::Session::Base.scope
-      
+
       thread2 = Thread.new do
         scope = {:id => :scope2}
         Authlogic::Session::Base.send(:scope=, scope)
@@ -23,17 +23,17 @@ module SessionTest
 
       assert_nil Authlogic::Session::Base.scope
     end
-  
+
     def test_with_scope_method
       assert_raise(ArgumentError) { UserSession.with_scope }
-      
+
       UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
         assert_equal({:find_options => {:conditions => "awesome = 1"}, :id => "some_id"}, UserSession.scope)
       end
-      
+
       assert_nil UserSession.scope
     end
-  
+
     def test_initialize
       UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
         session = UserSession.new
@@ -42,18 +42,18 @@ module SessionTest
         assert_equal "another_id_some_id_test", session.send(:build_key, "test")
       end
     end
-    
+
     def test_search_for_record_with_scopes
       binary_logic = companies(:binary_logic)
       ben = users(:ben)
       zack = users(:zack)
-      
+
       session = UserSession.new
       assert_equal zack, session.send(:search_for_record, "find_by_login", zack.login)
-      
+
       session.scope = {:find_options => {:conditions => ["company_id = ?", binary_logic.id]}}
       assert_nil session.send(:search_for_record, "find_by_login", zack.login)
-      
+
       assert_equal ben, session.send(:search_for_record, "find_by_login", ben.login)
     end
   end

data/test/session_test/session_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module SessionTest

data/test/session_test/timeout_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module TimeoutTest

data/test/session_test/unauthorized_record_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class UnauthorizedRecordTest < ActiveSupport::TestCase

data/test/session_test/validation_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class ValidationTest < ActiveSupport::TestCase

data/test/test_helper.rb

@@ -4,48 +4,34 @@ require "ruby-debug"
 require "active_record"
 require "active_record/fixtures"
 
-# A temporary fix to bring active record errors up to speed with rails edge.
-# I need to remove this once the new gem is released. This is only here so my tests pass.
-unless defined?(::ActiveModel)
-  class ActiveRecord::Errors
-    def [](key)
-      value = on(key)
-      value.is_a?(Array) ? value : [value].compact
-    end
-  end
-end
-
-
-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::Schema.verbose = false
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+logger = Logger.new(STDOUT)
+logger.level= Logger::FATAL
+ActiveRecord::Base.logger = logger
 
 ActiveRecord::Base.configurations = true
 ActiveRecord::Schema.define(:version => 1) do
   create_table :companies do |t|
-    t.datetime  :created_at    
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.string    :name
     t.boolean   :active
   end
 
   create_table :projects do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.string    :name
   end
-  
+
   create_table :projects_users, :id => false do |t|
     t.integer :project_id
     t.integer :user_id
   end
-  
+
   create_table :users do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.integer   :lock_version, :default => 0
     t.integer   :company_id
@@ -69,9 +55,9 @@ ActiveRecord::Schema.define(:version => 1) do
     t.boolean   :approved, :default => true
     t.boolean   :confirmed, :default => true
   end
-  
+
   create_table :employees do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.integer   :company_id
     t.string    :email
@@ -87,9 +73,9 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :current_login_ip
     t.string    :last_login_ip
   end
-  
+
   create_table :affiliates do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.integer   :company_id
     t.string    :username
@@ -97,9 +83,9 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :pw_salt
     t.string    :persistence_token
   end
-  
+
   create_table :ldapers do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.string    :ldap_login
     t.string    :persistence_token
@@ -127,7 +113,7 @@ class ActiveSupport::TestCase
   self.pre_loaded_fixtures = false
   fixtures :all
   setup :activate_authlogic
-  
+
   private
     def password_for(user)
       case user
@@ -137,45 +123,45 @@ class ActiveSupport::TestCase
         "zackrocks"
       end
     end
-    
+
     def http_basic_auth_for(user = nil, &block)
       unless user.blank?
         controller.http_user = user.login
         controller.http_password = password_for(user)
       end
       yield
-      controller.http_user = controller.http_password = nil
+      controller.http_user = controller.http_password = controller.realm = nil
     end
-    
+
     def set_cookie_for(user, id = nil)
       controller.cookies["user_credentials"] = {:value => user.persistence_token, :expires => nil}
     end
-    
+
     def unset_cookie
       controller.cookies["user_credentials"] = nil
     end
-    
+
     def set_params_for(user, id = nil)
       controller.params["user_credentials"] = user.single_access_token
     end
-    
+
     def unset_params
       controller.params["user_credentials"] = nil
     end
-    
+
     def set_request_content_type(type)
       controller.request_content_type = type
     end
-    
+
     def unset_request_content_type
       controller.request_content_type = nil
     end
-    
+
     def set_session_for(user, id = nil)
       controller.session["user_credentials"] = user.persistence_token
       controller.session["user_credentials_id"] = user.id
     end
-    
+
     def unset_session
       controller.session["user_credentials"] = controller.session["user_credentials_id"] = nil
     end

metadata

@@ -1,51 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: Empact-authlogic
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 2
-  - 1
-  - 5
-  version: 2.1.5
+version: !ruby/object:Gem::Version
+  version: 3.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ben Johnson of Binary Logic
 - Ben Woosley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-30 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+date: 2011-08-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2164354060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.7
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2164354060
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2164350480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.7
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2164350480
 description: 
 email: bjohnson@binarylogic.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
-- .gitignore
-- CHANGELOG.rdoc
+files:
 - Empact-authlogic.gemspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -112,6 +111,9 @@ files:
 - lib/authlogic/test_case/mock_logger.rb
 - lib/authlogic/test_case/mock_request.rb
 - lib/authlogic/test_case/rails_request_adapter.rb
+- lib/generators/authlogic/USAGE
+- lib/generators/authlogic/session_generator.rb
+- lib/generators/authlogic/templates/session.rb
 - rails/init.rb
 - shoulda_macros/authlogic.rb
 - test/acts_as_authentic_test/base_test.rb
@@ -168,41 +170,34 @@ files:
 - test/session_test/unauthorized_record_test.rb
 - test/session_test/validation_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/binarylogic/authlogic
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2975867320564342286
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: authlogic
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A clean, simple, and unobtrusive ruby authentication solution.
-test_files: 
+test_files:
 - test/acts_as_authentic_test/base_test.rb
 - test/acts_as_authentic_test/email_test.rb
 - test/acts_as_authentic_test/logged_in_status_test.rb