devise 3.2.0 → 3.3.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.

Potentially problematic release.


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

Files changed (187) hide show
  1. checksums.yaml +7 -0
  2. data/.travis.yml +18 -3
  3. data/CHANGELOG.md +82 -9
  4. data/CONTRIBUTING.md +2 -2
  5. data/Gemfile +7 -9
  6. data/Gemfile.lock +102 -96
  7. data/MIT-LICENSE +1 -1
  8. data/README.md +94 -42
  9. data/Rakefile +1 -1
  10. data/app/controllers/devise/confirmations_controller.rb +5 -3
  11. data/app/controllers/devise/omniauth_callbacks_controller.rb +2 -2
  12. data/app/controllers/devise/passwords_controller.rb +5 -3
  13. data/app/controllers/devise/registrations_controller.rb +26 -10
  14. data/app/controllers/devise/sessions_controller.rb +39 -14
  15. data/app/controllers/devise/unlocks_controller.rb +4 -2
  16. data/app/controllers/devise_controller.rb +6 -6
  17. data/app/helpers/devise_helper.rb +2 -2
  18. data/app/views/devise/confirmations/new.html.erb +2 -2
  19. data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
  20. data/app/views/devise/mailer/reset_password_instructions.html.erb +1 -1
  21. data/app/views/devise/mailer/unlock_instructions.html.erb +1 -1
  22. data/app/views/devise/passwords/edit.html.erb +3 -3
  23. data/app/views/devise/passwords/new.html.erb +2 -2
  24. data/app/views/devise/registrations/edit.html.erb +6 -6
  25. data/app/views/devise/registrations/new.html.erb +5 -5
  26. data/app/views/devise/sessions/new.html.erb +5 -5
  27. data/app/views/devise/shared/_links.erb +1 -1
  28. data/app/views/devise/unlocks/new.html.erb +2 -2
  29. data/config/locales/en.yml +17 -16
  30. data/devise.gemspec +2 -2
  31. data/gemfiles/{Gemfile.rails-3.2.x → Gemfile.rails-3.2-stable} +8 -10
  32. data/gemfiles/Gemfile.rails-3.2-stable.lock +166 -0
  33. data/gemfiles/Gemfile.rails-4.0-stable +29 -0
  34. data/gemfiles/Gemfile.rails-4.0-stable.lock +162 -0
  35. data/gemfiles/Gemfile.rails-head +32 -0
  36. data/gemfiles/Gemfile.rails-head.lock +190 -0
  37. data/lib/devise/controllers/helpers.rb +84 -29
  38. data/lib/devise/controllers/rememberable.rb +3 -3
  39. data/lib/devise/controllers/scoped_views.rb +1 -1
  40. data/lib/devise/controllers/sign_in_out.rb +9 -10
  41. data/lib/devise/controllers/store_location.rb +56 -0
  42. data/lib/devise/controllers/url_helpers.rb +3 -1
  43. data/lib/devise/failure_app.rb +12 -10
  44. data/lib/devise/hooks/activatable.rb +5 -6
  45. data/lib/devise/hooks/csrf_cleaner.rb +3 -1
  46. data/lib/devise/hooks/lockable.rb +1 -1
  47. data/lib/devise/hooks/proxy.rb +2 -2
  48. data/lib/devise/hooks/rememberable.rb +2 -2
  49. data/lib/devise/hooks/timeoutable.rb +10 -3
  50. data/lib/devise/hooks/trackable.rb +1 -1
  51. data/lib/devise/mailers/helpers.rb +8 -8
  52. data/lib/devise/mapping.rb +4 -1
  53. data/lib/devise/models/authenticatable.rb +5 -5
  54. data/lib/devise/models/confirmable.rb +14 -14
  55. data/lib/devise/models/database_authenticatable.rb +18 -5
  56. data/lib/devise/models/lockable.rb +14 -11
  57. data/lib/devise/models/omniauthable.rb +1 -1
  58. data/lib/devise/models/recoverable.rb +23 -7
  59. data/lib/devise/models/rememberable.rb +6 -6
  60. data/lib/devise/models/timeoutable.rb +2 -2
  61. data/lib/devise/models/trackable.rb +5 -2
  62. data/lib/devise/models/validatable.rb +6 -6
  63. data/lib/devise/modules.rb +10 -10
  64. data/lib/devise/omniauth/url_helpers.rb +2 -2
  65. data/lib/devise/orm/active_record.rb +1 -1
  66. data/lib/devise/orm/mongoid.rb +1 -1
  67. data/lib/devise/rails/routes.rb +107 -78
  68. data/lib/devise/rails.rb +7 -1
  69. data/lib/devise/strategies/authenticatable.rb +11 -4
  70. data/lib/devise/strategies/base.rb +1 -1
  71. data/lib/devise/strategies/database_authenticatable.rb +7 -4
  72. data/lib/devise/test_helpers.rb +2 -2
  73. data/lib/devise/time_inflector.rb +2 -2
  74. data/lib/devise/version.rb +1 -1
  75. data/lib/devise.rb +15 -10
  76. data/lib/generators/active_record/devise_generator.rb +27 -10
  77. data/lib/generators/active_record/templates/migration.rb +4 -4
  78. data/lib/generators/active_record/templates/migration_existing.rb +4 -4
  79. data/lib/generators/devise/devise_generator.rb +5 -3
  80. data/lib/generators/devise/install_generator.rb +5 -0
  81. data/lib/generators/devise/views_generator.rb +31 -18
  82. data/lib/generators/mongoid/devise_generator.rb +20 -19
  83. data/lib/generators/templates/README +4 -4
  84. data/lib/generators/templates/devise.rb +20 -11
  85. data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
  86. data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
  87. data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
  88. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +2 -2
  89. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +4 -4
  90. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +2 -2
  91. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +6 -6
  92. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +4 -4
  93. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +4 -4
  94. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +2 -2
  95. data/script/cached-bundle +49 -0
  96. data/script/s3-put +71 -0
  97. data/test/controllers/custom_registrations_controller_test.rb +35 -0
  98. data/test/controllers/helpers_test.rb +89 -31
  99. data/test/controllers/internal_helpers_test.rb +11 -8
  100. data/test/controllers/passwords_controller_test.rb +1 -1
  101. data/test/controllers/sessions_controller_test.rb +29 -25
  102. data/test/controllers/url_helpers_test.rb +4 -4
  103. data/test/delegator_test.rb +1 -1
  104. data/test/devise_test.rb +21 -8
  105. data/test/failure_app_test.rb +61 -25
  106. data/test/generators/active_record_generator_test.rb +10 -4
  107. data/test/generators/devise_generator_test.rb +2 -2
  108. data/test/generators/mongoid_generator_test.rb +3 -3
  109. data/test/generators/views_generator_test.rb +30 -1
  110. data/test/helpers/devise_helper_test.rb +14 -13
  111. data/test/integration/authenticatable_test.rb +61 -45
  112. data/test/integration/confirmable_test.rb +95 -55
  113. data/test/integration/database_authenticatable_test.rb +16 -16
  114. data/test/integration/http_authenticatable_test.rb +12 -12
  115. data/test/integration/lockable_test.rb +43 -43
  116. data/test/integration/omniauthable_test.rb +3 -3
  117. data/test/integration/recoverable_test.rb +53 -53
  118. data/test/integration/registerable_test.rb +90 -80
  119. data/test/integration/rememberable_test.rb +15 -15
  120. data/test/integration/timeoutable_test.rb +27 -16
  121. data/test/integration/trackable_test.rb +4 -4
  122. data/test/mailers/confirmation_instructions_test.rb +7 -7
  123. data/test/mailers/reset_password_instructions_test.rb +6 -6
  124. data/test/mailers/unlock_instructions_test.rb +5 -5
  125. data/test/mapping_test.rb +3 -3
  126. data/test/models/authenticatable_test.rb +3 -3
  127. data/test/models/confirmable_test.rb +32 -32
  128. data/test/models/database_authenticatable_test.rb +32 -27
  129. data/test/models/lockable_test.rb +57 -33
  130. data/test/models/recoverable_test.rb +34 -22
  131. data/test/models/rememberable_test.rb +29 -14
  132. data/test/models/serializable_test.rb +8 -8
  133. data/test/models/timeoutable_test.rb +1 -1
  134. data/test/models/trackable_test.rb +28 -0
  135. data/test/models/validatable_test.rb +13 -13
  136. data/test/omniauth/config_test.rb +4 -4
  137. data/test/omniauth/url_helpers_test.rb +3 -3
  138. data/test/orm/mongoid.rb +1 -1
  139. data/test/parameter_sanitizer_test.rb +1 -1
  140. data/test/rails_app/app/active_record/shim.rb +1 -1
  141. data/test/rails_app/app/active_record/user_on_engine.rb +7 -0
  142. data/test/rails_app/app/active_record/user_on_main_app.rb +7 -0
  143. data/test/rails_app/app/controllers/admins/sessions_controller.rb +1 -1
  144. data/test/rails_app/app/controllers/admins_controller.rb +1 -1
  145. data/test/rails_app/app/controllers/application_controller.rb +5 -2
  146. data/test/rails_app/app/controllers/application_with_fake_engine.rb +30 -0
  147. data/test/rails_app/app/controllers/custom/registrations_controller.rb +21 -0
  148. data/test/rails_app/app/controllers/home_controller.rb +1 -1
  149. data/test/rails_app/app/controllers/publisher/registrations_controller.rb +1 -1
  150. data/test/rails_app/app/controllers/publisher/sessions_controller.rb +1 -1
  151. data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +4 -4
  152. data/test/rails_app/app/controllers/users_controller.rb +6 -6
  153. data/test/rails_app/app/mailers/users/mailer.rb +4 -4
  154. data/test/rails_app/app/mongoid/admin.rb +11 -11
  155. data/test/rails_app/app/mongoid/shim.rb +2 -2
  156. data/test/rails_app/app/mongoid/user.rb +19 -19
  157. data/test/rails_app/app/mongoid/user_on_engine.rb +39 -0
  158. data/test/rails_app/app/mongoid/user_on_main_app.rb +39 -0
  159. data/test/rails_app/app/views/admins/sessions/new.html.erb +1 -1
  160. data/test/rails_app/app/views/home/admin_dashboard.html.erb +1 -1
  161. data/test/rails_app/app/views/home/index.html.erb +1 -1
  162. data/test/rails_app/app/views/home/join.html.erb +1 -1
  163. data/test/rails_app/app/views/home/user_dashboard.html.erb +1 -1
  164. data/test/rails_app/app/views/layouts/application.html.erb +1 -1
  165. data/test/rails_app/config/application.rb +2 -2
  166. data/test/rails_app/config/boot.rb +7 -1
  167. data/test/rails_app/config/environments/development.rb +0 -4
  168. data/test/rails_app/config/environments/production.rb +0 -4
  169. data/test/rails_app/config/initializers/devise.rb +7 -5
  170. data/test/rails_app/config/initializers/secret_token.rb +1 -1
  171. data/test/rails_app/config/routes.rb +60 -42
  172. data/test/rails_app/db/migrate/20100401102949_create_tables.rb +7 -7
  173. data/test/rails_app/db/schema.rb +21 -17
  174. data/test/rails_app/lib/shared_admin.rb +4 -4
  175. data/test/rails_app/lib/shared_user.rb +1 -1
  176. data/test/rails_app/lib/shared_user_without_omniauth.rb +13 -0
  177. data/test/routes_test.rb +72 -58
  178. data/test/support/action_controller/record_identifier.rb +10 -0
  179. data/test/support/assertions.rb +2 -3
  180. data/test/support/helpers.rb +4 -4
  181. data/test/support/integration.rb +14 -14
  182. data/test/support/mongoid.yml +6 -0
  183. data/test/test_helper.rb +2 -7
  184. data/test/test_helpers_test.rb +25 -35
  185. data/test/test_models.rb +12 -5
  186. metadata +53 -38
  187. data/gemfiles/Gemfile.rails-3.2.x.lock +0 -159
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 7a79724cdbd2d14aed052324284f0c46ccc73105
4
+ data.tar.gz: fb827a2e7cf992d9172084057d3299a67223fc90
5
+ SHA512:
6
+ metadata.gz: 4a0e69c16b5ec178882c8fea6a5a722342d59b5af1277c2fad6117f90a16f9eaafa7a36c7b20e3ec3154755071fb08a1788ec727b7de7bb460665a6dbde48e65
7
+ data.tar.gz: b2f16d7a9954c35675098a37659485266f221f84c861906155290ccb8d514f0056ecf312f86b57e85a670b03c152884bafef019f25f2fdd47c8ce2a1fce2a5cf
data/.travis.yml CHANGED
@@ -1,14 +1,29 @@
1
1
  language: ruby
2
2
  script: "bundle exec rake test"
3
+ install: script/cached-bundle install --deployment --path vendor/bundle
3
4
  rvm:
4
5
  - 1.9.3
5
6
  - 2.0.0
7
+ - 2.1.2
6
8
  env:
7
- - DEVISE_ORM=mongoid
8
- - DEVISE_ORM=active_record
9
+ matrix:
10
+ - DEVISE_ORM=mongoid
11
+ - DEVISE_ORM=active_record
12
+ global:
13
+ # AMAZON_S3_BUCKET
14
+ - secure: "qkeYGn2mpgsgU5tKS9GWvFp/utUF/9O8++Shch24DMnq8OB01TrV5QQ2Elj7sSjMWqw2Pbe56nUCA9eOWXhPglGyIq2AI9E0umsEGZxdRlqqobpiMWs5wl8KZ0cFD1rZm6CwfL8atmcNfTt5TnvsaQ2l/k3TerOT2e66R/Mibk8="
15
+ # AMAZON_ACCESS_KEY_ID
16
+ - secure: "rTYGUFH9SPN0L7QtdE6Liyy/1z7nGKxqDF9LMRsmNsIfsqxoTPKZ8bCctQ4ksuk9svynGQsLfsda5pA+YvuALzjdWmGcID6ENgOGvoFnhZO5LuJ5f6t0k8gFpV9oBquQgDWzhzrcPYvCUrUYg3GSlHjFSXdPdht3SoYn7PiDaNs="
17
+ # AMAZON_SECRET_ACCESS_KEY
18
+ - secure: "VJ4qiWMzoleLojCcluX+w0RtaFVc9ybRNo6NODkGhHSaao8+4EX4rETBQG67tNSInk1iuNqCcZAGwC8V/12RXdao3PguRSLD5IiKeT+D78dqFEoP0+yHg4PbmZ6TJXADW3gUv/IOqkW7f/UYGinRaPu7hloyiC498FpQdmMWSNI="
9
19
  gemfile:
