authlogic 2.0.4 → 2.0.5

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 2.0.5 released 2009-3-30
+
+* Stub out authenticate_with_http_basic for TestCase::Controller adapter.
+* Added second parameter for add_acts_as_authentic module to specify the position: append or prepend.
+
 == 2.0.4 released 2009-3-28
 
 * Added validates_uniqueness_of_login_field_options and validates_uniqueness_of_email_field_options configuration options

data/Manifest.txt

@@ -58,6 +58,7 @@ lib/authlogic/test_case.rb
 lib/authlogic/test_case/controller_adapter.rb
 lib/authlogic/test_case/mock_controller.rb
 lib/authlogic/test_case/mock_cookie_jar.rb
+lib/authlogic/test_case/mock_logger.rb
 lib/authlogic/test_case/mock_request.rb
 lib/authlogic/version.rb
 shoulda_macros/authlogic.rb

data/Rakefile

@@ -15,7 +15,6 @@ Hoe.new("Authlogic", Authlogic::Version::STRING) do |p|
   p.readme_file = "README.rdoc"
   p.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
   p.remote_rdoc_dir = ''
-  p.test_globs = ["test/*/test_*.rb", "test/*/*_test.rb"]
+  p.test_globs = ["test/*/test_*.rb", "test/*_test.rb", "test/*/*_test.rb"]
   p.extra_deps = %w(activesupport)
-  p.post_install_message = "Version 2.0 introduces some changes that break backwards compatibility. The big change is how acts_as_authentic accepts configuration options. Instead of a hash, it now accepts a block: acts_as_authentic { |c| c.my_config_option = my_value}. See the docs for more details."
 end

data/lib/authlogic/acts_as_authentic/base.rb

@@ -41,9 +41,14 @@ module Authlogic
         # nothing to do with Authlogic.
         #
         # That being said, this is your tool for extending Authlogic and "hooking" into the acts_as_authentic call.
-        def add_acts_as_authentic_module(mod)
+        def add_acts_as_authentic_module(mod, action = :append)
           modules = acts_as_authentic_modules
-          modules << mod
+          case action
+          when :append
+            modules << mod
+          when :prepend
+            modules = [mod] + modules
+          end
           modules.uniq!
           write_inheritable_attribute(:acts_as_authentic_modules, modules)
         end
@@ -62,8 +67,7 @@ module Authlogic
         
           def config(key, value, default_value = nil, read_value = nil)
             if value == read_value
-              return read_inheritable_attribute(key) if inheritable_attributes.include?(key)
-              write_inheritable_attribute(key, default_value)
+              inheritable_attributes.include?(key) ? read_inheritable_attribute(key) : default_value
             else
               write_inheritable_attribute(key, value)
             end
@@ -73,6 +77,7 @@ module Authlogic
             columns_to_check.each { |column_name| return column_name.to_sym if column_names.include?(column_name.to_s) }
             columns_to_check.first ? columns_to_check.first.to_sym : nil
           end
+
       end
     end
   end

data/lib/authlogic/acts_as_authentic/password.rb

@@ -54,7 +54,7 @@ module Authlogic
         # * <tt>Default:</tt> {:minimum => 4, :if => "#{password_salt_field}_changed?".to_sym}
         # * <tt>Accepts:</tt> Hash of options accepted by validates_confirmation_of
         def validates_confirmation_of_password_field_options(value = nil)
-          config(:validates_confirmation_of_password_field_options, value, {:minimum => 4, :if => (password_salt_field ? "#{password_salt_field}_changed?".to_sym : nil)})
+          config(:validates_confirmation_of_password_field_options, value, {:minimum => 4, :if => :require_password?})
         end
         alias_method :validates_confirmation_of_password_field_options=, :validates_confirmation_of_password_field_options
         
@@ -140,6 +140,7 @@ module Authlogic
           @password = pass
           send("#{password_salt_field}=", Authlogic::Random.friendly_token) if password_salt_field
           send("#{crypted_password_field}=", crypto_provider.encrypt(*encrypt_arguments(@password, act_like_restful_authentication? ? :restful_authentication : nil)))
+          @password_changed = true
           after_password_set
         end
         
@@ -201,7 +202,11 @@ module Authlogic
           end
           
           def require_password?
-            new_record? || (password_salt_field && send("#{password_salt_field}_changed?")) || send(crypted_password_field).blank?
+            new_record? || password_changed? || send(crypted_password_field).blank?
+          end
+          
+          def password_changed?
+            @password_changed == true
           end
           
           def crypted_password_field

data/lib/authlogic/controller_adapters/rails_adapter.rb

