devise 2.0.6 → 2.1.0.rc

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of devise might be problematic. Click here for more details.

Files changed (68) hide show
  1. data/.travis.yml +0 -1
  2. data/CHANGELOG.rdoc +12 -6
  3. data/Gemfile.lock +3 -3
  4. data/README.md +9 -15
  5. data/app/controllers/devise_controller.rb +2 -3
  6. data/app/views/devise/_links.erb +3 -25
  7. data/app/views/devise/confirmations/new.html.erb +1 -1
  8. data/app/views/devise/passwords/edit.html.erb +1 -1
  9. data/app/views/devise/passwords/new.html.erb +1 -1
  10. data/app/views/devise/registrations/new.html.erb +1 -1
  11. data/app/views/devise/sessions/new.html.erb +1 -1
  12. data/app/views/devise/shared/_links.erb +25 -3
  13. data/app/views/devise/unlocks/new.html.erb +1 -1
  14. data/config/locales/en.yml +2 -2
  15. data/gemfiles/Gemfile.rails-3.1.x.lock +3 -3
  16. data/lib/devise.rb +1 -0
  17. data/lib/devise/controllers/helpers.rb +1 -1
  18. data/lib/devise/encryptors/base.rb +5 -1
  19. data/lib/devise/encryptors/bcrypt.rb +14 -0
  20. data/lib/devise/failure_app.rb +1 -0
  21. data/lib/devise/models.rb +32 -2
  22. data/lib/devise/models/authenticatable.rb +15 -10
  23. data/lib/devise/models/confirmable.rb +21 -1
  24. data/lib/devise/models/database_authenticatable.rb +11 -5
  25. data/lib/devise/models/encryptable.rb +17 -9
  26. data/lib/devise/models/lockable.rb +17 -1
  27. data/lib/devise/models/omniauthable.rb +4 -0
  28. data/lib/devise/models/recoverable.rb +4 -0
  29. data/lib/devise/models/registerable.rb +4 -0
  30. data/lib/devise/models/rememberable.rb +6 -2
  31. data/lib/devise/models/timeoutable.rb +4 -0
  32. data/lib/devise/models/token_authenticatable.rb +5 -0
  33. data/lib/devise/models/trackable.rb +4 -0
  34. data/lib/devise/models/validatable.rb +4 -0
  35. data/lib/devise/param_filter.rb +2 -1
  36. data/lib/devise/rails/routes.rb +3 -2
  37. data/lib/devise/strategies/authenticatable.rb +10 -4
  38. data/lib/devise/version.rb +1 -1
  39. data/lib/generators/devise/views_generator.rb +15 -6
  40. data/lib/generators/templates/devise.rb +1 -1
  41. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +1 -1
  42. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +1 -1
  43. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +1 -1
  44. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +1 -1
  45. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +1 -1
  46. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +1 -1
  47. data/test/generators/views_generator_test.rb +1 -1
  48. data/test/integration/omniauthable_test.rb +2 -2
  49. data/test/integration/recoverable_test.rb +9 -0
  50. data/test/models/authenticatable_test.rb +3 -5
  51. data/test/models/confirmable_test.rb +26 -0
  52. data/test/models/database_authenticatable_test.rb +29 -7
  53. data/test/models/encryptable_test.rb +6 -0
  54. data/test/models/lockable_test.rb +34 -0
  55. data/test/models/omniauthable_test.rb +7 -0
  56. data/test/models/recoverable_test.rb +8 -1
  57. data/test/models/registerable_test.rb +7 -0
  58. data/test/models/rememberable_test.rb +8 -1
  59. data/test/models/timeoutable_test.rb +4 -0
  60. data/test/models/token_authenticatable_test.rb +6 -0
  61. data/test/models/trackable_test.rb +9 -1
  62. data/test/models/validatable_test.rb +5 -1
  63. data/test/models_test.rb +70 -0
  64. data/test/rails_app/config/routes.rb +4 -0
  65. data/test/routes_test.rb +4 -0
  66. data/test/support/assertions.rb +15 -0
  67. data/test/support/helpers.rb +21 -0
  68. metadata +19 -34
data/test/support/helpers.rb CHANGED
@@ -67,4 +67,25 @@ class ActiveSupport::TestCase
67
67
  end
68
68
  end
69
69
  end
