devise 3.5.1 → 4.7.1

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 (256) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +259 -1076
  3. data/MIT-LICENSE +1 -1
  4. data/README.md +256 -68
  5. data/app/controllers/devise/confirmations_controller.rb +3 -1
  6. data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
  7. data/app/controllers/devise/passwords_controller.rb +10 -7
  8. data/app/controllers/devise/registrations_controller.rb +39 -18
  9. data/app/controllers/devise/sessions_controller.rb +9 -7
  10. data/app/controllers/devise/unlocks_controller.rb +4 -2
  11. data/app/controllers/devise_controller.rb +23 -10
  12. data/app/helpers/devise_helper.rb +12 -19
  13. data/app/mailers/devise/mailer.rb +10 -0
  14. data/app/views/devise/confirmations/new.html.erb +2 -2
  15. data/app/views/devise/mailer/email_changed.html.erb +7 -0
  16. data/app/views/devise/mailer/password_change.html.erb +3 -0
  17. data/app/views/devise/passwords/edit.html.erb +5 -5
  18. data/app/views/devise/passwords/new.html.erb +2 -2
  19. data/app/views/devise/registrations/edit.html.erb +9 -5
  20. data/app/views/devise/registrations/new.html.erb +4 -4
  21. data/app/views/devise/sessions/new.html.erb +4 -4
  22. data/app/views/devise/shared/_error_messages.html.erb +15 -0
  23. data/app/views/devise/shared/_links.html.erb +8 -8
  24. data/app/views/devise/unlocks/new.html.erb +2 -2
  25. data/config/locales/en.yml +6 -1
  26. data/lib/devise/controllers/helpers.rb +35 -26
  27. data/lib/devise/controllers/rememberable.rb +11 -2
  28. data/lib/devise/controllers/scoped_views.rb +2 -0
  29. data/lib/devise/controllers/sign_in_out.rb +35 -18
  30. data/lib/devise/controllers/store_location.rb +25 -7
  31. data/lib/devise/controllers/url_helpers.rb +2 -0
  32. data/lib/devise/delegator.rb +2 -0
  33. data/lib/devise/encryptor.rb +6 -4
  34. data/lib/devise/failure_app.rb +84 -27
  35. data/lib/devise/hooks/activatable.rb +2 -0
  36. data/lib/devise/hooks/csrf_cleaner.rb +2 -0
  37. data/lib/devise/hooks/forgetable.rb +2 -0
  38. data/lib/devise/hooks/lockable.rb +6 -1
  39. data/lib/devise/hooks/proxy.rb +3 -1
  40. data/lib/devise/hooks/rememberable.rb +2 -0
  41. data/lib/devise/hooks/timeoutable.rb +7 -7
  42. data/lib/devise/hooks/trackable.rb +2 -0
  43. data/lib/devise/mailers/helpers.rb +7 -4
  44. data/lib/devise/mapping.rb +2 -0
  45. data/lib/devise/models/authenticatable.rb +51 -26
  46. data/lib/devise/models/confirmable.rb +106 -33
  47. data/lib/devise/models/database_authenticatable.rb +97 -21
  48. data/lib/devise/models/lockable.rb +15 -5
  49. data/lib/devise/models/omniauthable.rb +2 -0
  50. data/lib/devise/models/recoverable.rb +32 -24
  51. data/lib/devise/models/registerable.rb +4 -0
  52. data/lib/devise/models/rememberable.rb +42 -26
  53. data/lib/devise/models/timeoutable.rb +2 -6
  54. data/lib/devise/models/trackable.rb +15 -1
  55. data/lib/devise/models/validatable.rb +10 -3
  56. data/lib/devise/models.rb +3 -1
  57. data/lib/devise/modules.rb +2 -0
  58. data/lib/devise/omniauth/config.rb +2 -0
  59. data/lib/devise/omniauth/url_helpers.rb +14 -5
  60. data/lib/devise/omniauth.rb +2 -0
  61. data/lib/devise/orm/active_record.rb +5 -1
  62. data/lib/devise/orm/mongoid.rb +6 -2
  63. data/lib/devise/parameter_filter.rb +4 -0
  64. data/lib/devise/parameter_sanitizer.rb +139 -65
  65. data/lib/devise/rails/routes.rb +67 -47
  66. data/lib/devise/rails/warden_compat.rb +3 -10
  67. data/lib/devise/rails.rb +7 -16
  68. data/lib/devise/secret_key_finder.rb +27 -0
  69. data/lib/devise/strategies/authenticatable.rb +5 -3
  70. data/lib/devise/strategies/base.rb +2 -0
  71. data/lib/devise/strategies/database_authenticatable.rb +11 -4
  72. data/lib/devise/strategies/rememberable.rb +5 -6
  73. data/lib/devise/test/controller_helpers.rb +165 -0
  74. data/lib/devise/test/integration_helpers.rb +63 -0
  75. data/lib/devise/test_helpers.rb +7 -124
  76. data/lib/devise/time_inflector.rb +2 -0
  77. data/lib/devise/token_generator.rb +3 -41
  78. data/lib/devise/version.rb +3 -1
  79. data/lib/devise.rb +73 -46
  80. data/lib/generators/active_record/devise_generator.rb +29 -10
  81. data/lib/generators/active_record/templates/migration.rb +4 -2
  82. data/lib/generators/active_record/templates/migration_existing.rb +4 -2
  83. data/lib/generators/devise/controllers_generator.rb +3 -1
  84. data/lib/generators/devise/devise_generator.rb +4 -2
  85. data/lib/generators/devise/install_generator.rb +17 -0
  86. data/lib/generators/devise/orm_helpers.rb +10 -21
  87. data/lib/generators/devise/views_generator.rb +21 -11
  88. data/lib/generators/mongoid/devise_generator.rb +7 -5
  89. data/lib/generators/templates/README +1 -8
  90. data/lib/generators/templates/controllers/README +1 -1
  91. data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
  92. data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +2 -0
  93. data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
  94. data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
  95. data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
  96. data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
  97. data/lib/generators/templates/devise.rb +52 -22
  98. data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
  99. data/lib/generators/templates/markerb/email_changed.markerb +7 -0
  100. data/lib/generators/templates/markerb/password_change.markerb +3 -0
  101. data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
  102. data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
  103. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
  104. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
  105. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
  106. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
  107. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
  108. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
  109. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
  110. metadata +15 -301
  111. data/.gitignore +0 -10
  112. data/.travis.yml +0 -45
  113. data/.yardopts +0 -9
  114. data/CONTRIBUTING.md +0 -14
  115. data/Gemfile +0 -29
  116. data/Gemfile.lock +0 -191
  117. data/Rakefile +0 -36
  118. data/devise.gemspec +0 -29
  119. data/devise.png +0 -0
  120. data/gemfiles/Gemfile.rails-3.2-stable +0 -29
  121. data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -169
  122. data/gemfiles/Gemfile.rails-4.0-stable +0 -29
  123. data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -163
  124. data/gemfiles/Gemfile.rails-4.1-stable +0 -29
  125. data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -169
  126. data/gemfiles/Gemfile.rails-4.2-stable +0 -29
  127. data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -191
  128. data/script/cached-bundle +0 -49
  129. data/script/s3-put +0 -71
  130. data/test/controllers/custom_registrations_controller_test.rb +0 -40
  131. data/test/controllers/custom_strategy_test.rb +0 -62
  132. data/test/controllers/helpers_test.rb +0 -316
  133. data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
  134. data/test/controllers/internal_helpers_test.rb +0 -129
  135. data/test/controllers/load_hooks_controller_test.rb +0 -19
  136. data/test/controllers/passwords_controller_test.rb +0 -31
  137. data/test/controllers/sessions_controller_test.rb +0 -103
  138. data/test/controllers/url_helpers_test.rb +0 -65
  139. data/test/delegator_test.rb +0 -19
  140. data/test/devise_test.rb +0 -107
  141. data/test/failure_app_test.rb +0 -298
  142. data/test/generators/active_record_generator_test.rb +0 -109
  143. data/test/generators/controllers_generator_test.rb +0 -48
  144. data/test/generators/devise_generator_test.rb +0 -39
  145. data/test/generators/install_generator_test.rb +0 -13
  146. data/test/generators/mongoid_generator_test.rb +0 -23
  147. data/test/generators/views_generator_test.rb +0 -96
  148. data/test/helpers/devise_helper_test.rb +0 -49
  149. data/test/integration/authenticatable_test.rb +0 -729
  150. data/test/integration/confirmable_test.rb +0 -324
  151. data/test/integration/database_authenticatable_test.rb +0 -95
  152. data/test/integration/http_authenticatable_test.rb +0 -105
  153. data/test/integration/lockable_test.rb +0 -239
  154. data/test/integration/omniauthable_test.rb +0 -133
  155. data/test/integration/recoverable_test.rb +0 -347
  156. data/test/integration/registerable_test.rb +0 -359
  157. data/test/integration/rememberable_test.rb +0 -176
  158. data/test/integration/timeoutable_test.rb +0 -189
  159. data/test/integration/trackable_test.rb +0 -92
  160. data/test/mailers/confirmation_instructions_test.rb +0 -115
  161. data/test/mailers/reset_password_instructions_test.rb +0 -96
  162. data/test/mailers/unlock_instructions_test.rb +0 -91
  163. data/test/mapping_test.rb +0 -134
  164. data/test/models/authenticatable_test.rb +0 -23
  165. data/test/models/confirmable_test.rb +0 -468
  166. data/test/models/database_authenticatable_test.rb +0 -249
  167. data/test/models/lockable_test.rb +0 -328
  168. data/test/models/omniauthable_test.rb +0 -7
  169. data/test/models/recoverable_test.rb +0 -228
  170. data/test/models/registerable_test.rb +0 -7
  171. data/test/models/rememberable_test.rb +0 -204
  172. data/test/models/serializable_test.rb +0 -49
  173. data/test/models/timeoutable_test.rb +0 -51
  174. data/test/models/trackable_test.rb +0 -41
  175. data/test/models/validatable_test.rb +0 -127
  176. data/test/models_test.rb +0 -144
  177. data/test/omniauth/config_test.rb +0 -57
  178. data/test/omniauth/url_helpers_test.rb +0 -54
  179. data/test/orm/active_record.rb +0 -10
  180. data/test/orm/mongoid.rb +0 -13
  181. data/test/parameter_sanitizer_test.rb +0 -81
  182. data/test/rails_app/Rakefile +0 -6
  183. data/test/rails_app/app/active_record/admin.rb +0 -6
  184. data/test/rails_app/app/active_record/shim.rb +0 -2
  185. data/test/rails_app/app/active_record/user.rb +0 -6
  186. data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
  187. data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
  188. data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
  189. data/test/rails_app/app/controllers/admins_controller.rb +0 -11
  190. data/test/rails_app/app/controllers/application_controller.rb +0 -12
  191. data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
  192. data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
  193. data/test/rails_app/app/controllers/home_controller.rb +0 -25
  194. data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
  195. data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
  196. data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
  197. data/test/rails_app/app/controllers/users_controller.rb +0 -31
  198. data/test/rails_app/app/helpers/application_helper.rb +0 -3
  199. data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
  200. data/test/rails_app/app/mailers/users/mailer.rb +0 -3
  201. data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
  202. data/test/rails_app/app/mongoid/admin.rb +0 -29
  203. data/test/rails_app/app/mongoid/shim.rb +0 -23
  204. data/test/rails_app/app/mongoid/user.rb +0 -39
  205. data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
  206. data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
  207. data/test/rails_app/app/views/admins/index.html.erb +0 -1
  208. data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
  209. data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
  210. data/test/rails_app/app/views/home/index.html.erb +0 -1
  211. data/test/rails_app/app/views/home/join.html.erb +0 -1
  212. data/test/rails_app/app/views/home/private.html.erb +0 -1
  213. data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
  214. data/test/rails_app/app/views/layouts/application.html.erb +0 -24
  215. data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
  216. data/test/rails_app/app/views/users/index.html.erb +0 -1
  217. data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
  218. data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
  219. data/test/rails_app/bin/bundle +0 -3
  220. data/test/rails_app/bin/rails +0 -4
  221. data/test/rails_app/bin/rake +0 -4
  222. data/test/rails_app/config/application.rb +0 -40
  223. data/test/rails_app/config/boot.rb +0 -14
  224. data/test/rails_app/config/database.yml +0 -18
  225. data/test/rails_app/config/environment.rb +0 -5
  226. data/test/rails_app/config/environments/development.rb +0 -30
  227. data/test/rails_app/config/environments/production.rb +0 -84
  228. data/test/rails_app/config/environments/test.rb +0 -41
  229. data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
  230. data/test/rails_app/config/initializers/devise.rb +0 -180
  231. data/test/rails_app/config/initializers/inflections.rb +0 -2
  232. data/test/rails_app/config/initializers/secret_token.rb +0 -8
  233. data/test/rails_app/config/initializers/session_store.rb +0 -1
  234. data/test/rails_app/config/routes.rb +0 -122
  235. data/test/rails_app/config.ru +0 -4
  236. data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
  237. data/test/rails_app/db/schema.rb +0 -55
  238. data/test/rails_app/lib/shared_admin.rb +0 -17
  239. data/test/rails_app/lib/shared_user.rb +0 -29
  240. data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
  241. data/test/rails_app/public/404.html +0 -26
  242. data/test/rails_app/public/422.html +0 -26
  243. data/test/rails_app/public/500.html +0 -26
  244. data/test/rails_app/public/favicon.ico +0 -0
  245. data/test/rails_test.rb +0 -9
  246. data/test/routes_test.rb +0 -264
  247. data/test/support/action_controller/record_identifier.rb +0 -10
  248. data/test/support/assertions.rb +0 -39
  249. data/test/support/helpers.rb +0 -73
  250. data/test/support/integration.rb +0 -92
  251. data/test/support/locale/en.yml +0 -8
  252. data/test/support/mongoid.yml +0 -6
  253. data/test/support/webrat/integrations/rails.rb +0 -24
  254. data/test/test_helper.rb +0 -34
  255. data/test/test_helpers_test.rb +0 -178
  256. data/test/test_models.rb +0 -33