@@ -4,7 +4,7 @@ module Authlogic
     # provides. Similar to how ActiveRecord has an adapter for MySQL, PostgreSQL, SQLite, etc.
     class RailsAdapter < AbstractAdapter
       def authenticate_with_http_basic(&block)
-        controller.authenticate_with_http_basic(&block)
+        yield [nil, nil]
       end
       
       def cookies

data/lib/authlogic/test_case.rb

@@ -1,7 +1,8 @@
-require "authlogic/test_case/controller_adapter"
-require "authlogic/test_case/mock_cookie_jar"
-require "authlogic/test_case/mock_request"
-require "authlogic/test_case/mock_controller"
+require File.dirname(__FILE__) + "/test_case/controller_adapter"
+require File.dirname(__FILE__) + "/test_case/mock_cookie_jar"
+require File.dirname(__FILE__) + "/test_case/mock_controller"
+require File.dirname(__FILE__) + "/test_case/mock_logger"
+require File.dirname(__FILE__) + "/test_case/mock_request"
 
 module Authlogic
   # This is a collection of methods and classes that help you easily test Authlogic. In fact, I use these same tools

data/lib/authlogic/test_case/mock_controller.rb

@@ -20,6 +20,10 @@ module Authlogic
       def cookie_domain
         nil
       end
+      
+      def logger
+        @logger ||= MockLogger.new
+      end
   
       def params
         @params ||= {}

data/lib/authlogic/test_case/mock_logger.rb

@@ -0,0 +1,10 @@
+module Authlogic
+  module TestCase
+    # Simple class to replace real loggers, so that we can raise any errors being logged.
+    class MockLogger
+      def error(message)
+        raise message
+      end
+    end
+  end
+end

data/lib/authlogic/test_case/mock_request.rb

@@ -1,6 +1,10 @@
 module Authlogic
   module TestCase
     class MockRequest # :nodoc:
+      def request_method
+        nil
+      end
+      
       def remote_ip
         "1.1.1.1"
       end

data/lib/authlogic/version.rb

@@ -41,7 +41,7 @@ module Authlogic # :nodoc:
 
     MAJOR = 2
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/test/acts_as_authentic_test/password_test.rb

@@ -44,7 +44,7 @@ module ActsAsAuthenticTest
     end
     
     def test_validates_confirmation_of_password_field_options_config
-      default = {:minimum => 4, :if => "#{User.password_salt_field}_changed?".to_sym}
+      default = {:minimum => 4, :if => :require_password?}
       assert_equal default, User.validates_confirmation_of_password_field_options
       assert_equal default, Employee.validates_confirmation_of_password_field_options
       

data/test/random_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper.rb'
 
 class RandomTest < ActiveSupport::TestCase
   def test_random_tokens_have_consisten_length
@@ -36,7 +36,7 @@ class RandomTest < ActiveSupport::TestCase
     def reload_authlogic_with_sec_random!(secure_random, enabled = true)
       silence_warnings do
         secure_random.parent.const_set(secure_random.name.sub("#{secure_random.parent}::", ''), enabled ? secure_random : nil)
-        load(File.dirname(__FILE__) + '/../../lib/authlogic/random.rb')
+        load(File.dirname(__FILE__) + '/../lib/authlogic/random.rb')
       end
     end
 

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require "test/unit"
 require "rubygems"
 require "ruby-debug"
 require "active_record"
-require 'active_record/fixtures'
+require "active_record/fixtures"
 
 ActiveRecord::Schema.verbose = false
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-28 00:00:00 -04:00
+date: 2009-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - lib/authlogic/test_case/controller_adapter.rb
 - lib/authlogic/test_case/mock_controller.rb
 - lib/authlogic/test_case/mock_cookie_jar.rb
+- lib/authlogic/test_case/mock_logger.rb
 - lib/authlogic/test_case/mock_request.rb
 - lib/authlogic/version.rb
 - shoulda_macros/authlogic.rb
@@ -158,7 +159,7 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/binarylogic/authlogic
-post_install_message: "Version 2.0 introduces some changes that break backwards compatibility. The big change is how acts_as_authentic accepts configuration options. Instead of a hash, it now accepts a block: acts_as_authentic { |c| c.my_config_option = my_value}. See the docs for more details."
+post_install_message: 
 rdoc_options: 
 - --main
 - README.rdoc
@@ -184,6 +185,8 @@ signing_key:
 specification_version: 2
 summary: A clean, simple, and unobtrusive ruby authentication solution.
 test_files: 
+- test/authenticates_many_test.rb
+- test/random_test.rb
 - 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