RubyGems - clearance - Versions diffs - 1.0.0.rc3 → 1.0.0.rc4 - Mend

clearance 1.0.0.rc3 → 1.0.0.rc4

Potentially problematic release.

This version of clearance might be problematic. Click here for more details.

Files changed (28) hide show

data/Gemfile.lock +3 -3
data/NEWS.md +2 -0
data/app/controllers/clearance/passwords_controller.rb +14 -3
data/app/controllers/clearance/sessions_controller.rb +1 -1
data/app/views/clearance_mailer/change_password.html.erb +2 -2
data/app/views/layouts/application.html.erb +2 -2
data/app/views/passwords/create.html.erb +1 -4
data/app/views/passwords/edit.html.erb +5 -7
data/app/views/passwords/new.html.erb +4 -6
data/app/views/sessions/_form.html.erb +1 -1
data/app/views/sessions/new.html.erb +3 -3
data/app/views/users/new.html.erb +1 -1
data/config/locales/clearance.en.yml +42 -0
data/config/routes.rb +11 -6
data/gemfiles/3.0.17.gemfile.lock +1 -1
data/gemfiles/3.1.8.gemfile.lock +1 -1
data/gemfiles/3.2.8.gemfile.lock +1 -1
data/lib/clearance.rb +6 -0
data/lib/clearance/version.rb +1 -1
data/lib/generators/clearance/install/templates/README +5 -3
data/lib/generators/clearance/specs/templates/integration/clearance/visitor_resets_password_spec.rb +1 -1
data/lib/generators/clearance/specs/templates/integration/clearance/visitor_signs_in_spec.rb +4 -2
data/lib/generators/clearance/specs/templates/integration/clearance/visitor_updates_password_spec.rb +3 -3
data/lib/generators/clearance/specs/templates/support/integration.rb +2 -2
data/lib/generators/clearance/specs/templates/support/integration/clearance_helpers.rb +11 -11
data/lib/generators/clearance/views/views_generator.rb +10 -0
data/spec/controllers/passwords_controller_spec.rb +4 -4
metadata +2 -1

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.0.0.rc3)
+    clearance (1.0.0.rc4)
       bcrypt-ruby
       rails (>= 3.0)
@@ -149,10 +149,10 @@ GEM
     thor (0.15.4)
     tilt (1.3.3)
     timecop (0.3.5)
-    treetop (1.4.11)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.34)
     xpath (0.1.4)
       nokogiri (~> 1.3)

data/NEWS.md CHANGED

@@ -17,6 +17,8 @@ New for 1.0.0:
 * Improve security when changing password.
 * Replace Cucumber feature generator with RSpec + Capybara.
 * Remove Diesel dependency.
+* Add locales support.
+* PasswordsController `params[:user]` has changed to `params[:password_reset]` to avoid locale conflicts
 New for 0.16.2:

data/app/controllers/clearance/passwords_controller.rb CHANGED

@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
 class Clearance::PasswordsController < ApplicationController
   unloadable
@@ -25,7 +27,7 @@ class Clearance::PasswordsController < ApplicationController
   def update
     @user = find_user_for_update
-    if @user.update_password params[:user][:password]
+    if @user.update_password password_reset_params
       sign_in @user
       redirect_to url_after_update
     else
@@ -36,6 +38,15 @@ class Clearance::PasswordsController < ApplicationController
   private
+  def password_reset_params
+    if params.has_key? :user
+      ActiveSupport::Deprecation.warn %{Since locales functionality was added, accessing params[:user] is no longer supported.}
+      params[:user][:password]
+    else
+      params[:password_reset][:password]
+    end
+  end
   def find_user_by_id_and_confirmation_token
     Clearance.configuration.user_model.
       find_by_id_and_confirmation_token params[:user_id], params[:token].to_s
@@ -56,13 +67,13 @@ class Clearance::PasswordsController < ApplicationController
   def flash_failure_when_forbidden
     flash.now[:notice] = translate(:forbidden,
       :scope => [:clearance, :controllers, :passwords],
-      :default => 'Please double check the URL or try submitting the form again.')
+      :default => t('flashes.failure_when_forbidden'))
   end
   def flash_failure_after_update
     flash.now[:notice] = translate(:blank_password,
       :scope => [:clearance, :controllers, :passwords],
-      :default => "Password can't be blank.")
+      :default => t('flashes.failure_after_update'))
   end
   def forbid_missing_token

data/app/controllers/clearance/sessions_controller.rb CHANGED

