devise 3.4.1 → 3.5.10

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 (116) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +28 -19
  3. data/CHANGELOG.md +193 -104
  4. data/CODE_OF_CONDUCT.md +22 -0
  5. data/CONTRIBUTING.md +2 -0
  6. data/Gemfile +3 -2
  7. data/Gemfile.lock +90 -95
  8. data/MIT-LICENSE +1 -1
  9. data/README.md +55 -34
  10. data/Rakefile +2 -1
  11. data/app/controllers/devise/confirmations_controller.rb +4 -0
  12. data/app/controllers/devise/omniauth_callbacks_controller.rb +4 -0
  13. data/app/controllers/devise/passwords_controller.rb +14 -4
  14. data/app/controllers/devise/registrations_controller.rb +10 -11
  15. data/app/controllers/devise/sessions_controller.rb +7 -2
  16. data/app/controllers/devise/unlocks_controller.rb +3 -0
  17. data/app/controllers/devise_controller.rb +34 -18
  18. data/app/mailers/devise/mailer.rb +4 -0
  19. data/app/views/devise/confirmations/new.html.erb +1 -1
  20. data/app/views/devise/mailer/password_change.html.erb +3 -0
  21. data/app/views/devise/passwords/edit.html.erb +3 -0
  22. data/app/views/devise/registrations/new.html.erb +1 -1
  23. data/app/views/devise/shared/_links.html.erb +1 -1
  24. data/config/locales/en.yml +2 -0
  25. data/devise.gemspec +0 -2
  26. data/gemfiles/Gemfile.rails-3.2-stable.lock +52 -49
  27. data/gemfiles/Gemfile.rails-4.0-stable +1 -0
  28. data/gemfiles/Gemfile.rails-4.0-stable.lock +61 -60
  29. data/gemfiles/Gemfile.rails-4.1-stable +1 -0
  30. data/gemfiles/Gemfile.rails-4.1-stable.lock +66 -65
  31. data/gemfiles/Gemfile.rails-4.2-stable +30 -0
  32. data/gemfiles/Gemfile.rails-4.2-stable.lock +193 -0
  33. data/lib/devise/controllers/helpers.rb +12 -6
  34. data/lib/devise/controllers/rememberable.rb +9 -2
  35. data/lib/devise/controllers/sign_in_out.rb +2 -8
  36. data/lib/devise/controllers/store_location.rb +3 -1
  37. data/lib/devise/controllers/url_helpers.rb +7 -9
  38. data/lib/devise/encryptor.rb +22 -0
  39. data/lib/devise/failure_app.rb +48 -13
  40. data/lib/devise/hooks/timeoutable.rb +5 -7
  41. data/lib/devise/mapping.rb +1 -0
  42. data/lib/devise/models/authenticatable.rb +20 -26
  43. data/lib/devise/models/confirmable.rb +51 -17
  44. data/lib/devise/models/database_authenticatable.rb +17 -11
  45. data/lib/devise/models/lockable.rb +5 -1
  46. data/lib/devise/models/recoverable.rb +23 -15
  47. data/lib/devise/models/rememberable.rb +56 -22
  48. data/lib/devise/models/timeoutable.rb +0 -6
  49. data/lib/devise/models/trackable.rb +1 -2
  50. data/lib/devise/models/validatable.rb +3 -3
  51. data/lib/devise/models.rb +1 -1
  52. data/lib/devise/rails/routes.rb +27 -18
  53. data/lib/devise/rails.rb +1 -1
  54. data/lib/devise/strategies/authenticatable.rb +7 -4
  55. data/lib/devise/strategies/database_authenticatable.rb +1 -1
  56. data/lib/devise/strategies/rememberable.rb +13 -6
  57. data/lib/devise/test_helpers.rb +2 -2
  58. data/lib/devise/version.rb +1 -1
  59. data/lib/devise.rb +37 -36
  60. data/lib/generators/active_record/templates/migration.rb +1 -1
  61. data/lib/generators/active_record/templates/migration_existing.rb +1 -1
  62. data/lib/generators/devise/views_generator.rb +14 -3
  63. data/lib/generators/templates/controllers/README +2 -2
  64. data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +1 -1
  65. data/lib/generators/templates/controllers/registrations_controller.rb +2 -2
  66. data/lib/generators/templates/controllers/sessions_controller.rb +1 -1
  67. data/lib/generators/templates/devise.rb +17 -11
  68. data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
  69. data/lib/generators/templates/markerb/password_change.markerb +3 -0
  70. data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
  71. data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
  72. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +1 -1
  73. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +1 -1
  74. data/test/controllers/custom_registrations_controller_test.rb +6 -1
  75. data/test/controllers/helper_methods_test.rb +21 -0
  76. data/test/controllers/helpers_test.rb +5 -0
  77. data/test/controllers/inherited_controller_i18n_messages_test.rb +51 -0
  78. data/test/controllers/internal_helpers_test.rb +4 -4
  79. data/test/controllers/load_hooks_controller_test.rb +19 -0
  80. data/test/controllers/passwords_controller_test.rb +1 -1
  81. data/test/controllers/sessions_controller_test.rb +3 -3
  82. data/test/devise_test.rb +3 -3
  83. data/test/failure_app_test.rb +40 -0
  84. data/test/generators/views_generator_test.rb +7 -0
  85. data/test/integration/database_authenticatable_test.rb +11 -0
  86. data/test/integration/omniauthable_test.rb +12 -10
  87. data/test/integration/recoverable_test.rb +13 -0
  88. data/test/integration/rememberable_test.rb +50 -3
  89. data/test/integration/timeoutable_test.rb +13 -18
  90. data/test/mailers/confirmation_instructions_test.rb +1 -1
  91. data/test/mapping_test.rb +6 -0
  92. data/test/models/confirmable_test.rb +93 -37
  93. data/test/models/database_authenticatable_test.rb +20 -0
  94. data/test/models/lockable_test.rb +29 -7
  95. data/test/models/recoverable_test.rb +62 -7
  96. data/test/models/rememberable_test.rb +68 -97
  97. data/test/models/validatable_test.rb +5 -5
  98. data/test/models_test.rb +15 -6
  99. data/test/rails_app/app/active_record/user_without_email.rb +8 -0
  100. data/test/rails_app/app/controllers/admins_controller.rb +0 -5
  101. data/test/rails_app/app/controllers/custom/registrations_controller.rb +10 -0
  102. data/test/rails_app/app/mongoid/user_without_email.rb +33 -0
  103. data/test/rails_app/config/application.rb +1 -1
  104. data/test/rails_app/config/environments/production.rb +6 -2
  105. data/test/rails_app/config/environments/test.rb +7 -2
  106. data/test/rails_app/config/initializers/devise.rb +12 -15
  107. data/test/rails_app/config/routes.rb +6 -3
  108. data/test/rails_app/lib/shared_user.rb +1 -1
  109. data/test/rails_app/lib/shared_user_without_email.rb +26 -0
  110. data/test/rails_test.rb +9 -0
  111. data/test/support/helpers.rb +4 -0
  112. data/test/support/integration.rb +2 -2
  113. data/test/test_helpers_test.rb +22 -7
  114. data/test/test_models.rb +2 -2
  115. data/test/time_helpers.rb +137 -0
  116. metadata +26 -4
