clearance 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd3a11e206f30f451d54a86f708384fa70347724
-  data.tar.gz: e5b0a43cb7152178ca45351686e151bc1a01dd69
+  metadata.gz: 5b85f77997240efd1427372cbc15a24e658acffd
+  data.tar.gz: 5ca6fb26641354dbc90fb1415cc9b8a1a00c0f3e
 SHA512:
-  metadata.gz: 72f6f66e1473b220645672aa7fa324544f71217e298f05e85f545e898ba92eb1f7c2e056ed518c136aa5d2dbeda3ad313e72de3bb91f19cc21f929df2487860a
-  data.tar.gz: de1749e0f05fa69744648c32c6358c0adf4a14da4c9c9dabeec723d847c2cd7321c590d8a1c7f1154106e09d7e113d85bbb97acda2e23142ce61ba2a12b49576
+  metadata.gz: 98db9d506f81c47c7c4ca09a11d7e5bef8265460becde5e73959c342629b43f2d019a047d12cece15b8ffc31ba10ca20a0f15f5026ec4ccc41b7c056384afc6b
+  data.tar.gz: 6ef805fc817c6aedc195042aa15b473f16ed3b195fa180762e1365e7fd32dad57d957b8432617ef98fbbb72907d57584ad497e23a9bd948816d40f54f9667a22

data/.hound.yml

@@ -0,0 +1,2 @@
+StringLiterals:
+  EnforcedStyle: single_quotes

data/.travis.yml

@@ -4,18 +4,20 @@ language:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-
-before_install:
-  - "sudo apt-get install ca-certificates"
-  - "gem update --system"
+  - 2.1.1
 
 install:
   - "travis_retry bundle install"
+  - "bundle exec appraisal generate"
+  - "travis_retry bundle exec appraisal install"
 
 before_script:
   - "bundle exec rake db:migrate"
 
+script:
+  - "bundle exec appraisal rake"
+
 branches:
   only:
     - master
+    - 2.0

data/Appraisals

@@ -9,13 +9,13 @@ end
 
 appraise 'rails4.0' do
   gem 'jbuilder', '~> 1.2'
-  gem 'rails', '~> 4.0.3'
+  gem 'rails', '~> 4.0.4'
   gem 'sdoc'
 end
 
 appraise 'rails4.1' do
   gem 'jbuilder', '~> 2.0'
-  gem 'rails', '~> 4.1.0.rc1'
+  gem 'rails', '~> 4.1.0'
   gem 'sdoc'
   gem 'spring'
 end

data/CONTRIBUTING.md

@@ -1,12 +1,12 @@
 We love pull requests. Here's a quick guide:
 
-1. Fork the repo.
+1. Fork the repo and `bundle install`
 
 2. Set up Appraisal, which helps us test against multiple Rails versions:
-   `rake appraisal:install`.
+   `bundle exec appraisal install`
 
 3. Run the tests. We only take pull requests with passing tests, and it's great
-   to know that you have a clean slate: `rake`
+   to know that you have a clean slate: `bundle exec appraisal rake`
 
 4. Add a test for your change. Only refactoring and documentation changes
    require no new tests. If you are adding functionality or fixing a

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'appraisal', '~> 0.5'
+gem 'appraisal', '~> 1.0'
 gem 'aruba', '~> 0.5'
 gem 'bourne', '~> 1.4'
 gem 'bundler', '~> 1.3'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.3.0)
+    clearance (1.4.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -33,9 +33,10 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
+    appraisal (1.0.0)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (4.0.1)
     aruba (0.5.4)
       childprocess (>= 0.3.6)
@@ -111,7 +112,7 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.2.2)
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -159,7 +160,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 0.5)
+  appraisal (~> 1.0)
   aruba (~> 0.5)
   bourne (~> 1.4)
   bundler (~> 1.3)

data/NEWS.md

