clearance 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17291a4d13d462f49a5fc69684b8709714749aa
-  data.tar.gz: 30d2cbfaf5855833fa24c7c33b1d51bf50e7db25
+  metadata.gz: 6a5021a3a8f7df39932a7292ca2fe1c4156208c3
+  data.tar.gz: 9b3370145ee988d6d3454caf60b40726b41aa891
 SHA512:
-  metadata.gz: ee5ec1d2dd6d3790e53379b09da0b00654268ec650dc1b4fca1b7776c647d9ca34ddd0940d6fe0e4657619e1cc67d8546066bc31744c3d342954ed6a3a573cfb
-  data.tar.gz: 46ee3ac5bf3104289785a31bd935133d46325ef5da7c3827477fcd2fcc294569cbd992b58ba92765f7acf265ee5e90bec66f6908e06ac9b990bcaf67f858e46e
+  metadata.gz: 652f59e34e1b09d920c078c61bf3ebdecf6bb7d076b76b2af8318feb5661696e820bb4b6cf0a79958b05ec13295ea935a417de4eddb8a9d3c2bbf624fd832df3
+  data.tar.gz: 07178616436a36b4572dc24501aba0b75361cf080847d5f2382459fa1bc5d917a14f003e53843febe6061f93f8f8d9dd9968249637c2f986ca5cd5bb3d176208

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.10.1)
+    clearance (1.11.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -9,36 +9,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -48,11 +48,11 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-rails (>= 2.2)
-    appraisal (1.0.2)
+    appraisal (1.0.3)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.0)
+    arel (6.0.3)
     bcrypt (3.1.10)
     builder (3.2.2)
     capybara (2.4.4)
@@ -62,7 +62,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     coderay (1.1.0)
-    database_cleaner (1.3.0)
+    database_cleaner (1.4.1)
     diff-lcs (1.2.5)
     email_validator (1.6.0)
       activemodel
@@ -72,18 +72,18 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.2)
+    json (1.8.3)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.5)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pry (0.10.1)
@@ -93,16 +93,16 @@ GEM
     rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -112,42 +112,42 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-core (3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.0)
