authn 3.1.0 → 3.1.4

data/lib/authn/config.rb

@@ -14,7 +14,7 @@ module AuthN
     }
 
     def self.defaults
-      @@defaults ||= {}
+      @@defaults
     end
   end
 end

data/lib/authn/model.rb

@@ -41,7 +41,7 @@ module AuthN
       private
 
       def merge_config_with(options)
-        config.merge! options.merge! AuthN.config
+        config.merge! AuthN.config.dump.merge options
       end
     end
   end

data/lib/authn/session.rb

@@ -37,11 +37,11 @@ module AuthN
     end
 
     def generate_session_and_instance_from(instance)
-      instance.tap { instance_and_session instance if instance }
+      instance.tap { |i| instance_and_session i if i }
     end
 
     def instance_and_session(instance)
-      instance.tap { |instance| create_session instance.class, instance }
+      instance.tap { |i| create_session i.class, i }
     end
 
     def create_session(klass, instance)

data/lib/authn/version.rb

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

data/test/lib/authn/config_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require_relative '../../helper'
+require 'helper'
 
 class TestAuthNConfig < MiniTest::Unit::TestCase
   def setup

data/test/lib/authn/model_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require_relative '../../helper'
+require 'helper'
 
 class TestAuthNModel < MiniTest::Unit::TestCase
   def setup

data/test/lib/authn/session_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require_relative '../../helper'
+require 'helper'
 
 class TestAuthNSession < MiniTest::Unit::TestCase
   def setup

data/test/lib/authn/version_test.rb

@@ -1,8 +1,8 @@
 require 'minitest/autorun'
-require_relative '../../helper'
+require 'helper'
 
 class TestAuthNVersion < MiniTest::Unit::TestCase
   def test_that_version_is_latest
-    assert_equal "3.1.0", AuthN::VERSION
+    assert_equal "3.1.4", AuthN::VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authn
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-07 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: 3456173400469928444
+      hash: -2865134092982573588
 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: 3456173400469928444
+      hash: -2865134092982573588
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24