data/gemfiles/Gemfile.rails-4.0-stable.lock CHANGED
@@ -1,49 +1,49 @@
1
1
  GIT
2
2
  remote: git://github.com/rails/rails.git
3
- revision: 2d8886e05104316273a0f95dfbcd171d3b12678b
3
+ revision: 9be9597e510d185ca7964d0a05b4ea2a7f2d50d1
4
4
  branch: 4-0-stable
5
5
  specs:
6
- actionmailer (4.0.9)
7
- actionpack (= 4.0.9)
6
+ actionmailer (4.0.13)
7
+ actionpack (= 4.0.13)
8
8
  mail (~> 2.5, >= 2.5.4)
9
- actionpack (4.0.9)
10
- activesupport (= 4.0.9)
9
+ actionpack (4.0.13)
10
+ activesupport (= 4.0.13)
11
11
  builder (~> 3.1.0)
12
12
  erubis (~> 2.7.0)
13
13
  rack (~> 1.5.2)
14
14
  rack-test (~> 0.6.2)
15
- activemodel (4.0.9)
16
- activesupport (= 4.0.9)
15
+ activemodel (4.0.13)
16
+ activesupport (= 4.0.13)
17
17
  builder (~> 3.1.0)
18
- activerecord (4.0.9)
19
- activemodel (= 4.0.9)
18
+ activerecord (4.0.13)
19
+ activemodel (= 4.0.13)
20
20
  activerecord-deprecated_finders (~> 1.0.2)