@@ -30,7 +30,7 @@ class Clearance::SessionsController < ApplicationController
   def flash_failure_after_create
     flash.now[:notice] = translate(:bad_email_or_password,
       :scope => [:clearance, :controllers, :sessions],
-      :default => %{Bad email or password. Are you trying to register a new account? <a href="#{sign_up_path}">Sign up</a>.}.html_safe)
+      :default => t('flashes.failure_after_create', :sign_up_path => sign_up_path).html_safe)
   end
   def url_after_create

data/app/views/clearance_mailer/change_password.html.erb CHANGED

@@ -1,5 +1,5 @@
-Someone, hopefully you, requested we send you a link to change your password:
+<%= t('.introduction_paragraph') %>
 <%= edit_user_password_url(@user, :token => @user.confirmation_token.html_safe) %>
-If you didn't request this, ignore this email. Your password hasn't been changed.
+<%= t('.ending_paragraph') %>

data/app/views/layouts/application.html.erb CHANGED

@@ -7,9 +7,9 @@
 <body>
   <div id='header'>
     <% if signed_in? -%>
-      <%= link_to 'Sign out', sign_out_path, :method => :delete %>
+      <%= link_to t('.sign_out'), sign_out_path, :method => :delete %>
     <% else -%>
-      <%= link_to 'Sign in', sign_in_path %>
+      <%= link_to t('.sign_in'), sign_in_path %>
     <% end -%>
   </div>

data/app/views/passwords/create.html.erb CHANGED

@@ -1,4 +1 @@
-<p>
-  You will receive an email within the next few minutes.
-  It contains instructions for changing your password.
-</p>
+<p><%= t '.description' %></p>

data/app/views/passwords/edit.html.erb CHANGED

@@ -1,18 +1,16 @@
-<h2>Change your password</h2>
+<h2><%= t '.title' %></h2>
-<p>
-  Your password has been reset. Choose a new password below.
-</p>
+<p><%= t '.description' %></p>
-<%= form_for :user,
+<%= form_for :password_reset,
       :url => user_password_path(@user, :token => @user.confirmation_token),
       :html => { :method => :put } do |form| %>
   <div class='password_field'>
-    <%= form.label :password, 'Choose password' %>
+    <%= form.label :password %>
     <%= form.password_field :password %>
   </div>
   <div class='submit_field'>
-    <%= form.submit 'Save this password' %>
+    <%= form.submit %>
   </div>
 <% end %>

data/app/views/passwords/new.html.erb CHANGED

@@ -1,16 +1,14 @@
-<h2>Reset your password</h2>
+<h2><%= t '.title' %></h2>
-<p>
-  We will email you a link to reset your password.
-</p>
+<p><%= t '.description' %></p>
 <%= form_for :password, :url => passwords_path do |form| %>
   <div class='text_field'>
-    <%= form.label :email, 'Email address' %>
+    <%= form.label :email %>
     <%= form.text_field :email, :type => 'email' %>
   </div>
   <div class='submit_field'>
-    <%= form.submit 'Reset password' %>
+    <%= form.submit %>
   </div>
 <% end %>

data/app/views/sessions/_form.html.erb CHANGED

@@ -10,6 +10,6 @@
   </div>
   <div class='submit_field'>
-    <%= form.submit 'Sign in' %>
+    <%= form.submit %>
   </div>
 <% end %>

data/app/views/sessions/new.html.erb CHANGED

@@ -1,13 +1,13 @@
-<h2>Sign in</h2>
+<h2><%= t '.title' %></h2>
 <%= render :partial => '/sessions/form' %>
 <ul>
   <li>
-    <%= link_to 'Sign up', sign_up_path %>
+    <%= link_to t('.sign_up'), sign_up_path %>
   </li>
   <li>
-    <%= link_to 'Forgot password?', new_password_path %>
+    <%= link_to t('.forgot_password'), new_password_path %>
   </li>
 </ul>

data/app/views/users/new.html.erb CHANGED

@@ -2,5 +2,5 @@
 <%= form_for @user do |form| %>
   <%= render :partial => '/users/form', :object => form %>
-  <%= form.submit 'Sign up' %>
+  <%= form.submit %>
 <% end %>

data/config/locales/clearance.en.yml ADDED

