authlogic 2.1.3 → 2.1.4

data/README.rdoc

@@ -78,7 +78,7 @@ Apparently there is a bug with apache / passenger for v2.1.X with sessions not w
 
 == Documentation explanation
 
-You can find anything you want about Authlogic in the {documentation}[http://authlogic.rubyforge.org], all that you need to do is understand the basic design behind it.
+You can find anything you want about Authlogic in the {documentation}[http://rdoc.info/projects/binarylogic/authlogic], all that you need to do is understand the basic design behind it.
 
 That being said, there are 2 models involved during authentication. Your Authlogic model and your ActiveRecord model:
 
@@ -87,7 +87,7 @@ That being said, there are 2 models involved during authentication. Your Authlog
 
 Each of the above has its various sub modules that contain common logic. The sub modules are responsible for including *everything* related to it: configuration, class methods, instance methods, etc.
 
-For example, if you want to timeout users after a certain period of inactivity, you would look in <b>Authlogic::Session::Timeout</b>. To help you out, I listed the following publicly relevant modules with short descriptions. For the sake of brevity, there are more modules than listed here, the ones not listed are more for internal use, but you can easily read up on them in the {documentation}[http://authlogic.rubyforge.org].
+For example, if you want to timeout users after a certain period of inactivity, you would look in <b>Authlogic::Session::Timeout</b>. To help you out, I listed the following publicly relevant modules with short descriptions. For the sake of brevity, there are more modules than listed here, the ones not listed are more for internal use, but you can easily read up on them in the {documentation}[http://rdoc.info/projects/binarylogic/authlogic].
 
 === Authlogic::ActsAsAuthentic sub modules
 

data/Rakefile

@@ -9,10 +9,9 @@ begin
     gem.email = "bjohnson@binarylogic.com"
     gem.homepage = "http://github.com/binarylogic/authlogic"
     gem.authors = ["Ben Johnson of Binary Logic"]
-    gem.rubyforge_project = "authlogic"
     gem.add_dependency "activesupport"
   end
-  Jeweler::RubyforgeTasks.new
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:major: 2
 :minor: 1
-:patch: 3
+:patch: 4
 :build: 
-:major: 2

data/authlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic}
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2009-11-12}
+  s.date = %q{2010-05-23}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -145,8 +145,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/binarylogic/authlogic}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{authlogic}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A clean, simple, and unobtrusive ruby authentication solution.}
   s.test_files = [
     "test/acts_as_authentic_test/base_test.rb",
@@ -205,7 +204,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])

data/lib/authlogic.rb

@@ -1,57 +1,64 @@
 require "active_record"
 
-require File.dirname(__FILE__) + "/authlogic/i18n"
-require File.dirname(__FILE__) + "/authlogic/random"
-require File.dirname(__FILE__) + "/authlogic/regex"
+AUTHLOGIC_PATH = File.dirname(__FILE__) + "/authlogic/"
 
-require File.dirname(__FILE__) + "/authlogic/controller_adapters/abstract_adapter"
-require File.dirname(__FILE__) + "/authlogic/controller_adapters/rails_adapter" if defined?(Rails)
-require File.dirname(__FILE__) + "/authlogic/controller_adapters/merb_adapter" if defined?(Merb)
-require File.dirname(__FILE__) + "/authlogic/controller_adapters/sinatra_adapter" if defined?(Sinatra)
+[
+ "i18n",
+ "random",
+ "regex",
+ 
+ "controller_adapters/abstract_adapter",
+ 
+ "crypto_providers/md5",
+ "crypto_providers/sha1",
+ "crypto_providers/sha256",
+ "crypto_providers/sha512",
+ "crypto_providers/bcrypt",
+ "crypto_providers/aes256",
+ 
+ "authenticates_many/base",
+ "authenticates_many/association",
+ 
+ "acts_as_authentic/email",
+ "acts_as_authentic/logged_in_status",
+ "acts_as_authentic/login",
+ "acts_as_authentic/magic_columns",
+ "acts_as_authentic/password",
+ "acts_as_authentic/perishable_token",
+ "acts_as_authentic/persistence_token",
+ "acts_as_authentic/restful_authentication",
+ "acts_as_authentic/session_maintenance",
+ "acts_as_authentic/single_access_token",
+ "acts_as_authentic/validations_scope",
+ "acts_as_authentic/base",
+ 
+ "session/activation",
+ "session/active_record_trickery",
+ "session/brute_force_protection",
+ "session/callbacks",
+ "session/cookies",
+ "session/existence",
+ "session/foundation",
+ "session/http_auth",
+ "session/id",
+ "session/klass",
+ "session/magic_columns",
+ "session/magic_states",
+ "session/params",
+ "session/password",
+ "session/perishable_token",
+ "session/persistence",
+ "session/priority_record",
+ "session/scopes",
+ "session/session",
+ "session/timeout",
+ "session/unauthorized_record",
+ "session/validation",
+ "session/base"
+].each do |library|
+   require AUTHLOGIC_PATH + library
+ end
 
