authlogic 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 565581e21dba66d898a0aab8b407f73338a21b31
-  data.tar.gz: c9ba53aa14afd2a419f003791181f49fbacaa230
+  metadata.gz: f3c45b3e20668e033c6495eead74fffb26f49e2d
+  data.tar.gz: 5874acbfdecb0756c3832cf7529be7096dc5285a
 SHA512:
-  metadata.gz: fa27f90194dfe0df4e786238be81a7c0479fc0c8d5ddcff0612e23240ba17143efaa6f4a2aaa93bb9f61a87369e22ef811e048fbc99b0cd0fc4a12dee4082325
-  data.tar.gz: 5e55ec2fd8877e5800ca3b860273e5088423e0924fc94bdd5669d144e48444e55fe2e433808c18d513265e5838ec44eb47c06a8783cc7751c1835aa197ff73af
+  metadata.gz: 2fd5a1c9152c9b908e19788a93e5b6c81c6e445a16518278114e52110243acec868beacb1e2a901b5c9a6267ce15e2c58fafca16e788e49cb8d6ae6d0593ebd3
+  data.tar.gz: 6b59e97756f951c24bd0b7a79830bab6f1ab4f23e21446c6c49b90128d6aee29daa05d3a047a741d856810930591ef0dbee6d1a31a8b18c5591b0dbd3edc0a38

data/Gemfile.lock

@@ -1,61 +1,56 @@
 PATH
   remote: .
   specs:
-    authlogic (3.4.0)
+    authlogic (3.4.2)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
-      request_store (~> 1.0.5)
+      request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    atomic (1.1.15)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     bcrypt (3.1.7)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    builder (3.1.4)
+    builder (3.2.2)
     ffi (1.9.3)
     ffi-compiler (0.1.3)
       ffi (>= 1.0.0)
       rake
     i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.8.4)
-    rake (10.1.1)
+    json (1.8.1)
+    minitest (5.3.3)
+    rake (10.3.1)
     request_store (1.0.5)
-    scrypt (1.2.0)
+    scrypt (1.2.1)
       ffi-compiler (>= 0.0.2)
       rake
     sqlite3 (1.3.9)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
+    thread_safe (0.3.3)
     timecop (0.7.1)
-    tzinfo (0.3.38)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   authlogic!
-  bcrypt-ruby (>= 3.1.5)
-  i18n (>= 0.6.9)
-  rake (>= 10.1.1)
-  scrypt (>= 1.2.0)
-  sqlite3 (>= 1.3.9)
-  timecop (>= 0.7.1)
+  bcrypt-ruby (~> 3.1)
+  scrypt (~> 1.2)
+  sqlite3 (~> 1.3)
+  timecop (~> 0.7)

data/authlogic.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "authlogic"
-  s.version     = "3.4.1"
+  s.version     = "3.4.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben Johnson"]
   s.email       = ["bjohnson@binarylogic.com"]
@@ -11,15 +11,15 @@ Gem::Specification.new do |s|
   s.summary     = %q{A clean, simple, and unobtrusive ruby authentication solution.}
   s.description = %q{A clean, simple, and unobtrusive ruby authentication solution.}
 
+  s.license = 'MIT'
+
   s.add_dependency 'activerecord', '>= 3.2'
   s.add_dependency 'activesupport', '>= 3.2'
-  s.add_dependency 'request_store', '~>1.0.5'
-  s.add_development_dependency 'rake', '>= 10.1.1'
-  s.add_development_dependency 'bcrypt-ruby', '>= 3.1.5'
-  s.add_development_dependency 'scrypt', '>= 1.2.0'
-  s.add_development_dependency 'sqlite3', '>= 1.3.9'
-  s.add_development_dependency 'timecop', '>= 0.7.1'
-  s.add_development_dependency 'i18n', '>= 0.6.9'
+  s.add_dependency 'request_store', '~> 1.0'
+  s.add_development_dependency 'bcrypt-ruby', '~> 3.1'
+  s.add_development_dependency 'scrypt', '~> 1.2'
+  s.add_development_dependency 'sqlite3', '~> 1.3'
+  s.add_development_dependency 'timecop', '~> 0.7'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/authlogic.rb

@@ -9,13 +9,7 @@ path = File.dirname(__FILE__) + "/authlogic/"
 
  "controller_adapters/abstract_adapter",
 
- "crypto_providers/md5",
- "crypto_providers/sha1",
- "crypto_providers/sha256",
- "crypto_providers/sha512",
- "crypto_providers/bcrypt",
- "crypto_providers/aes256",
- "crypto_providers/scrypt",
+ "crypto_providers",
 
  "authenticates_many/base",
  "authenticates_many/association",

data/lib/authlogic/acts_as_authentic/password.rb

@@ -149,7 +149,11 @@ module Authlogic
         # * <tt>Default:</tt> CryptoProviders::SCrypt
         # * <tt>Accepts:</tt> Class
         def crypto_provider(value = nil)
