authn 2.6.0 → 3.1.0

data/lib/authn/model.rb

@@ -5,9 +5,8 @@ module AuthN
     end
 
     module ClassMethods
-      def has_authentication(o = {})
-        options = AuthN.config.table.any? ? o.merge!(AuthN.config) : o
-        config.merge! options
+      def has_authentication(options = {})
+        merge_config_with options
       end
 
       def config=(options)
@@ -38,6 +37,12 @@ module AuthN
         # Return false if account was found and password didn't match
         # Return nil if account wasn't found OR password wasn't given
       end
+
+      private
+
+      def merge_config_with(options)
+        config.merge! options.merge! AuthN.config
+      end
     end
   end
 end

data/lib/authn/version.rb

@@ -1,3 +1,3 @@
 module AuthN
-  VERSION = "2.6.0"
+  VERSION = "3.1.0"
 end

data/test/lib/authn/model_test.rb

@@ -3,64 +3,62 @@ require_relative '../../helper'
 
 class TestAuthNModel < MiniTest::Unit::TestCase
   def setup
-
+    @account = Account.new
   end
 
-  # def has_authentication(o = {})
-  #   options = AuthN::Config::DEFAULTS.dup
-  #   options.merge! AuthN.config if AuthN.config.to_hash
-  #   options.merge! o unless o.empty?
-  #   config options
+  # def has_authentication(options = {})
+  #   merge_config_with options
   # end
-  def test_
-    actual =
-    expected =
-    assert_equal expected, actual
+  def test_model_gets_has_authentication_method
+    assert Account.public_methods.include? :has_authentication
   end
 
-  def test_
+  def test_has_authentication_config_combinds_with_default_config
     actual =
     expected =
     assert_equal expected, actual
   end
 
-  def test_
+  def test_has_autehntication_config_merges_in_model_config
     actual =
     expected =
     assert_equal expected, actual
   end
 
-  def test_
+  # def config=(options)
+  #   @@config = options
+  # end
+  #
+  # def config
+  #   @@config ||= AuthN::Config.new
+  # end
+  def test_model_has_class_wide_config_settings
     actual =
     expected =
     assert_equal expected, actual
   end
 
   # def authenticate(identifiers = {})
-  #   password = identifiers.delete :password
-  #   criteria = where identifiers
+  #   password = identifiers.delete AuthN.config.login_password_key
+  #   criteria = send AuthN.config.model_critera_method, identifiers
   #   instance = criteria.first
   #   if instance && password
-  #     if instance.authenticate password
-  #       instance
-  #     else
-  #       false
-  #     end
+  #     instance.authenticate(password) ? instance : false
   #   end
   # end
-  def test_
+  def test_authenticate_returns_instance_if_given_good_credentials
     actual =
     expected =
     assert_equal expected, actual
   end
 
-  def test_
+  def test_authenticate_returns_false_if_bad_password
     actual =
     expected =
     assert_equal expected, actual
   end
 
-  def test_
+  def test_authenticate_return_nil_if_no_record_found
     actual =
     expected =
     assert_equal expected, actual

data/test/lib/authn/session_test.rb

@@ -3,7 +3,6 @@ require_relative '../../helper'
 
 class TestAuthNSession < MiniTest::Unit::TestCase
   def setup
-    AuthN.config.account_klass = :Account
     Account.password "12341234"
     @controller = Controller.new
     @controller.session = {}

data/test/lib/authn/version_test.rb

@@ -3,6 +3,6 @@ require_relative '../../helper'
 
 class TestAuthNVersion < MiniTest::Unit::TestCase
   def test_that_version_is_latest
-    assert_equal "2.6.0", AuthN::VERSION
+    assert_equal "3.1.0", AuthN::VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authn
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 251754304822765398
+      hash: 3456173400469928444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 251754304822765398
+      hash: 3456173400469928444
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24