@@ -1,5 +1,16 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.4.0 (July 18, 2014)
+* The sign out link in the default application layout has been replaced with a
+  semantically correct sign out button. This also removes an unnecessary
+  JavaScript dependency.
+* Clearance now uses `original_fullpath` when redirecting to a saved URL after
+  login. This should improve the behavior in mounted engines.
+* `user_params` method was added to `Clearance::UsersController` which provides
+  a convenient place to override the parameters used when creating users.
+* Controllers now inherit from `Clearance::BaseController` to allow for easily
+  adding behavior to all of them.
+
 New for 1.3.0 (March 14, 2014)
 * Installing Clearance with an existing User model will now create a migration
   that includes adding remember tokens to all existing user records.

data/README.md

@@ -3,7 +3,6 @@ Clearance
 
 [![Build Status](https://secure.travis-ci.org/thoughtbot/clearance.png)](http://travis-ci.org/thoughtbot/clearance?branch=master)
 [![Code Climate](https://codeclimate.com/github/thoughtbot/clearance.png)](https://codeclimate.com/github/thoughtbot/clearance)
-[![Dependency Status](https://gemnasium.com/thoughtbot/clearance.png)](https://gemnasium.com/thoughtbot/clearance)
 
 Rails authentication with email & password.
 
@@ -80,7 +79,7 @@ helpers. For example:
 ```haml
 - if signed_in?
   = current_user.email
-  = link_to 'Sign out', sign_out_path, method: :delete
+  = button_to 'Sign out', sign_out_path, method: :delete
 - else
   = link_to 'Sign in', sign_in_path
 ```
@@ -174,6 +173,8 @@ class SessionsController < Clearance::SessionsController
 class UsersController < Clearance::UsersController
 ```
 
+Don't forget to override routes to your new controllers!
+
 Then, override public methods:
 
     passwords#create
@@ -204,6 +205,7 @@ Or, override private methods:
     users#flash_failure_after_create
     users#url_after_create
     users#user_from_params
+    users#user_params
 
 All of these controller methods redirect to `'/'` by default:
 

data/Rakefile

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require 'rubygems'
 require 'bundler/setup'
 require 'bundler/gem_tasks'
@@ -7,22 +6,19 @@ require 'bundler/gem_tasks'
 require 'rake'
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
-require 'appraisal'
-
 require 'clearance/testing/application'
-Clearance::Testing::Application.load_tasks
 
 desc 'Default'
 task :default => [:all]
 
-desc 'Test the engine under all supported Rails versions'
-task :all => ['appraisal:install'] do |t|
-  exec 'rake appraisal spec cucumber'
-end
+desc 'Run the specs and cucumber featrues'
+task :all => [:spec, :cucumber]
 
-RSpec::Core::RakeTask.new(:spec)
+Clearance::Testing::Application.load_tasks
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = false
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
+
+RSpec::Core::RakeTask.new(:spec)

data/app/controllers/clearance/base_controller.rb

@@ -0,0 +1,2 @@
+class Clearance::BaseController < ApplicationController
+end

data/app/controllers/clearance/passwords_controller.rb

@@ -1,6 +1,6 @@
 require 'active_support/deprecation'
 
-class Clearance::PasswordsController < ApplicationController
+class Clearance::PasswordsController < Clearance::BaseController
   skip_before_filter :authorize, only: [:create, :edit, :new, :update]
   before_filter :forbid_missing_token, only: [:edit, :update]
   before_filter :forbid_non_existent_user, only: [:edit, :update]

data/app/controllers/clearance/sessions_controller.rb

@@ -1,4 +1,4 @@
-class Clearance::SessionsController < ApplicationController
+class Clearance::SessionsController < Clearance::BaseController
   skip_before_filter :authorize, only: [:create, :new, :destroy]
   protect_from_forgery except: :create
 

data/app/controllers/clearance/users_controller.rb

@@ -1,4 +1,4 @@
-class Clearance::UsersController < ApplicationController
+class Clearance::UsersController < Clearance::BaseController
   skip_before_filter :authorize, only: [:create, :new]
   before_filter :avoid_sign_in, only: [:create, :new], if: :signed_in?
 
@@ -29,7 +29,6 @@ class Clearance::UsersController < ApplicationController
   end
 
   def user_from_params
-    user_params = params[:user] || Hash.new
     email = user_params.delete(:email)
     password = user_params.delete(:password)
 
@@ -38,4 +37,8 @@ class Clearance::UsersController < ApplicationController
       user.password = password
     end
   end
+
+  def user_params
+    params[:user] || Hash.new
+  end
 end

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

@@ -5,17 +5,17 @@
   <%= csrf_meta_tag %>
 </head>
 <body>
-  <div id='header'>
+  <div id="header">
     <% if signed_in? -%>
-      <%= link_to t('.sign_out'), sign_out_path, :method => :delete %>
+      <%= button_to t('.sign_out'), sign_out_path, :method => :delete %>
     <% else -%>
       <%= link_to t('.sign_in'), sign_in_path %>
     <% end -%>
   </div>
 
-  <div id='flash'>
+  <div id="flash">
     <% flash.each do |key, value| -%>
-      <div id='flash_<%= key %>'><%=h value %></div>
+      <div id="flash_<%= key %>"><%=h value %></div>
     <% end %>
   </div>
 

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

@@ -1,4 +1,4 @@
-<div id='clearance' class='password-reset'>
+<div id="clearance" class="password-reset">
   <h2><%= t '.title' %></h2>
 
   <p><%= t '.description' %></p>
@@ -6,12 +6,12 @@
   <%= form_for :password_reset,
         :url => user_password_path(@user, :token => @user.confirmation_token),
         :html => { :method => :put } do |form| %>
-    <div class='password-field'>
+    <div class="password-field">
       <%= form.label :password %>
       <%= form.password_field :password %>
     </div>
 
-    <div class='submit-field'>
+    <div class="submit-field">
       <%= form.submit %>
     </div>
   <% end %>

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

@@ -1,15 +1,15 @@
-<div id='clearance' class='password-reset'>
+<div id="clearance" class="password-reset">
   <h2><%= t '.title' %></h2>
 
   <p><%= t '.description' %></p>
 
   <%= form_for :password, :url => passwords_path do |form| %>
-    <div class='text-field'>
+    <div class="text-field">
       <%= form.label :email %>
       <%= form.text_field :email, :type => 'email' %>
     </div>
 
-    <div class='submit-field'>
+    <div class="submit-field">
       <%= form.submit %>
     </div>
   <% end %>

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

@@ -1,19 +1,19 @@
 <%= form_for :session, :url => session_path do |form| %>
-  <div class='text-field'>
+  <div class="text-field">
     <%= form.label :email %>
     <%= form.text_field :email, :type => 'email' %>
   </div>
 
-  <div class='password-field'>
+  <div class="password-field">
     <%= form.label :password %>
     <%= form.password_field :password %>
   </div>
 
-  <div class='submit-field'>
+  <div class="submit-field">
     <%= form.submit %>
   </div>
 
-  <div class='other-links'>
+  <div class="other-links">
     <% if Clearance.configuration.allow_sign_up? %>
       <%= link_to t('.sign_up'), sign_up_path %>
     <% end %>

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

@@ -1,4 +1,4 @@
-<div id='clearance' class='sign-in'>
+<div id="clearance" class="sign-in">
   <h2><%= t '.title' %></h2>
 
   <%= render :partial => '/sessions/form' %>

data/app/views/users/_form.html.erb

@@ -1,9 +1,9 @@
-<div class='text-field'>
+<div class="text-field">
   <%= form.label :email %>
   <%= form.text_field :email, :type => 'email' %>
 </div>
 
-<div class='password-field'>
+<div class="password-field">
   <%= form.label :password %>
   <%= form.password_field :password %>
 </div>

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

@@ -1,14 +1,14 @@
-<div id='clearance' class='sign-up'>
+<div id="clearance" class="sign-up">
   <h2><%= t('.title') %></h2>
 
   <%= form_for @user do |form| %>
     <%= render :partial => '/users/form', :object => form %>
 
-    <div class='submit-field'>
+    <div class="submit-field">
       <%= form.submit %>
     </div>
 
-    <div class='other-links'>
+    <div class="other-links">
       <%= link_to t('.sign_in'), sign_in_path %>
     </div>
   <% end %>

data/lib/clearance/authorization.rb

@@ -41,7 +41,7 @@ module Clearance
 
     def store_location
       if request.get?
-        session[:return_to] = request.fullpath
+        session[:return_to] = request.original_fullpath
       end
     end
 

data/lib/clearance/password_strategies.rb

@@ -4,7 +4,6 @@ module Clearance
     autoload :BCryptMigrationFromSHA1,
       'clearance/password_strategies/bcrypt_migration_from_sha1'
     autoload :Blowfish, 'clearance/password_strategies/blowfish'
-    autoload :Fake, 'clearance/password_strategies/fake'
     autoload :SHA1, 'clearance/password_strategies/sha1'
   end
 end

data/lib/clearance/testing/helpers.rb

@@ -20,6 +20,7 @@ module Clearance
 
       def sign_in_as(user)
         @controller.sign_in user
+        user
       end
 
       def sign_out

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

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

@@ -6,7 +6,7 @@ Next steps:
 1. Configure the mailer to create full URLs in emails:
 
     # config/environments/{development,test}.rb
-    config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+    config.action_mailer.default_url_options = { host: 'localhost:3000' }
 
     In production it should be your app's domain name.
 
@@ -14,7 +14,7 @@ Next steps:
 
     <% if signed_in? %>
       Signed in as: <%= current_user.email %>
-      <%= link_to 'Sign out', sign_out_path, :method => :delete %>
+      <%= button_to 'Sign out', sign_out_path, method: :delete %>
     <% else %>
       <%= link_to 'Sign in', sign_in_path %>
     <% end %>

data/lib/generators/clearance/specs/templates/support/features/clearance_helpers.rb

@@ -23,11 +23,11 @@ module Features
 
     def user_should_be_signed_in
       visit root_path
-      page.should have_content I18n.t('layouts.application.sign_out')
+      page.should have_button I18n.t('layouts.application.sign_out')
     end
 
     def sign_out
-      click_link I18n.t('layouts.application.sign_out')
+      click_button I18n.t('layouts.application.sign_out')
     end
 
     def user_should_be_signed_out

data/spec/clearance/testing/helpers_spec.rb

@@ -24,4 +24,14 @@ describe Clearance::Testing::Helpers do
       expect(FactoryGirl).to have_received(:create).with(:my_user_model)
     end
   end
+
+  describe '#sign_in_as' do
+    it 'returns the user if signed in successfully' do
+      user = build(:user)
+
+      returned_user = TestClass.new.sign_in_as user
+
+      expect(returned_user).to eq user
+    end
+  end
 end

data/spec/controllers/passwords_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Clearance::PasswordsController do
+  it { should be_a Clearance::BaseController }
+
   describe 'a signed up user' do
     before do
       @user = create(:user)

data/spec/controllers/sessions_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Clearance::SessionsController do
+  it { should be_a Clearance::BaseController }
+
   describe 'on GET to /sessions/new' do
     before { get :new }
 

data/spec/controllers/users_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Clearance::UsersController do
+  it { should be_a Clearance::BaseController }
+
   describe 'when signed out' do
     before { sign_out }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -78,6 +78,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".travis.yml"
 - Appraisals
@@ -88,6 +89,7 @@ files:
 - NEWS.md
 - README.md
 - Rakefile
+- app/controllers/clearance/base_controller.rb
 - app/controllers/clearance/passwords_controller.rb
 - app/controllers/clearance/sessions_controller.rb
 - app/controllers/clearance/users_controller.rb
@@ -220,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails authentication & authorization with email & password.