clearance 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ce84cb7eaf277d03ef97bea09933416876f4c3
-  data.tar.gz: 622499f4174f3f22ceae7c50d1a6a586c73190f0
+  metadata.gz: 388172ea597e347bdc3de456ef71b97a3b2cedba
+  data.tar.gz: 35009502fecdd3eac14aff84850a3f32edb05594
 SHA512:
-  metadata.gz: 374a634825b204e2c41fd78884226ef4684667225b6143170c85f1496eeee37e8494fd64c5bd39fecb972822912d234d3c9967f34e9b9b3a1bf62b1fea3621c9
-  data.tar.gz: f1be7061869311f8787b273ad65860c4231975b8e6df2305b0aa15d59c6d332a93b87ec5af88a4af3dfc730b87ab4439b63ffd1a4d74d821067b2f34a9550b1c
+  metadata.gz: 05b2d5f2d0c369a99a37f34962f7772a6f0a5af66aa29e8761b40e159fc8c21921cfb50893529eb7b6b92c4c2a9ee45fbe342fa23f64b4661181838c8651bff8
+  data.tar.gz: 72e86acac7f47f097775b42f443171812bcc1e274d9d8aa96e3fe439926bfb87fec00364a69a8618ac10c79e220c2c2dd6a085345a54aa022d381f8db4e9a35d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.14.0)
+    clearance (1.14.1)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -56,7 +56,7 @@ GEM
     arel (6.0.3)
     bcrypt (3.1.11)
     builder (3.2.2)
-    capybara (2.7.0)
+    capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -64,7 +64,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     coderay (1.1.1)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     email_validator (1.6.0)

data/NEWS.md

@@ -3,6 +3,16 @@
 The noteworthy changes for each Clearance version are included here. For a
 complete changelog, see the git history for each version via the version links.
 
+## [1.14.1] - May 12, 2016
+
+### Fixed
+- Fixed insertion of `include Clearance::User` when running the install
+  generator in an app that already has a `User` model.
+- Updated `deny_access` matcher to assert against configured redirect location
+  rather than hard coded `/`.
+
+[1.14.1]: https://github.com/thoughtbot/clearance/compare/v1.14.0...v1.14.1
+
 ## [1.14.0] - April 29, 2016
 
 ### Added

data/README.md

@@ -23,7 +23,7 @@ Clearance is a Rails engine tested against Rails `>= 3.2` and Ruby `>= 1.9.3`.
 You can add it to your Gemfile with:
 
 ```sh
-gem 'clearance'
+gem "clearance"
 ```
 
 Run the bundle command to install it.
@@ -49,15 +49,15 @@ 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_domain = ".example.com"
   config.cookie_expiration = lambda { |cookies| 1.year.from_now.utc }
-  config.cookie_name = 'remember_token'
-  config.cookie_path = '/'
+  config.cookie_name = "remember_token"
+  config.cookie_path = "/"
   config.routes = true
   config.httponly = false
-  config.mailer_sender = 'reply@example.com'
+  config.mailer_sender = "reply@example.com"
   config.password_strategy = Clearance::PasswordStrategies::BCrypt
-  config.redirect_url = '/'
+  config.redirect_url = "/"
   config.secure_cookie = false
   config.sign_in_guards = []
   config.user_model = User
@@ -86,15 +86,15 @@ at the routing layer:
 ```ruby
 Blog::Application.routes.draw do
   constraints Clearance::Constraints::SignedIn.new { |user| user.admin? } do
-    root to: 'admin/dashboards#show', as: :admin_root
+    root to: "admin/dashboards#show", as: :admin_root
   end
 
   constraints Clearance::Constraints::SignedIn.new do
-    root to: 'dashboards#show', as: :signed_in_root
+    root to: "dashboards#show", as: :signed_in_root
   end
 
   constraints Clearance::Constraints::SignedOut.new do
-    root to: 'marketing#index'
+    root to: "marketing#index"
   end
 end
 ```
@@ -120,7 +120,7 @@ should change the `mailer_sender` default, used in the email's "from" header:
 
 ```ruby
 Clearance.configure do |config|
-  config.mailer_sender = 'reply@example.com'
+  config.mailer_sender = "reply@example.com"
 end
 ```
 
@@ -223,9 +223,9 @@ to change the layout that Clearance uses when rendering its views, simply
 specify the layout in an initializer.
 
 ```ruby
-Clearance::PasswordsController.layout 'my_passwords_layout'
-Clearance::SessionsController.layout 'my_sessions_layout'
-Clearance::UsersController.layout 'my_admin_layout'
+Clearance::PasswordsController.layout "my_passwords_layout"
+Clearance::SessionsController.layout "my_sessions_layout"
+Clearance::UsersController.layout "my_admin_layout"
 ```
 
 ### Translations
