devise 0.9.2 → 1.0.0

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 (54) hide show
  1. data/CHANGELOG.rdoc +11 -0
  2. data/README.rdoc +3 -2
  3. data/TODO +0 -1
  4. data/app/controllers/confirmations_controller.rb +18 -7
  5. data/app/controllers/passwords_controller.rb +18 -7
  6. data/app/controllers/registrations_controller.rb +55 -0
  7. data/app/controllers/sessions_controller.rb +17 -5
  8. data/app/controllers/unlocks_controller.rb +18 -7
  9. data/app/models/devise_mailer.rb +3 -2
  10. data/app/views/registrations/edit.html.erb +25 -0
  11. data/app/views/registrations/new.html.erb +17 -0
  12. data/app/views/sessions/new.html.erb +10 -12
  13. data/app/views/shared/_devise_links.erb +5 -1
  14. data/generators/devise_install/templates/devise.rb +3 -1
  15. data/lib/devise.rb +15 -8
  16. data/lib/devise/controllers/helpers.rb +1 -1
  17. data/lib/devise/controllers/internal_helpers.rb +15 -6
  18. data/lib/devise/controllers/url_helpers.rb +7 -7
  19. data/lib/devise/locales/en.yml +6 -0
  20. data/lib/devise/mapping.rb +9 -15
  21. data/lib/devise/models.rb +9 -16
  22. data/lib/devise/models/authenticatable.rb +38 -8
  23. data/lib/devise/models/lockable.rb +42 -24
  24. data/lib/devise/models/registerable.rb +8 -0
  25. data/lib/devise/models/timeoutable.rb +1 -1
  26. data/lib/devise/orm/active_record.rb +3 -2
  27. data/lib/devise/orm/data_mapper.rb +3 -3
  28. data/lib/devise/orm/mongo_mapper.rb +3 -3
  29. data/lib/devise/rails/routes.rb +9 -6
  30. data/lib/devise/strategies/authenticatable.rb +11 -1
  31. data/lib/devise/strategies/base.rb +5 -13
  32. data/lib/devise/strategies/http_authenticatable.rb +49 -0
  33. data/lib/devise/strategies/rememberable.rb +1 -1
  34. data/lib/devise/strategies/token_authenticatable.rb +9 -10
  35. data/lib/devise/version.rb +1 -1
  36. data/test/devise_test.rb +1 -1
  37. data/test/integration/authenticatable_test.rb +59 -43
  38. data/test/integration/http_authenticatable_test.rb +44 -0
  39. data/test/integration/registerable_test.rb +130 -0
  40. data/test/integration/token_authenticatable_test.rb +4 -4
  41. data/test/mailers/confirmation_instructions_test.rb +9 -0
  42. data/test/mapping_test.rb +14 -10
  43. data/test/models/authenticatable_test.rb +31 -9
  44. data/test/models/lockable_test.rb +8 -8
  45. data/test/models_test.rb +1 -1
  46. data/test/rails_app/app/active_record/admin.rb +1 -1
  47. data/test/rails_app/app/active_record/user.rb +4 -2
  48. data/test/rails_app/config/routes.rb +3 -2
  49. data/test/routes_test.rb +35 -0
  50. data/test/support/integration_tests_helper.rb +5 -1
  51. data/test/support/tests_helper.rb +35 -1
  52. metadata +9 -4
  53. data/lib/devise/controllers/common.rb +0 -24
  54. data/test/support/model_tests_helper.rb +0 -36
@@ -7,7 +7,11 @@ class ActionController::IntegrationTest
7
7
  def create_user(options={})
8
8
  @user ||= begin
9
9
  user = User.create!(
10
- :email => 'user@test.com', :password => '123456', :password_confirmation => '123456', :created_at => Time.now.utc
10
+ :username => 'usertest',
11
+ :email => 'user@test.com',
12
+ :password => '123456',
13
+ :password_confirmation => '123456',
14
+ :created_at => Time.now.utc
11
15
  )
12
16
  user.confirm! unless options[:confirm] == false
13
17
  user.lock! if options[:locked] == true
@@ -1,5 +1,39 @@
1
1
  class ActiveSupport::TestCase
2
-
3
2
  VALID_AUTHENTICATION_TOKEN = 'AbCdEfGhIjKlMnOpQrSt'.freeze
4
3
 
4
+ def setup_mailer
5
+ ActionMailer::Base.deliveries = []
6
+ end
7
+
8
+ def store_translations(locale, translations, &block)
9
+ begin
10
+ I18n.backend.store_translations locale, translations
11
+ yield
12
+ ensure
13
+ I18n.reload!
14
+ end
15
+ end
16
+
17
+ # Helpers for creating new users
18
+ #
19
+ def generate_unique_email
20
+ @@email_count ||= 0
21
+ @@email_count += 1
22
+ "test#{@@email_count}@email.com"
23
+ end
24
+
25
+ def valid_attributes(attributes={})
26
+ { :username => "usertest",
27
+ :email => generate_unique_email,
28
+ :password => '123456',
29
+ :password_confirmation => '123456' }.update(attributes)
30
+ end
31
+
32
+ def new_user(attributes={})
33
+ User.new(valid_attributes(attributes))
34
+ end
35
+
36
+ def create_user(attributes={})
37
+ User.create!(valid_attributes(attributes))
38
+ end
5
39
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devise
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.2
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2010-02-05 00:00:00 +01:00
13
+ date: 2010-02-09 00:00:00 +01:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -40,6 +40,7 @@ files:
40
40
  - TODO
