clearance 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e5c1ad076dc7b6d2437299cd7888a0112eb892
-  data.tar.gz: fbe33eb3eca23b455dd535d7d6c7df5af9e85d53
+  metadata.gz: 8266915cf611dc113c30738eb37360376aaa7aa2
+  data.tar.gz: b36bbf255d84a2840b5e99c6379c8e844d4e8813
 SHA512:
-  metadata.gz: 3c34b9bb7f111bc599149e006fbee5e3a98e6c7bbf00797469781585b9a846ae4900d1deed564795ef3da81f62dfe7a691f69f14b574c17091a2e158f2fa3956
-  data.tar.gz: 66f14e544e08dbf94d16ca3066750abe3d444280ff2dae2dc6782e90790efc6ce066234bc2592bffb0e5c4c01f1c3578c69d9529afc75411eca24fe2f95291dc
+  metadata.gz: fcde94feb3534ea779e9dc7f221f7038afa78963a2858bf437537d6c8c780122fa76e302e549059d95466573db08d5b90e3b3710fa7241c16a879ee7ccef4e99
+  data.tar.gz: 676762b9c0c0cae39863aecedb3f88017c949a1687645f3782c56127ce32fa8afc783fd43dbaeee8cf7f9fa21ce61e24515f3d1fc18bc41e9655030820416184

data/.travis.yml

@@ -4,13 +4,14 @@ language:
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 
 before_install:
   - "sudo apt-get install ca-certificates"
   - "gem update --system"
 
 install:
-  - "bundle install"
+  - "travis_retry bundle install"
 
 before_script:
   - "bundle exec rake db:migrate"

data/Appraisals

@@ -1,7 +1,21 @@
-rails_versions = ['~> 3.2.15', '~> 4.0.0']
+# These are the various versions of rails we want to test against.
+# The non-rails gems (jbuilder, sdoc, etc) are dependencies introduced
+# in the default rails gemfiles used in the clearance features.
+appraise 'rails3.2' do
+  gem 'jbuilder', '~> 1.2'
+  gem 'rails', '~> 3.2.17'
+  gem 'sdoc'
+end
+
+appraise 'rails4.0' do
+  gem 'jbuilder', '~> 1.2'
+  gem 'rails', '~> 4.0.3'
+  gem 'sdoc'
+end
 
-rails_versions.each do |rails_version|
-  appraise "rails#{rails_version.slice(/\d+\.\d+/)}" do
-    gem 'rails', rails_version
-  end
+appraise 'rails4.1' do
+  gem 'jbuilder', '~> 2.0'
+  gem 'rails', '~> 4.1.0.rc1'
+  gem 'sdoc'
+  gem 'spring'
 end

data/Gemfile

@@ -10,9 +10,7 @@ gem 'capybara', '~> 2.0.3'
 gem 'cucumber-rails', '~> 1.3', require: false
 gem 'database_cleaner', '~> 1.0'
 gem 'factory_girl_rails', '~> 4.2'
-gem 'jbuilder', '~> 1.2'
 gem 'rspec-rails', '~> 2.13'
-gem 'sdoc'
 gem 'shoulda-matchers', '~> 2.4'
 gem 'sqlite3', '~> 1.3'
 gem 'timecop', '~> 0.6'

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    clearance (1.1.0)
-      bcrypt-ruby
+    clearance (1.2.0)
+      bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -37,12 +37,12 @@ GEM
       bundler
       rake
     arel (4.0.1)
-    aruba (0.5.3)
+    aruba (0.5.4)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     atomic (1.1.14)
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.6)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
     builder (3.1.4)
@@ -53,93 +53,86 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    childprocess (0.3.9)
+    childprocess (0.4.0)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.5)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12.0)
-      multi_json (~> 1.7.5)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.0.2)
-    cucumber-rails (1.3.0)
+    cucumber-rails (1.4.0)
       capybara (>= 1.1.2)
-      cucumber (>= 1.1.8)
+      cucumber (>= 1.2.0)
       nokogiri (>= 1.5.0)
-    database_cleaner (1.0.1)
-    diff-lcs (1.2.4)
+      rails (>= 3.0.0)
+    database_cleaner (1.2.0)
+    diff-lcs (1.2.5)
     email_validator (1.4.0)
       activemodel
     erubis (2.7.0)