@@ -372,13 +372,13 @@ For `rspec`, add the following line to your `spec/rails_helper.rb` or
 `spec/spec_helper` if `rails_helper` does not exist:
 
 ```ruby
-require 'clearance/rspec'
+require "clearance/rspec"
 ```
 
 For `test-unit`, add this line to your `test/test_helper.rb`:
 
 ```ruby
-require 'clearance/test_unit'
+require "clearance/test_unit"
 ```
 
 This will make `Clearance::Controller` methods work in your controllers

data/lib/clearance/controller.rb

@@ -11,7 +11,7 @@ module Clearance
   # The `clearance:install` generator automatically adds this mixin to
   # `ApplicationController`, which is the recommended configuration.
   #
-  #     class ApplicationController < ApplicationController
+  #     class ApplicationController < ActionController::Base
   #       include Clearance::Controller
   #     end
   #

data/lib/clearance/testing/deny_access_matcher.rb

@@ -68,7 +68,7 @@ module Clearance
 
         def denied_access_url
           if clearance_session.signed_in?
-            '/'
+            Clearance.configuration.redirect_url
           else
             @controller.sign_in_url
           end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "1.14.0".freeze
+  VERSION = "1.14.1".freeze
 end

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

@@ -24,7 +24,7 @@ module Clearance
           inject_into_file(
             "app/models/user.rb",
             "  include Clearance::User\n\n",
-            after: "class User < ",
+            after: "class User < #{models_inherit_from}\n",
           )
         else
           @inherit_from = models_inherit_from

data/spec/app_templates/app/models/rails5/user.rb

@@ -0,0 +1,5 @@
+class User < ApplicationRecord
+  def previously_existed?
+    true
+  end
+end

data/spec/configuration_spec.rb

@@ -1,143 +1,103 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Clearance::Configuration do
   after { restore_default_config }
 
-  context 'when no user_model_name is specified' do
-    before do
-      Clearance.configure do |config|
-      end
-    end
-
-    it 'defaults to User' do
+  context "when no user_model_name is specified" do
+    it "defaults to User" do
       expect(Clearance.configuration.user_model).to eq ::User
     end
   end
 
-  context 'when a custom user_model_name is specified' do
-    before do
+  context "when a custom user_model_name is specified" do
+    it "is used instead of User" do
       MyUser = Class.new
+      Clearance.configure { |config| config.user_model = MyUser }
 
-      Clearance.configure do |config|
-        config.user_model = MyUser
-      end
-    end
-
-    it 'is used instead of User' do
       expect(Clearance.configuration.user_model).to eq ::MyUser
     end
   end
 
-  context 'when secure_cookie is set to true' do
-    before do
-      Clearance.configure do |config|
-        config.secure_cookie = true
-      end
-    end
-
-    it 'returns true' do
+  context "when secure_cookie is set to true" do
+    it "returns true" do
+      Clearance.configure { |config| config.secure_cookie = true }
       expect(Clearance.configuration.secure_cookie).to eq true
     end
   end
 
-  context 'when secure_cookie is not specified' do
-    before do
-      Clearance.configure do |config|
-      end
-    end
-
-    it 'defaults to false' do
+  context "when secure_cookie is not specified" do
+    it "defaults to false" do
       expect(Clearance.configuration.secure_cookie).to eq false
     end
   end
 
-  context 'when no redirect URL specified' do
+  context "when no redirect URL specified" do
     it 'returns "/" as redirect URL' do
-      expect(Clearance::Configuration.new.redirect_url).to eq '/'
+      expect(Clearance::Configuration.new.redirect_url).to eq "/"
     end
   end
 
-  context 'when redirect URL is specified' do
-    let(:new_redirect_url) { '/admin' }
+  context "when redirect URL is specified" do
+    it "returns new redirect URL" do
+      new_redirect_url = "/admin"
+      Clearance.configure { |config| config.redirect_url = new_redirect_url }
 
-    before do
-      Clearance.configure do |config|
-        config.redirect_url = new_redirect_url
-      end
-    end
-
-    it 'returns new redirect URL' do
       expect(Clearance.configuration.redirect_url).to eq new_redirect_url
     end
   end
 
-  context 'when specifying sign in guards' do
-    DummyGuard = Class.new
-
-    before do
-      Clearance.configure do |config|
-        config.sign_in_guards = [DummyGuard]
-      end
-    end
+  context "when specifying sign in guards" do
+    it "returns the stack with added guards" do
+      DummyGuard = Class.new
+      Clearance.configure { |config| config.sign_in_guards = [DummyGuard] }
 
-    it 'returns the stack with added guards' do
       expect(Clearance.configuration.sign_in_guards).to eq [DummyGuard]
     end
   end
 