21
- activesupport (= 4.0.9)
21
+ activesupport (= 4.0.13)
22
22
  arel (~> 4.0.0)
23
- activesupport (4.0.9)
23
+ activesupport (4.0.13)
24
24
  i18n (~> 0.6, >= 0.6.9)
25
25
  minitest (~> 4.2)
26
26
  multi_json (~> 1.3)
27
27
  thread_safe (~> 0.1)
28
28
  tzinfo (~> 0.3.37)
29
- rails (4.0.9)
30
- actionmailer (= 4.0.9)
31
- actionpack (= 4.0.9)
32
- activerecord (= 4.0.9)
33
- activesupport (= 4.0.9)
29
+ rails (4.0.13)
30
+ actionmailer (= 4.0.13)
31
+ actionpack (= 4.0.13)
32
+ activerecord (= 4.0.13)
33
+ activesupport (= 4.0.13)
34
34
  bundler (>= 1.3.0, < 2.0)
35
- railties (= 4.0.9)
35
+ railties (= 4.0.13)
36
36
  sprockets-rails (~> 2.0)
37
- railties (4.0.9)
38
- actionpack (= 4.0.9)
39
- activesupport (= 4.0.9)
37
+ railties (4.0.13)
38
+ actionpack (= 4.0.13)
39
+ activesupport (= 4.0.13)
40
40
  rake (>= 0.8.7)
41
41
  thor (>= 0.18.1, < 2.0)
42
42
 
43
43
  PATH
44
44
  remote: ..
45
45
  specs:
46
- devise (3.4.1)
46
+ devise (3.5.8)
47
47
  bcrypt (~> 3.0)
48
48
  orm_adapter (~> 0.1)
49
49
  railties (>= 3.2.6, < 5)
@@ -54,42 +54,42 @@ PATH
54
54
  GEM
55
55
  remote: https://rubygems.org/
56
56
  specs:
57
- activerecord-deprecated_finders (1.0.3)
57
+ activerecord-deprecated_finders (1.0.4)
58
58
  arel (4.0.2)
59
- bcrypt (3.1.7)
60
- bson (2.3.0)
59
+ bcrypt (3.1.11)
60
+ bson (3.2.6)
61
61
  builder (3.1.4)
62
- connection_pool (2.0.0)
62
+ concurrent-ruby (1.0.1)
63
+ connection_pool (2.2.0)
63
64
  erubis (2.7.0)
64
- faraday (0.9.0)
65
+ faraday (0.9.2)
65
66
  multipart-post (>= 1.2, < 3)
66
- hashie (3.2.0)
67
- hike (1.2.3)
68
- i18n (0.6.11)
69
- json (1.8.1)
70
- jwt (1.0.0)
71
- mail (2.6.1)
72
- mime-types (>= 1.16, < 3)
67
+ hashie (3.4.3)
68
+ i18n (0.7.0)
69
+ json (1.8.3)
70
+ jwt (1.5.4)
71
+ mail (2.6.4)
72
+ mime-types (>= 1.16, < 4)
73
73
  metaclass (0.0.4)
74
- mime-types (2.3)
75
- mini_portile (0.6.0)
74
+ mime-types (2.99.1)
75
+ mini_portile2 (2.0.0)
76
76
  minitest (4.7.5)
77
77
  mocha (1.1.0)
78
78
  metaclass (~> 0.0.1)
79
- mongoid (4.0.0)
79
+ mongoid (4.0.2)
80
80
  activemodel (~> 4.0)
81
81
  moped (~> 2.0.0)
82
82
  origin (~> 2.1)
83
83
  tzinfo (>= 0.3.37)
84
- moped (2.0.0)
85
- bson (~> 2.2)
84
+ moped (2.0.7)
85
+ bson (~> 3.0)
86
86
  connection_pool (~> 2.0)
87
87
  optionable (~> 0.2.0)
88
- multi_json (1.10.1)
88
+ multi_json (1.11.3)
89
89
  multi_xml (0.5.5)