@@ -0,0 +1,42 @@
+en:
+  flashes:
+    failure_when_forbidden: Please double check the URL or try submitting the form again.
+    failure_after_update: Password can't be blank.
+    failure_after_create: Bad email or password. Are you trying to register a new account? <a href="%{sign_up_path}">Sign up</a>.
+  helpers:
+    submit:
+      password:
+        submit: Reset password
+      password_reset:
+        submit: Save this password
+      session:
+        submit: Sign in
+      user:
+        create: Sign up
+    label:
+      password:
+        email: Email address
+      password_reset:
+        password: Choose password
+  layouts:
+    application:
+      sign_in: Sign in
+      sign_out: Sign out
+  passwords:
+    create:
+      description: You will receive an email within the next few minutes. It contains instructions for changing your password.
+    edit:
+      title: Change your password
+      description: Your password has been reset. Choose a new password below.
+    new:
+      title: Reset your password
+      description: We will email you a link to reset your password.
+  sessions:
+    new:
+      title: Sign in
+      sign_up: Sign up
+      forgot_password: Forgot password?
+  clearance_mailer:
+    change_password:
+      beginning_paragraph: 'Someone, hopefully you, requested we send you a link to change your password:'
+      ending_paragraph: If you didn't request this, ignore this email. Your password hasn't been changed.

data/config/routes.rb CHANGED

@@ -1,14 +1,19 @@
 Rails.application.routes.draw do
-  resources :passwords, :controller => 'clearance/passwords',
+  resources :passwords,
+    :controller => 'clearance/passwords',
     :only => [:create, :new]
-  resource  :session, :controller => 'clearance/sessions',
+  resource :session,
+    :controller => 'clearance/sessions',
     :only => [:create, :new, :destroy]
-  resources :users, :controller => 'clearance/users', :only => [:create, :new] do
-    resource :password, :controller => 'clearance/passwords',
-      :only => [:create, :edit, :update]
-  end
+  resources :users,
+    :controller => 'clearance/users',
+    :only => [:create, :new] do
+      resource :password,
+        :controller => 'clearance/passwords',
+        :only => [:create, :edit, :update]
+    end
   match 'sign_in' => 'clearance/sessions#new', :as => 'sign_in'
   match 'sign_out' => 'clearance/sessions#destroy', :as => 'sign_out', :via => :delete

data/gemfiles/3.0.17.gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/harlow/Sites/clearance
   specs:
-    clearance (1.0.0.rc2)
+    clearance (1.0.0.rc3)
       bcrypt-ruby
       rails (>= 3.0)

data/gemfiles/3.1.8.gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/harlow/Sites/clearance
   specs:
-    clearance (1.0.0.rc2)
+    clearance (1.0.0.rc3)
       bcrypt-ruby
       rails (>= 3.0)

data/gemfiles/3.2.8.gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/harlow/Sites/clearance
   specs:
-    clearance (1.0.0.rc2)
+    clearance (1.0.0.rc3)
       bcrypt-ruby
       rails (>= 3.0)

data/lib/clearance.rb CHANGED

@@ -6,3 +6,9 @@ require 'clearance/user'
 require 'clearance/engine'
 require 'clearance/password_strategies'
 require 'clearance/constraints'
+module Clearance
+  def self.root
+    File.expand_path('../..', __FILE__)
+  end
+end

data/lib/clearance/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.0.0.rc3'
+  VERSION = '1.0.0.rc4'
 end

data/lib/generators/clearance/install/templates/README CHANGED

@@ -19,9 +19,11 @@ Next steps:
       <%= link_to 'Sign in', sign_in_path %>
     <% end %>
-    <% flash.each do |key, value| %>
-      <div class="flash <%= key %>"><%= value %></div>
-    <% end %>
+    <div id="flash">
+      <% flash.each do |key, value| %>
+        <div class="flash <%= key %>"><%= value %></div>
+      <% end %>
+    </div>
 3. Migrate:

data/lib/generators/clearance/specs/templates/integration/clearance/visitor_resets_password_spec.rb CHANGED

@@ -23,6 +23,6 @@ feature 'Visitor resets password' do
   end
   def page_should_display_change_password_message
-    page.should have_content('instructions for changing your password')
+    page.should have_content I18n.t('passwords.create.description')
   end
 end

data/lib/generators/clearance/specs/templates/integration/clearance/visitor_signs_in_spec.rb CHANGED

@@ -37,6 +37,8 @@ feature 'Visitor signs in' do
   end
   def page_should_display_sign_in_error
-    page.should have_content('Bad email or password')
+    page.body.should include(
+      I18n.t('flashes.failure_after_create', :sign_up_path => sign_up_path)
+    )
   end
- end
+end

data/lib/generators/clearance/specs/templates/integration/clearance/visitor_updates_password_spec.rb CHANGED

@@ -22,7 +22,7 @@ feature 'Visitor updates password' do
     visit_password_reset_page_for user
     change_password_to ''
