janus 0.6.0 → 0.7.0

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 (41) hide show
  1. data/README.rdoc +77 -154
  2. data/lib/generators/janus/install_generator.rb +19 -0
  3. data/lib/generators/janus/resource_generator.rb +64 -0
  4. data/lib/generators/templates/confirmations/new.html.erb +16 -0
  5. data/lib/generators/templates/confirmations_controller.erb +3 -0
  6. data/lib/generators/templates/janus.en.yml +62 -0
  7. data/lib/generators/templates/janus.rb +25 -0
  8. data/lib/generators/templates/model.erb +8 -0
  9. data/lib/generators/templates/passwords/edit.html.erb +21 -0
  10. data/lib/generators/templates/passwords/new.html.erb +16 -0
  11. data/lib/generators/templates/passwords_controller.erb +3 -0
  12. data/lib/generators/templates/registrations/edit.html.erb +31 -0
  13. data/lib/generators/templates/registrations/new.html.erb +26 -0
  14. data/lib/generators/templates/registrations_controller.erb +17 -0
  15. data/lib/generators/templates/sessions/new.html.erb +30 -0
  16. data/lib/generators/templates/sessions_controller.erb +11 -0
  17. data/lib/janus.rb +1 -0
  18. data/lib/janus/config.rb +10 -4
  19. data/lib/janus/controllers/confirmations_controller.rb +6 -6
  20. data/lib/janus/controllers/helpers.rb +4 -4
  21. data/lib/janus/controllers/passwords_controller.rb +3 -3
  22. data/lib/janus/controllers/registrations_controller.rb +12 -9
  23. data/lib/janus/controllers/sessions_controller.rb +15 -7
  24. data/lib/janus/helper.rb +1 -1
  25. data/lib/janus/hooks.rb +6 -6
  26. data/lib/janus/hooks/rememberable.rb +2 -2
  27. data/lib/janus/hooks/remote_authenticatable.rb +1 -1
  28. data/lib/janus/manager.rb +5 -5
  29. data/lib/janus/models/base.rb +2 -2
  30. data/lib/janus/models/confirmable.rb +7 -4
  31. data/lib/janus/models/database_authenticatable.rb +26 -16
  32. data/lib/janus/models/rememberable.rb +12 -9
  33. data/lib/janus/models/remote_authenticatable.rb +21 -18
  34. data/lib/janus/models/trackable.rb +11 -8
  35. data/lib/janus/routes.rb +22 -22
  36. data/lib/janus/strategies.rb +3 -3
  37. data/lib/janus/strategies/database_authenticatable.rb +1 -1
  38. data/lib/janus/strategies/rememberable.rb +1 -1
  39. data/lib/janus/strategies/remote_authenticatable.rb +1 -1
  40. data/lib/janus/test_helper.rb +6 -2
  41. metadata +19 -36
data/lib/janus/strategies.rb CHANGED
@@ -10,16 +10,16 @@ module Janus
10
10
  # Runs a given strategy and returns true if it succeeded.
11
11
  def run_strategy(name, scope)
12
12
  strategy = "Janus::Strategies::#{name.to_s.camelize}".constantize.new(scope, self)
13
-
13
+
14
14
  if strategy.valid?
15
15
  strategy.authenticate!
16
-
16
+
17
17
  if strategy.success?
18
18
  send(strategy.auth_method, strategy.user, :scope => scope)
19
19
  Janus::Manager.run_callbacks(:authenticate, strategy.user, self, :scope => scope)
20
20
  end
21
21
  end
22
-
22
+
23
23
  strategy.success?
24
24
  end
25
25
 
data/lib/janus/strategies/database_authenticatable.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  # module Strategies
3
3
  # class DatabaseAuthenticatable < Base
4
4
  # def valid?
5
- # if params[scope].blank? ||
5
+ # if params[scope].blank? ||
6
6
  # false
7
7
  # else
8
8
  # keys = resource.authentication_keys
