thoughtbot-clearance 0.3.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. data/TODO.textile +2 -1
  2. data/generators/clearance/templates/app/views/confirmations/new.html.erb +3 -1
  3. data/generators/clearance/templates/app/views/passwords/edit.html.erb +22 -27
  4. data/generators/clearance/templates/app/views/passwords/new.html.erb +6 -4
  5. data/generators/clearance/templates/app/views/sessions/new.html.erb +12 -6
  6. data/generators/clearance/templates/app/views/users/_form.html.erb +12 -6
  7. data/lib/clearance/version.rb +1 -1
  8. data/test/rails_root/app/views/confirmations/new.html.erb +3 -1
  9. data/test/rails_root/app/views/passwords/edit.html.erb +22 -27
  10. data/test/rails_root/app/views/passwords/new.html.erb +6 -4
  11. data/test/rails_root/app/views/sessions/new.html.erb +12 -6
  12. data/test/rails_root/app/views/users/_form.html.erb +12 -6
  13. metadata +2 -11
data/TODO.textile CHANGED
@@ -9,15 +9,16 @@
9
9
  # add shoulda and factory girl dependencies to gemspec
10
10
  # refactor Mailer default_url_options[:host] to something cleaner
11
11
  # application controller uses protected, all other controllers use private
12
+ # add information about url_after_create to README or github wikis
12
13
 
13
14
  ideas to steal from merb-auth:
14
15
 
15
16
  # store current_user on the session, not controller
16
17
  # respond with 401 Unauthorized when request requires authentication
17
18
  # respond with 405 Method Not Allowed when action requested isn’t allowed
19
+ # 401 and 405 need to be in Exceptions controller or use safety_valve
18
20
  # email confirmation is a strategy
19
21
  # forgot password is a strategy
20
22
  # salted password is a strategy
21
- # 401 and 405 need to be in Exceptions controller or use safety_valve
22
23
 
23
24
  http://adam.speaksoutofturn.com/articles/entication_vs_orization.html
data/generators/clearance/templates/app/views/confirmations/new.html.erb CHANGED
@@ -1,4 +1,6 @@
1
1
  <% form_for :user, :url => user_confirmation_path(:user_id => @user,
2
2
  :salt => @user.salt) do |form| %>
3
- <%= form.submit 'Confirm' %>
3
+ <div class="submit_field">
4
+ <%= form.submit 'Confirm' %>
5
+ </div>
4
6
  <% end %>
data/generators/clearance/templates/app/views/passwords/edit.html.erb CHANGED
@@ -1,28 +1,23 @@
1
- <div class="page">
2
- <div class="plain">
3
- <div class="page-header">
4
- <h2 class="instructions">
5
- Your password has been reset. Choose a new password below.
6
- </h2>
7
- </div>
8
- <%= error_messages_for :user %>
9
- <% form_for(:user,
10
- :url => user_password_path(
11
- @user,
12
- :email => @user.email,
13
- :password => @user.crypted_password),
14
- :html => { :method => :put }) do |form| %>
15
- <div class="text">
16
- <%= form.label :password, 'Choose password' %>
17
- <%= form.password_field :password %>
18
- </div>
19
- <div class="text">
20
- <%= form.label :password_confirmation, 'Verify password' %>
21
- <%= form.password_field :password_confirmation %>
22
- </div>
23
- <div class="buttons" id="password-submit">
24
- <%= form.submit 'Save this password' %>
25
- </div>
26
- <% end %>
1
+ <p>
2
+ Your password has been reset. Choose a new password below.
3
+ </p>
4
+
5
+ <%= error_messages_for :user %>
6
+ <% form_for(:user,
7
+ :url => user_password_path(
8
+ @user,
9
+ :email => @user.email,
10
+ :password => @user.crypted_password),
11
+ :html => { :method => :put }) do |form| %>
12
+ <div class="password_field">
13
+ <%= form.label :password, 'Choose password' %>
14
+ <%= form.password_field :password %>
27
15
  </div>
28
- </div>
16
+ <div class="password_field">
17
+ <%= form.label :password_confirmation, 'Verify password' %>
18
+ <%= form.password_field :password_confirmation %>
19
+ </div>
20
+ <div class="submit_field">
21
+ <%= form.submit 'Save this password' %>
22
+ </div>
23
+ <% end %>
data/generators/clearance/templates/app/views/passwords/new.html.erb CHANGED
@@ -1,13 +1,15 @@
1
1
  <h2>Change your password</h2>
2
2
 
3
- <p class="help">We'll email you a link to change your password.</p>
3
+ <p>
4
+ We will email you a link to change your password.
5
+ </p>
4
6
 
5
7
  <% form_for :password, :url => passwords_path do |form| %>
6
- <div class="text">
8
+ <div class="text_field">
7
9
  <%= form.label :email, 'Email address' %>
8
10
  <%= form.text_field :email %>
9
11
  </div>