90
90
  multipart-post (2.0.0)
91
- nokogiri (1.6.3.1)
92
- mini_portile (= 0.6.0)
91
+ nokogiri (1.6.7.2)
92
+ mini_portile2 (~> 2.0.0.rc2)
93
93
  oauth2 (0.9.4)
94
94
  faraday (>= 0.8, < 0.10)
95
95
  jwt (~> 1.0)
@@ -110,35 +110,32 @@ GEM
110
110
  omniauth (~> 1.0)
111
111
  rack-openid (~> 1.3.1)
112
112
  optionable (0.2.0)
113
- origin (2.1.1)
113
+ origin (2.2.0)
114
114
  orm_adapter (0.5.0)
115
- rack (1.5.2)
115
+ rack (1.5.5)
116
116
  rack-openid (1.3.1)
117
117
  rack (>= 1.1.0)
118
118
  ruby-openid (>= 2.1.8)
119
- rack-test (0.6.2)
119
+ rack-test (0.6.3)
120
120
  rack (>= 1.0)
121
- rake (10.3.2)
122
- rdoc (4.1.1)
121
+ rake (11.1.2)
122
+ rdoc (4.2.2)
123
123
  json (~> 1.4)
124
- responders (1.1.1)
124
+ responders (1.1.2)
125
125
  railties (>= 3.2, < 4.2)
126
- ruby-openid (2.5.0)
127
- sprockets (2.12.1)
128
- hike (~> 1.2)
129
- multi_json (~> 1.0)
130
- rack (~> 1.0)
131
- tilt (~> 1.1, != 1.3.0)
132
- sprockets-rails (2.1.3)
126
+ ruby-openid (2.7.0)
127
+ sprockets (3.6.0)
128
+ concurrent-ruby (~> 1.0)
129
+ rack (> 1, < 3)
130
+ sprockets-rails (2.3.3)
133
131
  actionpack (>= 3.0)
134
132
  activesupport (>= 3.0)
135
- sprockets (~> 2.8)
136
- sqlite3 (1.3.9)
133
+ sprockets (>= 2.8, < 4.0)
134
+ sqlite3 (1.3.11)
137
135
  thor (0.19.1)
138
- thread_safe (0.3.4)
139
- tilt (1.4.1)
140
- tzinfo (0.3.41)
141
- warden (1.2.3)
136
+ thread_safe (0.3.5)
137
+ tzinfo (0.3.49)
138
+ warden (1.2.6)
142
139
  rack (>= 1.0)
143
140
  webrat (0.7.3)
144
141
  nokogiri (>= 1.2.0)
@@ -153,6 +150,7 @@ DEPENDENCIES
153
150
  activerecord-jdbcsqlite3-adapter
154
151
  devise!
155
152
  jruby-openssl
153
+ mime-types (~> 2.99)
156
154
  mocha (~> 1.1)
157
155
  mongoid (~> 4.0.0)
158
156
  omniauth (~> 1.2.0)
@@ -163,3 +161,6 @@ DEPENDENCIES
163
161
  rdoc
164
162
  sqlite3
165
163
  webrat (= 0.7.3)
164
+
165
+ BUNDLED WITH
166
+ 1.11.2
data/gemfiles/Gemfile.rails-4.1-stable CHANGED
@@ -6,6 +6,7 @@ gem "rails", github: 'rails/rails', branch: '4-1-stable'
6
6
  gem "omniauth", "~> 1.2.0"
7
7
  gem "omniauth-oauth2", "~> 1.1.0"
8
8
  gem "rdoc"
9
+ gem "mime-types", "~> 2.99"
9
10
 
10
11
  group :test do
11
12
  gem "omniauth-facebook"
data/gemfiles/Gemfile.rails-4.1-stable.lock CHANGED
@@ -1,54 +1,54 @@
1
1
  GIT
2
2
  remote: git://github.com/rails/rails.git
3
- revision: 90b70cd453e6b88b2ad484861ad9913f70bd15c9
3
+ revision: 41b4d81b4fd14cbf43060c223bea0f461256d099
4
4
  branch: 4-1-stable
5
5
  specs:
6
- actionmailer (4.1.5)
7
- actionpack (= 4.1.5)
8
- actionview (= 4.1.5)
6
+ actionmailer (4.1.15)
7
+ actionpack (= 4.1.15)
8
+ actionview (= 4.1.15)
9
9
  mail (~> 2.5, >= 2.5.4)
10
- actionpack (4.1.5)
11
- actionview (= 4.1.5)
12
- activesupport (= 4.1.5)
10
+ actionpack (4.1.15)
11
+ actionview (= 4.1.15)
12
+ activesupport (= 4.1.15)
13
13
  rack (~> 1.5.2)
14
14
  rack-test (~> 0.6.2)
15
- actionview (4.1.5)
16
- activesupport (= 4.1.5)
15
+ actionview (4.1.15)
16
+ activesupport (= 4.1.15)
17
17
  builder (~> 3.1)
18
18
  erubis (~> 2.7.0)
19
- activemodel (4.1.5)
20
- activesupport (= 4.1.5)
19
+ activemodel (4.1.15)
20
+ activesupport (= 4.1.15)
21
21
  builder (~> 3.1)
22
- activerecord (4.1.5)
23
- activemodel (= 4.1.5)
24
- activesupport (= 4.1.5)
22
+ activerecord (4.1.15)
23
+ activemodel (= 4.1.15)
24
+ activesupport (= 4.1.15)
25
25
  arel (~> 5.0.0)
26
- activesupport (4.1.5)
26
+ activesupport (4.1.15)
27
27
  i18n (~> 0.6, >= 0.6.9)
28
28
  json (~> 1.7, >= 1.7.7)
29
29
  minitest (~> 5.1)
30
30
  thread_safe (~> 0.1)
31
31
  tzinfo (~> 1.1)
32
- rails (4.1.5)
33
- actionmailer (= 4.1.5)
34
- actionpack (= 4.1.5)
35
- actionview (= 4.1.5)
36
- activemodel (= 4.1.5)
37
- activerecord (= 4.1.5)
38
- activesupport (= 4.1.5)
32
+ rails (4.1.15)
33
+ actionmailer (= 4.1.15)
34
+ actionpack (= 4.1.15)
35
+ actionview (= 4.1.15)
36
+ activemodel (= 4.1.15)
37
+ activerecord (= 4.1.15)
38
+ activesupport (= 4.1.15)
39
39
  bundler (>= 1.3.0, < 2.0)
40
- railties (= 4.1.5)
40
+ railties (= 4.1.15)
41
41
  sprockets-rails (~> 2.0)
42
- railties (4.1.5)
43
- actionpack (= 4.1.5)
44
- activesupport (= 4.1.5)
42
+ railties (4.1.15)
43
+ actionpack (= 4.1.15)
44
+ activesupport (= 4.1.15)
45
45
  rake (>= 0.8.7)
46
46
  thor (>= 0.18.1, < 2.0)
47
47
 
48
48
  PATH
49
49
  remote: ..
50
50
  specs:
51
- devise (3.4.1)
51
+ devise (3.5.8)
52
52
  bcrypt (~> 3.0)
53
53
  orm_adapter (~> 0.1)
54
54
  railties (>= 3.2.6, < 5)
@@ -60,40 +60,40 @@ GEM
60
60
  remote: https://rubygems.org/
61
61
  specs:
62
62
  arel (5.0.1.20140414130214)
63
- bcrypt (3.1.7)
64
- bson (2.3.0)
63
+ bcrypt (3.1.11)
64
+ bson (3.2.6)
65
65
  builder (3.2.2)
66
- connection_pool (2.0.0)
66
+ concurrent-ruby (1.0.1)
67
+ connection_pool (2.2.0)
67
68
  erubis (2.7.0)
68
- faraday (0.9.0)
69
+ faraday (0.9.2)
69
70
  multipart-post (>= 1.2, < 3)
70
- hashie (3.2.0)
71
- hike (1.2.3)
72
- i18n (0.6.11)
73
- json (1.8.1)
74
- jwt (1.0.0)
75
- mail (2.6.1)
76
- mime-types (>= 1.16, < 3)
71
+ hashie (3.4.3)
72
+ i18n (0.7.0)
73
+ json (1.8.3)
74
+ jwt (1.5.4)
75
+ mail (2.6.4)
76
+ mime-types (>= 1.16, < 4)
77
77
  metaclass (0.0.4)