-    page.should have_content("Password can't be blank")
+    page.should have_content I18n.t('flashes.failure_after_update')
     user_should_be_signed_out
   end
@@ -41,7 +41,7 @@ feature 'Visitor updates password' do
   end
   def change_password_to(password)
-    fill_in 'Choose password', :with => password
-    click_button 'Save this password'
+    fill_in 'password_reset_password', :with => password
+    click_button I18n.t('helpers.submit.password_reset.submit')
   end
 end

data/lib/generators/clearance/specs/templates/support/integration.rb CHANGED

@@ -1,4 +1,4 @@
 RSpec.configure do |config|
-  config.include Integration::ClearanceHelpers
-  config.include Integration::ActionMailerHelpers
+  config.include Integration::ClearanceHelpers, :type => :request
+  config.include Integration::ActionMailerHelpers, :type => :request
 end

data/lib/generators/clearance/specs/templates/support/integration/clearance_helpers.rb CHANGED

@@ -2,16 +2,16 @@ module Integration
   module ClearanceHelpers
     def sign_up_with(email, password)
       visit sign_up_path
-      fill_in 'Email', :with => email
-      fill_in 'Password', :with => password
-      click_button 'Sign up'
+      fill_in 'user_email', :with => email
+      fill_in 'user_password', :with => password
+      click_button I18n.t('helpers.submit.user.create')
     end
     def sign_in_with(email, password)
       visit sign_in_path
-      fill_in 'Email', :with => email
-      fill_in 'Password', :with => password
-      click_button 'Sign in'
+      fill_in 'session_email', :with => email
+      fill_in 'session_password', :with => password
+      click_button I18n.t('helpers.submit.session.submit')
     end
     def signed_in_user
@@ -23,15 +23,15 @@ module Integration
     def user_should_be_signed_in
       visit root_path
-      page.should have_content('Sign out')
+      page.should have_content I18n.t('layouts.application.sign_out')
     end
     def sign_out
-      click_link 'Sign out'
+      click_link I18n.t('layouts.application.sign_out')
     end
     def user_should_be_signed_out
-      page.should have_content('Sign in')
+      page.should have_content I18n.t('layouts.application.sign_in')
     end
     def user_with_reset_password
@@ -42,8 +42,8 @@ module Integration
     def reset_password_for(email)
       visit new_password_path
-      fill_in 'Email address', :with => email
-      click_button 'Reset password'
+      fill_in 'password_email', :with => email
+      click_button I18n.t('helpers.submit.password.submit')
     end
   end
 end

data/lib/generators/clearance/views/views_generator.rb CHANGED

@@ -11,12 +11,22 @@ module Clearance
         end
       end
+      def create_locales
+        locales.each do |locale|
+          copy_file locale
+        end
+      end
       private
       def views
         files_within_root('.', 'app/views/**/*.*')
       end
+      def locales
+        files_within_root('.', 'config/locales/**/*.*')
+      end
       def files_within_root(prefix, glob)
         root = "#{self.class.source_root}/#{prefix}"

data/spec/controllers/passwords_controller_spec.rb CHANGED

@@ -101,7 +101,7 @@ describe Clearance::PasswordsController do
         @new_password = 'new_password'
         @user.encrypted_password.should_not == @new_password
         put :update, :user_id => @user, :token => @user.confirmation_token,
-          :user => { :password => @new_password }
+          :password_reset => { :password => @new_password }
         @user.reload
       end
@@ -123,7 +123,7 @@ describe Clearance::PasswordsController do
     describe 'on PUT to #update with blank password' do
       before do
         put :update, :user_id => @user.to_param, :token => @user.confirmation_token,
-          :user => { :password => '' }
+          :password_reset => { :password => '' }
         @user.reload
       end
@@ -147,9 +147,9 @@ describe Clearance::PasswordsController do
     describe 'on PUT to #update with an empty token after the user sets a password' do
       before do
         put :update, :user_id => @user.to_param, :token => @user.confirmation_token,
-          :user => { :password => 'good password' }
+          :password_reset => { :password => 'good password' }
         put :update, :user_id => @user.to_param, :token => [nil],
-          :user => { :password => 'new password' }
+          :password_reset => { :password => 'new password' }
       end
       it { should set_the_flash.to(/double check the URL/i).now }

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -277,6 +277,7 @@ files:
 - app/views/users/_form.html.erb
 - app/views/users/new.html.erb
 - clearance.gemspec
+- config/locales/clearance.en.yml
 - config/routes.rb
 - cucumber.yml
 - db/migrate/20110111224543_create_clearance_users.rb