-  context 'when cookie domain is specified' do
-    let(:domain) { '.example.com' }
-
-    before do
-      Clearance.configure do |config|
-        config.cookie_domain = domain
-      end
-    end
+  context "when cookie domain is specified" do
+    it "returns configured value" do
+      domain = ".example.com"
+      Clearance.configure { |config| config.cookie_domain = domain }
 
-    it 'returns configured value' do
       expect(Clearance.configuration.cookie_domain).to eq domain
     end
   end
 
-  context 'when cookie path is specified' do
-    let(:path) { '/user' }
-
-    before do
-      Clearance.configure do |config|
-        config.cookie_path = path
-      end
-    end
+  context "when cookie path is specified" do
+    it "returns configured value" do
+      path = "/user"
+      Clearance.configure { |config| config.cookie_path = path }
 
-    it 'returns configured value' do
       expect(Clearance.configuration.cookie_path).to eq path
     end
   end
 
-  describe '#allow_sign_up?' do
-    context 'when allow_sign_up is configured to false' do
-      it 'returns false' do
+  describe "#allow_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 }
         expect(Clearance.configuration.allow_sign_up?).to eq false
       end
     end
 
-    context 'when allow_sign_up has not been configured' do
-      it 'returns true' do
+    context "when allow_sign_up has not been configured" do
+      it "returns true" do
         expect(Clearance.configuration.allow_sign_up?).to eq true
       end
     end
   end
 
-  describe '#user_actions' do
-    context 'when allow_sign_up is configured to false' do
-      it 'returns empty array' do
+  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 }
         expect(Clearance.configuration.user_actions).to eq []
       end
     end
 
-    context 'when sign_up has not been configured' do
-      it 'returns create' do
+    context "when sign_up has not been configured" do
+      it "returns create" do
         expect(Clearance.configuration.user_actions).to eq [:create]
       end
     end
@@ -152,8 +112,8 @@ describe Clearance::Configuration do
     end
   end
 
-  describe '#user_id_parameter' do
-    it 'returns the parameter key to use based on the user_model' do
+  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 }
 
@@ -161,12 +121,12 @@ describe Clearance::Configuration do
     end
   end
 
-  describe '#routes_enabled?' do
-    it 'is true by default' do
+  describe "#routes_enabled?" do
+    it "is true by default" do
       expect(Clearance.configuration.routes_enabled?).to be true
     end
 
-    it 'is false when routes are set to false' do
+    it "is false when routes are set to false" do
       Clearance.configure { |config| config.routes = false }
       expect(Clearance.configuration.routes_enabled?).to be false
     end

data/spec/generators/clearance/install/install_generator_spec.rb

@@ -37,6 +37,7 @@ describe Clearance::Generators::InstallGenerator, :generator do
 
         expect(user_class).to exist
         expect(user_class).to have_correct_syntax
+        expect(user_class).to contain_models_inherit_from
         expect(user_class).to contain("include Clearance::User")
       end
     end
@@ -51,6 +52,7 @@ describe Clearance::Generators::InstallGenerator, :generator do
 
         expect(user_class).to exist
         expect(user_class).to have_correct_syntax
+        expect(user_class).to contain_models_inherit_from
         expect(user_class).to contain("include Clearance::User")
         expect(user_class).to have_method("previously_existed?")
       end
@@ -127,4 +129,16 @@ describe Clearance::Generators::InstallGenerator, :generator do
         and_return(false)
     end
   end
+
+  def contain_models_inherit_from
+    contain "< #{models_inherit_from}\n"
+  end
+
+  def models_inherit_from
+    if Rails.version >= "5.0.0"
+      "ApplicationRecord"
+    else
+      "ActiveRecord::Base"
+    end
+  end
 end

data/spec/support/generator_spec_helpers.rb

@@ -18,7 +18,7 @@ module GeneratorSpecHelpers
   end
 
   def provide_existing_user_class
-    copy_to_generator_root("app/models", "user.rb")
+    copy_to_generator_root("app/models", versionize_template("user.rb"))
     allow(File).to receive(:exist?).and_call_original
     allow(File).to receive(:exist?).with("app/models/user.rb").and_return(true)
   end
@@ -32,6 +32,14 @@ module GeneratorSpecHelpers
     FileUtils.mkdir_p(destination)
     FileUtils.cp(template_file, destination)
   end
+
+  def versionize_template(template_file)
+    if Rails.version >= "5.0.0"
+      template_file = ["rails5", template_file].join("/")
+    end
+
+    template_file
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -169,6 +169,7 @@ files:
 - lib/generators/clearance/views/views_generator.rb
 - spec/acceptance/clearance_installation_spec.rb
 - spec/app_templates/app/controllers/application_controller.rb
+- spec/app_templates/app/models/rails5/user.rb
 - spec/app_templates/app/models/user.rb
 - spec/app_templates/config/initializers/clearance.rb
 - spec/app_templates/config/routes.rb