authn 1.0.0 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
data/lib/authn/config.rb CHANGED
@@ -11,9 +11,7 @@ module AuthN
11
11
  login_password_key: :password,
12
12
  model_id_method: :id,
13
13
  model_critera_method: :where,
14
- session_key_function: ->(klass) {
15
- :"session_#{klass}_id"
16
- }
14
+ session_key_function: ->(klass) { :"session_#{klass}_id" }
17
15
  }
18
16
  end
19
17
  end
data/lib/authn/model.rb CHANGED
@@ -31,11 +31,7 @@ module AuthN
31
31
  # Check to see if the instance exists and if a password was given
32
32
  if instance && password
33
33
  # Check to see if the instance can authenticate with password
34
- if instance.authenticate password
35
- instance
36
- else
37
- false
38
- end
34
+ instance.authenticate(password) ? instance : false
39
35
  end
40
36
 
41
37
  # Return instance if account was found and password matched
data/lib/authn/session.rb CHANGED
@@ -1,72 +1,66 @@
1
1
  module AuthN
2
2
  module Session
3
- def self.included(object)
4
- object.extend ClassMethods
3
+ def login(identifiers, klass = AuthN.config.account_klass)
4
+ generate_session_and_instance_from find_instance_klass(klass).authenticate identifiers
5
5
  end
6
6
 
7
- module ClassMethods
8
- def login(identifiers, klass = AuthN.config.account_klass)
9
- generate_session_and_instance_from find_instance_klass(klass).authenticate identifiers
10
- end
11
-
12
- def auto_login(instance)
13
- instance_and_session instance
14
- end
7
+ def auto_login(instance)
8
+ instance_and_session instance
9
+ end
15
10
 
16
- def logged_in?(instance = nil, klass = AuthN.config.account_klass)
17
- klass = instance.class if instance
18
- klass = find_instance_klass klass unless instance
19
- check_session klass
20
- end
11
+ def logged_in?(instance = nil, klass = AuthN.config.account_klass)
12
+ klass = instance.class if instance
13
+ klass = find_instance_klass klass unless instance
14
+ check_session klass
15
+ end
21
16
 
22
- def logout(instance = nil, klass = AuthN.config.account_klass)
23
- klass = instance.class if instance
24
- klass = find_instance_klass klass unless instance
25
- destroy_session klass
26
- end
17
+ def logout(instance = nil, klass = AuthN.config.account_klass)
18
+ klass = instance.class if instance
19
+ klass = find_instance_klass klass unless instance
20
+ destroy_session klass
21
+ end
27
22
 
28
- def current_user(klass = AuthN.config.account_klass)
29
- @current_user ||= get_session klass_as_name klass
30
- end
23
+ def current_user(klass = AuthN.config.account_klass)
24
+ @current_user ||= get_session klass_as_name klass
25
+ end
31
26
 
32
- alias_method :current_account, :current_user
27
+ alias_method :current_account, :current_user
33
28
 
34
- private
29
+ private
35
30
 
36
- def find_instance_klass(klass)
37
- const_get klass.capitalize
38
- end
31
+ def find_instance_klass(klass)
32
+ const_get klass.capitalize
33
+ end
39
34
 
40
- def klass_as_name(klass)
41
- klass.name.downcase
42
- end
35
+ def klass_as_name(klass)
36
+ klass.name.downcase
37
+ end
43
38
 
44
- def generate_session_and_instance_from(instance)
45
- instance.tap { instance_and_session instance if instance }
46
- end
39
+ def generate_session_and_instance_from(instance)
40
+ instance.tap { instance_and_session instance if instance }
41
+ end
47
42
 
48
- def instance_and_session(instance)
49
- instance.tap { |instance| create_session instance.class, instance }
50
- end
43
+ def instance_and_session(instance)
44
+ instance.tap { |instance| create_session instance.class, instance }
45
+ end
51
46
 
52
- def create_session(klass, instance)
53
- key = AuthN.config.session_key_function.call klass_as_name klass
54
- session[key] = instance.send AuthN.config.model_id_method
55
- end
47
+ def create_session(klass, instance)
48
+ key = AuthN.config.session_key_function.call klass_as_name klass
49
+ session[key] = instance.send AuthN.config.model_id_method
50
+ end
56
51
 
57
- def destroy_session(klass)
58
- key = AuthN.config.session_key_function.call klass_as_name klass
59
- session.delete key
60
- end
52
+ def destroy_session(klass)
53
+ key = AuthN.config.session_key_function.call klass_as_name klass
54
+ session.delete key
55
+ end
61
56
 
62
- def check_session(klass)
63
- get_session(klass).present?
64
- end
57
+ def check_session(klass)
58
+ get_session(klass).present?
59
+ end
65
60
 
66
- def get_session(klass)
67
- key = AuthN.config.session_key_function.call klass_as_name klass
68
- session[key]
69
- end
61
+ def get_session(klass)
62
+ key = AuthN.config.session_key_function.call klass_as_name klass
63
+ session[key]
70
64
  end
71
65
  end
72
66
  end
data/lib/authn/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module AuthN
2
- VERSION = "1.0.0"
2
+ VERSION = "2.0.0"
3
3
  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: 1.0.0
4
+ version: 2.0.0
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-08-28 00:00:00.000000000 Z
12
+ date: 2012-09-01 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: -4128468406629184695
135
+ hash: 4517271983309580040
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: -4128468406629184695
144
+ hash: 4517271983309580040
145
145
  requirements: []
146
146
  rubyforge_project:
147
147
  rubygems_version: 1.8.24