78
- mime-types (2.3)
79
- mini_portile (0.6.0)
80
- minitest (5.4.0)
78
+ mime-types (2.99.1)
79
+ mini_portile2 (2.0.0)
80
+ minitest (5.8.4)
81
81
  mocha (1.1.0)
82
82
  metaclass (~> 0.0.1)
83
- mongoid (4.0.0)
83
+ mongoid (4.0.2)
84
84
  activemodel (~> 4.0)
85
85
  moped (~> 2.0.0)
86
86
  origin (~> 2.1)
87
87
  tzinfo (>= 0.3.37)
88
- moped (2.0.0)
89
- bson (~> 2.2)
88
+ moped (2.0.7)
89
+ bson (~> 3.0)
90
90
  connection_pool (~> 2.0)
91
91
  optionable (~> 0.2.0)
92
- multi_json (1.10.1)
92
+ multi_json (1.11.3)
93
93
  multi_xml (0.5.5)
94
94
  multipart-post (2.0.0)
95
- nokogiri (1.6.3.1)
96
- mini_portile (= 0.6.0)
95
+ nokogiri (1.6.7.2)
96
+ mini_portile2 (~> 2.0.0.rc2)
97
97
  oauth2 (0.9.4)
98
98
  faraday (>= 0.8, < 0.10)
99
99
  jwt (~> 1.0)
@@ -114,36 +114,33 @@ GEM
114
114
  omniauth (~> 1.0)
115
115
  rack-openid (~> 1.3.1)
116
116
  optionable (0.2.0)
117
- origin (2.1.1)
117
+ origin (2.2.0)
118
118
  orm_adapter (0.5.0)
119
- rack (1.5.2)
119
+ rack (1.5.5)
120
120
  rack-openid (1.3.1)
121
121
  rack (>= 1.1.0)
122
122
  ruby-openid (>= 2.1.8)
123
- rack-test (0.6.2)
123
+ rack-test (0.6.3)
124
124
  rack (>= 1.0)
125
- rake (10.3.2)
126
- rdoc (4.1.1)
125
+ rake (11.1.2)
126
+ rdoc (4.2.2)
127
127
  json (~> 1.4)
128
- responders (1.1.1)
128
+ responders (1.1.2)
129
129
  railties (>= 3.2, < 4.2)
130
- ruby-openid (2.5.0)
131
- sprockets (2.12.1)
132
- hike (~> 1.2)
133
- multi_json (~> 1.0)
134
- rack (~> 1.0)
135
- tilt (~> 1.1, != 1.3.0)
136
- sprockets-rails (2.1.3)
130
+ ruby-openid (2.7.0)
131
+ sprockets (3.6.0)
132
+ concurrent-ruby (~> 1.0)
133
+ rack (> 1, < 3)
134
+ sprockets-rails (2.3.3)
137
135
  actionpack (>= 3.0)
138
136
  activesupport (>= 3.0)
139
- sprockets (~> 2.8)
140
- sqlite3 (1.3.9)
137
+ sprockets (>= 2.8, < 4.0)
138
+ sqlite3 (1.3.11)
141
139
  thor (0.19.1)
142
- thread_safe (0.3.4)
143
- tilt (1.4.1)
140
+ thread_safe (0.3.5)
144
141
  tzinfo (1.2.2)
145
142
  thread_safe (~> 0.1)
146
- warden (1.2.3)
143
+ warden (1.2.6)
147
144
  rack (>= 1.0)
148
145
  webrat (0.7.3)
149
146
  nokogiri (>= 1.2.0)
@@ -158,6 +155,7 @@ DEPENDENCIES
158
155
  activerecord-jdbcsqlite3-adapter
159
156
  devise!
160
157
  jruby-openssl
158
+ mime-types (~> 2.99)
161
159
  mocha (~> 1.1)
162
160
  mongoid (~> 4.0.0)
163
161
  omniauth (~> 1.2.0)
@@ -168,3 +166,6 @@ DEPENDENCIES
168
166
  rdoc
169
167
  sqlite3
170
168
  webrat (= 0.7.3)