-      actionpack (>= 3.0, <= 4.2)
-      activesupport (>= 3.0, <= 4.2)
-      railties (>= 3.0, <= 4.2)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.0)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     slop (3.6.0)
-    sprockets (3.1.0)
+    sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.5)
-    timecop (0.7.1)
+    timecop (0.7.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     xpath (2.0.0)
@@ -169,3 +169,6 @@ DEPENDENCIES
   shoulda-matchers (~> 2.8)
   sqlite3 (~> 1.3)
   timecop (~> 0.6)
+
+BUNDLED WITH
+   1.10.5

data/NEWS.md

@@ -1,7 +1,29 @@
 # News
 
 The noteworthy changes for each Clearance version are included here. For a
-complete changelog, see the git history.
+complete changelog, see the git history for each version via the version links.
+
+## [1.11.0] - August 21, 2015
+
+### Added
+- Add `sign_in` and `sign_in_as` helper methods to view specs. These helpers
+  avoid errors from verified partial doubles that come from. See
+  [462c009].
+
+### Fixed
+- `clearance:routes` generator now properly disables internal routes in your
+  Clearance initializer.
+- Clearance now accesses the cookie jar via ActionDispatch::Request rather than
+  `Rack::Request`. This is more consistent with what Rails does internally.
+
+### Deprecated
+- `Clearance::Testing::Helpers` has been deprecated in favor of
+  `Clearance::Testing::ControllerHelpers`. Most users are accessing these
+  helpers by requiring `clearance/rspec` or `clearance/test_unit` and should be
+  unaffected.
+
+[462c009]: https://github.com/thoughtbot/clearance/commit/462c00965c14b2492500fbb4fecd7b84b9790bb9
+[1.11.0]: https://github.com/thoughtbot/clearance/compare/v1.10.1...v1.11.0
 
 ## [1.10.1] - May 15, 2015
 

data/README.md

@@ -165,7 +165,9 @@ class UsersController < Clearance::UsersController
 ```
 
 ### Redirects
-All of these controller methods redirect to `'/'` by default:
+
+All of these controller methods redirect to
+`Clearance.configuration.redirect_url` (which is `/` by default):
 
 ```
 passwords#url_after_update
@@ -173,10 +175,13 @@ sessions#url_after_create
 sessions#url_for_signed_in_users
 users#url_after_create
 application#url_after_denied_access_when_signed_in
-application#url_after_denied_access_when_signed_out
 ```
 
 To override them all at once, change the global configuration of `redirect_url`.
+To change individual URLs, override the appropriate method.
+
+`application#url_after_denied_access_when_signed_out` defaults to `sign_in_url`.
+Override this method to change this.
 
 ### Views
 
@@ -363,6 +368,23 @@ sign_in_as(user)
 sign_out
 ```
 
+### View and Helper Spec Helpers
+
+Does the view or helper you're testing reference `signed_in?`, `signed_out?` or
+`current_user`? If you `require 'clearance/rspec'`, you will have the following
+helpers available in your view specs:
+
+```ruby
+sign_in
+sign_in_as(user)
+```
+
+These will make the clearance view helpers work as expected by signing in either
+a new instance of your user model (`sign_in`) or the object you pass to
+`sign_in_as`. If you do not call one of these sign in helpers or otherwise set
+`current_user` in your view specs, your view will behave as if there is no
+current user: `signed_in?` will be false and `signed_out?` will be true.
+
 ## Contributing
 
 Please see [CONTRIBUTING.md].
@@ -371,12 +393,6 @@ Thank you, [contributors]!
 [CONTRIBUTING.md]: /CONTRIBUTING.md
 [contributors]: https://github.com/thoughtbot/clearance/graphs/contributors
 
-## Need Help?
-
-We offer 1-on-1 coaching. We can help you set up Clearance, write authentication
-and authorization extensions for your application, and work out a permission and
-role model which works for you. [Get in touch][coaching].
-
 ## License
 
 Clearance is copyright © 2009 thoughtbot. It is free software, and may be
@@ -392,10 +408,8 @@ Clearance is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
 We love open source software!
-See [our other projects][community],
-[hire us][hire] to design, develop, and grow your product,
-or get in touch about [1-on-1 coaching][coaching].
+See [our other projects][community] or
+[hire us][hire] to design, develop, and grow your product.
 
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com/hire-us?utm_source=github
-[coaching]: http://coaching.thoughtbot.com/rails/?utm_source=github

data/app/controllers/clearance/passwords_controller.rb

@@ -3,8 +3,7 @@ require 'active_support/deprecation'
 class Clearance::PasswordsController < Clearance::BaseController
   skip_before_filter :require_login, only: [:create, :edit, :new, :update]
   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]
+  before_filter :ensure_existing_user, only: [:edit, :update]
 
   def create
     if user = find_user_for_create
@@ -76,6 +75,13 @@ class Clearance::PasswordsController < Clearance::BaseController
     find_user_by_id_and_confirmation_token
   end
 
+  def ensure_existing_user
+    unless find_user_by_id_and_confirmation_token
+      flash_failure_when_forbidden
+      render template: "passwords/new"
+    end
+  end
+
   def flash_failure_when_forbidden
     flash.now[:notice] = translate(:forbidden,
       scope: [:clearance, :controllers, :passwords],
@@ -88,20 +94,6 @@ class Clearance::PasswordsController < Clearance::BaseController
       default: t('flashes.failure_after_update'))
   end
 
-  def forbid_missing_token
-    if params[:token].to_s.blank?
-      flash_failure_when_forbidden
-      render template: 'passwords/new'
-    end
-  end
-
-  def forbid_non_existent_user
-    unless find_user_by_id_and_confirmation_token
-      flash_failure_when_forbidden
-      render template: 'passwords/new'
-    end
-  end
-
   def url_after_create
     sign_in_url
   end

data/lib/clearance/configuration.rb

@@ -48,8 +48,8 @@ module Clearance
     attr_accessor :mailer_sender
 
     # The password strategy to use when authenticating and setting passwords.
-    # Defaults to `Clearance::PasswordStrategies::BCrypt`.
-    # @return [Class #authenticated? #password=]
+    # Defaults to {Clearance::PasswordStrategies::BCrypt}.
+    # @return [Module #authenticated? #password=]
     attr_accessor :password_strategy
 
     # The default path Clearance will redirect signed in users to.

data/lib/clearance/constraints/signed_in.rb

@@ -1,5 +1,22 @@
 module Clearance
   module Constraints
+    # Can be applied to make a set of routes visible only to users that are
+    # signed in.
+    #
+    #     # config/routes.rb
+    #     constraints Clearance::Constraints::SignedIn.new do
+    #       resources :posts
+    #     end
+    #
+    # In the example above, requests to `/posts` from users that are not signed
+    # in will result in a 404. You can make additional assertions about the user
+    # by passing a block. For instance, if you want to require that the
+    # signed-in user be an admin:
+    #
+    #     # config/routes.rb
+    #     constraints Clearance::Constraints::SignedIn.new { |user| user.admin? } do
+    #       resources :posts
+    #     end
     class SignedIn
       def initialize(&block)
         @block = block || lambda { |user| true }

data/lib/clearance/constraints/signed_out.rb

@@ -1,5 +1,15 @@
 module Clearance
   module Constraints
+    # Can be applied to make a set of routes visible only to users that are
+    # signed out.
+    #
+    #     # config/routes.rb
+    #     constraints Clearance::Constraints::SignedOut.new do
+    #       resources :registrations, only: [:new, :create]
+    #     end
+    #
+    # In the example above, requests to `/registrations/new` from users that are
+    # signed in will result in a 404.
     class SignedOut
       def matches?(request)
         @request = request

data/lib/clearance/password_strategies.rb

@@ -1,4 +1,17 @@
 module Clearance
+  # Control how users are authenticated and how passwords are stored.
+  #
+  # The default password strategy is {Clearance::PasswordStrategies::BCrypt},
+  # but this can be overridden in {Clearance::Configuration}.
+  #
+  # You can supply your own password strategy by implementing a module that
+  # responds to the proper interface methods. Once this module is configured as
+  # your password strategy, Clearance will mix it into your Clearance User
+  # class. Thus, your module can access any methods or attributes on User.
+  #
+  # Password strategies need to respond to `authenticated?(password)` and
+  # `password=(new_password)`. For an example of how to implement these methods,
+  # see {Clearance::PasswordStrategies::BCrypt}.
   module PasswordStrategies
     autoload :BCrypt, 'clearance/password_strategies/bcrypt'
     autoload :BCryptMigrationFromSHA1,

data/lib/clearance/password_strategies/bcrypt.rb

@@ -1,5 +1,11 @@
 module Clearance
   module PasswordStrategies
+    # Uses BCrypt to authenticate users and store encrypted passwords.
+    #
+    # The BCrypt cost (the measure of how many key expansion iterations BCrypt
+    # will perform) is automatically set to the minimum allowed value when
+    # Rails is operating in the test environment and the default cost in all
+    # other envionments. This provides a speed boost in tests.
     module BCrypt
       require 'bcrypt'
 

data/lib/clearance/password_strategies/bcrypt_migration_from_sha1.rb

@@ -1,5 +1,6 @@
 module Clearance
   module PasswordStrategies
+    # @deprecated Use {BCrypt} or `clearance-deprecated_password_strategies` gem
     module BCryptMigrationFromSHA1
       DEPRECATION_MESSAGE = "[DEPRECATION] The BCryptMigrationFromSha1 " \
         "password strategy has been deprecated and will be removed from " \

data/lib/clearance/password_strategies/blowfish.rb

@@ -3,6 +3,7 @@ require 'base64'
 
 module Clearance
   module PasswordStrategies
+    # @deprecated Use {BCrypt} or `clearance-deprecated_password_strategies` gem
     module Blowfish
       DEPRECATION_MESSAGE = "[DEPRECATION] The Blowfish password strategy " \
         "has been deprecated and will be removed from Clearance 2.0. BCrypt " \

data/lib/clearance/password_strategies/sha1.rb

@@ -1,5 +1,6 @@
 module Clearance
   module PasswordStrategies
+    # @deprecated Use {BCrypt} or `clearance-deprecated_password_strategies` gem
     module SHA1
       require 'digest/sha1'
 

data/lib/clearance/rspec.rb

@@ -1,8 +1,19 @@
-require 'rspec/rails'
-require 'clearance/testing/deny_access_matcher'
-require 'clearance/testing/helpers'
+require "rspec/rails"
+require "clearance/testing/deny_access_matcher"
+require "clearance/testing/controller_helpers"
+require "clearance/testing/view_helpers"
 
 RSpec.configure do |config|
   config.include Clearance::Testing::Matchers, type: :controller
-  config.include Clearance::Testing::Helpers, type: :controller
+  config.include Clearance::Testing::ControllerHelpers, type: :controller
+  config.include Clearance::Testing::ViewHelpers, type: :view
+  config.include Clearance::Testing::ViewHelpers, type: :helper
+
+  config.before(:each, type: :view) do
+    view.extend Clearance::Testing::ViewHelpers::CurrentUser
+  end
+
+  config.before(:each, type: :helper) do
+    view.extend Clearance::Testing::ViewHelpers::CurrentUser
+  end
 end

data/lib/clearance/session.rb

@@ -61,7 +61,7 @@ module Clearance
     private
 
     def cookies
-      @cookies ||= @env['action_dispatch.cookies'] || Rack::Request.new(@env).cookies
+      @cookies ||= ActionDispatch::Request.new(@env).cookie_jar
     end
 
     def remember_token

data/lib/clearance/test_unit.rb

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

data/lib/clearance/testing/controller_helpers.rb

@@ -0,0 +1,35 @@
+module Clearance
+  module Testing
+    module ControllerHelpers
+      # @private
+      def setup_controller_request_and_response
+        super
+        @request.env[:clearance] = Clearance::Session.new(@request.env)
+      end
+
+      # Signs in a user that is created using FactoryGirl.
+      # The factory name is derrived from your `user_class` Clearance
+      # configuration.
+      # @raise [RuntimeError] if FactoryGirl is not defined.
+      def sign_in
+        unless defined?(FactoryGirl)
+          raise("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
+
+      # Signs in the provided user.
+      def sign_in_as(user)
+        @controller.sign_in user
+        user
+      end
+
+      # Signs out a user that may be signed in.
+      def sign_out
+        @controller.sign_out
+      end
+    end
+  end
+end

data/lib/clearance/testing/helpers.rb

@@ -1,31 +1,15 @@
+require "clerance/testing/controller_helpers"
+
 module Clearance
   module Testing
+    # @deprecated Use Clearance::Testing::ControllerHelpers
     module Helpers
-      def setup_controller_request_and_response
-        super
-        @request.env[:clearance] = Clearance::Session.new(@request.env)
-      end
-
-      def sign_in
-        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.sign_in user
-        user
-      end
-
-      def sign_out
-        @controller.sign_out
-      end
+      warn(
+        "#{Kernel.caller.first} [DEPRECATION] Clearance::Testing::Helpers is "\
+        "deprecated and has been replaced with " \
+        "Clearance::Testing::ControllerHelpers. Require " \
+        "clearance/testing/controller_helpers instead."
+      )
     end
   end
 end

data/lib/clearance/testing/view_helpers.rb

@@ -0,0 +1,32 @@
+module Clearance
+  module Testing
+    # Provides helpers to your view and helper specs.
+    # Using these helpers makes `current_user`, `signed_in?` and `signed_out?`
+    # behave properly in view and helper specs.
+    module ViewHelpers
+      # Sets current_user on the view under test to a new instance of your user
+      # model.
+      def sign_in
+        view.current_user = Clearance.configuration.user_model.new
+      end
+
+      # Sets current_user on the view under test to the supplied user.
+      def sign_in_as(user)
+        view.current_user = user
+      end
+
+      # @private
+      module CurrentUser
+        attr_accessor :current_user
+
+        def signed_in?
+          current_user.present?
+        end
+
+        def signed_out?
+          !signed_in?
+        end
+      end
+    end
+  end
+end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "1.10.1"
+  VERSION = "1.11.0"
 end

data/lib/generators/clearance/install/templates/db/migrate/add_clearance_to_users.rb

@@ -1,6 +1,6 @@
 class AddClearanceToUsers < ActiveRecord::Migration
   def self.up
-    change_table :users  do |t|
+    change_table :users do |t|
 <% config[:new_columns].values.each do |column| -%>
       <%= column %>
 <% end -%>

data/lib/generators/clearance/install/templates/db/migrate/create_users.rb

@@ -1,14 +1,13 @@
 class CreateUsers < ActiveRecord::Migration
   def change
-    create_table :users  do |t|
+    create_table :users do |t|
       t.timestamps null: false
       t.string :email, null: false
       t.string :encrypted_password, limit: 128, null: false
       t.string :confirmation_token, limit: 128
       t.string :remember_token, limit: 128, null: false
+      t.index :email
+      t.index :remember_token
     end
-
-    add_index :users, :email
-    add_index :users, :remember_token
   end
 end

data/lib/generators/clearance/routes/routes_generator.rb

@@ -9,6 +9,14 @@ module Clearance
         route(clearance_routes)
       end
 
+      def disable_clearance_internal_routes
+        inject_into_file(
+          "config/initializers/clearance.rb",
+          "  config.routes = false\n",
+          after: "Clearance.configure do |config|\n",
+        )
+      end
+
       private
 
       def clearance_routes

data/lib/generators/clearance/routes/templates/routes.rb

@@ -1,12 +1,12 @@
-resources :passwords, controller: 'clearance/passwords', only: [:create, :new]
-  resource :session, controller: 'clearance/sessions', only: [:create]
+resources :passwords, controller: "clearance/passwords", only: [:create, :new]
+resource :session, controller: "clearance/sessions", only: [:create]
 
-  resources :users, controller: 'clearance/users', only: [:create] do
-    resource :password,
-      controller: 'clearance/passwords',
-      only: [:create, :edit, :update]
-  end
+resources :users, controller: "clearance/users", only: [:create] do
+  resource :password,
+    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"
+get "/sign_up" => "clearance/users#new", as: "sign_up"

data/spec/acceptance/clearance_installation_spec.rb

@@ -69,7 +69,10 @@ describe "Clearance Installation" do
       silencer = ""
     end
 
-    return_value = system("#{command} #{silencer}")
+    return_value = Bundler.with_clean_env do
+      system("#{command} #{silencer}")
+    end
+
     expect(return_value).to eq true
   end
 end

data/spec/app_templates/config/initializers/clearance.rb

@@ -0,0 +1,2 @@
+Clearance.configure do |config|
+end

data/spec/clearance/testing/{helpers_spec.rb → controller_helpers_spec.rb}

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe Clearance::Testing::Helpers do
+describe Clearance::Testing::ControllerHelpers do
   class TestClass
-    include Clearance::Testing::Helpers
+    include Clearance::Testing::ControllerHelpers
 
     def initialize
       @controller = Controller.new
@@ -13,8 +13,8 @@ describe Clearance::Testing::Helpers do
     end
   end
 
-  describe '#sign_in' do
-    it 'creates an instance of the clearance user model with FactoryGirl' do
+  describe "#sign_in" do
+    it "creates an instance of the clearance user model with FactoryGirl" do
       MyUserModel = Class.new
       allow(FactoryGirl).to receive(:create)
       allow(Clearance.configuration).to receive(:user_model).
@@ -26,8 +26,8 @@ describe Clearance::Testing::Helpers do
     end
   end
 
-  describe '#sign_in_as' do
-    it 'returns the user if signed in successfully' do
+  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

data/spec/clearance/testing/view_helpers_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe Clearance::Testing::ViewHelpers do
+  describe "#sign_in" do
+    it "sets the signed in user to a new user object" do
+      user_model = Class.new
+      allow(Clearance.configuration).to receive(:user_model).
+        and_return(user_model)
+
+      view = test_view_class.new
+      view.sign_in
+
+      expect(view.current_user).to be_an_instance_of(user_model)
+    end
+  end
+
+  describe "#sign_in_as" do
+    it "sets the signed in user to the object provided" do
+      user = double("User")
+
+      view = test_view_class.new
+      view.sign_in_as(user)
+
+      expect(view.current_user).to eq user
+    end
+  end
+
+  def test_view_class
+    Class.new do
+      include Clearance::Testing::ViewHelpers
+
+      def view
+        @view ||= extend Clearance::Testing::ViewHelpers::CurrentUser
+      end
+    end
+  end
+end

data/spec/controllers/passwords_controller_spec.rb

@@ -101,16 +101,6 @@ describe Clearance::PasswordsController do
         expect(user.reload.encrypted_password).not_to eq old_encrypted_password
       end
 
-      it "sets the remember token and clears the confirmation token" do
-        user = create(:user, :with_forgotten_password)
-
-        put :update, update_parameters(user, new_password: "my_new_password")
-
-        user.reload
-        expect(user.remember_token).not_to be_nil
-        expect(user.confirmation_token).to be_nil
-      end
-
       it "signs the user in and redirects" do
         user = create(:user, :with_forgotten_password)
 
@@ -121,7 +111,7 @@ describe Clearance::PasswordsController do
       end
     end
 
-    context "no password provided" do
+    context "password update fails" do
       it "does not update the password" do
         user = create(:user, :with_forgotten_password)
         old_encrypted_password = user.encrypted_password

data/spec/generators/clearance/routes/routes_generator_spec.rb

@@ -4,14 +4,18 @@ require "generators/clearance/routes/routes_generator"
 describe Clearance::Generators::RoutesGenerator, :generator do
   it "adds clearance routes to host application routes" do
     provide_existing_routes_file
+    provide_existing_initializer
 
     routes = file("config/routes.rb")
+    initializer = file("config/initializers/clearance.rb")
 
     run_generator
 
+    expect(initializer).to have_correct_syntax
+    expect(initializer).to contain("config.routes = false")
     expect(routes).to have_correct_syntax
     expect(routes).to contain(
-      "get '/sign_in' => 'clearance/sessions#new', as: 'sign_in'"
+      'get "/sign_in" => "clearance/sessions#new", as: "sign_in"'
     )
   end
 end

data/spec/helpers/helper_helpers_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+
+describe "Clearance RSpec helper spec configuration", type: :helper do
+  it "lets me use clearance's helper methods in helper specs" do
+    user = double("User")
+    sign_in_as(user)
+
+    expect(helper.current_user).to eq user
+  end
+end

data/spec/support/generator_spec_helpers.rb

@@ -9,6 +9,10 @@ module GeneratorSpecHelpers
     copy_to_generator_root("config", "routes.rb")
   end
 
+  def provide_existing_initializer
+    copy_to_generator_root("config/initializers", "clearance.rb")
+  end
+
   def provide_existing_application_controller
     copy_to_generator_root("app/controllers", "application_controller.rb")
   end

data/spec/user_spec.rb

@@ -85,6 +85,15 @@ describe User do
 
         expect(user.confirmation_token).to be_nil
       end
+
+      it "sets the remember token" do
+        user = create(:user, :with_forgotten_password)
+
+        user.update_password("my_new_password")
+
+        user.reload
+        expect(user.remember_token).not_to be_nil
+      end
     end
 
     context "with blank password" do

data/spec/views/view_helpers_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+
+describe "Clearance RSpec view spec configuration", type: :view do
+  it "lets me use clearance's helper methods in view specs" do
+    user = double("User")
+    sign_in_as(user)
+
+    expect(view.current_user).to eq user
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -139,8 +139,10 @@ files:
 - lib/clearance/sign_in_guard.rb
 - lib/clearance/test_unit.rb
 - lib/clearance/testing.rb
+- lib/clearance/testing/controller_helpers.rb
 - lib/clearance/testing/deny_access_matcher.rb
 - lib/clearance/testing/helpers.rb
+- lib/clearance/testing/view_helpers.rb
 - lib/clearance/token.rb
 - lib/clearance/user.rb
 - lib/clearance/version.rb
@@ -167,6 +169,7 @@ files:
 - spec/acceptance/clearance_installation_spec.rb
 - spec/app_templates/app/controllers/application_controller.rb
 - spec/app_templates/app/models/user.rb
+- spec/app_templates/config/initializers/clearance.rb
 - spec/app_templates/config/routes.rb
 - spec/app_templates/testapp/Gemfile
 - spec/app_templates/testapp/app/controllers/home_controller.rb
@@ -180,7 +183,8 @@ files:
 - 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/clearance/testing/controller_helpers_spec.rb
+- spec/clearance/testing/view_helpers_spec.rb
 - spec/clearance/token_spec.rb
 - spec/configuration_spec.rb
 - spec/controllers/apis_controller_spec.rb
@@ -200,6 +204,7 @@ files:
 - spec/generators/clearance/routes/routes_generator_spec.rb
 - spec/generators/clearance/specs/specs_generator_spec.rb
 - spec/generators/clearance/views/views_generator_spec.rb
+- spec/helpers/helper_helpers_spec.rb
 - spec/mailers/clearance_mailer_spec.rb
 - spec/password_strategies/bcrypt_migration_from_sha1_spec.rb
 - spec/password_strategies/bcrypt_spec.rb
@@ -215,6 +220,7 @@ files:
 - spec/support/generator_spec_helpers.rb
 - spec/support/request_with_remember_token.rb
 - spec/user_spec.rb
+- spec/views/view_helpers_spec.rb
 homepage: http://github.com/thoughtbot/clearance
 licenses:
 - MIT