authlogic 2.1.8 → 2.1.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 65da0c6f5fd6864251660c5f4a664358b30dc988
+  data.tar.gz: 7ea0d41d92635a9c28a1a5ccbd619bb37f562c8c
+SHA512:
+  metadata.gz: a1ead9e2f007f5047839b0fd1ac838f468c35d13052764c6a1506a10228003271d45f301684604c922805ad464c33da5e5531d67a806003e8449691de5becef0
+  data.tar.gz: aeed0bd6382c40cc168bb481ef9432bbcaa8e882906d2c4dd761da4076ecb9f1b03e2cd2bbb7e964af45a72147cfae04000bb0ea190161b5c84299b415d52b7d

data/.gitignore

@@ -2,6 +2,7 @@
 .swp
 *.log
 *.sqlite3
+*.gem
 pkg/*
 coverage/*
 doc/*

data/Gemfile

@@ -1,11 +1,2 @@
 source :rubygems
-
-gem 'activesupport', '~> 2.3.0'
-gem 'activerecord', '~> 2.3.0'
-
-group :test do
-  gem 'bcrypt-ruby'
-  gem 'rake'
-  gem 'debugger'
-  gem 'sqlite3'
-end
+gemspec

data/Gemfile.lock

@@ -1,3 +1,10 @@
+PATH
+  remote: .
+  specs:
+    authlogic (2.1.9)
+      activerecord (~> 2.3.0)
+      activesupport (~> 2.3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -5,14 +12,6 @@ GEM
       activesupport (= 2.3.14)
     activesupport (2.3.14)
     bcrypt-ruby (3.0.1)
-    columnize (0.3.6)
-    debugger (1.1.3)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.2)
-    debugger-linecache (1.1.1)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
     rake (0.9.2.2)
     sqlite3 (1.3.6)
 
@@ -20,9 +19,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3.0)
-  activesupport (~> 2.3.0)
+  authlogic!
   bcrypt-ruby
-  debugger
   rake
   sqlite3

data/authlogic.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "authlogic"
-  s.version     = "2.1.8"
+  s.version     = "2.1.10"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben Johnson"]
   s.email       = ["bjohnson@binarylogic.com"]
@@ -13,9 +13,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord', '~> 2.3.0'
   s.add_dependency 'activesupport', '~> 2.3.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'bcrypt-ruby'
+  s.add_development_dependency 'sqlite3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-end
+end

data/lib/authlogic/acts_as_authentic/session_maintenance.rb

@@ -48,12 +48,25 @@ module Authlogic
         end
         alias_method :session_ids=, :session_ids
         
+        # In some cases, you can use a different namespace for the session class. If you want to use a model
+        # to control access in a namespace and edit it in another namespace, you can define the session class
+        # namespace here so authlogic knows where to find it without problems.
+        #
+        # * <tt>Default:</tt> nil
+        # * <tt>Accepts:</tt> Strings
+        def session_class_namespace(value = nil)
+          rw_config(:session_class_namespace, value, nil)
+        end
+        alias_method :session_class_namespace=, :session_class_namespace
+        
         # The name of the associated session class. This is inferred by the name of the model.
         #
         # * <tt>Default:</tt> "#{klass.name}Session".constantize
         # * <tt>Accepts:</tt> Class
         def session_class(value = nil)
-          const = "#{base_class.name}Session".constantize rescue nil
+          namespace = rw_config(:session_class_namespace, nil)
+
+          const = ((namespace.nil? ? "" : "#{namespace}::") + "#{base_class.name}Session").constantize rescue nil
           rw_config(:session_class, value, const)
         end
         alias_method :session_class=, :session_class
@@ -136,4 +149,4 @@ module Authlogic
       end
     end
   end
-end
+end

data/lib/authlogic/controller_adapters/sinatra_adapter.rb

@@ -58,4 +58,4 @@ module Authlogic
   end
 end
 
-Sinatra::Request.send(:include, Authlogic::ControllerAdapters::SinatraAdapter::Adapter::Implementation)
+Sinatra::Base.send(:include, Authlogic::ControllerAdapters::SinatraAdapter::Adapter::Implementation)

data/lib/authlogic/regex.rb

@@ -9,17 +9,18 @@ module Authlogic
     # by reading this website: http://www.regular-expressions.info/email.html, which is an excellent resource
     # for regular expressions.
     def self.email
-      return @email_regex if @email_regex
-      email_name_regex  = '[A-Z0-9_\.%\+\-]+'
-      domain_head_regex = '(?:[A-Z0-9\-]+\.)+'
-      domain_tld_regex  = '(?:[A-Z]{2,4}|museum|travel)'
-      @email_regex = /^#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
+      @email_regex ||= begin
+        email_name_regex  = '[A-Z0-9_\.%\+\-\']+'
+        domain_head_regex = '(?:[A-Z0-9\-]+\.)+'
+        domain_tld_regex  = '(?:[A-Z]{2,4}|museum|travel)'
+        /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
+      end
     end
 
     # A simple regular expression that only allows for letters, numbers, spaces, and .-_@. Just a standard login / username
     # regular expression.
     def self.login
-      /\A\w[\w\.+\-_@ ]+$/
+      /\A\w[\w\.+\-_@ ]+\z/
     end
   end
-end
+end

data/lib/authlogic/session/active_record_trickery.rb

@@ -40,7 +40,7 @@ module Authlogic
         
         # For rails >= 3.0
         def model_name
-          if defined?(::ActiveModel)
+          if defined?(::ActiveModel.version)
             ::ActiveModel::Name.new(self)
           else
             ::ActiveSupport::ModelName.new(self.to_s)

data/lib/authlogic/session/cookies.rb

@@ -168,7 +168,7 @@ module Authlogic
               :value => "#{record.persistence_token}::#{record.send(record.class.primary_key)}",
               :expires => remember_me_until,
               :secure => secure,
-              :http_only => httponly,
+              :httponly => httponly,
               :domain => controller.cookie_domain
             }
           end
@@ -179,4 +179,4 @@ module Authlogic
       end
     end
   end
-end
+end

data/lib/authlogic/session/validation.rb

@@ -13,8 +13,8 @@ module Authlogic
       #         errors.add(:base, "You must be awesome to log in") unless attempted_record.awesome?
       #       end
       #   end
-      class Errors < (defined?(::ActiveModel) ? ::ActiveModel::Errors : ::ActiveRecord::Errors)
-        unless defined?(::ActiveModel)
+      class Errors < (defined?(::ActiveModel.version) ? ::ActiveModel::Errors : ::ActiveRecord::Errors)
+        unless defined?(::ActiveModel.version)
           def [](key)
             value = super
             value.is_a?(Array) ? value : [value].compact

data/test/acts_as_authentic_test/login_test.rb

@@ -5,101 +5,101 @@ module ActsAsAuthenticTest
     def test_login_field_config
       assert_equal :login, User.login_field
       assert_nil Employee.login_field
-      
+
       User.login_field = :nope
       assert_equal :nope, User.login_field
       User.login_field :login
       assert_equal :login, User.login_field
     end
-    
+
     def test_validate_login_field_config
       assert User.validate_login_field
       assert Employee.validate_login_field
-      
+
       User.validate_login_field = false
       assert !User.validate_login_field
       User.validate_login_field true
       assert User.validate_login_field
     end
-    
+
     def test_validates_length_of_login_field_options_config
       assert_equal({:within => 3..100}, User.validates_length_of_login_field_options)
       assert_equal({:within => 3..100}, Employee.validates_length_of_login_field_options)
-      
+
       User.validates_length_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_length_of_login_field_options)
       User.validates_length_of_login_field_options({:within => 3..100})
       assert_equal({:within => 3..100}, User.validates_length_of_login_field_options)
     end
-    
+
     def test_validates_format_of_login_field_options_config
-      default = {:with => /\A\w[\w\.+\-_@ ]+$/, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}
+      default = {:with => /\A\w[\w\.+\-_@ ]+\z/, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}
       assert_equal default, User.validates_format_of_login_field_options
       assert_equal default, Employee.validates_format_of_login_field_options
-      
+
       User.validates_format_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_format_of_login_field_options)
       User.validates_format_of_login_field_options default
       assert_equal default, User.validates_format_of_login_field_options
     end
-    
+
     def test_validates_uniqueness_of_login_field_options_config
       default = {:case_sensitive => false, :scope => User.validations_scope, :if => "#{User.login_field}_changed?".to_sym}
       assert_equal default, User.validates_uniqueness_of_login_field_options
-      
+
       User.validates_uniqueness_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_uniqueness_of_login_field_options)
       User.validates_uniqueness_of_login_field_options default
       assert_equal default, User.validates_uniqueness_of_login_field_options
     end
-    
+
     def test_validates_length_of_login_field
       u = User.new
       u.login = "a"
       assert !u.valid?
       assert u.errors[:login].size > 0
-      
+
       u.login = "aaaaaaaaaa"
       assert !u.valid?
       assert u.errors[:login].size == 0
     end
-    
+
     def test_validates_format_of_login_field
       u = User.new
       u.login = "fdsf@^&*"
       assert !u.valid?
       assert u.errors[:login].size > 0
-      
+
       u.login = "fdsfdsfdsfdsfs"
       assert !u.valid?
       assert u.errors[:login].size == 0
-      
+
       u.login = "dakota.dux+1@gmail.com"
       assert !u.valid?
       assert u.errors[:login].size == 0
     end
-    
+
     def test_validates_uniqueness_of_login_field
       u = User.new
       u.login = "bjohnson"
       assert !u.valid?
       assert u.errors[:login].size > 0
-      
+
       u.login = "BJOHNSON"
       assert !u.valid?
       assert u.errors[:login].size > 0
-      
+
       u.login = "fdsfdsf"
       assert !u.valid?
       assert u.errors[:login].size == 0
     end
-    
+
     def test_find_by_smart_case_login_field
       ben = users(:ben)
       assert_equal ben, User.find_by_smart_case_login_field("bjohnson")
       assert_equal ben, User.find_by_smart_case_login_field("BJOHNSON")
       assert_equal ben, User.find_by_smart_case_login_field("Bjohnson")
-      
+
       drew = employees(:drew)
       assert_equal drew, Employee.find_by_smart_case_login_field("dgainor@binarylogic.com")
       assert_equal drew, Employee.find_by_smart_case_login_field("Dgainor@binarylogic.com")

data/test/session_test/cookies_test.rb

@@ -6,35 +6,35 @@ module SessionTest
       def test_cookie_key
         UserSession.cookie_key = "my_cookie_key"
         assert_equal "my_cookie_key", UserSession.cookie_key
-    
+
         UserSession.cookie_key "user_credentials"
         assert_equal "user_credentials", UserSession.cookie_key
       end
-    
+
       def test_default_cookie_key
         assert_equal "user_credentials", UserSession.cookie_key
         assert_equal "back_office_user_credentials", BackOfficeUserSession.cookie_key
       end
-    
+
       def test_remember_me
         UserSession.remember_me = true
         assert_equal true, UserSession.remember_me
         session = UserSession.new
         assert_equal true, session.remember_me
-    
+
         UserSession.remember_me false
         assert_equal false, UserSession.remember_me
         session = UserSession.new
         assert_equal false, session.remember_me
       end
-  
+
       def test_remember_me_for
         UserSession.remember_me_for = 3.years
         assert_equal 3.years, UserSession.remember_me_for
         session = UserSession.new
         session.remember_me = true
         assert_equal 3.years, session.remember_me_for
-    
+
         UserSession.remember_me_for 3.months
         assert_equal 3.months, UserSession.remember_me_for
         session = UserSession.new
@@ -42,48 +42,48 @@ module SessionTest
         assert_equal 3.months, session.remember_me_for
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_credentials
         session = UserSession.new
         session.credentials = {:remember_me => true}
         assert_equal true, session.remember_me
       end
-    
+
       def test_remember_me
         session = UserSession.new
         assert_equal false, session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = false
         assert_equal false, session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = true
         assert_equal true, session.remember_me
         assert session.remember_me?
-      
+
         session.remember_me = nil
         assert_nil session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = "1"
         assert_equal "1", session.remember_me
         assert session.remember_me?
-      
+
         session.remember_me = "true"
         assert_equal "true", session.remember_me
         assert session.remember_me?
       end
-    
+
       def test_remember_me_until
         session = UserSession.new
         assert_nil session.remember_me_until
-      
+
         session.remember_me = true
         assert 3.months.from_now <= session.remember_me_until
       end
-    
+
       def test_persist_persist_by_cookie
         ben = users(:ben)
         assert !UserSession.find
@@ -91,14 +91,16 @@ module SessionTest
         assert session = UserSession.find
         assert_equal ben, session.record
       end
-    
+
       def test_after_save_save_cookie
         ben = users(:ben)
         session = UserSession.new(ben)
         assert session.save
+        debugger
         assert_equal "#{ben.persistence_token}::#{ben.id}", controller.cookies["user_credentials"]
+        assert_equal nil, controller.cookies["httponly"]
       end
-    
+
       def test_after_destroy_destroy_cookie
         ben = users(:ben)
         set_cookie_for(ben)
@@ -109,4 +111,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,12 +1,11 @@
 require "test/unit"
 require "rubygems"
-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)
+unless defined?(::ActiveModel.version)
   class ActiveRecord::Errors
     def [](key)
       value = on(key)
@@ -27,25 +26,25 @@ end
 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 +68,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 +86,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 +96,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 +126,7 @@ class ActiveSupport::TestCase
   self.pre_loaded_fixtures = false
   fixtures :all
   setup :activate_authlogic
-  
+
   private
     def password_for(user)
       case user
@@ -137,7 +136,7 @@ class ActiveSupport::TestCase
         "zackrocks"
       end
     end
-    
+
     def http_basic_auth_for(user = nil, &block)
       unless user.blank?
         controller.http_user = user.login
@@ -146,36 +145,36 @@ class ActiveSupport::TestCase
       yield
       controller.http_user = controller.http_password = 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,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: authlogic
 version: !ruby/object:Gem::Version
-  version: 2.1.8
-  prerelease: 
+  version: 2.1.10
 platform: ruby
 authors:
 - Ben Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,11 +34,52 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A clean, simple, and unobtrusive ruby authentication solution.
 email:
 - bjohnson@binarylogic.com
@@ -179,27 +216,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/binarylogic/authlogic
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A clean, simple, and unobtrusive ruby authentication solution.
 test_files:
 - test/acts_as_authentic_test/base_test.rb