169
+
170
+ BUNDLED WITH
171
+ 1.11.2
data/gemfiles/Gemfile.rails-4.2-stable ADDED
@@ -0,0 +1,30 @@
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
+ gem "mime-types", "~> 2.99"
10
+
11
+ group :test do
12
+ gem "omniauth-facebook"
13
+ gem "omniauth-openid", "~> 1.0.1"
14
+ gem "webrat", "0.7.3", require: false
15
+ gem "mocha", "~> 1.1", require: false
16
+ end
17
+
18
+ platforms :jruby do
19
+ gem "activerecord-jdbc-adapter"
20
+ gem "activerecord-jdbcsqlite3-adapter"
21
+ gem "jruby-openssl"
22
+ end
23
+
24
+ platforms :ruby do
25
+ gem "sqlite3"
26
+ end
27
+
28
+ group :mongoid do
29
+ gem "mongoid", "~> 4.0.0"
30
+ end
data/gemfiles/Gemfile.rails-4.2-stable.lock ADDED
@@ -0,0 +1,193 @@
1
+ GIT
2
+ remote: git://github.com/rails/rails.git
3
+ revision: 2a1b655bb7db42ed0dbadab5bb129a8515e86a40
4
+ branch: 4-2-stable
5
+ specs:
6
+ actionmailer (4.2.6)
7
+ actionpack (= 4.2.6)
8
+ actionview (= 4.2.6)
9
+ activejob (= 4.2.6)
10
+ mail (~> 2.5, >= 2.5.4)
11
+ rails-dom-testing (~> 1.0, >= 1.0.5)
12
+ actionpack (4.2.6)
13
+ actionview (= 4.2.6)
14
+ activesupport (= 4.2.6)
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.6)
20
+ activesupport (= 4.2.6)
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.6)
26
+ activesupport (= 4.2.6)
27
+ globalid (>= 0.3.0)
28
+ activemodel (4.2.6)
29
+ activesupport (= 4.2.6)
30
+ builder (~> 3.1)
31
+ activerecord (4.2.6)
32
+ activemodel (= 4.2.6)
33
+ activesupport (= 4.2.6)
34
+ arel (~> 6.0)
35
+ activesupport (4.2.6)
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.6)
42
+ actionmailer (= 4.2.6)
43
+ actionpack (= 4.2.6)
44
+ actionview (= 4.2.6)
45
+ activejob (= 4.2.6)
46
+ activemodel (= 4.2.6)
47
+ activerecord (= 4.2.6)
48
+ activesupport (= 4.2.6)
49
+ bundler (>= 1.3.0, < 2.0)
50
+ railties (= 4.2.6)
51
+ sprockets-rails
52
+ railties (4.2.6)
53
+ actionpack (= 4.2.6)
54
+ activesupport (= 4.2.6)
55
+ rake (>= 0.8.7)
56
+ thor (>= 0.18.1, < 2.0)
57
+
58
+ PATH
59
+ remote: ..
60
+ specs:
61
+ devise (3.5.8)
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.3)
73
+ bcrypt (3.1.11)
74
+ bson (3.2.6)
75
+ builder (3.2.2)
76
+ concurrent-ruby (1.0.1)
77
+ connection_pool (2.2.0)
78
+ erubis (2.7.0)
79
+ faraday (0.9.2)
80
+ multipart-post (>= 1.2, < 3)
81
+ globalid (0.3.6)
82
+ activesupport (>= 4.1.0)
83
+ hashie (3.4.3)
84
+ i18n (0.7.0)
85
+ json (1.8.3)
86
+ jwt (1.5.1)
87
+ loofah (2.0.3)
88
+ nokogiri (>= 1.5.9)
89
+ mail (2.6.4)
90
+ mime-types (>= 1.16, < 4)
91
+ metaclass (0.0.4)
92
+ mime-types (2.99.1)
93
+ mini_portile2 (2.0.0)
94
+ minitest (5.8.4)
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.7)
103
+ bson (~> 3.0)
104
+ connection_pool (~> 2.0)
105
+ optionable (~> 0.2.0)
106
+ multi_json (1.11.3)
107
+ multi_xml (0.5.5)
108
+ multipart-post (2.0.0)
109
+ nokogiri (1.6.7.2)
110
+ mini_portile2 (~> 2.0.0.rc2)
111
+ oauth2 (1.1.0)
112
+ faraday (>= 0.8, < 0.10)
113
+ jwt (~> 1.0, < 1.5.2)
114
+ multi_json (~> 1.3)
115
+ multi_xml (~> 0.5)
116
+ rack (>= 1.2, < 3)
117
+ omniauth (1.2.2)
118
+ hashie (>= 1.2, < 4)
119
+ rack (~> 1.0)
120
+ omniauth-facebook (3.0.0)
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.2.0)
132
+ orm_adapter (0.5.0)
133
+ rack (1.6.4)
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.7)
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.3)
146
+ loofah (~> 2.0)
147
+ rake (11.1.2)
148
+ rdoc (4.2.2)
149
+ json (~> 1.4)
150
+ responders (2.1.2)
151
+ railties (>= 4.2.0, < 5.1)
152
+ ruby-openid (2.7.0)
153
+ sprockets (3.6.0)
154
+ concurrent-ruby (~> 1.0)
155
+ rack (> 1, < 3)
156
+ sprockets-rails (3.0.4)
157
+ actionpack (>= 4.0)
158
+ activesupport (>= 4.0)
159
+ sprockets (>= 3.0.0)
160
+ sqlite3 (1.3.11)
161
+ thor (0.19.1)
162
+ thread_safe (0.3.5)
163
+ tzinfo (1.2.2)
164
+ thread_safe (~> 0.1)
165
+ warden (1.2.6)
166
+ rack (>= 1.0)
167
+ webrat (0.7.3)
168
+ nokogiri (>= 1.2.0)
169
+ rack (>= 1.0)
170
+ rack-test (>= 0.5.3)
171
+
172
+ PLATFORMS
173
+ ruby
174
+
175
+ DEPENDENCIES
176
+ activerecord-jdbc-adapter
177
+ activerecord-jdbcsqlite3-adapter
178
+ devise!
179
+ jruby-openssl
180
+ mime-types (~> 2.99)
181
+ mocha (~> 1.1)
182
+ mongoid (~> 4.0.0)
183
+ omniauth (~> 1.2.2)
184
+ omniauth-facebook
185
+ omniauth-oauth2 (~> 1.2.0)
186
+ omniauth-openid (~> 1.0.1)
187
+ rails!
188
+ rdoc
189
+ sqlite3
190
+ webrat (= 0.7.3)
191
+
192
+ BUNDLED WITH
193
+ 1.11.2
data/lib/devise/controllers/helpers.rb CHANGED
@@ -7,7 +7,9 @@ module Devise
7
7
  include Devise::Controllers::StoreLocation