data/lib/janus/strategies/rememberable.rb CHANGED
@@ -9,7 +9,7 @@ module Janus
9
9
 
10
10
  def authenticate!
11
11
  user = resource.find_for_remember_authentication(remember_cookie)
12
-
12
+
13
13
  if user.nil?
14
14
  destroy_remember_cookie
15
15
  pass
data/lib/janus/strategies/remote_authenticatable.rb CHANGED
@@ -8,7 +8,7 @@ module Janus
8
8
 
9
9
  def authenticate!
10
10
  user = resource.find_for_remote_authentication(remote_token)
11
-
11
+
12
12
  if user
13
13
  success!(user)
14
14
  else
data/lib/janus/test_helper.rb CHANGED
@@ -10,8 +10,12 @@ module Janus
10
10
  @janus.login(user, options)
11
11
  end
12
12
 
13
- def sign_out(user_or_scope)
14
- @janus.logout(Janus.scope_for(user_or_scope))
13
+ def sign_out(user_or_scope = nil)
14
+ if user_or_scope
15
+ @janus.logout(Janus.scope_for(user_or_scope))
16
+ else
17
+ @janus.logout
18
+ end
15
19
  end
16
20
 
17
21
  def assert_authenticated(scope)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: janus
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.7.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,40 +9,8 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-27 00:00:00.000000000 Z
12
+ date: 2013-04-09 00:00:00.000000000 Z
13
13
  dependencies:
14
- - !ruby/object:Gem::Dependency
15
- name: bcrypt-ruby
16
- requirement: !ruby/object:Gem::Requirement
17
- none: false
18
- requirements:
19
- - - ! '>='
20
- - !ruby/object:Gem::Version
21
- version: '0'
22
- type: :runtime
23
- prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ! '>='
28
- - !ruby/object:Gem::Version
29
- version: '0'
30
- - !ruby/object:Gem::Dependency
31
- name: scrypt
32
- requirement: !ruby/object:Gem::Requirement
33
- none: false
34
- requirements:
35
- - - ! '>='
36
- - !ruby/object:Gem::Version
37
- version: '0'
38
- type: :runtime
39
- prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ! '>='
44
- - !ruby/object:Gem::Version
45
- version: '0'
46
14
  - !ruby/object:Gem::Dependency
47
15
  name: addressable
48
16
  requirement: !ruby/object:Gem::Requirement
@@ -59,14 +27,29 @@ dependencies:
59
27
  - - ! '>='
60
28
  - !ruby/object:Gem::Version
61
29
  version: '0'
62
- description: Authentication engine for Ruby on Rails.
63
- email: ysbaddaden@gmail.com
30
+ description: Janus is an authentication engine for Ruby on Rails.
31
+ email: julien@portalier.com
64
32
  executables: []
65
33
  extensions: []
66
34
  extra_rdoc_files:
67
35
  - README.rdoc
68
36
  files:
69
37
  - README.rdoc
38
+ - lib/generators/janus/install_generator.rb
39
+ - lib/generators/janus/resource_generator.rb
40
+ - lib/generators/templates/confirmations/new.html.erb
41
+ - lib/generators/templates/confirmations_controller.erb
42
+ - lib/generators/templates/janus.en.yml
43
+ - lib/generators/templates/janus.rb
44
+ - lib/generators/templates/model.erb
45
+ - lib/generators/templates/passwords/edit.html.erb
46
+ - lib/generators/templates/passwords/new.html.erb
47
+ - lib/generators/templates/passwords_controller.erb
48
+ - lib/generators/templates/registrations/edit.html.erb
49
+ - lib/generators/templates/registrations/new.html.erb
50
+ - lib/generators/templates/registrations_controller.erb
51
+ - lib/generators/templates/sessions/new.html.erb
52
+ - lib/generators/templates/sessions_controller.erb
70
53
  - lib/janus.rb
71
54
  - lib/janus/config.rb
72
55
  - lib/janus/controllers/confirmations_controller.rb