authn 3.1.0 → 3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/lib/authn/config.rb +1 -1
  2. data/lib/authn/model.rb +1 -1
  3. data/lib/authn/session.rb +2 -2
  4. data/lib/authn/version.rb +1 -1
  5. data/test/lib/authn/config_test.rb +1 -1
  6. data/test/lib/authn/model_test.rb +1 -1
  7. data/test/lib/authn/session_test.rb +1 -1
  8. data/test/lib/authn/version_test.rb +2 -2
  9. metadata +4 -4
data/lib/authn/config.rb CHANGED
@@ -14,7 +14,7 @@ module AuthN
14
14
  }
15
15
 
16
16
  def self.defaults
17
- @@defaults ||= {}
17
+ @@defaults
18
18
  end
19
19
  end
20
20
  end
data/lib/authn/model.rb CHANGED
@@ -41,7 +41,7 @@ module AuthN
41
41
  private
42
42
 
43
43
  def merge_config_with(options)
44
- config.merge! options.merge! AuthN.config
44
+ config.merge! AuthN.config.dump.merge options
45
45
  end
46
46
  end
47
47
  end
data/lib/authn/session.rb CHANGED
@@ -37,11 +37,11 @@ module AuthN
37
37
  end
38
38
 
39
39
  def generate_session_and_instance_from(instance)
40
- instance.tap { instance_and_session instance if instance }
40
+ instance.tap { |i| instance_and_session i if i }
41
41
  end
42
42
 
43
43
  def instance_and_session(instance)
44
- instance.tap { |instance| create_session instance.class, instance }
44
+ instance.tap { |i| create_session i.class, i }
45
45
  end
46
46
 
47
47
  def create_session(klass, instance)
data/lib/authn/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module AuthN
2
- VERSION = "3.1.0"
2
+ VERSION = "3.1.4"
3
3
  end
data/test/lib/authn/config_test.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'minitest/autorun'
2
- require_relative '../../helper'
2
+ require 'helper'
3
3
 
4
4
  class TestAuthNConfig < MiniTest::Unit::TestCase
5
5
  def setup
data/test/lib/authn/model_test.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'minitest/autorun'
2
- require_relative '../../helper'
2
+ require 'helper'
3
3
 
4
4
  class TestAuthNModel < MiniTest::Unit::TestCase
5
5
  def setup
data/test/lib/authn/session_test.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'minitest/autorun'
2
- require_relative '../../helper'
2
+ require 'helper'
3
3
 
4
4
  class TestAuthNSession < MiniTest::Unit::TestCase
5
5
  def setup
data/test/lib/authn/version_test.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  require 'minitest/autorun'
2
- require_relative '../../helper'
2
+ require 'helper'
3
3
 
4
4
  class TestAuthNVersion < MiniTest::Unit::TestCase
5
5
  def test_that_version_is_latest
6
- assert_equal "3.1.0", AuthN::VERSION
6
+ assert_equal "3.1.4", AuthN::VERSION
7
7
  end
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: authn
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0
4
+ version: 3.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-05 00:00:00.000000000 Z
12
+ date: 2012-09-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activemodel
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
132
132
  version: '0'
133
133
  segments:
134
134
  - 0
135
- hash: 3456173400469928444
135
+ hash: -2865134092982573588
136
136
  required_rubygems_version: !ruby/object:Gem::Requirement
137
137
  none: false
138
138
  requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
141
141
  version: '0'
142
142
  segments:
143
143
  - 0
144
- hash: 3456173400469928444
144
+ hash: -2865134092982573588
145
145
  requirements: []
146
146
  rubyforge_project:
147
147
  rubygems_version: 1.8.24