10
- <div class="buttons" id="password-submit">
12
+ <div class="submit_field">
11
13
  <%= form.submit 'Reset password' %>
12
14
  </div>
13
- <% end %>
15
+ <% end %>
data/generators/clearance/templates/app/views/sessions/new.html.erb CHANGED
@@ -1,20 +1,26 @@
1
1
  <% form_for :session, :url => session_path do |form| %>
2
- <div class="group">
2
+ <div class="text_field">
3
3
  <%= form.label :email %>
4
4
  <%= form.text_field :email %>
5
5
  </div>
6
- <div class="group">
6
+ <div class="text_field">
7
7
  <%= form.label :password %>
8
8
  <%= form.password_field :password %>
9
9
  </div>
10
- <div class="checkbox">
10
+ <div class="text_field">
11
11
  <%= form.check_box :remember_me %>
12
12
  <%= form.label :remember_me %>
13
13
  </div>
14
- <div class="group buttons">
14
+ <div class="submit_field">
15
15
  <%= form.submit 'Login', :disable_with => 'Please wait...' %>
16
16
  </div>
17
17
  <% end %>
18
18
 
19
- <p><%= link_to "Sign up", new_user_path %></p>
20
- <p><%= link_to "Forgot My Password", new_password_path %></p>
19
+ <ul>
20
+ <li>
21
+ <%= link_to "Sign up", new_user_path %>
22
+ </li>
23
+ <li>
24
+ <%= link_to "Forgot My Password", new_password_path %>
25
+ </li>
26
+ </ul>
data/generators/clearance/templates/app/views/users/_form.html.erb CHANGED
@@ -1,7 +1,13 @@
1
1
  <%= form.error_messages %>
2
- <%= form.label :email %>
3
- <%= form.text_field :email %>
4
- <%= form.label :password %>
5
- <%= form.password_field :password %>
6
- <%= form.label :password_confirmation %>
7
- <%= form.password_field :password_confirmation %>
2
+ <div class="text_field">
3
+ <%= form.label :email %>
4
+ <%= form.text_field :email %>
5
+ </div>
6
+ <div class="password_field">
7
+ <%= form.label :password %>
8
+ <%= form.password_field :password %>
9
+ </div>
10
+ <div class="password_field">
11
+ <%= form.label :password_confirmation %>
12
+ <%= form.password_field :password_confirmation %>
13
+ </div>
data/lib/clearance/version.rb CHANGED
@@ -2,6 +2,6 @@ module Clearance
2
2
  module Version
3
3
  MAJOR = 0
4
4
  MINOR = 3
5
- PATCH = 0
5
+ PATCH = 1
6
6
  end
7
7
  end
data/test/rails_root/app/views/confirmations/new.html.erb CHANGED
@@ -1,4 +1,6 @@
1
1
  <% form_for :user, :url => user_confirmation_path(:user_id => @user,
2
2
  :salt => @user.salt) do |form| %>
3
- <%= form.submit 'Confirm' %>
3
+ <div class="submit_field">
4
+ <%= form.submit 'Confirm' %>
5
+ </div>
4
6
  <% end %>
data/test/rails_root/app/views/passwords/edit.html.erb CHANGED
@@ -1,28 +1,23 @@
1
- <div class="page">
2
- <div class="plain">
3
- <div class="page-header">
4
- <h2 class="instructions">
5
- Your password has been reset. Choose a new password below.
6
- </h2>
7
- </div>
8
- <%= error_messages_for :user %>
9
- <% form_for(:user,
10
- :url => user_password_path(
11
- @user,
12
- :email => @user.email,
13
- :password => @user.crypted_password),
14
- :html => { :method => :put }) do |form| %>
15
- <div class="text">
16
- <%= form.label :password, 'Choose password' %>
17
- <%= form.password_field :password %>
18
- </div>
19
- <div class="text">
20
- <%= form.label :password_confirmation, 'Verify password' %>
21
- <%= form.password_field :password_confirmation %>
22
- </div>
23
- <div class="buttons" id="password-submit">
24
- <%= form.submit 'Save this password' %>
25
- </div>
26
- <% end %>
1
+ <p>
2
+ Your password has been reset. Choose a new password below.
3
+ </p>
4
+
5
+ <%= error_messages_for :user %>
6
+ <% form_for(:user,
7
+ :url => user_password_path(
8
+ @user,
9
+ :email => @user.email,
10
+ :password => @user.crypted_password),
11
+ :html => { :method => :put }) do |form| %>
12
+ <div class="password_field">
13
+ <%= form.label :password, 'Choose password' %>
14
+ <%= form.password_field :password %>
27
15
  </div>
28
- </div>
16
+ <div class="password_field">
17
+ <%= form.label :password_confirmation, 'Verify password' %>
18
+ <%= form.password_field :password_confirmation %>
19
+ </div>
20
+ <div class="submit_field">
21
+ <%= form.submit 'Save this password' %>
22
+ </div>
23
+ <% end %>
data/test/rails_root/app/views/passwords/new.html.erb CHANGED
@@ -1,13 +1,15 @@
1
1
  <h2>Change your password</h2>