41
41
  - app/controllers/confirmations_controller.rb
42
42
  - app/controllers/passwords_controller.rb
43
+ - app/controllers/registrations_controller.rb
43
44
  - app/controllers/sessions_controller.rb
44
45
  - app/controllers/unlocks_controller.rb
45
46
  - app/models/devise_mailer.rb
@@ -49,6 +50,8 @@ files:
49
50
  - app/views/devise_mailer/unlock_instructions.html.erb
50
51
  - app/views/passwords/edit.html.erb
51
52
  - app/views/passwords/new.html.erb
53
+ - app/views/registrations/edit.html.erb
54
+ - app/views/registrations/new.html.erb
52
55
  - app/views/sessions/new.html.erb
53
56
  - app/views/shared/_devise_links.erb
54
57
  - app/views/unlocks/new.html.erb
@@ -65,7 +68,6 @@ files:
65
68
  - generators/devise_views/devise_views_generator.rb
66
69
  - init.rb
67
70
  - lib/devise.rb
68
- - lib/devise/controllers/common.rb
69
71
  - lib/devise/controllers/helpers.rb
70
72
  - lib/devise/controllers/internal_helpers.rb
71
73
  - lib/devise/controllers/url_helpers.rb
@@ -89,6 +91,7 @@ files:
89
91
  - lib/devise/models/confirmable.rb
90
92
  - lib/devise/models/lockable.rb
91
93
  - lib/devise/models/recoverable.rb
94
+ - lib/devise/models/registerable.rb
92
95
  - lib/devise/models/rememberable.rb
93
96
  - lib/devise/models/timeoutable.rb
94
97
  - lib/devise/models/token_authenticatable.rb
@@ -103,6 +106,7 @@ files:
103
106
  - lib/devise/schema.rb
104
107
  - lib/devise/strategies/authenticatable.rb
105
108
  - lib/devise/strategies/base.rb
109
+ - lib/devise/strategies/http_authenticatable.rb
106
110
  - lib/devise/strategies/rememberable.rb
107
111
  - lib/devise/strategies/token_authenticatable.rb
108
112
  - lib/devise/test_helpers.rb
@@ -144,8 +148,10 @@ test_files:
144
148
  - test/failure_app_test.rb
145
149
  - test/integration/authenticatable_test.rb
146
150
  - test/integration/confirmable_test.rb
151
+ - test/integration/http_authenticatable_test.rb
147
152
  - test/integration/lockable_test.rb
148
153
  - test/integration/recoverable_test.rb
154
+ - test/integration/registerable_test.rb
149
155
  - test/integration/rememberable_test.rb
150
156
  - test/integration/timeoutable_test.rb
151
157
  - test/integration/token_authenticatable_test.rb
@@ -188,7 +194,6 @@ test_files:
188
194
  - test/routes_test.rb
189
195
  - test/support/assertions_helper.rb
190
196
  - test/support/integration_tests_helper.rb
191
- - test/support/model_tests_helper.rb
192
197
  - test/support/test_silencer.rb
193
198
  - test/support/tests_helper.rb
194
199
  - test/test_helper.rb
@@ -1,24 +0,0 @@
1
- module Devise
2
- module Controllers
3
- # Common actions shared between Devise controllers
4
- module Common #:nodoc:
5
- # GET /resource/controller/new
6
- def new
7
- build_resource
8
- render_with_scope :new
9
- end
10
-
11
- # POST /resource/controller
12
- def create
13
- self.resource = resource_class.send(send_instructions_with, params[resource_name])
14
-
15
- if resource.errors.empty?
16
- set_flash_message :notice, :send_instructions
17
- redirect_to new_session_path(resource_name)
18
- else
19
- render_with_scope :new
20
- end
21
- end
22
- end
23
- end
24
- end
@@ -1,36 +0,0 @@
1
- class ActiveSupport::TestCase
2
- def setup_mailer
3
- ActionMailer::Base.deliveries = []
4
- end
5
-
6
- def store_translations(locale, translations, &block)
7
- begin
8
- I18n.backend.store_translations locale, translations
9
- yield
10
- ensure
11
- I18n.reload!
12
- end
13
- end
14
-
15
- # Helpers for creating new users
16
- #
17
- def generate_unique_email
18
- @@email_count ||= 0
19
- @@email_count += 1
20
- "test#{@@email_count}@email.com"
21
- end
22
-
23
- def valid_attributes(attributes={})
24
- { :email => generate_unique_email,
25
- :password => '123456',
26
- :password_confirmation => '123456' }.update(attributes)
27
- end
28
-
29
- def new_user(attributes={})
30
- User.new(valid_attributes(attributes))
31
- end
32
-
33
- def create_user(attributes={})
34
- User.create!(valid_attributes(attributes))
35
- end
36
- end