-          rw_config(:crypto_provider, value, CryptoProviders::SCrypt)
+          if value.nil? and !acts_as_authentic_config.include?(:crypto_provider)
+            rw_config(:crypto_provider, CryptoProviders::SCrypt)
+          else
+            rw_config(:crypto_provider, value)
+          end
         end
         alias_method :crypto_provider=, :crypto_provider
 

data/lib/authlogic/acts_as_authentic/restful_authentication.rb

@@ -8,7 +8,7 @@ module Authlogic
           include InstanceMethods
         end
       end
-      
+
       module Config
         # Switching an existing app to Authlogic from restful_authentication? No problem, just set this true and your users won't know
         # anything changed. From your database perspective nothing will change at all. Authlogic will continue to encrypt passwords
@@ -23,18 +23,18 @@ module Authlogic
           r
         end
         alias_method :act_like_restful_authentication=, :act_like_restful_authentication
-        
+
         # This works just like act_like_restful_authentication except that it will start transitioning your users to the algorithm you
         # specify with the crypto provider option. The next time they log in it will resave their password with the new algorithm
         # and any new record will use the new algorithm as well. Make sure to update your users table if you are using the default
-        # migration since it will set crypted_password and salt columns to a maximum width of 40 characters which is not enough. 
+        # migration since it will set crypted_password and salt columns to a maximum width of 40 characters which is not enough.
         def transition_from_restful_authentication(value = nil)
           r = rw_config(:transition_from_restful_authentication, value, false)
           set_restful_authentication_config if value
           r
         end
         alias_method :transition_from_restful_authentication=, :transition_from_restful_authentication
-        
+
         private
           def set_restful_authentication_config
             crypto_provider_key = act_like_restful_authentication ? :crypto_provider : :transition_from_crypto_providers
@@ -45,17 +45,17 @@ module Authlogic
             end
           end
       end
-      
+
       module InstanceMethods
         private
           def act_like_restful_authentication?
             self.class.act_like_restful_authentication == true
           end
-          
+
           def transition_from_restful_authentication?
             self.class.transition_from_restful_authentication == true
           end
       end
     end
   end
-end
+end

data/lib/authlogic/crypto_providers.rb

@@ -0,0 +1,11 @@
+module Authlogic
+  module CryptoProviders
+    autoload :MD5,    "authlogic/crypto_providers/md5"
+    autoload :Sha1,   "authlogic/crypto_providers/sha1"
+    autoload :Sha256, "authlogic/crypto_providers/sha256"
+    autoload :Sha512, "authlogic/crypto_providers/sha512"
+    autoload :BCrypt, "authlogic/crypto_providers/bcrypt"
+    autoload :AES256, "authlogic/crypto_providers/aes256"
+    autoload :SCrypt, "authlogic/crypto_providers/scrypt"
+  end
+end

data/lib/authlogic/regex.rb

@@ -5,15 +5,15 @@ module Authlogic
   #
   #   validates_format_of :my_email_field, :with => Authlogic::Regex.email
   module Regex
-    # A general email regular expression. It allows top level domains (TLD) to be from 2 - 4 in length, any
-    # TLD longer than that must be manually specified. The decisions behind this regular expression were made
-    # by reading this website: http://www.regular-expressions.info/email.html, which is an excellent resource
-    # for regular expressions.
+    # A general email regular expression. It allows top level domains (TLD) to be from 2 - 13 in length.
+    # The decisions behind this regular expression were made by analyzing the list of top-level domains
+    # maintained by IANA and by reading this website: http://www.regular-expressions.info/email.html,
+    # which is an excellent resource for regular expressions.
     def self.email
       @email_regex ||= begin
         email_name_regex  = '[A-Z0-9_\.%\+\-\']+'
         domain_head_regex = '(?:[A-Z0-9\-]+\.)+'
-        domain_tld_regex  = '(?:[A-Z]{2,4}|museum|travel|онлайн)'
+        domain_tld_regex  = '(?:[A-Z]{2,13})'
         /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
       end
     end

data/test/test_helper.rb

@@ -14,7 +14,7 @@ logger = Logger.new(STDOUT)
 logger.level= Logger::FATAL
 ActiveRecord::Base.logger = logger
 
-ActiveRecord::Base.configurations = true
+#ActiveRecord::Base.configurations = true
 ActiveRecord::Base.default_timezone = :local
 ActiveRecord::Schema.define(:version => 1) do
   create_table :companies do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authlogic
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Ben Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,98 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.7'
 description: A clean, simple, and unobtrusive ruby authentication solution.
 email:
 - bjohnson@binarylogic.com
@@ -172,6 +144,7 @@ files:
 - lib/authlogic/controller_adapters/rack_adapter.rb
 - lib/authlogic/controller_adapters/rails_adapter.rb
 - lib/authlogic/controller_adapters/sinatra_adapter.rb
+- lib/authlogic/crypto_providers.rb
 - lib/authlogic/crypto_providers/aes256.rb
 - lib/authlogic/crypto_providers/bcrypt.rb
 - lib/authlogic/crypto_providers/md5.rb
@@ -273,7 +246,8 @@ files:
 - test/session_test/validation_test.rb
 - test/test_helper.rb
 homepage: http://github.com/binarylogic/authlogic
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []