devise 3.2.1 → 4.4.3

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 (254) hide show
  1. checksums.yaml +7 -0
  2. data/.travis.yml +58 -10
  3. data/CHANGELOG.md +199 -979
  4. data/CODE_OF_CONDUCT.md +22 -0
  5. data/CONTRIBUTING.md +73 -8
  6. data/Gemfile +19 -11
  7. data/Gemfile.lock +152 -119
  8. data/ISSUE_TEMPLATE.md +19 -0
  9. data/MIT-LICENSE +1 -1
  10. data/README.md +347 -93
  11. data/Rakefile +4 -2
  12. data/app/controllers/devise/confirmations_controller.rb +11 -5
  13. data/app/controllers/devise/omniauth_callbacks_controller.rb +12 -6
  14. data/app/controllers/devise/passwords_controller.rb +20 -8
  15. data/app/controllers/devise/registrations_controller.rb +34 -19
  16. data/app/controllers/devise/sessions_controller.rb +47 -17
  17. data/app/controllers/devise/unlocks_controller.rb +9 -4
  18. data/app/controllers/devise_controller.rb +67 -31
  19. data/app/helpers/devise_helper.rb +4 -2
  20. data/app/mailers/devise/mailer.rb +10 -0
  21. data/app/views/devise/confirmations/new.html.erb +8 -4
  22. data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
  23. data/app/views/devise/mailer/email_changed.html.erb +7 -0
  24. data/app/views/devise/mailer/password_change.html.erb +3 -0
  25. data/app/views/devise/mailer/reset_password_instructions.html.erb +1 -1
  26. data/app/views/devise/mailer/unlock_instructions.html.erb +1 -1
  27. data/app/views/devise/passwords/edit.html.erb +15 -6
  28. data/app/views/devise/passwords/new.html.erb +8 -4
  29. data/app/views/devise/registrations/edit.html.erb +28 -14
  30. data/app/views/devise/registrations/new.html.erb +19 -8
  31. data/app/views/devise/sessions/new.html.erb +17 -8
  32. data/app/views/devise/shared/{_links.erb → _links.html.erb} +2 -2
  33. data/app/views/devise/unlocks/new.html.erb +8 -4
  34. data/bin/test +13 -0
  35. data/config/locales/en.yml +22 -17
  36. data/devise.gemspec +7 -6
  37. data/gemfiles/Gemfile.rails-4.1-stable +32 -0
  38. data/gemfiles/Gemfile.rails-4.1-stable.lock +171 -0
  39. data/gemfiles/Gemfile.rails-4.2-stable +32 -0
  40. data/gemfiles/Gemfile.rails-4.2-stable.lock +192 -0
  41. data/gemfiles/Gemfile.rails-5.0-stable +33 -0
  42. data/gemfiles/Gemfile.rails-5.0-stable.lock +192 -0
  43. data/gemfiles/Gemfile.rails-5.2-rc1 +26 -0
  44. data/gemfiles/Gemfile.rails-5.2-rc1.lock +201 -0
  45. data/guides/bug_report_templates/integration_test.rb +106 -0
  46. data/lib/devise.rb +107 -84
  47. data/lib/devise/controllers/helpers.rb +111 -31
  48. data/lib/devise/controllers/rememberable.rb +15 -6
  49. data/lib/devise/controllers/scoped_views.rb +3 -1
  50. data/lib/devise/controllers/sign_in_out.rb +39 -26
  51. data/lib/devise/controllers/store_location.rb +31 -2
  52. data/lib/devise/controllers/url_helpers.rb +9 -7
  53. data/lib/devise/delegator.rb +2 -0
  54. data/lib/devise/encryptor.rb +24 -0
  55. data/lib/devise/failure_app.rb +98 -39
  56. data/lib/devise/hooks/activatable.rb +7 -6
  57. data/lib/devise/hooks/csrf_cleaner.rb +5 -1
  58. data/lib/devise/hooks/forgetable.rb +2 -0
  59. data/lib/devise/hooks/lockable.rb +7 -2
  60. data/lib/devise/hooks/proxy.rb +4 -2
  61. data/lib/devise/hooks/rememberable.rb +4 -2
  62. data/lib/devise/hooks/timeoutable.rb +16 -9
  63. data/lib/devise/hooks/trackable.rb +3 -1
  64. data/lib/devise/mailers/helpers.rb +15 -12
  65. data/lib/devise/mapping.rb +8 -2
  66. data/lib/devise/models.rb +3 -1
  67. data/lib/devise/models/authenticatable.rb +63 -36
  68. data/lib/devise/models/confirmable.rb +121 -41
  69. data/lib/devise/models/database_authenticatable.rb +66 -23
  70. data/lib/devise/models/lockable.rb +30 -17
  71. data/lib/devise/models/omniauthable.rb +3 -1
  72. data/lib/devise/models/recoverable.rb +62 -26
  73. data/lib/devise/models/registerable.rb +2 -0
  74. data/lib/devise/models/rememberable.rb +62 -33
  75. data/lib/devise/models/timeoutable.rb +4 -8
  76. data/lib/devise/models/trackable.rb +12 -3
  77. data/lib/devise/models/validatable.rb +16 -9
  78. data/lib/devise/modules.rb +12 -10
  79. data/lib/devise/omniauth.rb +2 -0
  80. data/lib/devise/omniauth/config.rb +2 -0
  81. data/lib/devise/omniauth/url_helpers.rb +14 -5
  82. data/lib/devise/orm/active_record.rb +5 -1
  83. data/lib/devise/orm/mongoid.rb +6 -2
  84. data/lib/devise/parameter_filter.rb +2 -0
  85. data/lib/devise/parameter_sanitizer.rb +131 -69
  86. data/lib/devise/rails.rb +10 -13
  87. data/lib/devise/rails/routes.rb +147 -116
  88. data/lib/devise/rails/warden_compat.rb +3 -10
  89. data/lib/devise/secret_key_finder.rb +25 -0
  90. data/lib/devise/strategies/authenticatable.rb +20 -9
  91. data/lib/devise/strategies/base.rb +3 -1
  92. data/lib/devise/strategies/database_authenticatable.rb +8 -5
  93. data/lib/devise/strategies/rememberable.rb +15 -3
  94. data/lib/devise/test/controller_helpers.rb +165 -0
  95. data/lib/devise/test/integration_helpers.rb +63 -0
  96. data/lib/devise/test_helpers.rb +7 -124
  97. data/lib/devise/time_inflector.rb +4 -2
  98. data/lib/devise/token_generator.rb +3 -41
  99. data/lib/devise/version.rb +3 -1
  100. data/lib/generators/active_record/devise_generator.rb +47 -10
  101. data/lib/generators/active_record/templates/migration.rb +9 -7
  102. data/lib/generators/active_record/templates/migration_existing.rb +9 -7
  103. data/lib/generators/devise/controllers_generator.rb +46 -0
  104. data/lib/generators/devise/devise_generator.rb +9 -5
  105. data/lib/generators/devise/install_generator.rb +22 -0
  106. data/lib/generators/devise/orm_helpers.rb +8 -19
  107. data/lib/generators/devise/views_generator.rb +51 -28
  108. data/lib/generators/mongoid/devise_generator.rb +22 -19
  109. data/lib/generators/templates/README +5 -12
  110. data/lib/generators/templates/controllers/README +14 -0
  111. data/lib/generators/templates/controllers/confirmations_controller.rb +30 -0
  112. data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +30 -0
  113. data/lib/generators/templates/controllers/passwords_controller.rb +34 -0
  114. data/lib/generators/templates/controllers/registrations_controller.rb +62 -0
  115. data/lib/generators/templates/controllers/sessions_controller.rb +27 -0
  116. data/lib/generators/templates/controllers/unlocks_controller.rb +30 -0
  117. data/lib/generators/templates/devise.rb +64 -35
  118. data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
  119. data/lib/generators/templates/markerb/email_changed.markerb +7 -0
  120. data/lib/generators/templates/markerb/password_change.markerb +3 -0
  121. data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
  122. data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
  123. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +2 -2
  124. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +4 -4
  125. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +2 -2
  126. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +6 -6
  127. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +4 -4
  128. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +6 -6
  129. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +2 -2
  130. data/test/controllers/custom_registrations_controller_test.rb +42 -0
  131. data/test/controllers/custom_strategy_test.rb +10 -6
  132. data/test/controllers/helper_methods_test.rb +24 -0
  133. data/test/controllers/helpers_test.rb +88 -40
  134. data/test/controllers/inherited_controller_i18n_messages_test.rb +53 -0
  135. data/test/controllers/internal_helpers_test.rb +31 -22
  136. data/test/controllers/load_hooks_controller_test.rb +21 -0
  137. data/test/controllers/passwords_controller_test.rb +8 -5
  138. data/test/controllers/sessions_controller_test.rb +42 -33
  139. data/test/controllers/url_helpers_test.rb +13 -5
  140. data/test/delegator_test.rb +3 -1
  141. data/test/devise_test.rb +34 -19
  142. data/test/failure_app_test.rb +150 -42
  143. data/test/generators/active_record_generator_test.rb +58 -31
  144. data/test/generators/controllers_generator_test.rb +50 -0
  145. data/test/generators/devise_generator_test.rb +4 -2
  146. data/test/generators/install_generator_test.rb +16 -3
  147. data/test/generators/mongoid_generator_test.rb +5 -3
  148. data/test/generators/views_generator_test.rb +40 -2
  149. data/test/helpers/devise_helper_test.rb +20 -20
  150. data/test/integration/authenticatable_test.rb +134 -141
  151. data/test/integration/confirmable_test.rb +109 -67
  152. data/test/integration/database_authenticatable_test.rb +36 -23
  153. data/test/integration/http_authenticatable_test.rb +29 -20
  154. data/test/integration/lockable_test.rb +52 -49
  155. data/test/integration/mounted_engine_test.rb +38 -0
  156. data/test/integration/omniauthable_test.rb +30 -15
  157. data/test/integration/recoverable_test.rb +76 -61
  158. data/test/integration/registerable_test.rb +107 -91
  159. data/test/integration/rememberable_test.rb +82 -30
  160. data/test/integration/timeoutable_test.rb +48 -40
  161. data/test/integration/trackable_test.rb +15 -8
  162. data/test/mailers/confirmation_instructions_test.rb +16 -14
  163. data/test/mailers/email_changed_test.rb +132 -0
  164. data/test/mailers/mailer_test.rb +20 -0
  165. data/test/mailers/reset_password_instructions_test.rb +13 -11
  166. data/test/mailers/unlock_instructions_test.rb +12 -10
  167. data/test/mapping_test.rb +15 -6
  168. data/test/models/authenticatable_test.rb +15 -3
  169. data/test/models/confirmable_test.rb +190 -95
  170. data/test/models/database_authenticatable_test.rb +75 -41
  171. data/test/models/lockable_test.rb +115 -61
  172. data/test/models/omniauthable_test.rb +3 -1
  173. data/test/models/recoverable_test.rb +116 -37
  174. data/test/models/registerable_test.rb +3 -1
  175. data/test/models/rememberable_test.rb +95 -94
  176. data/test/models/serializable_test.rb +19 -8
  177. data/test/models/timeoutable_test.rb +10 -8
  178. data/test/models/trackable_test.rb +50 -1
  179. data/test/models/validatable_test.rb +24 -30
  180. data/test/models_test.rb +19 -8
  181. data/test/omniauth/config_test.rb +15 -11
  182. data/test/omniauth/url_helpers_test.rb +8 -9
  183. data/test/orm/active_record.rb +16 -2
  184. data/test/orm/mongoid.rb +4 -2
  185. data/test/parameter_sanitizer_test.rb +53 -57
  186. data/test/rails_app/app/active_record/admin.rb +2 -0
  187. data/test/rails_app/app/active_record/shim.rb +3 -1
  188. data/test/rails_app/app/active_record/user.rb +14 -0
  189. data/test/rails_app/app/active_record/user_on_engine.rb +9 -0
  190. data/test/rails_app/app/active_record/user_on_main_app.rb +9 -0
  191. data/test/rails_app/app/active_record/user_with_validations.rb +12 -0
  192. data/test/rails_app/app/active_record/user_without_email.rb +10 -0
  193. data/test/rails_app/app/controllers/admins/sessions_controller.rb +3 -1
  194. data/test/rails_app/app/controllers/admins_controller.rb +3 -6
  195. data/test/rails_app/app/controllers/application_controller.rb +7 -3
  196. data/test/rails_app/app/controllers/application_with_fake_engine.rb +32 -0
  197. data/test/rails_app/app/controllers/custom/registrations_controller.rb +33 -0
  198. data/test/rails_app/app/controllers/home_controller.rb +7 -1
  199. data/test/rails_app/app/controllers/publisher/registrations_controller.rb +3 -1
  200. data/test/rails_app/app/controllers/publisher/sessions_controller.rb +3 -1
  201. data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +7 -5
  202. data/test/rails_app/app/controllers/users_controller.rb +8 -6
  203. data/test/rails_app/app/helpers/application_helper.rb +2 -0
  204. data/test/rails_app/app/mailers/users/from_proc_mailer.rb +5 -0
  205. data/test/rails_app/app/mailers/users/mailer.rb +3 -10
  206. data/test/rails_app/app/mailers/users/reply_to_mailer.rb +6 -0
  207. data/test/rails_app/app/mongoid/admin.rb +13 -11
  208. data/test/rails_app/app/mongoid/shim.rb +4 -2
  209. data/test/rails_app/app/mongoid/user.rb +30 -19
  210. data/test/rails_app/app/mongoid/user_on_engine.rb +41 -0
  211. data/test/rails_app/app/mongoid/user_on_main_app.rb +41 -0
  212. data/test/rails_app/app/mongoid/user_with_validations.rb +37 -0
  213. data/test/rails_app/app/mongoid/user_without_email.rb +35 -0
  214. data/test/rails_app/app/views/admins/sessions/new.html.erb +1 -1
  215. data/test/rails_app/app/views/home/admin_dashboard.html.erb +1 -1
  216. data/test/rails_app/app/views/home/index.html.erb +1 -1
  217. data/test/rails_app/app/views/home/join.html.erb +1 -1
  218. data/test/rails_app/app/views/home/user_dashboard.html.erb +1 -1
  219. data/test/rails_app/app/views/layouts/application.html.erb +1 -1
  220. data/test/rails_app/config/application.rb +13 -5
  221. data/test/rails_app/config/boot.rb +17 -4
  222. data/test/rails_app/config/environment.rb +2 -0
  223. data/test/rails_app/config/environments/development.rb +2 -0
  224. data/test/rails_app/config/environments/production.rb +10 -2
  225. data/test/rails_app/config/environments/test.rb +14 -3
  226. data/test/rails_app/config/initializers/backtrace_silencers.rb +2 -0
  227. data/test/rails_app/config/initializers/devise.rb +22 -21
  228. data/test/rails_app/config/initializers/inflections.rb +2 -0
  229. data/test/rails_app/config/initializers/secret_token.rb +3 -6
  230. data/test/rails_app/config/initializers/session_store.rb +2 -0
  231. data/test/rails_app/config/routes.rb +67 -43
  232. data/test/rails_app/db/migrate/20100401102949_create_tables.rb +16 -10
  233. data/test/rails_app/db/schema.rb +2 -0
  234. data/test/rails_app/lib/shared_admin.rb +10 -4
  235. data/test/rails_app/lib/shared_user.rb +4 -1
  236. data/test/rails_app/lib/shared_user_without_email.rb +28 -0
  237. data/test/rails_app/lib/shared_user_without_omniauth.rb +15 -0
  238. data/test/rails_test.rb +11 -0
  239. data/test/routes_test.rb +92 -61
  240. data/test/secret_key_finder_test.rb +97 -0
  241. data/test/support/action_controller/record_identifier.rb +12 -0
  242. data/test/support/assertions.rb +4 -14
  243. data/test/support/helpers.rb +23 -10
  244. data/test/support/http_method_compatibility.rb +53 -0
  245. data/test/support/integration.rb +19 -16
  246. data/test/support/mongoid.yml +6 -0
  247. data/test/support/webrat/integrations/rails.rb +11 -0
  248. data/test/{test_helpers_test.rb → test/controller_helpers_test.rb} +60 -40
  249. data/test/test/integration_helpers_test.rb +34 -0
  250. data/test/test_helper.rb +9 -0
  251. data/test/test_models.rb +8 -6
  252. metadata +123 -53
  253. data/gemfiles/Gemfile.rails-3.2.x +0 -31
  254. data/gemfiles/Gemfile.rails-3.2.x.lock +0 -159
@@ -0,0 +1,22 @@
1
+ # Contributor Code of Conduct
2
+
3
+ As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
4
+
5
+ We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
6
+
7
+ Examples of unacceptable behavior by participants include:
8
+
9
+ * The use of sexualized language or imagery
10
+ * Personal attacks
11
+ * Trolling or insulting/derogatory comments
12
+ * Public or private harassment
13
+ * Publishing other's private information, such as physical or electronic addresses, without explicit permission
14
+ * Other unethical or unprofessional conduct.
15
+
16
+ Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
17
+
18
+ This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
19
+
20
+ Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by sending an email to [conduct@plataformatec.com.br](conduct@plataformatec.com.br) or contacting one or more of the project maintainers.
21
+
22
+ This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
@@ -1,14 +1,79 @@
1
- ### Please read before contributing
1
+ # How to contribute to Devise
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
+ Thanks for your interest on contributing to Devise! Here are a few general
4
+ guidelines on contributing and reporting bugs to Devise that we ask you to
5
+ take a look first. Notice that all of your interactions in the project are
6
+ expected to follow our [Code of Conduct](CODE_OF_CONDUCT.md).
4
7
 
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.
8
+ ## Reporting Issues
6
9
 
7
- 3) Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed.
10
+ Before reporting a new issue, please be sure that the issue wasn't already
11
+ reported or fixed by searching on GitHub through our [issues](https://github.com/plataformatec/devise/issues).
8
12
 
9
- 4) When reporting an issue, include Rails, Devise and Warden versions. If you are getting exceptions, please include the full backtrace.
13
+ When creating a new issue, be sure to include a **title and clear description**,
14
+ as much relevant information as possible, and either a test case example or
15
+ even better a **sample Rails app that replicates the issue** - Devise has a lot
16
+ of moving parts and it's functionality can be affected by third party gems, so
17
+ we need as much context and details as possible to identify what might be broken
18
+ for you. We have a [test case template](guides/bug_report_templates/integration_test.rb)
19
+ that can be used to replicate issues with minimal setup.
10
20
 
11
- That's it! The more information you give, the easier it becomes for us to track it down and fix it.
12
- Ideally, you should provide an application that reproduces the error or a test case to Devise's suite.
21
+ Please do not attempt to translate Devise built in views. The views are meant
22
+ to be a starting point for fresh apps and not production material - eventually
23
+ all applications will require custom views where you can write your own copy and
24
+ translate it if the application requires it . For historical references, please look into closed
25
+ [Issues/Pull Requests](https://github.com/plataformatec/devise/issues?q=i18n) regarding
26
+ internationalization.
13
27
 
14
- Thanks!
28
+ Avoid opening new issues to ask questions in our issues tracker. Please go through
29
+ the project wiki, documentation and source code first, or try to ask your question
30
+ on [Stack Overflow](http://stackoverflow.com/questions/tagged/devise).
31
+
32
+ **If you find a security bug, do not report it through GitHub. Please send an
33
+ e-mail to [opensource@plataformatec.com.br](mailto:opensource@plataformatec.com.br)
34
+ instead.**
35
+
36
+ ## Sending Pull Requests
37
+
38
+ Before sending a new Pull Request, take a look on existing Pull Requests and Issues
39
+ to see if the proposed change or fix has been discussed in the past, or if the
40
+ change was already implemented but not yet released.
41
+
42
+ We expect new Pull Requests to include enough tests for new or changed behavior,
43
+ and we aim to maintain everything as most backwards compatible as possible,
44
+ reserving breaking changes to be ship in major releases when necessary - you
45
+ can wrap the new code path with a setting toggle from the `Devise` module defined
46
+ as `false` by default to require developers to opt-in for the new behavior.
47
+
48
+ If your Pull Request includes new or changed behavior, be sure that the changes
49
+ are beneficial to a wide range of use cases or it's an application specific change
50
+ that might not be so valuable to other applications. Some changes can be introduced
51
+ as a new `devise-something` gem instead of belonging to the main codebase.
52
+
53
+ When adding new settings, you can take advantage of the [`Devise::Models.config`](https://github.com/plataformatec/devise/blob/245b1f9de0b3386b7913e14b60ea24f43b77feb0/lib/devise/models.rb#L13-L50) method to add class and instance level fallbacks
54
+ to the new setting.
55
+
56
+ We also welcome Pull Requests that improve our existing documentation (both our
57
+ `README.md` and the RDoc sections in the source code) or improve existing rough
58
+ edges in our API that might be blocking existing integrations or 3rd party gems.
59
+
60
+ ## Other ways to contribute
61
+
62
+ We welcome anyone that wants to contribute to Devise to triage and reply to
63
+ open issues to help troubleshoot and fix existing bugs on Devise. Here is what
64
+ you can do:
65
+
66
+ * Help ensure that existing issues follows the recommendations from the
67
+ _[Reporting Issues](#reporting-issues)_ section, providing feeback to the issue's
68
+ author on what might be missing.
69
+ * Review and update the existing content of our [Wiki](https://github.com/plataformatec/devise/wiki)
70
+ with up to date instructions and code samples - the wiki was grown with several
71
+ different tutorials and references that we can't keep track of everything, so if
72
+ there is a page that showcases an integration or customization that you are
73
+ familiar with feel free to update it as necessary.
74
+ * Review existing Pull Requests, and testing patches against real existing
75
+ applications that use Devise.
76
+
77
+ Thanks again for your interest on contributing to the project!
78
+
79
+ :heart:
data/Gemfile CHANGED
@@ -1,17 +1,26 @@
1
+ # frozen_string_literal: true
2
+
1
3
  source "https://rubygems.org"
2
4
 
3
5
  gemspec
4
6
 
5
- gem "rails", "~> 4.0.0"
6
- gem "omniauth", "~> 1.0.0"
7
- gem "omniauth-oauth2", "~> 1.0.0"
7
+ gem "rails", "~> 5.1"
8
+ gem "omniauth", "~> 1.3"
9
+ gem "oauth2"
10
+ gem "omniauth-oauth2"
8
11
  gem "rdoc"
9
12
 
13
+ gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
14
+
15
+ gem "rails-controller-testing"
16
+
17
+ gem "responders", "~> 2.1"
18
+
10
19
  group :test do
11
20
  gem "omniauth-facebook"
12
- gem "omniauth-openid", "~> 1.0.1"
13
- gem "webrat", "0.7.3", :require => false
14
- gem "mocha", "~> 0.13.1", :require => false
21
+ gem "omniauth-openid"
22
+ gem "webrat", "0.7.3", require: false
23
+ gem "mocha", "~> 1.1", require: false
15
24
  end
16
25
 
17
26
  platforms :jruby do
@@ -24,8 +33,7 @@ platforms :ruby do
24
33
  gem "sqlite3"
25
34
  end
26
35
 
27
- platforms :mri_19, :mri_20 do
28
- group :mongoid do
29
- gem "mongoid", github: "mongoid/mongoid", branch: "master"
30
- end
31
- end
36
+ # TODO:
37
+ # group :mongoid do
38
+ # gem "mongoid", "~> 4.0.0"
39
+ # end
@@ -1,160 +1,193 @@
1
1
  GIT
2
- remote: git://github.com/mongoid/mongoid.git
3
- revision: 346a79a7d01aa194de80e649916239a18d38ce13
4
- branch: master
2
+ remote: git://github.com/rails/activemodel-serializers-xml.git
3
+ revision: dd9c0acf26aab111ebc647cd8deb99ebc6946531
5
4
  specs:
6
- mongoid (4.0.0)
7
- activemodel (~> 4.0.0)
8
- moped (~> 1.5)
9
- origin (~> 1.0)
10
- tzinfo (~> 0.3.22)
5
+ activemodel-serializers-xml (1.0.1)
6
+ activemodel (> 5.x)
7
+ activesupport (> 5.x)
8
+ builder (~> 3.1)
11
9
 
12
10
  PATH
13
11
  remote: .
14
12
  specs:
15
- devise (3.2.1)
16
- bcrypt-ruby (~> 3.0)
13
+ devise (4.4.3)
14
+ bcrypt (~> 3.0)
17
15
  orm_adapter (~> 0.1)
18
- railties (>= 3.2.6, < 5)
19
- thread_safe (~> 0.1)
16
+ railties (>= 4.1.0, < 6.0)
17
+ responders
20
18
  warden (~> 1.2.3)
21
19
 
22
20
  GEM
23
21
  remote: https://rubygems.org/
24
22
  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)
32
- rack (~> 1.5.2)
33
- 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)
47
- 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)
53
- erubis (2.7.0)
54
- faraday (0.8.8)
55
- multipart-post (~> 1.2.0)
56
- hashie (1.2.0)
57
- 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)
63
- mail (2.5.4)
64
- mime-types (~> 1.16)
65
- treetop (~> 1.4.8)
66
- metaclass (0.0.1)
67
- mime-types (1.23)
68
- minitest (4.7.5)
69
- mocha (0.13.3)
23
+ actioncable (5.1.0)
24
+ actionpack (= 5.1.0)
25
+ nio4r (~> 2.0)
26
+ websocket-driver (~> 0.6.1)
27
+ actionmailer (5.1.0)
28
+ actionpack (= 5.1.0)
29
+ actionview (= 5.1.0)
30
+ activejob (= 5.1.0)
31
+ mail (~> 2.5, >= 2.5.4)
32
+ rails-dom-testing (~> 2.0)
33
+ actionpack (5.1.0)
34
+ actionview (= 5.1.0)
35
+ activesupport (= 5.1.0)
36
+ rack (~> 2.0)
37
+ rack-test (~> 0.6.3)
38
+ rails-dom-testing (~> 2.0)
39
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
40
+ actionview (5.1.0)
41
+ activesupport (= 5.1.0)
42
+ builder (~> 3.1)
43
+ erubi (~> 1.4)
44
+ rails-dom-testing (~> 2.0)
45
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
46
+ activejob (5.1.0)
47
+ activesupport (= 5.1.0)
48
+ globalid (>= 0.3.6)
49
+ activemodel (5.1.0)
50
+ activesupport (= 5.1.0)
51
+ activerecord (5.1.0)
52
+ activemodel (= 5.1.0)
53
+ activesupport (= 5.1.0)
54
+ arel (~> 8.0)
55
+ activesupport (5.1.0)
56
+ concurrent-ruby (~> 1.0, >= 1.0.2)
57
+ i18n (~> 0.7)
58
+ minitest (~> 5.1)
59
+ tzinfo (~> 1.1)
60
+ arel (8.0.0)
61
+ bcrypt (3.1.11)
62
+ builder (3.2.3)
63
+ concurrent-ruby (1.0.5)
64
+ erubi (1.6.0)
65
+ faraday (0.11.0)
66
+ multipart-post (>= 1.2, < 3)
67
+ globalid (0.4.0)
68
+ activesupport (>= 4.2.0)
69
+ hashie (3.5.5)
70
+ i18n (0.8.1)
71
+ jwt (1.5.6)
72
+ loofah (2.0.3)
73
+ nokogiri (>= 1.5.9)
74
+ mail (2.6.5)
75
+ mime-types (>= 1.16, < 4)
76
+ metaclass (0.0.4)
77
+ method_source (0.8.2)
78
+ mime-types (3.1)
79
+ mime-types-data (~> 3.2015)
80
+ mime-types-data (3.2016.0521)
81
+ mini_portile2 (2.1.0)
82
+ minitest (5.10.1)
83
+ mocha (1.2.1)
70
84
  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)
80
- 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)
85
+ multi_json (1.12.1)
86
+ multi_xml (0.6.0)
87
+ multipart-post (2.0.0)
88
+ nio4r (2.0.0)
89
+ nokogiri (1.7.1)
90
+ mini_portile2 (~> 2.1.0)
91
+ oauth2 (1.3.1)
92
+ faraday (>= 0.8, < 0.12)
93
+ jwt (~> 1.0)
94
+ multi_json (~> 1.3)
95
+ multi_xml (~> 0.5)
96
+ rack (>= 1.2, < 3)
97
+ omniauth (1.6.1)
98
+ hashie (>= 3.4.6, < 3.6.0)
99
+ rack (>= 1.6.2, < 3)
100
+ omniauth-facebook (4.0.0)
101
+ omniauth-oauth2 (~> 1.2)
102
+ omniauth-oauth2 (1.4.0)
103
+ oauth2 (~> 1.0)
104
+ omniauth (~> 1.2)
89
105
  omniauth-openid (1.0.1)
90
106
  omniauth (~> 1.0)
91
107
  rack-openid (~> 1.3.1)
92
- origin (1.1.0)
93
- orm_adapter (0.4.0)
94
- polyglot (0.3.3)
95
- rack (1.5.2)
108
+ orm_adapter (0.5.0)
109
+ rack (2.0.1)
96
110
  rack-openid (1.3.1)
97
111
  rack (>= 1.1.0)
98
112
  ruby-openid (>= 2.1.8)
99
- rack-test (0.6.2)
113
+ rack-test (0.6.3)
100
114
  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)
115
+ rails (5.1.0)
116
+ actioncable (= 5.1.0)
117
+ actionmailer (= 5.1.0)
118
+ actionpack (= 5.1.0)
119
+ actionview (= 5.1.0)
120
+ activejob (= 5.1.0)
121
+ activemodel (= 5.1.0)
122
+ activerecord (= 5.1.0)
123
+ activesupport (= 5.1.0)
106
124
  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)
125
+ railties (= 5.1.0)
126
+ sprockets-rails (>= 2.0.0)
127
+ rails-controller-testing (1.0.1)
128
+ actionpack (~> 5.x)
129
+ actionview (~> 5.x)
130
+ activesupport (~> 5.x)
131
+ rails-dom-testing (2.0.2)
132
+ activesupport (>= 4.2.0, < 6.0)
133
+ nokogiri (~> 1.6)
134
+ rails-html-sanitizer (1.0.3)
135
+ loofah (~> 2.0)
136
+ railties (5.1.0)
137
+ actionpack (= 5.1.0)
138
+ activesupport (= 5.1.0)
139
+ method_source
112
140
  rake (>= 0.8.7)
113
141
  thor (>= 0.18.1, < 2.0)
114
- rake (10.1.0)
115
- rdoc (4.0.1)
116
- json (~> 1.4)
117
- ruby-openid (2.2.3)
118
- sprockets (2.10.0)
119
- hike (~> 1.2)
120
- multi_json (~> 1.0)
121
- rack (~> 1.0)
122
- tilt (~> 1.1, != 1.3.0)
123
- sprockets-rails (2.0.0)
124
- actionpack (>= 3.0)
125
- activesupport (>= 3.0)
126
- sprockets (~> 2.8)
127
- sqlite3 (1.3.7)
128
- thor (0.18.1)
129
- thread_safe (0.1.2)
130
- atomic
131
- tilt (1.4.1)
132
- treetop (1.4.14)
133
- polyglot
134
- polyglot (>= 0.3.1)
135
- tzinfo (0.3.37)
136
- warden (1.2.3)
142
+ rake (12.0.0)
143
+ rdoc (5.1.0)
144
+ responders (2.4.0)
145
+ actionpack (>= 4.2.0, < 5.3)
146
+ railties (>= 4.2.0, < 5.3)
147
+ ruby-openid (2.7.0)
148
+ sprockets (3.7.1)
149
+ concurrent-ruby (~> 1.0)
150
+ rack (> 1, < 3)
151
+ sprockets-rails (3.2.0)
152
+ actionpack (>= 4.0)
153
+ activesupport (>= 4.0)
154
+ sprockets (>= 3.0.0)
155
+ sqlite3 (1.3.13)
156
+ thor (0.19.4)
157
+ thread_safe (0.3.6)
158
+ tzinfo (1.2.3)
159
+ thread_safe (~> 0.1)
160
+ warden (1.2.7)
137
161
  rack (>= 1.0)
138
162
  webrat (0.7.3)
139
163
  nokogiri (>= 1.2.0)
140
164
  rack (>= 1.0)
141
165
  rack-test (>= 0.5.3)
166
+ websocket-driver (0.6.5)
167
+ websocket-extensions (>= 0.1.0)
168
+ websocket-extensions (0.1.2)
142
169
 
143
170
  PLATFORMS
144
171
  ruby
145
172
 
146
173
  DEPENDENCIES
174
+ activemodel-serializers-xml!
147
175
  activerecord-jdbc-adapter
148
176
  activerecord-jdbcsqlite3-adapter
149
177
  devise!
150
178
  jruby-openssl
151
- mocha (~> 0.13.1)
152
- mongoid!
153
- omniauth (~> 1.0.0)
179
+ mocha (~> 1.1)
180
+ oauth2
181
+ omniauth (~> 1.3)
154
182
  omniauth-facebook
155
- omniauth-oauth2 (~> 1.0.0)
156
- omniauth-openid (~> 1.0.1)
157
- rails (~> 4.0.0)
183
+ omniauth-oauth2
184
+ omniauth-openid
185
+ rails (~> 5.1)
186
+ rails-controller-testing
158
187
  rdoc
188
+ responders (~> 2.1)
159
189
  sqlite3
160
190
  webrat (= 0.7.3)
191
+
192
+ BUNDLED WITH
193
+ 1.16.1