2
2
 
3
- <p class="help">We'll email you a link to change your password.</p>
3
+ <p>
4
+ We will email you a link to change your password.
5
+ </p>
4
6
 
5
7
  <% form_for :password, :url => passwords_path do |form| %>
6
- <div class="text">
8
+ <div class="text_field">
7
9
  <%= form.label :email, 'Email address' %>
8
10
  <%= form.text_field :email %>
9
11
  </div>
10
- <div class="buttons" id="password-submit">
12
+ <div class="submit_field">
11
13
  <%= form.submit 'Reset password' %>
12
14
  </div>
13
- <% end %>
15
+ <% end %>
data/test/rails_root/app/views/sessions/new.html.erb CHANGED
@@ -1,20 +1,26 @@
1
1
  <% form_for :session, :url => session_path do |form| %>
2
- <div class="group">
2
+ <div class="text_field">
3
3
  <%= form.label :email %>
4
4
  <%= form.text_field :email %>
5
5
  </div>
6
- <div class="group">
6
+ <div class="text_field">
7
7
  <%= form.label :password %>
8
8
  <%= form.password_field :password %>
9
9
  </div>
10
- <div class="checkbox">
10
+ <div class="text_field">
11
11
  <%= form.check_box :remember_me %>
12
12
  <%= form.label :remember_me %>
13
13
  </div>
14
- <div class="group buttons">
14
+ <div class="submit_field">
15
15
  <%= form.submit 'Login', :disable_with => 'Please wait...' %>
16
16
  </div>
17
17
  <% end %>
18
18
 
19
- <p><%= link_to "Sign up", new_user_path %></p>
20
- <p><%= link_to "Forgot My Password", new_password_path %></p>
19
+ <ul>
20
+ <li>
21
+ <%= link_to "Sign up", new_user_path %>
22
+ </li>
23
+ <li>
24
+ <%= link_to "Forgot My Password", new_password_path %>
25
+ </li>
26
+ </ul>
data/test/rails_root/app/views/users/_form.html.erb CHANGED
@@ -1,7 +1,13 @@
1
1
  <%= form.error_messages %>
2
- <%= form.label :email %>
3
- <%= form.text_field :email %>
4
- <%= form.label :password %>
5
- <%= form.password_field :password %>
6
- <%= form.label :password_confirmation %>
7
- <%= form.password_field :password_confirmation %>
2
+ <div class="text_field">
3
+ <%= form.label :email %>
4
+ <%= form.text_field :email %>
5
+ </div>
6
+ <div class="password_field">
7
+ <%= form.label :password %>
8
+ <%= form.password_field :password %>
9
+ </div>
10
+ <div class="password_field">
11
+ <%= form.label :password_confirmation %>
12
+ <%= form.password_field :password_confirmation %>
13
+ </div>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thoughtbot-clearance
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - thoughtbot, inc.
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2008-10-12 00:00:00 -07:00
17
+ date: 2008-10-13 00:00:00 -07:00
18
18
  default_executable:
19
19
  dependencies: []
20
20
 
@@ -142,10 +142,8 @@ files:
142
142
  - test/rails_root/config/routes.rb
143
143
  - test/rails_root/db
144
144
  - test/rails_root/db/bootstrap
145
- - test/rails_root/db/development.sqlite3
146
145
  - test/rails_root/db/migrate
147
146
  - test/rails_root/db/migrate/001_create_users.rb
148
- - test/rails_root/db/schema.rb
149
147
  - test/rails_root/db/test.sqlite3
150
148
  - test/rails_root/doc
151
149
  - test/rails_root/doc/README_FOR_APP
@@ -200,8 +198,6 @@ files:
200
198
  - test/rails_root/script/server
201
199
  - test/rails_root/test
202
200
  - test/rails_root/test/factories.rb
203
- - test/rails_root/test/fixtures
204
- - test/rails_root/test/fixtures/mailer
205
201
  - test/rails_root/test/functional
206
202
  - test/rails_root/test/functional/confirmations_controller_test.rb
207
203
  - test/rails_root/test/functional/passwords_controller_test.rb
@@ -215,11 +211,6 @@ files:
215
211
  - test/rails_root/test/unit
216
212
  - test/rails_root/test/unit/user_mailer_test.rb
217
213
  - test/rails_root/test/unit/user_test.rb
218
- - test/rails_root/tmp
219
- - test/rails_root/tmp/cache
220
- - test/rails_root/tmp/pids
221
- - test/rails_root/tmp/sessions
222
- - test/rails_root/tmp/sockets
223
214
  - test/rails_root/vendor
224
215
  - test/rails_root/vendor/gems
225
216
  - test/rails_root/vendor/gems/mocha-0.9.1