8
8
 
9
9
  included do
10
- helper_method :warden, :signed_in?, :devise_controller?
10
+ if respond_to?(:helper_method)
11
+ helper_method :warden, :signed_in?, :devise_controller?
12
+ end
11
13
  end
12
14
 
13
15
  module ClassMethods
@@ -69,7 +71,9 @@ module Devise
69
71
  end.compact
70
72
  end
71
73
 
72
- helper_method "current_#{group_name}", "current_#{group_name.to_s.pluralize}", "#{group_name}_signed_in?"
74
+ if respond_to?(:helper_method)
75
+ helper_method "current_#{group_name}", "current_#{group_name.to_s.pluralize}", "#{group_name}_signed_in?"
76
+ end
73
77
  METHODS
74
78
  end
75
79
 
@@ -126,7 +130,9 @@ module Devise
126
130
  METHODS
127
131
 
128
132
  ActiveSupport.on_load(:action_controller) do
129
- helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
133
+ if respond_to?(:helper_method)
134
+ helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
135
+ end
130
136
  end
131
137
  end
132
138
 
@@ -190,10 +196,10 @@ module Devise
190
196
  # root path. For a user scope, you can define the default url in
191
197
  # the following way:
192
198
  #
193
- # map.user_root '/users', controller: 'users' # creates user_root_path
199
+ # get '/users' => 'users#index', as: :user_root # creates user_root_path
194
200
  #
195
- # map.namespace :user do |user|
196
- # user.root controller: 'users' # creates user_root_path
201
+ # namespace :user do
202
+ # root 'users#index' # creates user_root_path
197
203
  # end
198
204
  #
199
205
  # If the resource root path is not defined, root_path is used. However,