-require File.dirname(__FILE__) + "/authlogic/crypto_providers/md5"
-require File.dirname(__FILE__) + "/authlogic/crypto_providers/sha1"
-require File.dirname(__FILE__) + "/authlogic/crypto_providers/sha256"
-require File.dirname(__FILE__) + "/authlogic/crypto_providers/sha512"
-require File.dirname(__FILE__) + "/authlogic/crypto_providers/bcrypt"
-require File.dirname(__FILE__) + "/authlogic/crypto_providers/aes256"
-
-require File.dirname(__FILE__) + "/authlogic/authenticates_many/base"
-require File.dirname(__FILE__) + "/authlogic/authenticates_many/association"
-
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/email"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/logged_in_status"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/login"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/magic_columns"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/password"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/perishable_token"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/persistence_token"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/restful_authentication"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/session_maintenance"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/single_access_token"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/validations_scope"
-require File.dirname(__FILE__) + "/authlogic/acts_as_authentic/base"
-
-require File.dirname(__FILE__) + "/authlogic/session/activation"
-require File.dirname(__FILE__) + "/authlogic/session/active_record_trickery"
-require File.dirname(__FILE__) + "/authlogic/session/brute_force_protection"
-require File.dirname(__FILE__) + "/authlogic/session/callbacks"
-require File.dirname(__FILE__) + "/authlogic/session/cookies"
-require File.dirname(__FILE__) + "/authlogic/session/existence"
-require File.dirname(__FILE__) + "/authlogic/session/foundation"
-require File.dirname(__FILE__) + "/authlogic/session/http_auth"
-require File.dirname(__FILE__) + "/authlogic/session/id"
-require File.dirname(__FILE__) + "/authlogic/session/klass"
-require File.dirname(__FILE__) + "/authlogic/session/magic_columns"
-require File.dirname(__FILE__) + "/authlogic/session/magic_states"
-require File.dirname(__FILE__) + "/authlogic/session/params"
-require File.dirname(__FILE__) + "/authlogic/session/password"
-require File.dirname(__FILE__) + "/authlogic/session/perishable_token"
-require File.dirname(__FILE__) + "/authlogic/session/persistence"
-require File.dirname(__FILE__) + "/authlogic/session/priority_record"
-require File.dirname(__FILE__) + "/authlogic/session/scopes"
-require File.dirname(__FILE__) + "/authlogic/session/session"
-require File.dirname(__FILE__) + "/authlogic/session/timeout"
-require File.dirname(__FILE__) + "/authlogic/session/unauthorized_record"
-require File.dirname(__FILE__) + "/authlogic/session/validation"
-require File.dirname(__FILE__) + "/authlogic/session/base"
+require AUTHLOGIC_PATH + "controller_adapters/rails_adapter"   if defined?( Rails   )
+require AUTHLOGIC_PATH + "controller_adapters/merb_adapter"    if defined?( Merb    )
+require AUTHLOGIC_PATH + "controller_adapters/sinatra_adapter" if defined?( Sinatra )

data/lib/authlogic/acts_as_authentic/password.rb

@@ -64,8 +64,8 @@ module Authlogic
         #   u.password = "new pass"
         #   u.valid_password?("old pass")
         #
-        # Should the last line above return true or false? The record hasn't been saved yet, so most would assume yes.
-        # Other would assume no. So I let you decide by giving you this option.
+        # Should the last line above return true or false? The record hasn't been saved yet, so most would assume true.
+        # Other would assume false. So I let you decide by giving you this option.
         #
         # * <tt>Default:</tt> true
         # * <tt>Accepts:</tt> Boolean
@@ -180,6 +180,17 @@ module Authlogic
         def self.included(klass)
           return if klass.crypted_password_field.nil?
           klass.define_callbacks *METHODS
+          
+          # If Rails 3, support the new callback syntax
+          if klass.singleton_class.method_defined?(:set_callback)
+            METHODS.each do |method|
+              klass.class_eval <<-"end_eval", __FILE__, __LINE__
+                def self.#{method}(*methods, &block)
+                  set_callback :#{method}, *methods, &block
+                end
+              end_eval
+            end
+          end
         end
         
         private

data/lib/authlogic/controller_adapters/rails_adapter.rb

@@ -15,7 +15,7 @@ module Authlogic
       
       def cookie_domain
         @cookie_domain_key ||= Rails::VERSION::STRING >= '2.3' ? :domain : :session_domain
-        ActionController::Base.session_options[@cookie_domain_key]
+        controller.request.session_options[@cookie_domain_key]
       end
       
       def request_content_type

data/lib/authlogic/session/active_record_trickery.rb

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

data/lib/authlogic/session/callbacks.rb

@@ -64,6 +64,17 @@ module Authlogic
       def self.included(base) #:nodoc:
         base.send :include, ActiveSupport::Callbacks
         base.define_callbacks *METHODS
+        
+        # If Rails 3, support the new callback syntax
+        if base.singleton_class.method_defined?(:set_callback)
+          METHODS.each do |method|
+            base.class_eval <<-"end_eval", __FILE__, __LINE__
+              def self.#{method}(*methods, &block)
+                set_callback :#{method}, *methods, &block
+              end
+            end_eval
+          end
+        end
       end
       
       private

data/lib/authlogic/session/foundation.rb

@@ -39,7 +39,7 @@ module Authlogic
         #
         # or you can pass an array of objects:
         #
-        #   session.credentails = [my_user_object, true]
+        #   session.credentials = [my_user_object, true]
         #
         # and if you need to set an id, just pass it last. This value need be the last item in the array you pass, since the id is something that
         # you control yourself, it should never be set from a hash or a form. Examples:

data/test/acts_as_authentic_test/email_test.rb

@@ -74,6 +74,10 @@ module ActsAsAuthenticTest
       u.valid?
       assert u.errors[:email].size == 0
       
+      u.email = "damien+test1...etc..@mydomain.com"
+      u.valid?
+      assert u.errors[:email].size == 0
+      
       u.email = "dakota.dux+1@gmail.com"
       u.valid?
       assert u.errors[:email].size == 0

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  hash: 3
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 -05:00
+date: 2010-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: bjohnson@binarylogic.com
 executables: []
@@ -167,21 +177,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: authlogic
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A clean, simple, and unobtrusive ruby authentication solution.