70
+
71
+ def swap_module_method_existence(klass, method)
72
+ klass.module_eval %Q[
73
+ class << self
74
+ alias #{method}_referenced #{method}
75
+ undef #{method}
76
+ end
77
+ ]
78
+
79
+ begin
80
+ yield if block_given?
81
+ ensure
82
+
83
+ klass.module_eval %Q[
84
+ class << self
85
+ alias #{method} #{method}_referenced
86
+ undef #{method}_referenced
87
+ end
88
+ ]
89
+ end
90
+ end
70
91
  end
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devise
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.6
5
- prerelease:
4
+ version: 2.1.0.rc
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - José Valim
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-08-18 00:00:00.000000000 Z
13
+ date: 2012-03-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: warden
17
- requirement: !ruby/object:Gem::Requirement
17
+ requirement: &70142542329300 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,15 +22,10 @@ dependencies:
22
22
  version: 1.1.1
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
- requirements:
28
- - - ~>
29
- - !ruby/object:Gem::Version
30
- version: 1.1.1
25
+ version_requirements: *70142542329300
31
26
  - !ruby/object:Gem::Dependency
32
27
  name: orm_adapter
33
- requirement: !ruby/object:Gem::Requirement
28
+ requirement: &70142542328140 !ruby/object:Gem::Requirement
34
29
  none: false
35
30
  requirements:
36
31
  - - ~>
@@ -38,15 +33,10 @@ dependencies:
38
33
  version: 0.0.3
39
34
  type: :runtime
40
35
  prerelease: false
41
- version_requirements: !ruby/object:Gem::Requirement
42
- none: false
43
- requirements:
44
- - - ~>
45
- - !ruby/object:Gem::Version
46
- version: 0.0.3
36
+ version_requirements: *70142542328140
47
37
  - !ruby/object:Gem::Dependency
48
38
  name: bcrypt-ruby
49
- requirement: !ruby/object:Gem::Requirement
39
+ requirement: &70142542327080 !ruby/object:Gem::Requirement
50
40
  none: false
51
41
  requirements:
52
42
  - - ~>
@@ -54,15 +44,10 @@ dependencies:
54
44
  version: '3.0'
55
45
  type: :runtime
56
46
  prerelease: false
57
- version_requirements: !ruby/object:Gem::Requirement
58
- none: false
59
- requirements:
60
- - - ~>
61
- - !ruby/object:Gem::Version
62
- version: '3.0'
47
+ version_requirements: *70142542327080
63
48
  - !ruby/object:Gem::Dependency
64
49
  name: railties
65
- requirement: !ruby/object:Gem::Requirement
50
+ requirement: &70142542326160 !ruby/object:Gem::Requirement
66
51
  none: false
67
52
  requirements:
68
53
  - - ~>
@@ -70,12 +55,7 @@ dependencies:
70
55
  version: '3.1'
71
56
  type: :runtime
72
57
  prerelease: false
73
- version_requirements: !ruby/object:Gem::Requirement
74
- none: false
75
- requirements:
76
- - - ~>
77
- - !ruby/object:Gem::Version
78
- version: '3.1'
58
+ version_requirements: *70142542326160
79
59
  description: Flexible authentication solution for Rails with Warden
80
60
  email: contact@plataformatec.com.br
81
61
  executables: []
@@ -123,6 +103,7 @@ files:
123
103
  - lib/devise/delegator.rb
124
104
  - lib/devise/encryptors/authlogic_sha512.rb
125
105
  - lib/devise/encryptors/base.rb
106
+ - lib/devise/encryptors/bcrypt.rb
126
107
  - lib/devise/encryptors/clearance_sha1.rb
127
108
  - lib/devise/encryptors/restful_authentication_sha1.rb
128
109
  - lib/devise/encryptors/sha1.rb
@@ -223,7 +204,9 @@ files:
223
204
  - test/models/database_authenticatable_test.rb
224
205
  - test/models/encryptable_test.rb
225
206
  - test/models/lockable_test.rb
207
+ - test/models/omniauthable_test.rb
226
208
  - test/models/recoverable_test.rb
209
+ - test/models/registerable_test.rb
227
210
  - test/models/rememberable_test.rb
228
211
  - test/models/serializable_test.rb
229
212
  - test/models/timeoutable_test.rb
@@ -308,12 +291,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
308
291
  required_rubygems_version: !ruby/object:Gem::Requirement
309
292
  none: false
310
293
  requirements:
311
- - - ! '>='
294
+ - - ! '>'
312
295
  - !ruby/object:Gem::Version
313
- version: '0'
296
+ version: 1.3.1
314
297
  requirements: []
315
298
  rubyforge_project: devise
316
- rubygems_version: 1.8.23
299
+ rubygems_version: 1.8.11
317
300
  signing_key:
318
301
  specification_version: 3
319
302
  summary: Flexible authentication solution for Rails with Warden
@@ -354,7 +337,9 @@ test_files:
354
337
  - test/models/database_authenticatable_test.rb
355
338
  - test/models/encryptable_test.rb
356
339
  - test/models/lockable_test.rb
340
+ - test/models/omniauthable_test.rb
357
341
  - test/models/recoverable_test.rb
342
+ - test/models/registerable_test.rb
358
343
  - test/models/rememberable_test.rb
359
344
  - test/models/serializable_test.rb
360
345
  - test/models/timeoutable_test.rb