10
- - gemfiles/Gemfile.rails-3.2.x
20
+ - gemfiles/Gemfile.rails-head
21
+ - gemfiles/Gemfile.rails-4.0-stable
22
+ - gemfiles/Gemfile.rails-3.2-stable
11
23
  - Gemfile
24
+ matrix:
25
+ allow_failures:
26
+ - gemfile: gemfiles/Gemfile.rails-head
12
27
  services:
13
28
  - mongodb
14
29
  notifications:
data/CHANGELOG.md CHANGED
@@ -1,10 +1,73 @@
1
+ ### Unreleased
2
+
3
+ * enhancements
4
+ * bug fixes
5
+
6
+ ### 3.3.0
7
+
8
+ * enhancements
9
+ * Support multiple warden configuration blocks on devise configuration. (by @rossta)
10
+ * Previously, when a user signed out, all remember me tokens for all sessions/browsers would be
11
+ invalidated, and this behavior could not be changed. This behavior is now configurable via
12
+ `expire_all_remember_me_on_sign_out`. The default continues to be true. (by @laurocaetano)
13
+ * Default email messages was updated with grammar fixes, check the diff on
14
+ #2906 for the updated copy (by @p-originate)
15
+ * Allow a resource to be found based on its encrypted password token (by @karlentwistle)
16
+ * Adds `devise_group`, a macro to define controller helpers for multiple mappings at once. (by @dropletzz)
17
+ * The default views now use `Log in` instead of `Sign in` and have a hint about the minimum password length if
18
+ the current scope is using the `validatable` module (by @alexsoble)
19
+
20
+ * bug fix
21
+ * Check if there is a signed in user before executing the `SessionsController#destroy`.
22
+ * `SessionsController#destroy` no longer yields the `resource` to receiving block,
23
+ since the resource isn't loaded in the action. If you need access to the current
24
+ resource when overring the action use the scope helper (like `current_user`) before
25
+ calling `super`
26
+ * Serialize the `last_request_at` entry as an Integer
27
+ * Ensure registration controller block yields happen on failure in addition to success (by @dpehrson)
28
+ * Only valid paths will be stored for redirections (by @parallel588)
29
+
30
+ ### 3.2.4
31
+
32
+ * enhancements
33
+ * `bcrypt` dependency updated due https://github.com/codahale/bcrypt-ruby/pull/86.
34
+ * View generator now can generate specific views with the `-v` flag, like `rails g devise:views -v sessions` (by @kayline)
35
+
36
+ ### 3.2.3
37
+
38
+ * enhancements
39
+ * Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`.
40
+ You can change this and use your own secret by changing the `devise.rb` initializer.
41
+
42
+ * bug fix
43
+ * Migrations will be properly generated when using rails 4.1.0.
44
+
45
+ ### 3.2.2
46
+
47
+ * bug fix
48
+ * Ensure timeoutable works when `sign_out_all_scopes` is false (by @louman)
49
+ * Keep the query string when storing location (by @csexton)
50
+ * Require rails generator base class in devise generators
51
+
52
+ ### 3.2.1
53
+
54
+ Security announcement: http://blog.plataformatec.com.br/2013/11/e-mail-enumeration-in-devise-in-paranoid-mode
55
+
56
+ * enhancements
57
+ * Add `store_location_for` helper and ensure it is safe (by @matthewrudy and @homakov)
58
+ * Add `yield` around resource methods in Devise controllers (by @edelpero)
59
+
60
+ * bug fix
61
+ * Bring `password_digest` back to fix compatibility with `devise-encryptable`
62
+ * Avoid e-mail enumeration on sign in when in paranoid mode
63
+
1
64
  ### 3.2.0
2
65
 
3
66
  * enhancements
4
67
  * Previously deprecated token authenticatable and insecure lookups have been removed
5
68
  * Add a class method so you can encrypt passwords from fixtures (by @tenderlove)
6
69
  * Send custom message when user enters invalid password and it has only one attempt
7
- to enter correct password before his account will be locked (by @Lightpower)
70
+ to enter correct password before their account will be locked (by @Lightpower)
8
71
  * Prevent mutation of values assigned to case and whitespace santitized members (by @iamvery)
9
72
  * Separate redirects and flash messages in `navigational_formats` and `flashing_formats` (by @ssendev)
10
73
 
@@ -72,9 +135,6 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixat
72
135
  * bug fix
73
136
  * Errors on unlock are now properly reflected on the first `unlock_keys`
74
137
 
75
- * backwards incompatible changes
76
- * Changes on session storage will expire all existing sessions on upgrade. For those storing the session in the DB, they can be upgraded according to this gist: https://gist.github.com/moll/6417606
77
-
78
138
  ### 2.2.4
79
139
 
80
140
  * enhancements
@@ -91,6 +151,9 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixat
91
151
  * Fix inheriting mailer templates from `Devise::Mailer`
92
152
  * Fix a bug when procs are used as default mailer in Devise (by @tomasv)
93
153
 
154
+ * backwards incompatible changes
155
+ * Changes on session storage will expire all existing sessions on upgrade. For those storing the session in the DB, they can be upgraded according to this gist: https://gist.github.com/moll/6417606
156
+
94
157
  ### 2.2.3
95
158
 
96
159
  Security announcement: http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
@@ -140,6 +203,16 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
140
203
  * `update_with_password` doesn't change encrypted password when it is invalid (by @nashby)
141
204
  * Properly handle namespaced models on Active Record generator (by @nashby)
142
205
 
206
+ ### 2.1.4
207
+
208
+ * bugfix
209
+ * Do not confirm account after reset password
210
+
211
+ ### 2.1.3
212
+
213
+ * bugfix
214
+ * Require string conversion for all values
215
+
143
216
  ### 2.1.2
144
217
 
145
218
  * enhancements
@@ -371,7 +444,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
371
444
  ### 1.4.0
372
445
 
373
446
  * enhancements
374
- * Added authenticated and unauthenticated to the router to route the used based on his status (by @sj26)
447
+ * Added authenticated and unauthenticated to the router to route the used based on their status (by @sj26)
375
448
  * Improve e-mail regexp (by @rodrigoflores)
376
449
  * Add strip_whitespace_keys and default to e-mail (by @swrobel)
377
450
  * Do not run format and uniqueness validations on e-mail if it hasn't changed (by @Thibaut)
@@ -380,7 +453,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
380
453
 
381
454
  * bug fix
382
455
  * password_required? should not affect length validation
383
- * User cannot access sign up and similar pages if he is already signed in through a cookie or token
456
+ * User cannot access sign up and similar pages if they are already signed in through a cookie or token
384
457
  * Do not convert booleans to strings on finders (by @xavier)
385
458
  * Run validations even if current_password fails (by @crx)
386
459
  * Devise now honors routes constraints (by @macmartine)
@@ -488,10 +561,10 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
488
561
  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by @rymai)
489
562
  * Extracted encryptors into :encryptable for better bcrypt support
490
563
  * :rememberable is now able to use salt as token if no remember_token is provided
491
- * Store the salt in session and expire the session if the user changes his password
564
+ * Store the salt in session and expire the session if the user changes their password
492
565
  * Allow :stateless_token to be set to true avoiding users to be stored in session through token authentication
493
566
  * cookie_options uses session_options values by default
494
- * Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message
567
+ * Sign up now checks if the user is active or not and redirect them accordingly, setting the inactive_signed_up message
495
568
  * Use ActiveModel#to_key instead of #id
496
569
  * sign_out_all_scopes now destroys the whole session
497
570
  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by @adahl)
@@ -934,7 +1007,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
934
1007
 
935
1008
  * deprecations
936
1009
  * Renamed confirm_in to confirm_within
937
- * Do not send confirmation messages when user changes his e-mail
1010
+ * Do not send confirmation messages when user changes their e-mail
938
1011
  * Renamed authenticable to authenticatable and added deprecation warnings
939
1012
 
940
1013
  ### 0.2.3
data/CONTRIBUTING.md CHANGED
@@ -1,8 +1,8 @@
1
1
  ### Please read before contributing
2
2
 
3
- 1) Do not post questions in the issues tracker. If you have any questions about Devise, search the [Wiki](https://github.com/plataformatec/devise/wiki) or use the [Mailing List](https://groups.google.com/group/plataformatec-devise) or [Stack Overflow](http://stackoverflow.com/questions/tagged/devise).
3
+ 1) Do not post questions in the issues tracker. If you have any questions about Devise, search the [Wiki](https://github.com/plataformatec/devise/wiki) or use the [Mailing List](https://groups.google.com/group/plataformatec-devise) or [Stack Overflow](http://stackoverflow.com/questions/tagged/devise).
4
4
 
5
- 2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [developers@plataformatec.com.br](mailto:developers@plataformatec.com.br) instead.
5
+ 2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [opensource@plataformatec.com.br](mailto:opensource@plataformatec.com.br) instead.
6
6
 
7
7
  3) Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed.
8
8
 
data/Gemfile CHANGED
@@ -2,16 +2,16 @@ source "https://rubygems.org"
2
2
 
3
3
  gemspec
4
4
 
5
- gem "rails", "~> 4.0.0"
6
- gem "omniauth", "~> 1.0.0"
7
- gem "omniauth-oauth2", "~> 1.0.0"
5
+ gem "rails", "~> 4.1.0"
6
+ gem "omniauth", "~> 1.2.0"
7
+ gem "omniauth-oauth2", "~> 1.1.0"
8
8
  gem "rdoc"
9
9
 
10
10
  group :test do
11
11
  gem "omniauth-facebook"
12
12
  gem "omniauth-openid", "~> 1.0.1"
13
- gem "webrat", "0.7.3", :require => false
14
- gem "mocha", "~> 0.13.1", :require => false
13
+ gem "webrat", "0.7.3", require: false
14
+ gem "mocha", "~> 1.1", require: false
15
15
  end
16
16
 
17
17
  platforms :jruby do
@@ -24,8 +24,6 @@ platforms :ruby do
24
24
  gem "sqlite3"
25
25
  end
26
26
 
27
- platforms :mri_19, :mri_20 do
28
- group :mongoid do
29
- gem "mongoid", github: "mongoid/mongoid", branch: "master"
30
- end
27
+ group :mongoid do
28
+ gem "mongoid", "~> 4.0.0"
31
29
  end
data/Gemfile.lock CHANGED
@@ -1,19 +1,8 @@
1
- GIT
2
- remote: git://github.com/mongoid/mongoid.git
3
- revision: 346a79a7d01aa194de80e649916239a18d38ce13
4
- branch: master
5
- specs:
6
- mongoid (4.0.0)
7
- activemodel (~> 4.0.0)
8
- moped (~> 1.5)
9
- origin (~> 1.0)
10
- tzinfo (~> 0.3.22)
11
-
12
1
  PATH
13
2
  remote: .
14
3
  specs:
15
- devise (3.2.0)
16
- bcrypt-ruby (~> 3.0)
4
+ devise (3.3.0)
5
+ bcrypt (~> 3.0)
17
6
  orm_adapter (~> 0.1)
18
7
  railties (>= 3.2.6, < 5)
19
8
  thread_safe (~> 0.1)
@@ -22,117 +11,134 @@ PATH
22
11
  GEM
23
12
  remote: https://rubygems.org/
24
13
  specs:
25
- actionmailer (4.0.0)
26
- actionpack (= 4.0.0)
27
- mail (~> 2.5.3)
28
- actionpack (4.0.0)
29
- activesupport (= 4.0.0)
30
- builder (~> 3.1.0)
31
- erubis (~> 2.7.0)
14
+ actionmailer (4.1.4)
15
+ actionpack (= 4.1.4)
16
+ actionview (= 4.1.4)
17
+ mail (~> 2.5.4)
18
+ actionpack (4.1.4)
19
+ actionview (= 4.1.4)
20
+ activesupport (= 4.1.4)
32
21
  rack (~> 1.5.2)
33
22
  rack-test (~> 0.6.2)
34
- activemodel (4.0.0)
35
- activesupport (= 4.0.0)
36
- builder (~> 3.1.0)
37
- activerecord (4.0.0)
38
- activemodel (= 4.0.0)
39
- activerecord-deprecated_finders (~> 1.0.2)
40
- activesupport (= 4.0.0)
41
- arel (~> 4.0.0)
42
- activerecord-deprecated_finders (1.0.3)
43
- activesupport (4.0.0)
44
- i18n (~> 0.6, >= 0.6.4)
45
- minitest (~> 4.2)
46
- multi_json (~> 1.3)
23
+ actionview (4.1.4)
24
+ activesupport (= 4.1.4)
25
+ builder (~> 3.1)
26
+ erubis (~> 2.7.0)
27
+ activemodel (4.1.4)
28
+ activesupport (= 4.1.4)
29
+ builder (~> 3.1)
30
+ activerecord (4.1.4)
31
+ activemodel (= 4.1.4)
32
+ activesupport (= 4.1.4)
33
+ arel (~> 5.0.0)
34
+ activesupport (4.1.4)
35
+ i18n (~> 0.6, >= 0.6.9)
36
+ json (~> 1.7, >= 1.7.7)
37
+ minitest (~> 5.1)
47
38
  thread_safe (~> 0.1)
48
- tzinfo (~> 0.3.37)
49
- arel (4.0.0)
50
- atomic (1.1.12)
51
- bcrypt-ruby (3.1.2)
52
- builder (3.1.4)
39
+ tzinfo (~> 1.1)
40
+ arel (5.0.1.20140414130214)
41
+ bcrypt (3.1.7)
42
+ bson (2.3.0)
43
+ builder (3.2.2)
44
+ connection_pool (2.0.0)
53
45
  erubis (2.7.0)
54
- faraday (0.8.8)
55
- multipart-post (~> 1.2.0)
56
- hashie (1.2.0)
46
+ faraday (0.9.0)
47
+ multipart-post (>= 1.2, < 3)
48
+ hashie (3.2.0)
57
49
  hike (1.2.3)
58
- httpauth (0.2.0)
59
- i18n (0.6.5)
60
- json (1.8.0)
61
- jwt (0.1.8)
62
- multi_json (>= 1.5)
50
+ i18n (0.6.11)
51
+ json (1.8.1)
52
+ jwt (1.0.0)
63
53
  mail (2.5.4)
64
54
  mime-types (~> 1.16)
65
55
  treetop (~> 1.4.8)
66
- metaclass (0.0.1)
67
- mime-types (1.23)
68
- minitest (4.7.5)
69
- mocha (0.13.3)
56
+ metaclass (0.0.4)
57
+ mime-types (1.25.1)
58
+ mini_portile (0.6.0)
59
+ minitest (5.4.0)
60
+ mocha (1.1.0)
70
61
  metaclass (~> 0.0.1)
71
- moped (1.5.1)
72
- multi_json (1.7.9)
73
- multipart-post (1.2.0)
74
- nokogiri (1.5.9)
75
- oauth2 (0.8.1)
76
- faraday (~> 0.8)
77
- httpauth (~> 0.1)
78
- jwt (~> 0.1.4)
79
- multi_json (~> 1.0)
62
+ mongoid (4.0.0)
63
+ activemodel (~> 4.0)
64
+ moped (~> 2.0.0)
65
+ origin (~> 2.1)
66
+ tzinfo (>= 0.3.37)
67
+ moped (2.0.0)
68
+ bson (~> 2.2)
69
+ connection_pool (~> 2.0)
70
+ optionable (~> 0.2.0)
71
+ multi_json (1.10.1)
72
+ multi_xml (0.5.5)
73
+ multipart-post (2.0.0)
74
+ nokogiri (1.6.3.1)
75
+ mini_portile (= 0.6.0)
76
+ oauth2 (0.9.4)
77
+ faraday (>= 0.8, < 0.10)
78
+ jwt (~> 1.0)
79
+ multi_json (~> 1.3)
80
+ multi_xml (~> 0.5)
80
81
  rack (~> 1.2)
81
- omniauth (1.0.3)
82
- hashie (~> 1.2)
83
- rack
84
- omniauth-facebook (1.4.0)
85
- omniauth-oauth2 (~> 1.0.2)
86
- omniauth-oauth2 (1.0.3)
87
- oauth2 (~> 0.8.0)
88
- omniauth (~> 1.0)
82
+ omniauth (1.2.2)
83
+ hashie (>= 1.2, < 4)
84
+ rack (~> 1.0)
85
+ omniauth-facebook (1.6.0)
86
+ omniauth-oauth2 (~> 1.1)
87
+ omniauth-oauth2 (1.1.2)
88
+ faraday (>= 0.8, < 0.10)
89
+ multi_json (~> 1.3)
90
+ oauth2 (~> 0.9.3)
91
+ omniauth (~> 1.2)
89
92
  omniauth-openid (1.0.1)
90
93
  omniauth (~> 1.0)
91
94
  rack-openid (~> 1.3.1)
92
- origin (1.1.0)
93
- orm_adapter (0.4.0)
94
- polyglot (0.3.3)
95
+ optionable (0.2.0)
96
+ origin (2.1.1)
97
+ orm_adapter (0.5.0)
98
+ polyglot (0.3.5)
95
99
  rack (1.5.2)
96
100
  rack-openid (1.3.1)
97
101
  rack (>= 1.1.0)
98
102
  ruby-openid (>= 2.1.8)
99
103
  rack-test (0.6.2)
100
104
  rack (>= 1.0)
101
- rails (4.0.0)
102
- actionmailer (= 4.0.0)
103
- actionpack (= 4.0.0)
104
- activerecord (= 4.0.0)
105
- activesupport (= 4.0.0)
105
+ rails (4.1.4)
106
+ actionmailer (= 4.1.4)
107
+ actionpack (= 4.1.4)
108
+ actionview (= 4.1.4)
109
+ activemodel (= 4.1.4)
110
+ activerecord (= 4.1.4)
111
+ activesupport (= 4.1.4)
106
112
  bundler (>= 1.3.0, < 2.0)
107
- railties (= 4.0.0)
108
- sprockets-rails (~> 2.0.0)
109
- railties (4.0.0)
110
- actionpack (= 4.0.0)
111
- activesupport (= 4.0.0)
113
+ railties (= 4.1.4)
114
+ sprockets-rails (~> 2.0)
115
+ railties (4.1.4)
116
+ actionpack (= 4.1.4)
117
+ activesupport (= 4.1.4)
112
118
  rake (>= 0.8.7)
113
119
  thor (>= 0.18.1, < 2.0)
114
- rake (10.1.0)
115
- rdoc (4.0.1)
120
+ rake (10.3.2)
121
+ rdoc (4.1.1)
116
122
  json (~> 1.4)
117
- ruby-openid (2.2.3)
118
- sprockets (2.10.0)
123
+ ruby-openid (2.5.0)
124
+ sprockets (2.12.1)
119
125
  hike (~> 1.2)
120
126
  multi_json (~> 1.0)
121
127
  rack (~> 1.0)
122
128
  tilt (~> 1.1, != 1.3.0)
123
- sprockets-rails (2.0.0)
129
+ sprockets-rails (2.1.3)
124
130
  actionpack (>= 3.0)
125
131
  activesupport (>= 3.0)
126
132
  sprockets (~> 2.8)
127
- sqlite3 (1.3.7)
128
- thor (0.18.1)
129
- thread_safe (0.1.2)
130
- atomic
133
+ sqlite3 (1.3.9)
134
+ thor (0.19.1)
135
+ thread_safe (0.3.4)
131
136
  tilt (1.4.1)
132
- treetop (1.4.14)
137
+ treetop (1.4.15)
133
138
  polyglot
134
139
  polyglot (>= 0.3.1)
135
- tzinfo (0.3.37)
140
+ tzinfo (1.2.1)
141
+ thread_safe (~> 0.1)
136
142
  warden (1.2.3)
137
143
  rack (>= 1.0)
138
144
  webrat (0.7.3)
@@ -148,13 +154,13 @@ DEPENDENCIES
148
154
  activerecord-jdbcsqlite3-adapter
149
155
  devise!
150
156
  jruby-openssl
151
- mocha (~> 0.13.1)
152
- mongoid!
153
- omniauth (~> 1.0.0)
157
+ mocha (~> 1.1)
158
+ mongoid (~> 4.0.0)
159
+ omniauth (~> 1.2.0)
154
160
  omniauth-facebook
155
- omniauth-oauth2 (~> 1.0.0)
161
+ omniauth-oauth2 (~> 1.1.0)
156
162
  omniauth-openid (~> 1.0.1)
157
- rails (~> 4.0.0)
163
+ rails (~> 4.1.0)
158
164
  rdoc
159
165
  sqlite3
160
166
  webrat (= 0.7.3)
data/MIT-LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright 2009-2013 Plataformatec. http://plataformatec.com.br
1
+ Copyright 2009-2014 Plataformatec. http://plataformatec.com.br
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the