-    factory_girl (4.2.0)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.3.0)
+      factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    ffi (1.9.0)
-    gherkin (2.12.0)
+    ffi (1.9.3)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
     hike (1.2.3)
-    i18n (0.6.5)
-    jbuilder (1.5.0)
-      activesupport (>= 3.0.0)
-      multi_json (>= 1.2.0)
-    json (1.8.0)
+    i18n (0.6.9)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    mini_portile (0.5.1)
+    metaclass (0.0.2)
+    mime-types (1.25.1)
+    mini_portile (0.5.2)
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
-    multi_test (0.0.2)
-    nokogiri (1.6.0)
+    multi_json (1.8.4)
+    multi_test (0.0.3)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    polyglot (0.3.3)
+    polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
+      railties (= 4.0.2)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rake (10.1.1)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.2)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.4)
+    rspec-rails (2.14.1)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rubyzip (0.9.9)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-    selenium-webdriver (2.33.0)
+    rubyzip (1.1.0)
+    selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
-    shoulda-matchers (2.4.0)
+    shoulda-matchers (2.5.0)
       activesupport (>= 3.0.0)
-    sprockets (2.10.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -148,12 +141,12 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     thor (0.18.1)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    timecop (0.6.2.2)
+    timecop (0.7.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -175,9 +168,7 @@ DEPENDENCIES
   cucumber-rails (~> 1.3)
   database_cleaner (~> 1.0)
   factory_girl_rails (~> 4.2)
-  jbuilder (~> 1.2)
   rspec-rails (~> 2.13)
-  sdoc
   shoulda-matchers (~> 2.4)
   sqlite3 (~> 1.3)
   timecop (~> 0.6)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2013 thoughtbot, inc.
+Copyright (c) 2009-2014 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,16 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.2.0 (February 28, 2014):
+* Support for Rails 4.1.0.rc1
+* `clearance/testing` is now deprecated. Require `clearance/rspec` or
+  `clearance/test_unit` as appropriate.
+* Sign in failure message is now customized exclusively via I18n.
+  `SessionsController#flash_failure_after_create` is no longer called. To
+  customize the message, change the
+  `clearance.controllers.sessions.bad_email_or_password` or
+  `flashes.failure_after_create` key.
+* Sign in can now be disabled with `config.allow_sign_in = false`
+
 New for 1.1.0 (November 21, 2013):
 
 * Validate email with `EmailValidator` [strict mode][strict].

data/README.md

@@ -29,7 +29,7 @@ gem 'clearance'
 
 Bundle:
 
-    bundle --binstubs
+    bundle install
 
 Make sure the development database exists. Then, run the generator:
 
@@ -57,6 +57,7 @@ Override any of these defaults in `config/initializers/clearance.rb`:
 
 ```ruby
 Clearance.configure do |config|
+  config.allow_sign_up = true
   config.cookie_domain = '.example.com'
   config.cookie_expiration = lambda { |cookies| 1.year.from_now.utc }
   config.cookie_path = '/'
@@ -116,15 +117,15 @@ Or, you can authorize users in `config/routes.rb`:
 ```ruby
 Blog::Application.routes.draw do
   constraints Clearance::Constraints::SignedIn.new { |user| user.admin? } do
-    root to: 'admin'
+    root to: 'admin/dashboards#show', as: :admin_root
   end
 
   constraints Clearance::Constraints::SignedIn.new do
-    root to: 'dashboard'
+    root to: 'dashboards#show', as: :signed_in_root
   end
 
   constraints Clearance::Constraints::SignedOut.new do
-    root to: 'marketing'
+    root to: 'marketing#index'
   end
 end
 ```
@@ -198,7 +199,6 @@ Or, override private methods:
     passwords#forbid_non_existent_user
     passwords#url_after_create
     passwords#url_after_update
-    sessions#flash_failure_after_create
     sessions#url_after_create
     sessions#url_after_destroy
     users#flash_failure_after_create
@@ -444,11 +444,18 @@ Testing authorized controller actions
 -------------------------------------
 
 To test controller actions that are protected by `before_filter :authorize`,
-include Clearance's test helpers and matchers in `spec/support/clearance.rb` or
-`test/test_helper.rb`:
+require Clearance's test helpers and matchers in your test suite.
+
+For `rspec`, add this line to your `spec/spec_helper.rb`:
+
+```ruby
+require 'clearance/rspec'
+```
+
+For `test-unit`, add this line to your `test/test_helper.rb`:
 
 ```ruby
-require 'clearance/testing'
+require 'clearance/test_unit'
 ```
 
 This will make `Clearance::Controller` methods work in your controllers
@@ -522,12 +529,13 @@ Credits
 ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
 Clearance is maintained by [thoughtbot, inc](http://thoughtbot.com/community)
-and [contributors](/thoughtbot/clearance/graphs/contributors) like you. Thank you!
+and [contributors](https://github.com/thoughtbot/clearance/contributors) like
+you. Thank you!
 
 License
 -------
 
-Clearance is copyright © 2009-2013 thoughtbot. It is free software, and may be
+Clearance is copyright © 2009-2014 thoughtbot. It is free software, and may be
 redistributed under the terms specified in the `LICENSE` file.
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/app/controllers/clearance/passwords_controller.rb

@@ -50,8 +50,10 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def find_user_by_id_and_confirmation_token
+    user_param = Clearance.configuration.user_id_parameter
+
     Clearance.configuration.user_model.
-      find_by_id_and_confirmation_token params[:user_id], params[:token].to_s
+      find_by_id_and_confirmation_token params[user_param], params[:token].to_s
   end
 
   def find_user_for_create

data/app/controllers/clearance/sessions_controller.rb

@@ -26,12 +26,6 @@ class Clearance::SessionsController < ApplicationController
 
   private
 
-  def flash_failure_after_create
-    flash.now[:notice] = translate(:bad_email_or_password,
-      :scope => [:clearance, :controllers, :sessions],
-      :default => t('flashes.failure_after_create', :sign_up_path => sign_up_path).html_safe)
-  end
-
   def url_after_create
     Clearance.configuration.redirect_url
   end

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

@@ -14,7 +14,9 @@
   </div>
 
   <div class='other-links'>
-    <%= link_to t('.sign_up'), sign_up_path %>
+    <% if Clearance.configuration.allow_sign_up? %>
+      <%= link_to t('.sign_up'), sign_up_path %>
+    <% end %>
     <%= link_to t('.forgot_password'), new_password_path %>
   </div>
 <% end %>

data/clearance.gemspec

@@ -3,7 +3,7 @@ require 'clearance/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.add_dependency 'bcrypt-ruby'
+  s.add_dependency 'bcrypt'
   s.add_dependency 'email_validator', '~> 1.4'
   s.add_dependency 'rails', '>= 3.1'
   s.authors = [

data/config/locales/clearance.en.yml

@@ -1,75 +1,53 @@
+---
 en:
   clearance_mailer:
     change_password:
-      opening:
-        'Someone, hopefully you, requested we send you a link to change your
-         password:'
-      closing:
-        "If you didn't request this, ignore this email. Your password has not
-         been changed."
+      closing: If you didn't request this, ignore this email. Your password
+        has not been changed.
+      opening: 'Someone, hopefully you, requested we send you a link to change
+        your password:'
   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>.'
+    failure_after_create: Bad email or password.
+    failure_after_update: Password can't be blank.
+    failure_when_forbidden: Please double check the URL or try submitting
+      the form again.
   helpers:
+    label:
+      password:
+        email: Email address
+      password_reset:
+        password: Choose password
     submit:
       password:
-        submit:
-          'Reset password'
+        submit: Reset password
       password_reset:
-        submit:
-          'Save this password'
+        submit: Save this password
       session:
-        submit:
-          'Sign in'
+        submit: Sign in
       user:
-        create:
-          'Sign up'
-    label:
-      password:
-        email:
-          'Email address'
-      password_reset:
-        password:
-          'Choose password'
+        create: Sign up
   layouts:
     application:
-      sign_in:
-        'Sign in'
-      sign_out:
-        'Sign out'
+      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.'
+      description: You will receive an email within the next few minutes. It
+        contains instructions for changing your password.
     edit:
-      description:
-        'Your password has been reset. Choose a new password below.'
-      title:
-        'Change your password'
+      description: Your password has been reset. Choose a new password below.
+      title: Change your password
     new:
-      description:
-        'To be emailed a link to reset your password, please enter your email
-         address.'
-      title:
-        'Reset your password'
+      description: To be emailed a link to reset your password, please enter
+        your email address.
+      title: Reset your password
   sessions:
     form:
-      forgot_password:
-        'Forgot password?'
-      sign_up:
-        'Sign up'
+      forgot_password: Forgot password?
+      sign_up: Sign up
     new:
-      title:
-        'Sign in'
+      title: Sign in
   users:
     new:
-      title:
-        'Sign up'
-      sign_in:
-        'Sign in'
+      sign_in: Sign in
+      title: Sign up

data/config/routes.rb

@@ -1,21 +1,24 @@
 Rails.application.routes.draw do
   resources :passwords,
-    :controller => 'clearance/passwords',
-    :only => [:create, :new]
+    controller: 'clearance/passwords',
+    only: [:create, :new]
 
   resource :session,
-    :controller => 'clearance/sessions',
-    :only => [:create]
+    controller: 'clearance/sessions',
+    only: [:create]
 
   resources :users,
-    :controller => 'clearance/users',
-    :only => [:create] do
+    controller: 'clearance/users',
+    only: Clearance.configuration.user_actions do
       resource :password,
-        :controller => 'clearance/passwords',
-        :only => [:create, :edit, :update]
+        controller: 'clearance/passwords',
+        only: [:create, :edit, :update]
     end
 
-  get '/sign_in' => 'clearance/sessions#new', :as => 'sign_in'
-  delete '/sign_out' => 'clearance/sessions#destroy', :as => 'sign_out'
-  get '/sign_up' => 'clearance/users#new', :as => 'sign_up'
+  get '/sign_in' => 'clearance/sessions#new', as: 'sign_in'
+  delete '/sign_out' => 'clearance/sessions#destroy', as: 'sign_out'
+
+  if Clearance.configuration.allow_sign_up?
+    get '/sign_up' => 'clearance/users#new', as: 'sign_up'
+  end
 end

data/features/integration_with_test_unit.feature

@@ -13,4 +13,4 @@ Feature: integrate with test-unit
     And I successfully run `bundle exec rails generate controller posts index`
     And I configure test-unit
     And I successfully run `bundle exec rake`
-    Then the output should match /1 tests.+1 assertions/
+    Then the output should match /1 (tests|runs).+1 assertions/

data/features/step_definitions/configuration_steps.rb

@@ -68,7 +68,7 @@ When /^I configure test-unit$/ do
   steps %Q{
     When I append to "test/test_helper.rb" with:
     """
-    require 'clearance/testing'
+    require 'clearance/test_unit'
     """
     And I overwrite "test/#{controller_test_dir}/posts_controller_test.rb" with:
     """

data/lib/clearance/authentication.rb

@@ -25,8 +25,8 @@ module Clearance
     end
 
     def current_user=(user)
-      warn 'DEPRECATION WARNING: Assigning the current_user this way has been' +
-      ' deprecated. You should instead use the sign_in method.'
+      warn "#{Kernel.caller.first}: [DEPRECATION] " +
+        'Assigning the current_user has been deprecated. Use the sign_in method instead.'
       clearance_session.sign_in user
     end
 

data/lib/clearance/configuration.rb

@@ -1,5 +1,7 @@
 module Clearance
   class Configuration
+    attr_writer :allow_sign_up
+
     attr_accessor \
       :cookie_domain,
       :cookie_expiration,
@@ -13,6 +15,7 @@ module Clearance
       :user_model
 
     def initialize
+      @allow_sign_up = true
       @cookie_expiration = ->(cookies) { 1.year.from_now.utc }
       @cookie_path = '/'
       @httponly = false
@@ -25,14 +28,33 @@ module Clearance
     def user_model
       @user_model || ::User
     end
+
+    def allow_sign_up?
+      @allow_sign_up
+    end
+
+    def  user_actions
+      if allow_sign_up?
+        [:create]
+      else
+        []
+      end
+    end
+
+    def user_id_parameter
+      "#{user_model.model_name.singular}_id".to_sym
+    end
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
   end
 
-  class << self
-    attr_accessor :configuration
+  def self.configuration=(config)
+    @configuration = config
   end
 
   def self.configure
-    self.configuration ||= Configuration.new
     yield configuration
   end
 end

data/lib/clearance/default_sign_in_guard.rb

@@ -9,11 +9,11 @@ module Clearance
     end
 
     def default_failure_message
-      I18n.t("flashes.failure_after_create", :sign_up_path => sign_up_path)
-    end
-
-    def sign_up_path
-      Rails.application.routes.url_helpers.sign_up_path
+      I18n.t(
+        :bad_email_or_password,
+        scope: [:clearance, :controllers, :sessions],
+        default: I18n.t('flashes.failure_after_create').html_safe
+      )
     end
   end
 end

data/lib/clearance/rspec.rb

@@ -0,0 +1,8 @@
+require 'rspec/rails'
+require 'clearance/testing/deny_access_matcher'
+require 'clearance/testing/helpers'
+
+RSpec.configure do |config|
+  config.include Clearance::Testing::Matchers, type: :controller
+  config.include Clearance::Testing::Helpers, type: :controller
+end

data/lib/clearance/session.rb

@@ -66,10 +66,10 @@ module Clearance
       if expires_configuration.arity == 1
         expires_configuration.call(cookies)
       else
-        warn 'DEPRECATION WARNING: Clearance.configuration.cookie_expiration' +
-          'lambda with no parameters has been deprecated and will be removed' +
-          ' from a future release. The lambda should accept the collection' +
-          ' of previously set cookies.'
+        warn "#{Kernel.caller.first}: [DEPRECATION] " +
+          'Clearance.configuration.cookie_expiration lambda with no parameters ' +
+          'has been deprecated and will be removed from a future release. The ' +
+          'lambda should accept the collection of previously set cookies.'
         expires_configuration.call
       end
     end

data/lib/clearance/sign_in_guard.rb

@@ -19,10 +19,9 @@ module Clearance
       stack.call
     end
 
-
     private
-    attr_reader :stack, :session
 
+    attr_reader :stack, :session
 
     def signed_in?
       session.signed_in?
@@ -31,6 +30,5 @@ module Clearance
     def current_user
       session.current_user
     end
-
   end
 end

data/lib/clearance/test_unit.rb

@@ -0,0 +1,8 @@
+require 'clearance/testing/deny_access_matcher'
+require 'clearance/testing/helpers'
+
+ActionController::TestCase.extend Clearance::Testing::Matchers
+
+class ActionController::TestCase
+  include Clearance::Testing::Helpers
+end

data/lib/clearance/testing.rb

@@ -1,18 +1,11 @@
-require 'clearance/testing/assertion_error'
-require 'clearance/testing/deny_access_matcher'
-require 'clearance/testing/helpers'
-
-if defined?(ActionController::TestCase)
-  ActionController::TestCase.extend Clearance::Testing::Matchers
-
-  class ActionController::TestCase
-    include Clearance::Testing::Helpers
-  end
+if defined?(RSpec)
+  require 'clearance/rspec'
+elsif defined?(ActionController::TestCase)
+  require 'clearance/test_unit'
 end
 
-if defined?(RSpec) && RSpec.respond_to?(:configure)
-  RSpec.configure do |config|
-    config.include Clearance::Testing::Matchers
-    config.include Clearance::Testing::Helpers, :type => :controller
-  end
-end
+warn(
+  "#{Kernel.caller.first} [DEPRECATION] Requiring `clearance/testing` in " +
+  '`spec/spec_helper.rb` (or in `test/test_helper.rb`) is deprecated. ' +
+  'Require `clearance/rspec` or `clearance/test_unit` instead.'
+)

data/lib/clearance/testing/application.rb

@@ -8,6 +8,8 @@ module Clearance
       Rails::VERSION::MAJOR == 4
     end
 
+    I18n.enforce_available_locales = true
+
     class Application < Rails::Application
       config.action_controller.allow_forgery_protection = false
       config.action_controller.perform_caching = false

data/lib/clearance/testing/deny_access_matcher.rb

@@ -1,3 +1,5 @@
+require 'clearance/testing/assertion_error'
+
 module Clearance
   module Testing
     module Matchers

data/lib/clearance/testing/helpers.rb

@@ -7,11 +7,19 @@ module Clearance
       end
 
       def sign_in
-        sign_in_as FactoryGirl.create(:user)
+        unless defined?(FactoryGirl)
+          raise(
+            RuntimeError,
+            "Clearance's `sign_in` helper requires factory_girl"
+          )
+        end
+
+        factory = Clearance.configuration.user_model.to_s.underscore.to_sym
+        sign_in_as FactoryGirl.create(factory)
       end
 
       def sign_in_as(user)
-        @controller.current_user = user
+        @controller.sign_in user
       end
 
       def sign_out

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/generators/clearance/install/install_generator.rb

@@ -35,7 +35,7 @@ module Clearance
         if users_table_exists?
           create_add_columns_migration
         else
-          create_migration 'create_users.rb'
+          copy_migration 'create_users.rb'
         end
       end
 
@@ -52,11 +52,11 @@ module Clearance
             :new_indexes => new_indexes
           }
 
-          create_migration('add_clearance_to_users.rb', config)
+          copy_migration('add_clearance_to_users.rb', config)
         end
       end
 
-      def create_migration(migration_name, config = {})
+      def copy_migration(migration_name, config = {})
         unless migration_exists?(migration_name)
           migration_template(
             "db/migrate/#{migration_name}",

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

@@ -1 +1 @@
-require 'clearance/testing'
+require 'clearance/rspec'

data/spec/clearance/default_sign_in_guard_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Clearance::DefaultSignInGuard do
+  context 'session is signed in' do
+    it 'returns success' do
+      session = stub('Session', signed_in?: true)
+      guard = Clearance::DefaultSignInGuard.new(session)
+
+      expect(guard.call).to be_a Clearance::SuccessStatus
+    end
+  end
+
+  context 'session is not signed in' do
+    it 'returns failure' do
+      session = stub('Session', signed_in?: false)
+      guard = Clearance::DefaultSignInGuard.new(session)
+
+      response = guard.call
+
+      expect(response).to be_a Clearance::FailureStatus
+      expect(response.failure_message).to eq default_failure_message
+    end
+  end
+
+  def default_failure_message
+    I18n.t('flashes.failure_after_create').html_safe
+  end
+end

data/spec/clearance/testing/helpers_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Clearance::Testing::Helpers do
+  class TestClass
+    include Clearance::Testing::Helpers
+
+    def initialize
+      @controller = Controller.new
+    end
+
+    class Controller
+      def sign_in(user); end
+    end
+  end
+
+  describe '#sign_in' do
+    it 'creates an instance of the clearance user model with FactoryGirl' do
+      MyUserModel = Class.new
+      FactoryGirl.stubs(:create)
+      Clearance.configuration.stubs(user_model: MyUserModel)
+
+      TestClass.new.sign_in
+
+      expect(FactoryGirl).to have_received(:create).with(:my_user_model)
+    end
+  end
+end

data/spec/configuration_spec.rb

@@ -112,4 +112,43 @@ describe Clearance::Configuration do
       expect(Clearance.configuration.cookie_path).to eq path
     end
   end
+
+  describe '#sign_up?' do
+    context 'when allow_sign_up is configured to false' do
+      it 'returns false' do
+        Clearance.configure { |config| config.allow_sign_up = false }
+        Clearance.configuration.allow_sign_up?.should be_false
+      end
+    end
+
+    context 'when allow_sign_up has not been configured' do
+      it 'returns true' do
+        Clearance.configuration.allow_sign_up?.should be_true
+      end
+    end
+  end
+
+  describe '#user_actions' do
+    context 'when allow_sign_up is configured to false' do
+      it 'returns empty array' do
+        Clearance.configure { |config| config.allow_sign_up = false }
+        Clearance.configuration.user_actions.should eq []
+      end
+    end
+
+    context 'when sign_up has not been configured' do
+      it 'returns create' do
+        Clearance.configuration.user_actions.should eq [:create]
+      end
+    end
+  end
+
+  describe '#user_id_parameter' do
+    it 'returns the parameter key to use based on the user_model' do
+      CustomUser = Class.new(ActiveRecord::Base)
+      Clearance.configure { |config| config.user_model = CustomUser }
+
+      Clearance.configuration.user_id_parameter.should eq :custom_user_id
+    end
+  end
 end

data/spec/routing/clearance_routes_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe 'routes for Clearance' do
+  context 'signup disabled' do
+    before(:all) do
+      Clearance.configure do |config|
+        config.allow_sign_up = false
+      end
+
+      Rails.application.reload_routes!
+    end
+
+    after :all do
+      Clearance.configuration = Clearance::Configuration.new
+      Rails.application.reload_routes!
+    end
+
+    it 'does not route sign_up' do
+      expect(get: 'sign_up').not_to be_routable
+    end
+
+    it 'does not route to users#create' do
+      expect(post: 'users').not_to be_routable
+    end
+
+    it 'does not route to users#new' do
+      expect(get: 'users/new').not_to be_routable
+    end
+  end
+
+  context 'signup enabled' do
+    it 'does route sign_up' do
+      expect(get: 'sign_up').to be_routable
+    end
+
+    it 'does route to users#create' do
+      expect(post: 'users').to be_routable
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'rspec/rails'
 require 'bourne'
 require 'factory_girl_rails'
 require 'shoulda-matchers'
-require 'clearance/testing'
+require 'clearance/rspec'
 require 'timecop'
 
 Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,48 +25,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: email_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Rails authentication & authorization with email & password.
@@ -77,9 +77,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
@@ -131,9 +131,11 @@ files:
 - lib/clearance/password_strategies/blowfish.rb
 - lib/clearance/password_strategies/sha1.rb
 - lib/clearance/rack_session.rb
+- lib/clearance/rspec.rb
 - lib/clearance/session.rb
 - lib/clearance/session_status.rb
 - lib/clearance/sign_in_guard.rb
+- lib/clearance/test_unit.rb
 - lib/clearance/testing.rb
 - lib/clearance/testing/app/controllers/application_controller.rb
 - lib/clearance/testing/application.rb
@@ -168,9 +170,11 @@ files:
 - spec/clearance/back_door_spec.rb
 - spec/clearance/constraints/signed_in_spec.rb
 - spec/clearance/constraints/signed_out_spec.rb
+- spec/clearance/default_sign_in_guard_spec.rb
 - spec/clearance/rack_session_spec.rb
 - spec/clearance/session_spec.rb
 - spec/clearance/sign_in_guard_spec.rb
+- spec/clearance/testing/helpers_spec.rb
 - spec/configuration_spec.rb
 - spec/controllers/apis_controller_spec.rb
 - spec/controllers/flashes_controller_spec.rb
@@ -187,6 +191,7 @@ files:
 - spec/models/password_strategies_spec.rb
 - spec/models/sha1_spec.rb
 - spec/models/user_spec.rb
+- spec/routing/clearance_routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/clearance.rb
 - spec/support/cookies.rb
@@ -198,22 +203,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Rails authentication & authorization with email & password.
@@ -228,9 +233,11 @@ test_files:
 - spec/clearance/back_door_spec.rb
 - spec/clearance/constraints/signed_in_spec.rb
 - spec/clearance/constraints/signed_out_spec.rb
+- spec/clearance/default_sign_in_guard_spec.rb
 - spec/clearance/rack_session_spec.rb
 - spec/clearance/session_spec.rb
 - spec/clearance/sign_in_guard_spec.rb
+- spec/clearance/testing/helpers_spec.rb
 - spec/configuration_spec.rb
 - spec/controllers/apis_controller_spec.rb
 - spec/controllers/flashes_controller_spec.rb
@@ -247,6 +254,7 @@ test_files:
 - spec/models/password_strategies_spec.rb
 - spec/models/sha1_spec.rb
 - spec/models/user_spec.rb
+- spec/routing/clearance_routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/clearance.rb
 - spec/support/cookies.rb