@@ -1,169 +0,0 @@
1
- GIT
2
- remote: git://github.com/rails/rails.git
3
- revision: bf32ec7b8611e6b4c7e9398f7d297a1f0221e9b9
4
- branch: 4-1-stable
5
- specs:
6
- actionmailer (4.1.10)
7
- actionpack (= 4.1.10)
8
- actionview (= 4.1.10)
9
- mail (~> 2.5, >= 2.5.4)
10
- actionpack (4.1.10)
11
- actionview (= 4.1.10)
12
- activesupport (= 4.1.10)
13
- rack (~> 1.5.2)
14
- rack-test (~> 0.6.2)
15
- actionview (4.1.10)
16
- activesupport (= 4.1.10)
17
- builder (~> 3.1)
18
- erubis (~> 2.7.0)
19
- activemodel (4.1.10)
20
- activesupport (= 4.1.10)
21
- builder (~> 3.1)
22
- activerecord (4.1.10)
23
- activemodel (= 4.1.10)
24
- activesupport (= 4.1.10)
25
- arel (~> 5.0.0)
26
- activesupport (4.1.10)
27
- i18n (~> 0.6, >= 0.6.9)
28
- json (~> 1.7, >= 1.7.7)
29
- minitest (~> 5.1)
30
- thread_safe (~> 0.1)
31
- tzinfo (~> 1.1)
32
- rails (4.1.10)
33
- actionmailer (= 4.1.10)
34
- actionpack (= 4.1.10)
35
- actionview (= 4.1.10)
36
- activemodel (= 4.1.10)
37
- activerecord (= 4.1.10)
38
- activesupport (= 4.1.10)
39
- bundler (>= 1.3.0, < 2.0)
40
- railties (= 4.1.10)
41
- sprockets-rails (~> 2.0)
42
- railties (4.1.10)
43
- actionpack (= 4.1.10)
44
- activesupport (= 4.1.10)
45
- rake (>= 0.8.7)
46
- thor (>= 0.18.1, < 2.0)
47
-
48
- PATH
49
- remote: ..
50
- specs:
51
- devise (3.4.1)
52
- bcrypt (~> 3.0)
53
- orm_adapter (~> 0.1)
54
- railties (>= 3.2.6, < 5)
55
- responders
56
- thread_safe (~> 0.1)
57
- warden (~> 1.2.3)
58
-
59
- GEM
60
- remote: https://rubygems.org/
61
- specs:
62
- arel (5.0.1.20140414130214)
63
- bcrypt (3.1.10)
64
- bson (2.3.0)
65
- builder (3.2.2)
66
- connection_pool (2.1.3)
67
- erubis (2.7.0)
68
- faraday (0.9.1)
69
- multipart-post (>= 1.2, < 3)
70
- hashie (3.4.0)
71
- hike (1.2.3)
72
- i18n (0.7.0)
73
- json (1.8.2)
74
- jwt (1.4.1)
75
- mail (2.6.3)
76
- mime-types (>= 1.16, < 3)
77
- metaclass (0.0.4)
78
- mime-types (2.4.3)
79
- mini_portile (0.6.2)
80
- minitest (5.5.1)
81
- mocha (1.1.0)
82
- metaclass (~> 0.0.1)
83
- mongoid (4.0.2)
84
- activemodel (~> 4.0)
85
- moped (~> 2.0.0)
86
- origin (~> 2.1)
87
- tzinfo (>= 0.3.37)
88
- moped (2.0.4)
89
- bson (~> 2.2)
90
- connection_pool (~> 2.0)
91
- optionable (~> 0.2.0)
92
- multi_json (1.11.0)
93
- multi_xml (0.5.5)
94
- multipart-post (2.0.0)
95
- nokogiri (1.6.6.2)
96
- mini_portile (~> 0.6.0)
97
- oauth2 (0.9.4)
98
- faraday (>= 0.8, < 0.10)
99
- jwt (~> 1.0)
100
- multi_json (~> 1.3)
101
- multi_xml (~> 0.5)
102
- rack (~> 1.2)
103
- omniauth (1.2.2)
104
- hashie (>= 1.2, < 4)
105
- rack (~> 1.0)
106
- omniauth-facebook (1.6.0)
107
- omniauth-oauth2 (~> 1.1)
108
- omniauth-oauth2 (1.1.2)
109
- faraday (>= 0.8, < 0.10)
110
- multi_json (~> 1.3)
111
- oauth2 (~> 0.9.3)
112
- omniauth (~> 1.2)
113
- omniauth-openid (1.0.1)
114
- omniauth (~> 1.0)
115
- rack-openid (~> 1.3.1)
116
- optionable (0.2.0)
117
- origin (2.1.1)
118
- orm_adapter (0.5.0)
119
- rack (1.5.2)
120
- rack-openid (1.3.1)
121
- rack (>= 1.1.0)
122
- ruby-openid (>= 2.1.8)
123
- rack-test (0.6.3)
124
- rack (>= 1.0)
125
- rake (10.4.2)
126
- rdoc (4.2.0)
127
- responders (1.1.2)
128
- railties (>= 3.2, < 4.2)
129
- ruby-openid (2.7.0)
130
- sprockets (2.12.3)
131
- hike (~> 1.2)
132
- multi_json (~> 1.0)
133
- rack (~> 1.0)
134
- tilt (~> 1.1, != 1.3.0)
135
- sprockets-rails (2.2.4)
136
- actionpack (>= 3.0)
137
- activesupport (>= 3.0)
138
- sprockets (>= 2.8, < 4.0)
139
- sqlite3 (1.3.10)
140
- thor (0.19.1)
141
- thread_safe (0.3.5)
142
- tilt (1.4.1)
143
- tzinfo (1.2.2)
144
- thread_safe (~> 0.1)
145
- warden (1.2.3)
146
- rack (>= 1.0)
147
- webrat (0.7.3)
148
- nokogiri (>= 1.2.0)
149
- rack (>= 1.0)
150
- rack-test (>= 0.5.3)
151
-
152
- PLATFORMS
153
- ruby
154
-
155
- DEPENDENCIES
156
- activerecord-jdbc-adapter
157
- activerecord-jdbcsqlite3-adapter
158
- devise!
159
- jruby-openssl
160
- mocha (~> 1.1)
161
- mongoid (~> 4.0.0)
162
- omniauth (~> 1.2.0)
163
- omniauth-facebook
164
- omniauth-oauth2 (~> 1.1.0)
165
- omniauth-openid (~> 1.0.1)
166
- rails!
167
- rdoc
168
- sqlite3
169
- webrat (= 0.7.3)
@@ -1,29 +0,0 @@
1
- source "https://rubygems.org"
2
-
3
- gemspec path: '..'
4
-
5
- gem "rails", github: 'rails/rails', branch: '4-2-stable'
6
- gem "omniauth", "~> 1.2.2"
7
- gem "omniauth-oauth2", "~> 1.2.0"
8
- gem "rdoc"
9
-
10
- group :test do
11
- gem "omniauth-facebook"
12
- gem "omniauth-openid", "~> 1.0.1"
13
- gem "webrat", "0.7.3", require: false
14
- gem "mocha", "~> 1.1", require: false
15
- end
16
-
17
- platforms :jruby do
18
- gem "activerecord-jdbc-adapter"
19
- gem "activerecord-jdbcsqlite3-adapter"
20
- gem "jruby-openssl"
21
- end
22
-
23
- platforms :ruby do
24
- gem "sqlite3"
25
- end
26
-
27
- group :mongoid do
28
- gem "mongoid", "~> 4.0.0"
29
- end
@@ -1,191 +0,0 @@
1
- GIT
2
- remote: git://github.com/rails/rails.git
3
- revision: f12ff8ddab7b199707ec36d72bd72f206f142c8b
4
- branch: 4-2-stable
5
- specs:
6
- actionmailer (4.2.1)
7
- actionpack (= 4.2.1)
8
- actionview (= 4.2.1)
9
- activejob (= 4.2.1)
10
- mail (~> 2.5, >= 2.5.4)
11
- rails-dom-testing (~> 1.0, >= 1.0.5)
12
- actionpack (4.2.1)
13
- actionview (= 4.2.1)
14
- activesupport (= 4.2.1)
15
- rack (~> 1.6)
16
- rack-test (~> 0.6.2)
17
- rails-dom-testing (~> 1.0, >= 1.0.5)
18
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
19
- actionview (4.2.1)
20
- activesupport (= 4.2.1)
21
- builder (~> 3.1)
22
- erubis (~> 2.7.0)
23
- rails-dom-testing (~> 1.0, >= 1.0.5)
24
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
25
- activejob (4.2.1)
26
- activesupport (= 4.2.1)
27
- globalid (>= 0.3.0)
28
- activemodel (4.2.1)
29
- activesupport (= 4.2.1)
30
- builder (~> 3.1)
31
- activerecord (4.2.1)
32
- activemodel (= 4.2.1)
33
- activesupport (= 4.2.1)
34
- arel (~> 6.0)
35
- activesupport (4.2.1)
36
- i18n (~> 0.7)
37
- json (~> 1.7, >= 1.7.7)
38
- minitest (~> 5.1)
39
- thread_safe (~> 0.3, >= 0.3.4)
40
- tzinfo (~> 1.1)
41
- rails (4.2.1)
42
- actionmailer (= 4.2.1)
43
- actionpack (= 4.2.1)
44
- actionview (= 4.2.1)
45
- activejob (= 4.2.1)
46
- activemodel (= 4.2.1)
47
- activerecord (= 4.2.1)
48
- activesupport (= 4.2.1)
49
- bundler (>= 1.3.0, < 2.0)
50
- railties (= 4.2.1)
51
- sprockets-rails
52
- railties (4.2.1)
53
- actionpack (= 4.2.1)
54
- activesupport (= 4.2.1)
55
- rake (>= 0.8.7)
56
- thor (>= 0.18.1, < 2.0)
57
-
58
- PATH
59
- remote: ..
60
- specs:
61
- devise (3.4.1)
62
- bcrypt (~> 3.0)
63
- orm_adapter (~> 0.1)
64
- railties (>= 3.2.6, < 5)
65
- responders
66
- thread_safe (~> 0.1)
67
- warden (~> 1.2.3)
68
-
69
- GEM
70
- remote: https://rubygems.org/
71
- specs:
72
- arel (6.0.0)
73
- bcrypt (3.1.10)
74
- bson (2.3.0)
75
- builder (3.2.2)
76
- connection_pool (2.1.3)
77
- erubis (2.7.0)
78
- faraday (0.9.1)
79
- multipart-post (>= 1.2, < 3)
80
- globalid (0.3.3)
81
- activesupport (>= 4.1.0)
82
- hashie (3.4.0)
83
- hike (1.2.3)
84
- i18n (0.7.0)
85
- json (1.8.2)
86
- jwt (1.4.1)
87
- loofah (2.0.1)
88
- nokogiri (>= 1.5.9)
89
- mail (2.6.3)
90
- mime-types (>= 1.16, < 3)
91
- metaclass (0.0.4)
92
- mime-types (2.4.3)
93
- mini_portile (0.6.2)
94
- minitest (5.5.1)
95
- mocha (1.1.0)
96
- metaclass (~> 0.0.1)
97
- mongoid (4.0.2)
98
- activemodel (~> 4.0)
99
- moped (~> 2.0.0)
100
- origin (~> 2.1)
101
- tzinfo (>= 0.3.37)
102
- moped (2.0.4)
103
- bson (~> 2.2)
104
- connection_pool (~> 2.0)
105
- optionable (~> 0.2.0)
106
- multi_json (1.11.0)
107
- multi_xml (0.5.5)
108
- multipart-post (2.0.0)
109
- nokogiri (1.6.6.2)
110
- mini_portile (~> 0.6.0)
111
- oauth2 (1.0.0)
112
- faraday (>= 0.8, < 0.10)
113
- jwt (~> 1.0)
114
- multi_json (~> 1.3)
115
- multi_xml (~> 0.5)
116
- rack (~> 1.2)
117
- omniauth (1.2.2)
118
- hashie (>= 1.2, < 4)
119
- rack (~> 1.0)
120
- omniauth-facebook (2.0.1)
121
- omniauth-oauth2 (~> 1.2)
122
- omniauth-oauth2 (1.2.0)
123
- faraday (>= 0.8, < 0.10)
124
- multi_json (~> 1.3)
125
- oauth2 (~> 1.0)
126
- omniauth (~> 1.2)
127
- omniauth-openid (1.0.1)
128
- omniauth (~> 1.0)
129
- rack-openid (~> 1.3.1)
130
- optionable (0.2.0)
131
- origin (2.1.1)
132
- orm_adapter (0.5.0)
133
- rack (1.6.0)
134
- rack-openid (1.3.1)
135
- rack (>= 1.1.0)
136
- ruby-openid (>= 2.1.8)
137
- rack-test (0.6.3)
138
- rack (>= 1.0)
139
- rails-deprecated_sanitizer (1.0.3)
140
- activesupport (>= 4.2.0.alpha)
141
- rails-dom-testing (1.0.6)
142
- activesupport (>= 4.2.0.beta, < 5.0)
143
- nokogiri (~> 1.6.0)
144
- rails-deprecated_sanitizer (>= 1.0.1)
145
- rails-html-sanitizer (1.0.2)
146
- loofah (~> 2.0)
147
- rake (10.4.2)
148
- rdoc (4.2.0)
149
- responders (2.1.0)
150
- railties (>= 4.2.0, < 5)
151
- ruby-openid (2.7.0)
152
- sprockets (2.12.3)
153
- hike (~> 1.2)
154
- multi_json (~> 1.0)
155
- rack (~> 1.0)
156
- tilt (~> 1.1, != 1.3.0)
157
- sprockets-rails (2.2.4)
158
- actionpack (>= 3.0)
159
- activesupport (>= 3.0)
160
- sprockets (>= 2.8, < 4.0)
161
- sqlite3 (1.3.10)
162
- thor (0.19.1)
163
- thread_safe (0.3.5)
164
- tilt (1.4.1)
165
- tzinfo (1.2.2)
166
- thread_safe (~> 0.1)
167
- warden (1.2.3)
168
- rack (>= 1.0)
169
- webrat (0.7.3)
170
- nokogiri (>= 1.2.0)
171
- rack (>= 1.0)
172
- rack-test (>= 0.5.3)
173
-
174
- PLATFORMS
175
- ruby
176
-
177
- DEPENDENCIES
178
- activerecord-jdbc-adapter
179
- activerecord-jdbcsqlite3-adapter
180
- devise!
181
- jruby-openssl
182
- mocha (~> 1.1)
183
- mongoid (~> 4.0.0)
184
- omniauth (~> 1.2.2)
185
- omniauth-facebook
186
- omniauth-oauth2 (~> 1.2.0)
187
- omniauth-openid (~> 1.0.1)
188
- rails!
189
- rdoc
190
- sqlite3
191
- webrat (= 0.7.3)
data/script/cached-bundle DELETED
@@ -1,49 +0,0 @@
1
- #!/usr/bin/env bash
2
- # Usage: cached-bundle install --deployment
3
- #
4
- # After running `bundle`, caches the `vendor/bundle` directory to S3.
5
- # On the next run, restores the cached directory before running `bundle`.
6
- # When `Gemfile.lock` changes, the cache gets rebuilt.
7
- #
8
- # Requirements:
9
- # - Gemfile.lock
10
- # - TRAVIS_REPO_SLUG
11
- # - TRAVIS_RUBY_VERSION
12
- # - AMAZON_S3_BUCKET
13
- # - script/s3-put
14
- # - bundle
15
- # - curl
16
- #
17
- # Author: Mislav Marohnić
18
-
19
- set -e
20
-
21
- compute_md5() {
22
- local output="$(openssl md5)"
23
- echo "${output##* }"
24
- }
25
-
26
- download() {
27
- curl --tcp-nodelay -qsfL "$1" -o "$2"
28
- }
29
-
30
-
31
- gemfile="${BUNDLE_GEMFILE:-Gemfile}"
32
- bundle_fullpath="$(dirname $gemfile)/vendor/bundle"
33
- bundle_path=${bundle_fullpath#$PWD/}
34
- gemfile_hash="$(compute_md5 <"${gemfile}.lock")"
35
- cache_name="${TRAVIS_RUBY_VERSION}-${gemfile_hash}.tgz"
36
- fetch_url="http://${AMAZON_S3_BUCKET}.s3.amazonaws.com/${TRAVIS_REPO_SLUG}/${cache_name}"
37
-
38
- if download "$fetch_url" "$cache_name"; then
39
- echo "Reusing cached bundle ${cache_name}"
40
- tar xzf "$cache_name"
41
- fi
42
-
43
- bundle "$@"
44
-
45
- if [ ! -f "$cache_name" ] && [ -n "$AMAZON_SECRET_ACCESS_KEY" ]; then
46
- echo "Caching \`${bundle_path}' to S3"
47
- tar czf "$cache_name" "$bundle_path"
48
- script/s3-put "$cache_name" "${AMAZON_S3_BUCKET}:${TRAVIS_REPO_SLUG}/${cache_name}"
49
- fi
data/script/s3-put DELETED
@@ -1,71 +0,0 @@
1
- #!/usr/bin/env bash
2
- # Usage: s3-put <FILE> <S3_BUCKET>[:<PATH>] [<CONTENT_TYPE>]
3
- #
4
- # Uploads a file to the Amazon S3 service.
5
- # Outputs the URL for the newly uploaded file.
6
- #
7
- # Requirements:
8
- # - AMAZON_ACCESS_KEY_ID
9
- # - AMAZON_SECRET_ACCESS_KEY
10
- # - openssl
11
- # - curl
12
- #
13
- # Author: Mislav Marohnić
14
-
15
- set -e
16
-
17
- authorization() {
18
- local signature="$(string_to_sign | hmac_sha1 | base64)"
19
- echo "AWS ${AMAZON_ACCESS_KEY_ID?}:${signature}"
20
- }
21
-
22
- hmac_sha1() {
23
- openssl dgst -binary -sha1 -hmac "${AMAZON_SECRET_ACCESS_KEY?}"
24
- }
25
-
26
- base64() {
27
- openssl enc -base64
28
- }
29
-
30
- bin_md5() {
31
- openssl dgst -binary -md5
32
- }
33
-
34
- string_to_sign() {
35
- echo "$http_method"
36
- echo "$content_md5"
37
- echo "$content_type"
38
- echo "$date"
39
- echo "x-amz-acl:$acl"
40
- printf "/$bucket/$remote_path"
41
- }
42
-
43
- date_string() {
44
- LC_TIME=C date "+%a, %d %h %Y %T %z"
45
- }
46
-
47
- file="$1"
48
- bucket="${2%%:*}"
49
- remote_path="${2#*:}"
50
- content_type="$3"
51
-
52
- if [ -z "$remote_path" ] || [ "$remote_path" = "$bucket" ]; then
53
- remote_path="${file##*/}"
54
- fi
55
-
56
- http_method=PUT
57
- acl="public-read"
58
- content_md5="$(bin_md5 < "$file" | base64)"
59
- date="$(date_string)"
60
-
61
- url="https://$bucket.s3.amazonaws.com/$remote_path"
62
-
63
- curl -qsSf -T "$file" \
64
- -H "Authorization: $(authorization)" \
65
- -H "x-amz-acl: $acl" \
66
- -H "Date: $date" \
67
- -H "Content-MD5: $content_md5" \
68
- -H "Content-Type: $content_type" \
69
- "$url"
70
-
71
- echo "$url"
@@ -1,40 +0,0 @@
1
- require 'test_helper'
2
-
3
- class CustomRegistrationsControllerTest < ActionController::TestCase
4
- tests Custom::RegistrationsController
5
-
6
- include Devise::TestHelpers
7
-
8
- setup do
9
- request.env["devise.mapping"] = Devise.mappings[:user]
10
- @password = 'password'
11
- @user = create_user(password: @password, password_confirmation: @password).tap(&:confirm)
12
- end
13
-
14
- test "yield resource to block on create success" do
15
- post :create, { user: { email: "user@example.org", password: "password", password_confirmation: "password" } }
16
- assert @controller.create_block_called?, "create failed to yield resource to provided block"
17
- end
18
-
19
- test "yield resource to block on create failure" do
20
- post :create, { user: { } }
21
- assert @controller.create_block_called?, "create failed to yield resource to provided block"
22
- end
23
-
24
- test "yield resource to block on update success" do
25
- sign_in @user
26
- put :update, { user: { current_password: @password } }
27
- assert @controller.update_block_called?, "update failed to yield resource to provided block"
28
- end
29
-
30
- test "yield resource to block on update failure" do
31
- sign_in @user
32
- put :update, { user: { } }
33
- assert @controller.update_block_called?, "update failed to yield resource to provided block"
34
- end
35
-
36
- test "yield resource to block on new" do
37
- get :new
38
- assert @controller.new_block_called?, "new failed to yield resource to provided block"
39
- end
40
- end
@@ -1,62 +0,0 @@
1
- require 'test_helper'
2
- require 'ostruct'
3
- require 'warden/strategies/base'
4
- require 'devise/test_helpers'
5
-
6
- class CustomStrategyController < ActionController::Base
7
- def new
8
- warden.authenticate!(:custom_strategy)
9
- end
10
- end
11
-
12
- # These tests are to prove that a warden strategy can successfully
13
- # return a custom response, including a specific status code and
14
- # custom http response headers. This does work in production,
15
- # however, at the time of writing this, the Devise test helpers do
16
- # not recognise the custom response and proceed to calling the
17
- # Failure App. This makes it impossible to write tests for a
18
- # strategy that return a custom response with Devise.
19
- class CustomStrategy < Warden::Strategies::Base
20
- def authenticate!
21
- custom_headers = { "X-FOO" => "BAR" }
22
- response = Rack::Response.new("BAD REQUEST", 400, custom_headers)
23
- custom! response.finish
24
- end
25
- end
26
-
27
- class CustomStrategyTest < ActionController::TestCase
28
- tests CustomStrategyController
29
-
30
- include Devise::TestHelpers
31
-
32
- setup do
33
- Warden::Strategies.add(:custom_strategy, CustomStrategy)
34
- end
35
-
36
- teardown do
37
- Warden::Strategies._strategies.delete(:custom_strategy)
38
- end
39
-
40
- test "custom strategy can return its own status code" do
41
- ret = get :new
42
-
43
- # check the returned rack array
44
- assert ret.is_a?(Array)
45
- assert_equal 400, ret.first
46
-
47
- # check the saved response as well. This is purely so that the response is available to the testing framework
48
- # for verification. In production, the above array would be delivered directly to Rack.
49
- assert_response 400
50
- end
51
-
52
- test "custom strategy can return custom headers" do
53
- ret = get :new
54
-
55
- # check the returned rack array
56
- assert ret.is_a?(Array)
57
- assert_equal ret.third['X-FOO'], 'BAR'
58
-
59
- # check the saved response headers as well.
60
- assert_equal response.headers['X-FOO'], 'BAR'
61
- end
62
- end