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.
- checksums.yaml +7 -0
- data/.travis.yml +18 -3
- data/CHANGELOG.md +82 -9
- data/CONTRIBUTING.md +2 -2
- data/Gemfile +7 -9
- data/Gemfile.lock +102 -96
- data/MIT-LICENSE +1 -1
- data/README.md +94 -42
- data/Rakefile +1 -1
- data/app/controllers/devise/confirmations_controller.rb +5 -3
- data/app/controllers/devise/omniauth_callbacks_controller.rb +2 -2
- data/app/controllers/devise/passwords_controller.rb +5 -3
- data/app/controllers/devise/registrations_controller.rb +26 -10
- data/app/controllers/devise/sessions_controller.rb +39 -14
- data/app/controllers/devise/unlocks_controller.rb +4 -2
- data/app/controllers/devise_controller.rb +6 -6
- data/app/helpers/devise_helper.rb +2 -2
- data/app/views/devise/confirmations/new.html.erb +2 -2
- data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/reset_password_instructions.html.erb +1 -1
- data/app/views/devise/mailer/unlock_instructions.html.erb +1 -1
- data/app/views/devise/passwords/edit.html.erb +3 -3
- data/app/views/devise/passwords/new.html.erb +2 -2
- data/app/views/devise/registrations/edit.html.erb +6 -6
- data/app/views/devise/registrations/new.html.erb +5 -5
- data/app/views/devise/sessions/new.html.erb +5 -5
- data/app/views/devise/shared/_links.erb +1 -1
- data/app/views/devise/unlocks/new.html.erb +2 -2
- data/config/locales/en.yml +17 -16
- data/devise.gemspec +2 -2
- data/gemfiles/{Gemfile.rails-3.2.x → Gemfile.rails-3.2-stable} +8 -10
- data/gemfiles/Gemfile.rails-3.2-stable.lock +166 -0
- data/gemfiles/Gemfile.rails-4.0-stable +29 -0
- data/gemfiles/Gemfile.rails-4.0-stable.lock +162 -0
- data/gemfiles/Gemfile.rails-head +32 -0
- data/gemfiles/Gemfile.rails-head.lock +190 -0
- data/lib/devise/controllers/helpers.rb +84 -29
- data/lib/devise/controllers/rememberable.rb +3 -3
- data/lib/devise/controllers/scoped_views.rb +1 -1
- data/lib/devise/controllers/sign_in_out.rb +9 -10
- data/lib/devise/controllers/store_location.rb +56 -0
- data/lib/devise/controllers/url_helpers.rb +3 -1
- data/lib/devise/failure_app.rb +12 -10
- data/lib/devise/hooks/activatable.rb +5 -6
- data/lib/devise/hooks/csrf_cleaner.rb +3 -1
- data/lib/devise/hooks/lockable.rb +1 -1
- data/lib/devise/hooks/proxy.rb +2 -2
- data/lib/devise/hooks/rememberable.rb +2 -2
- data/lib/devise/hooks/timeoutable.rb +10 -3
- data/lib/devise/hooks/trackable.rb +1 -1
- data/lib/devise/mailers/helpers.rb +8 -8
- data/lib/devise/mapping.rb +4 -1
- data/lib/devise/models/authenticatable.rb +5 -5
- data/lib/devise/models/confirmable.rb +14 -14
- data/lib/devise/models/database_authenticatable.rb +18 -5
- data/lib/devise/models/lockable.rb +14 -11
- data/lib/devise/models/omniauthable.rb +1 -1
- data/lib/devise/models/recoverable.rb +23 -7
- data/lib/devise/models/rememberable.rb +6 -6
- data/lib/devise/models/timeoutable.rb +2 -2
- data/lib/devise/models/trackable.rb +5 -2
- data/lib/devise/models/validatable.rb +6 -6
- data/lib/devise/modules.rb +10 -10
- data/lib/devise/omniauth/url_helpers.rb +2 -2
- data/lib/devise/orm/active_record.rb +1 -1
- data/lib/devise/orm/mongoid.rb +1 -1
- data/lib/devise/rails/routes.rb +107 -78
- data/lib/devise/rails.rb +7 -1
- data/lib/devise/strategies/authenticatable.rb +11 -4
- data/lib/devise/strategies/base.rb +1 -1
- data/lib/devise/strategies/database_authenticatable.rb +7 -4
- data/lib/devise/test_helpers.rb +2 -2
- data/lib/devise/time_inflector.rb +2 -2
- data/lib/devise/version.rb +1 -1
- data/lib/devise.rb +15 -10
- data/lib/generators/active_record/devise_generator.rb +27 -10
- data/lib/generators/active_record/templates/migration.rb +4 -4
- data/lib/generators/active_record/templates/migration_existing.rb +4 -4
- data/lib/generators/devise/devise_generator.rb +5 -3
- data/lib/generators/devise/install_generator.rb +5 -0
- data/lib/generators/devise/views_generator.rb +31 -18
- data/lib/generators/mongoid/devise_generator.rb +20 -19
- data/lib/generators/templates/README +4 -4
- data/lib/generators/templates/devise.rb +20 -11
- data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
- data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +2 -2
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +4 -4
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +2 -2
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +6 -6
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +4 -4
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +4 -4
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +2 -2
- data/script/cached-bundle +49 -0
- data/script/s3-put +71 -0
- data/test/controllers/custom_registrations_controller_test.rb +35 -0
- data/test/controllers/helpers_test.rb +89 -31
- data/test/controllers/internal_helpers_test.rb +11 -8
- data/test/controllers/passwords_controller_test.rb +1 -1
- data/test/controllers/sessions_controller_test.rb +29 -25
- data/test/controllers/url_helpers_test.rb +4 -4
- data/test/delegator_test.rb +1 -1
- data/test/devise_test.rb +21 -8
- data/test/failure_app_test.rb +61 -25
- data/test/generators/active_record_generator_test.rb +10 -4
- data/test/generators/devise_generator_test.rb +2 -2
- data/test/generators/mongoid_generator_test.rb +3 -3
- data/test/generators/views_generator_test.rb +30 -1
- data/test/helpers/devise_helper_test.rb +14 -13
- data/test/integration/authenticatable_test.rb +61 -45
- data/test/integration/confirmable_test.rb +95 -55
- data/test/integration/database_authenticatable_test.rb +16 -16
- data/test/integration/http_authenticatable_test.rb +12 -12
- data/test/integration/lockable_test.rb +43 -43
- data/test/integration/omniauthable_test.rb +3 -3
- data/test/integration/recoverable_test.rb +53 -53
- data/test/integration/registerable_test.rb +90 -80
- data/test/integration/rememberable_test.rb +15 -15
- data/test/integration/timeoutable_test.rb +27 -16
- data/test/integration/trackable_test.rb +4 -4
- data/test/mailers/confirmation_instructions_test.rb +7 -7
- data/test/mailers/reset_password_instructions_test.rb +6 -6
- data/test/mailers/unlock_instructions_test.rb +5 -5
- data/test/mapping_test.rb +3 -3
- data/test/models/authenticatable_test.rb +3 -3
- data/test/models/confirmable_test.rb +32 -32
- data/test/models/database_authenticatable_test.rb +32 -27
- data/test/models/lockable_test.rb +57 -33
- data/test/models/recoverable_test.rb +34 -22
- data/test/models/rememberable_test.rb +29 -14
- data/test/models/serializable_test.rb +8 -8
- data/test/models/timeoutable_test.rb +1 -1
- data/test/models/trackable_test.rb +28 -0
- data/test/models/validatable_test.rb +13 -13
- data/test/omniauth/config_test.rb +4 -4
- data/test/omniauth/url_helpers_test.rb +3 -3
- data/test/orm/mongoid.rb +1 -1
- data/test/parameter_sanitizer_test.rb +1 -1
- data/test/rails_app/app/active_record/shim.rb +1 -1
- data/test/rails_app/app/active_record/user_on_engine.rb +7 -0
- data/test/rails_app/app/active_record/user_on_main_app.rb +7 -0
- data/test/rails_app/app/controllers/admins/sessions_controller.rb +1 -1
- data/test/rails_app/app/controllers/admins_controller.rb +1 -1
- data/test/rails_app/app/controllers/application_controller.rb +5 -2
- data/test/rails_app/app/controllers/application_with_fake_engine.rb +30 -0
- data/test/rails_app/app/controllers/custom/registrations_controller.rb +21 -0
- data/test/rails_app/app/controllers/home_controller.rb +1 -1
- data/test/rails_app/app/controllers/publisher/registrations_controller.rb +1 -1
- data/test/rails_app/app/controllers/publisher/sessions_controller.rb +1 -1
- data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +4 -4
- data/test/rails_app/app/controllers/users_controller.rb +6 -6
- data/test/rails_app/app/mailers/users/mailer.rb +4 -4
- data/test/rails_app/app/mongoid/admin.rb +11 -11
- data/test/rails_app/app/mongoid/shim.rb +2 -2
- data/test/rails_app/app/mongoid/user.rb +19 -19
- data/test/rails_app/app/mongoid/user_on_engine.rb +39 -0
- data/test/rails_app/app/mongoid/user_on_main_app.rb +39 -0
- data/test/rails_app/app/views/admins/sessions/new.html.erb +1 -1
- data/test/rails_app/app/views/home/admin_dashboard.html.erb +1 -1
- data/test/rails_app/app/views/home/index.html.erb +1 -1
- data/test/rails_app/app/views/home/join.html.erb +1 -1
- data/test/rails_app/app/views/home/user_dashboard.html.erb +1 -1
- data/test/rails_app/app/views/layouts/application.html.erb +1 -1
- data/test/rails_app/config/application.rb +2 -2
- data/test/rails_app/config/boot.rb +7 -1
- data/test/rails_app/config/environments/development.rb +0 -4
- data/test/rails_app/config/environments/production.rb +0 -4
- data/test/rails_app/config/initializers/devise.rb +7 -5
- data/test/rails_app/config/initializers/secret_token.rb +1 -1
- data/test/rails_app/config/routes.rb +60 -42
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +7 -7
- data/test/rails_app/db/schema.rb +21 -17
- data/test/rails_app/lib/shared_admin.rb +4 -4
- data/test/rails_app/lib/shared_user.rb +1 -1
- data/test/rails_app/lib/shared_user_without_omniauth.rb +13 -0
- data/test/routes_test.rb +72 -58
- data/test/support/action_controller/record_identifier.rb +10 -0
- data/test/support/assertions.rb +2 -3
- data/test/support/helpers.rb +4 -4
- data/test/support/integration.rb +14 -14
- data/test/support/mongoid.yml +6 -0
- data/test/test_helper.rb +2 -7
- data/test/test_helpers_test.rb +25 -35
- data/test/test_models.rb +12 -5
- metadata +53 -38
- data/gemfiles/Gemfile.rails-3.2.x.lock +0 -159
metadata
CHANGED
@@ -1,8 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: devise
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
5
|
-
prerelease:
|
4
|
+
version: 3.3.0
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- José Valim
|
@@ -10,92 +9,82 @@ authors:
|
|
10
9
|
autorequire:
|
11
10
|
bindir: bin
|
12
11
|
cert_chain: []
|
13
|
-
date:
|
12
|
+
date: 2014-08-13 00:00:00.000000000 Z
|
14
13
|
dependencies:
|
15
14
|
- !ruby/object:Gem::Dependency
|
16
15
|
name: warden
|
17
16
|
requirement: !ruby/object:Gem::Requirement
|
18
|
-
none: false
|
19
17
|
requirements:
|
20
|
-
- - ~>
|
18
|
+
- - "~>"
|
21
19
|
- !ruby/object:Gem::Version
|
22
20
|
version: 1.2.3
|
23
21
|
type: :runtime
|
24
22
|
prerelease: false
|
25
23
|
version_requirements: !ruby/object:Gem::Requirement
|
26
|
-
none: false
|
27
24
|
requirements:
|
28
|
-
- - ~>
|
25
|
+
- - "~>"
|
29
26
|
- !ruby/object:Gem::Version
|
30
27
|
version: 1.2.3
|
31
28
|
- !ruby/object:Gem::Dependency
|
32
29
|
name: orm_adapter
|
33
30
|
requirement: !ruby/object:Gem::Requirement
|
34
|
-
none: false
|
35
31
|
requirements:
|
36
|
-
- - ~>
|
32
|
+
- - "~>"
|
37
33
|
- !ruby/object:Gem::Version
|
38
34
|
version: '0.1'
|
39
35
|
type: :runtime
|
40
36
|
prerelease: false
|
41
37
|
version_requirements: !ruby/object:Gem::Requirement
|
42
|
-
none: false
|
43
38
|
requirements:
|
44
|
-
- - ~>
|
39
|
+
- - "~>"
|
45
40
|
- !ruby/object:Gem::Version
|
46
41
|
version: '0.1'
|
47
42
|
- !ruby/object:Gem::Dependency
|
48
|
-
name: bcrypt
|
43
|
+
name: bcrypt
|
49
44
|
requirement: !ruby/object:Gem::Requirement
|
50
|
-
none: false
|
51
45
|
requirements:
|
52
|
-
- - ~>
|
46
|
+
- - "~>"
|
53
47
|
- !ruby/object:Gem::Version
|
54
48
|
version: '3.0'
|
55
49
|
type: :runtime
|
56
50
|
prerelease: false
|
57
51
|
version_requirements: !ruby/object:Gem::Requirement
|
58
|
-
none: false
|
59
52
|
requirements:
|
60
|
-
- - ~>
|
53
|
+
- - "~>"
|
61
54
|
- !ruby/object:Gem::Version
|
62
55
|
version: '3.0'
|
63
56
|
- !ruby/object:Gem::Dependency
|
64
57
|
name: thread_safe
|
65
58
|
requirement: !ruby/object:Gem::Requirement
|
66
|
-
none: false
|
67
59
|
requirements:
|
68
|
-
- - ~>
|
60
|
+
- - "~>"
|
69
61
|
- !ruby/object:Gem::Version
|
70
62
|
version: '0.1'
|
71
63
|
type: :runtime
|
72
64
|
prerelease: false
|
73
65
|
version_requirements: !ruby/object:Gem::Requirement
|
74
|
-
none: false
|
75
66
|
requirements:
|
76
|
-
- - ~>
|
67
|
+
- - "~>"
|
77
68
|
- !ruby/object:Gem::Version
|
78
69
|
version: '0.1'
|
79
70
|
- !ruby/object:Gem::Dependency
|
80
71
|
name: railties
|
81
72
|
requirement: !ruby/object:Gem::Requirement
|
82
|
-
none: false
|
83
73
|
requirements:
|
84
|
-
- -
|
74
|
+
- - ">="
|
85
75
|
- !ruby/object:Gem::Version
|
86
76
|
version: 3.2.6
|
87
|
-
- - <
|
77
|
+
- - "<"
|
88
78
|
- !ruby/object:Gem::Version
|
89
79
|
version: '5'
|
90
80
|
type: :runtime
|
91
81
|
prerelease: false
|
92
82
|
version_requirements: !ruby/object:Gem::Requirement
|
93
|
-
none: false
|
94
83
|
requirements:
|
95
|
-
- -
|
84
|
+
- - ">="
|
96
85
|
- !ruby/object:Gem::Version
|
97
86
|
version: 3.2.6
|
98
|
-
- - <
|
87
|
+
- - "<"
|
99
88
|
- !ruby/object:Gem::Version
|
100
89
|
version: '5'
|
101
90
|
description: Flexible authentication solution for Rails with Warden
|
@@ -104,9 +93,9 @@ executables: []
|
|
104
93
|
extensions: []
|
105
94
|
extra_rdoc_files: []
|
106
95
|
files:
|
107
|
-
- .gitignore
|
108
|
-
- .travis.yml
|
109
|
-
- .yardopts
|
96
|
+
- ".gitignore"
|
97
|
+
- ".travis.yml"
|
98
|
+
- ".yardopts"
|
110
99
|
- CHANGELOG.md
|
111
100
|
- CONTRIBUTING.md
|
112
101
|
- Gemfile
|
@@ -137,13 +126,18 @@ files:
|
|
137
126
|
- config/locales/en.yml
|
138
127
|
- devise.gemspec
|
139
128
|
- devise.png
|
140
|
-
- gemfiles/Gemfile.rails-3.2
|
141
|
-
- gemfiles/Gemfile.rails-3.2.
|
129
|
+
- gemfiles/Gemfile.rails-3.2-stable
|
130
|
+
- gemfiles/Gemfile.rails-3.2-stable.lock
|
131
|
+
- gemfiles/Gemfile.rails-4.0-stable
|
132
|
+
- gemfiles/Gemfile.rails-4.0-stable.lock
|
133
|
+
- gemfiles/Gemfile.rails-head
|
134
|
+
- gemfiles/Gemfile.rails-head.lock
|
142
135
|
- lib/devise.rb
|
143
136
|
- lib/devise/controllers/helpers.rb
|
144
137
|
- lib/devise/controllers/rememberable.rb
|
145
138
|
- lib/devise/controllers/scoped_views.rb
|
146
139
|
- lib/devise/controllers/sign_in_out.rb
|
140
|
+
- lib/devise/controllers/store_location.rb
|
147
141
|
- lib/devise/controllers/url_helpers.rb
|
148
142
|
- lib/devise/delegator.rb
|
149
143
|
- lib/devise/failure_app.rb
|
@@ -208,6 +202,9 @@ files:
|
|
208
202
|
- lib/generators/templates/simple_form_for/registrations/new.html.erb
|
209
203
|
- lib/generators/templates/simple_form_for/sessions/new.html.erb
|
210
204
|
- lib/generators/templates/simple_form_for/unlocks/new.html.erb
|
205
|
+
- script/cached-bundle
|
206
|
+
- script/s3-put
|
207
|
+
- test/controllers/custom_registrations_controller_test.rb
|
211
208
|
- test/controllers/custom_strategy_test.rb
|
212
209
|
- test/controllers/helpers_test.rb
|
213
210
|
- test/controllers/internal_helpers_test.rb
|
@@ -260,9 +257,13 @@ files:
|
|
260
257
|
- test/rails_app/app/active_record/admin.rb
|
261
258
|
- test/rails_app/app/active_record/shim.rb
|
262
259
|
- test/rails_app/app/active_record/user.rb
|
260
|
+
- test/rails_app/app/active_record/user_on_engine.rb
|
261
|
+
- test/rails_app/app/active_record/user_on_main_app.rb
|
263
262
|
- test/rails_app/app/controllers/admins/sessions_controller.rb
|
264
263
|
- test/rails_app/app/controllers/admins_controller.rb
|
265
264
|
- test/rails_app/app/controllers/application_controller.rb
|
265
|
+
- test/rails_app/app/controllers/application_with_fake_engine.rb
|
266
|
+
- test/rails_app/app/controllers/custom/registrations_controller.rb
|
266
267
|
- test/rails_app/app/controllers/home_controller.rb
|
267
268
|
- test/rails_app/app/controllers/publisher/registrations_controller.rb
|
268
269
|
- test/rails_app/app/controllers/publisher/sessions_controller.rb
|
@@ -273,6 +274,8 @@ files:
|
|
273
274
|
- test/rails_app/app/mongoid/admin.rb
|
274
275
|
- test/rails_app/app/mongoid/shim.rb
|
275
276
|
- test/rails_app/app/mongoid/user.rb
|
277
|
+
- test/rails_app/app/mongoid/user_on_engine.rb
|
278
|
+
- test/rails_app/app/mongoid/user_on_main_app.rb
|
276
279
|
- test/rails_app/app/views/admins/index.html.erb
|
277
280
|
- test/rails_app/app/views/admins/sessions/new.html.erb
|
278
281
|
- test/rails_app/app/views/home/admin_dashboard.html.erb
|
@@ -306,45 +309,48 @@ files:
|
|
306
309
|
- test/rails_app/db/schema.rb
|
307
310
|
- test/rails_app/lib/shared_admin.rb
|
308
311
|
- test/rails_app/lib/shared_user.rb
|
312
|
+
- test/rails_app/lib/shared_user_without_omniauth.rb
|
309
313
|
- test/rails_app/public/404.html
|
310
314
|
- test/rails_app/public/422.html
|
311
315
|
- test/rails_app/public/500.html
|
312
316
|
- test/rails_app/public/favicon.ico
|
313
317
|
- test/routes_test.rb
|
318
|
+
- test/support/action_controller/record_identifier.rb
|
314
319
|
- test/support/assertions.rb
|
315
320
|
- test/support/helpers.rb
|
316
321
|
- test/support/integration.rb
|
317
322
|
- test/support/locale/en.yml
|
323
|
+
- test/support/mongoid.yml
|
318
324
|
- test/support/webrat/integrations/rails.rb
|
319
325
|
- test/test_helper.rb
|
320
326
|
- test/test_helpers_test.rb
|
321
327
|
- test/test_models.rb
|
322
|
-
homepage:
|
328
|
+
homepage: https://github.com/plataformatec/devise
|
323
329
|
licenses:
|
324
330
|
- MIT
|
331
|
+
metadata: {}
|
325
332
|
post_install_message:
|
326
333
|
rdoc_options: []
|
327
334
|
require_paths:
|
328
335
|
- lib
|
329
336
|
required_ruby_version: !ruby/object:Gem::Requirement
|
330
|
-
none: false
|
331
337
|
requirements:
|
332
|
-
- -
|
338
|
+
- - ">="
|
333
339
|
- !ruby/object:Gem::Version
|
334
340
|
version: '0'
|
335
341
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
336
|
-
none: false
|
337
342
|
requirements:
|
338
|
-
- -
|
343
|
+
- - ">="
|
339
344
|
- !ruby/object:Gem::Version
|
340
345
|
version: '0'
|
341
346
|
requirements: []
|
342
347
|
rubyforge_project: devise
|
343
|
-
rubygems_version:
|
348
|
+
rubygems_version: 2.2.2
|
344
349
|
signing_key:
|
345
|
-
specification_version:
|
350
|
+
specification_version: 4
|
346
351
|
summary: Flexible authentication solution for Rails with Warden
|
347
352
|
test_files:
|
353
|
+
- test/controllers/custom_registrations_controller_test.rb
|
348
354
|
- test/controllers/custom_strategy_test.rb
|
349
355
|
- test/controllers/helpers_test.rb
|
350
356
|
- test/controllers/internal_helpers_test.rb
|
@@ -397,9 +403,13 @@ test_files:
|
|
397
403
|
- test/rails_app/app/active_record/admin.rb
|
398
404
|
- test/rails_app/app/active_record/shim.rb
|
399
405
|
- test/rails_app/app/active_record/user.rb
|
406
|
+
- test/rails_app/app/active_record/user_on_engine.rb
|
407
|
+
- test/rails_app/app/active_record/user_on_main_app.rb
|
400
408
|
- test/rails_app/app/controllers/admins/sessions_controller.rb
|
401
409
|
- test/rails_app/app/controllers/admins_controller.rb
|
402
410
|
- test/rails_app/app/controllers/application_controller.rb
|
411
|
+
- test/rails_app/app/controllers/application_with_fake_engine.rb
|
412
|
+
- test/rails_app/app/controllers/custom/registrations_controller.rb
|
403
413
|
- test/rails_app/app/controllers/home_controller.rb
|
404
414
|
- test/rails_app/app/controllers/publisher/registrations_controller.rb
|
405
415
|
- test/rails_app/app/controllers/publisher/sessions_controller.rb
|
@@ -410,6 +420,8 @@ test_files:
|
|
410
420
|
- test/rails_app/app/mongoid/admin.rb
|
411
421
|
- test/rails_app/app/mongoid/shim.rb
|
412
422
|
- test/rails_app/app/mongoid/user.rb
|
423
|
+
- test/rails_app/app/mongoid/user_on_engine.rb
|
424
|
+
- test/rails_app/app/mongoid/user_on_main_app.rb
|
413
425
|
- test/rails_app/app/views/admins/index.html.erb
|
414
426
|
- test/rails_app/app/views/admins/sessions/new.html.erb
|
415
427
|
- test/rails_app/app/views/home/admin_dashboard.html.erb
|
@@ -443,15 +455,18 @@ test_files:
|
|
443
455
|
- test/rails_app/db/schema.rb
|
444
456
|
- test/rails_app/lib/shared_admin.rb
|
445
457
|
- test/rails_app/lib/shared_user.rb
|
458
|
+
- test/rails_app/lib/shared_user_without_omniauth.rb
|
446
459
|
- test/rails_app/public/404.html
|
447
460
|
- test/rails_app/public/422.html
|
448
461
|
- test/rails_app/public/500.html
|
449
462
|
- test/rails_app/public/favicon.ico
|
450
463
|
- test/routes_test.rb
|
464
|
+
- test/support/action_controller/record_identifier.rb
|
451
465
|
- test/support/assertions.rb
|
452
466
|
- test/support/helpers.rb
|
453
467
|
- test/support/integration.rb
|
454
468
|
- test/support/locale/en.yml
|
469
|
+
- test/support/mongoid.yml
|
455
470
|
- test/support/webrat/integrations/rails.rb
|
456
471
|
- test/test_helper.rb
|
457
472
|
- test/test_helpers_test.rb
|
@@ -1,159 +0,0 @@
|
|
1
|
-
PATH
|
2
|
-
remote: ..
|
3
|
-
specs:
|
4
|
-
devise (3.2.0)
|
5
|
-
bcrypt-ruby (~> 3.0)
|
6
|
-
orm_adapter (~> 0.1)
|
7
|
-
railties (>= 3.2.6, < 5)
|
8
|
-
thread_safe (~> 0.1)
|
9
|
-
warden (~> 1.2.3)
|
10
|
-
|
11
|
-
GEM
|
12
|
-
remote: https://rubygems.org/
|
13
|
-
specs:
|
14
|
-
actionmailer (3.2.14)
|
15
|
-
actionpack (= 3.2.14)
|
16
|
-
mail (~> 2.5.4)
|
17
|
-
actionpack (3.2.14)
|
18
|
-
activemodel (= 3.2.14)
|
19
|
-
activesupport (= 3.2.14)
|
20
|
-
builder (~> 3.0.0)
|
21
|
-
erubis (~> 2.7.0)
|
22
|
-
journey (~> 1.0.4)
|
23
|
-
rack (~> 1.4.5)
|
24
|
-
rack-cache (~> 1.2)
|
25
|
-
rack-test (~> 0.6.1)
|
26
|
-
sprockets (~> 2.2.1)
|
27
|
-
activemodel (3.2.14)
|
28
|
-
activesupport (= 3.2.14)
|
29
|
-
builder (~> 3.0.0)
|
30
|
-
activerecord (3.2.14)
|
31
|
-
activemodel (= 3.2.14)
|
32
|
-
activesupport (= 3.2.14)
|
33
|
-
arel (~> 3.0.2)
|
34
|
-
tzinfo (~> 0.3.29)
|
35
|
-
activeresource (3.2.14)
|
36
|
-
activemodel (= 3.2.14)
|
37
|
-
activesupport (= 3.2.14)
|
38
|
-
activesupport (3.2.14)
|
39
|
-
i18n (~> 0.6, >= 0.6.4)
|
40
|
-
multi_json (~> 1.0)
|
41
|
-
arel (3.0.2)
|
42
|
-
atomic (1.1.14)
|
43
|
-
bcrypt-ruby (3.1.2)
|
44
|
-
builder (3.0.4)
|
45
|
-
erubis (2.7.0)
|
46
|
-
faraday (0.8.8)
|
47
|
-
multipart-post (~> 1.2.0)
|
48
|
-
hashie (1.2.0)
|
49
|
-
hike (1.2.3)
|
50
|
-
httpauth (0.2.0)
|
51
|
-
i18n (0.6.5)
|
52
|
-
journey (1.0.4)
|
53
|
-
json (1.8.0)
|
54
|
-
jwt (0.1.8)
|
55
|
-
multi_json (>= 1.5)
|
56
|
-
mail (2.5.4)
|
57
|
-
mime-types (~> 1.16)
|
58
|
-
treetop (~> 1.4.8)
|
59
|
-
metaclass (0.0.1)
|
60
|
-
mime-types (1.23)
|
61
|
-
mocha (0.13.3)
|
62
|
-
metaclass (~> 0.0.1)
|
63
|
-
mongoid (3.1.4)
|
64
|
-
activemodel (~> 3.2)
|
65
|
-
moped (~> 1.4)
|
66
|
-
origin (~> 1.0)
|
67
|
-
tzinfo (~> 0.3.22)
|
68
|
-
moped (1.5.1)
|
69
|
-
multi_json (1.7.9)
|
70
|
-
multipart-post (1.2.0)
|
71
|
-
nokogiri (1.5.9)
|
72
|
-
oauth2 (0.8.1)
|
73
|
-
faraday (~> 0.8)
|
74
|
-
httpauth (~> 0.1)
|
75
|
-
jwt (~> 0.1.4)
|
76
|
-
multi_json (~> 1.0)
|
77
|
-
rack (~> 1.2)
|
78
|
-
omniauth (1.0.3)
|
79
|
-
hashie (~> 1.2)
|
80
|
-
rack
|
81
|
-
omniauth-facebook (1.4.0)
|
82
|
-
omniauth-oauth2 (~> 1.0.2)
|
83
|
-
omniauth-oauth2 (1.0.3)
|
84
|
-
oauth2 (~> 0.8.0)
|
85
|
-
omniauth (~> 1.0)
|
86
|
-
omniauth-openid (1.0.1)
|
87
|
-
omniauth (~> 1.0)
|
88
|
-
rack-openid (~> 1.3.1)
|
89
|
-
origin (1.1.0)
|
90
|
-
orm_adapter (0.4.0)
|
91
|
-
polyglot (0.3.3)
|
92
|
-
rack (1.4.5)
|
93
|
-
rack-cache (1.2)
|
94
|
-
rack (>= 0.4)
|
95
|
-
rack-openid (1.3.1)
|
96
|
-
rack (>= 1.1.0)
|
97
|
-
ruby-openid (>= 2.1.8)
|
98
|
-
rack-ssl (1.3.3)
|
99
|
-
rack
|
100
|
-
rack-test (0.6.2)
|
101
|
-
rack (>= 1.0)
|
102
|
-
rails (3.2.14)
|
103
|
-
actionmailer (= 3.2.14)
|
104
|
-
actionpack (= 3.2.14)
|
105
|
-
activerecord (= 3.2.14)
|
106
|
-
activeresource (= 3.2.14)
|
107
|
-
activesupport (= 3.2.14)
|
108
|
-
bundler (~> 1.0)
|
109
|
-
railties (= 3.2.14)
|
110
|
-
railties (3.2.14)
|
111
|
-
actionpack (= 3.2.14)
|
112
|
-
activesupport (= 3.2.14)
|
113
|
-
rack-ssl (~> 1.3.2)
|
114
|
-
rake (>= 0.8.7)
|
115
|
-
rdoc (~> 3.4)
|
116
|
-
thor (>= 0.14.6, < 2.0)
|
117
|
-
rake (10.1.0)
|
118
|
-
rdoc (3.12.2)
|
119
|
-
json (~> 1.4)
|
120
|
-
ruby-openid (2.2.3)
|
121
|
-
sprockets (2.2.2)
|
122
|
-
hike (~> 1.2)
|
123
|
-
multi_json (~> 1.0)
|
124
|
-
rack (~> 1.0)
|
125
|
-
tilt (~> 1.1, != 1.3.0)
|
126
|
-
sqlite3 (1.3.7)
|
127
|
-
thor (0.18.1)
|
128
|
-
thread_safe (0.1.3)
|
129
|
-
atomic
|
130
|
-
tilt (1.4.1)
|
131
|
-
treetop (1.4.14)
|
132
|
-
polyglot
|
133
|
-
polyglot (>= 0.3.1)
|
134
|
-
tzinfo (0.3.37)
|
135
|
-
warden (1.2.3)
|
136
|
-
rack (>= 1.0)
|
137
|
-
webrat (0.7.3)
|
138
|
-
nokogiri (>= 1.2.0)
|
139
|
-
rack (>= 1.0)
|
140
|
-
rack-test (>= 0.5.3)
|
141
|
-
|
142
|
-
PLATFORMS
|
143
|
-
ruby
|
144
|
-
|
145
|
-
DEPENDENCIES
|
146
|
-
activerecord-jdbc-adapter
|
147
|
-
activerecord-jdbcsqlite3-adapter
|
148
|
-
devise!
|
149
|
-
jruby-openssl
|
150
|
-
mocha (~> 0.13.1)
|
151
|
-
mongoid (~> 3.0)
|
152
|
-
omniauth (~> 1.0.0)
|
153
|
-
omniauth-facebook
|
154
|
-
omniauth-oauth2 (~> 1.0.0)
|
155
|
-
omniauth-openid (~> 1.0.1)
|
156
|
-
rails (~> 3.2.6)
|
157
|
-
rdoc
|
158
|
-
sqlite3
|
159
|
-
webrat (= 0.7.3)
|