clearance 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2509c5d9c52e522bf079988f49c43b6e34b66f9b
-  data.tar.gz: bdda3e9606f883b26fc25bfa17dbcaeda830684e
+  metadata.gz: 44710933cf74cc5856e2b54f9635c9ce57a3bccb
+  data.tar.gz: 922d68715caba09515eaf38755a4eaacbe84e29a
 SHA512:
-  metadata.gz: 67d001dd40baca13d399acb8184a741438ff5af9cd8fd992753469a956a61b4054a54051ff10426efab0b02b689625b0062887f929de9266a4ef3753292e9b12
-  data.tar.gz: 93709396bcea3b6afa92a3e41216d248cbaf1d2524f88a04d8c00e2c594d18ad920ad6eef736ffc069fdd9db4e3afe8de4cd4d57c141ad08794aed2b74c82bd8
+  metadata.gz: 61008d6951aadac829026e458009b7eeeed0aa2fb7fbb814935656ab7e1ccec47bd81bab57430a50ea923d7fa9aee8ef94c418f432782898ec14b10499f1874c
+  data.tar.gz: 5bc31612cc5f8203052b0f8a7a6fee0c06da99a54f00890d2fd7f2a52b4746a885c46bc7dd24e675371f6fc689f3f5dfe7611faebfd4af04d310498028481e9e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.8.1)
+    clearance (1.9.0)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)
@@ -72,7 +72,7 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    globalid (0.3.2)
+    globalid (0.3.3)
       activesupport (>= 4.1.0)
     hike (1.2.3)
     i18n (0.7.0)
@@ -85,7 +85,7 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pry (0.10.1)

data/NEWS.md

@@ -3,6 +3,23 @@
 The noteworthy changes for each Clearance version are included here. For a
 complete changelog, see the git history.
 
+## [1.9.0] - April 3, 2015
+
+### Added
+- The change password mailer now produces a multipart message which includes a
+  text part along with the previously existing HTML part. To override the text
+  part, add `change_password.text.erb` alongside your `change_password.html.erb`
+  file.
+
+### Fixed
+- Custom `user_model` configured in a Rails initializer will now be reloaded in
+  development mode.
+- Change password template now contains "Change my password" link text to
+  address an issue linking the URL in some mail clients.
+
+
+[1.9.0]: https://github.com/thoughtbot/clearance/compare/v1.8.1...v1.9.0
+
 ## [1.8.1] - March 3, 2015
 
 ### Security
@@ -13,6 +30,8 @@ complete changelog, see the git history.
 - All methods included by `Clearance::Controller` are now excluded from
   `action_methods`.
 
+[1.8.1]: https://github.com/thoughtbot/clearance/compare/v1.8.0...v1.8.1
+
 ## [1.8.0] - January 23, 2015
 
 ### Added

data/README.md

@@ -361,17 +361,39 @@ sign_in_as(user)
 sign_out
 ```
 
-## Credits
+## Contributing
 
-![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+Please see [CONTRIBUTING.md].
+Thank you, [contributors]!
 
-Clearance is maintained by [thoughtbot, inc](http://thoughtbot.com/community)
-and [contributors](https://github.com/thoughtbot/clearance/contributors) like
-you. Thank you!
+[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
-redistributed under the terms specified in the `LICENSE` file.
+redistributed under the terms specified in the [`LICENSE`] file.
+
+[`LICENSE`]: /LICENSE
+
+## About thoughtbot
 
+![thoughtbot](https://thoughtbot.com/logo.png)
+
+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].
+
+[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/views/clearance_mailer/change_password.html.erb

@@ -1,5 +1,8 @@
-<%= t(".opening") %>
+<p><%= t(".opening") %></p>
 
-<%= edit_user_password_url(@user, token: @user.confirmation_token.html_safe) %>
+<p>
+  <%= link_to t(".link_text", default: "Change my password"),
+    edit_user_password_url(@user, token: @user.confirmation_token.html_safe) %>
+</p>
 
-<%= raw t(".closing") %>
+<p><%= raw t(".closing") %></p>

data/app/views/clearance_mailer/change_password.text.erb

@@ -0,0 +1,5 @@
+<%= t(".opening") %></p>
+
+<%= edit_user_password_url(@user, token: @user.confirmation_token.html_safe) %>
+
+<%= raw t(".closing") %>

data/config/locales/clearance.en.yml

@@ -4,6 +4,7 @@ en:
     change_password:
       closing: If you didn't request this, ignore this email. Your password has
         not been changed.
+      link_text: Change my password
       opening: "Someone, hopefully you, requested we send you a link to change
         your password:"
   flashes:

data/db/migrate/20110111224543_create_clearance_users.rb

@@ -1,6 +1,6 @@
 class CreateClearanceUsers < ActiveRecord::Migration
   def self.up
-    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

data/gemfiles/rails3.2.gemfile

@@ -9,7 +9,7 @@ gem "capybara", ">= 2.3"
 gem "database_cleaner", "~> 1.0"
 gem "factory_girl_rails", "~> 4.2"
 gem "rspec-rails", "~> 3.1"
-gem "shoulda-matchers", "~> 2.4"
+gem "shoulda-matchers", "~> 2.8"
 gem "sqlite3", "~> 1.3"
 gem "timecop", "~> 0.6"
 gem "pry", :require => false

data/lib/clearance/configuration.rb

@@ -133,6 +133,17 @@ module Clearance
     def routes_enabled?
       @routes
     end
+
+    # Reloads the clearance user model class.
+    # This is called from the Clearance engine to reload the configured
+    # user class during each request while in development mode, but only once
+    # in production.
+    # @private
+    def reload_user_model
+      if @user_model.present?
+        @user_model = @user_model.to_s.constantize
+      end
+    end
   end
 
   # @return [Clearance::Configuration] Clearance's current configuration

data/lib/clearance/engine.rb

@@ -1,12 +1,19 @@
-require 'clearance'
-require 'rails'
+require "clearance"
+require "rails"
 
 module Clearance
   class Engine < Rails::Engine
-    initializer 'clearance.filter' do |app|
+    initializer "clearance.filter" do |app|
       app.config.filter_parameters += [:password, :token]
     end
 
-    config.app_middleware.insert_after ActionDispatch::ParamsParser, Clearance::RackSession
+    config.app_middleware.insert_after(
+      ActionDispatch::ParamsParser,
+      Clearance::RackSession
+    )
+
+    config.to_prepare do
+      Clearance.configuration.reload_user_model
+    end
   end
 end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "1.8.1"
+  VERSION = "1.9.0"
 end

data/lib/generators/clearance/specs/templates/features/clearance/visitor_resets_password_spec.rb.tt

@@ -47,7 +47,8 @@ feature "Visitor resets password" do
     message = ActionMailer::Base.deliveries.any? do |email|
       email.to == [recipient] &&
         email.subject =~ /#{subject}/i &&
-        email.body =~ /#{body}/
+        email.html_part.body =~ /#{body}/
+        email.text_part.body =~ /#{body}/
     end
 
     expect(message).to be

data/spec/configuration_spec.rb

@@ -162,4 +162,19 @@ describe Clearance::Configuration do
       expect(Clearance.configuration.routes_enabled?).to be false
     end
   end
+
+  describe "#reload_user_model" do
+    it "returns the user model class if one has already been configured" do
+      ConfiguredUser = Class.new
+      Clearance.configure { |config| config.user_model = ConfiguredUser }
+
+      expect(Clearance.configuration.reload_user_model).to eq ConfiguredUser
+    end
+
+    it "returns nil if the user_model has not been configured" do
+      Clearance.configuration = Clearance::Configuration.new
+
+      expect(Clearance.configuration.reload_user_model).to be_nil
+    end
+  end
 end

data/spec/generators/clearance/views/views_generator_spec.rb

@@ -6,18 +6,19 @@ describe Clearance::Generators::ViewsGenerator, :generator do
     run_generator
 
     views = %w(
-      clearance_mailer/change_password
-      layouts/application
-      passwords/create
-      passwords/edit
-      passwords/new
-      sessions/_form
-      sessions/new
-      users/_form
-      users/new
+      clearance_mailer/change_password.html.erb
+      clearance_mailer/change_password.text.erb
+      layouts/application.html.erb
+      passwords/create.html.erb
+      passwords/edit.html.erb
+      passwords/new.html.erb
+      sessions/_form.html.erb
+      sessions/new.html.erb
+      users/_form.html.erb
+      users/new.html.erb
     )
 
-    view_files = views.map { |view| file("app/views/#{view}.html.erb") }
+    view_files = views.map { |view| file("app/views/#{view}") }
 
     view_files.each do |each|
       expect(each).to exist

data/spec/mailers/clearance_mailer_spec.rb

@@ -19,18 +19,6 @@ describe ClearanceMailer do
     expect(email.to.first).to eq(user.email)
   end
 
-  it "contains a link to edit the password" do
-    user = create(:user)
-    user.forgot_password!
-    host = ActionMailer::Base.default_url_options[:host]
-    link = "http://#{host}/users/#{user.id}/password/edit" \
-      "?token=#{user.confirmation_token}"
-
-    email = ClearanceMailer.change_password(user)
-
-    expect(email.body.to_s).to include(link)
-  end
-
   it "sets its subject" do
     user = create(:user)
     user.forgot_password!
@@ -40,25 +28,31 @@ describe ClearanceMailer do
     expect(email.subject).to include("Change your password")
   end
 
-  it "contains opening text in the body" do
+  it "has html and plain text parts" do
     user = create(:user)
     user.forgot_password!
 
     email = ClearanceMailer.change_password(user)
 
-    expect(email.body).to include(
-      I18n.t("clearance_mailer.change_password.opening")
-    )
+    expect(email.body.parts.length).to eq 2
+    expect(email.text_part).to be_present
+    expect(email.html_part).to be_present
   end
 
-  it "contains closing text in the body" do
+  it "contains a link to edit the password" do
     user = create(:user)
     user.forgot_password!
+    host = ActionMailer::Base.default_url_options[:host]
+    link = "http://#{host}/users/#{user.id}/password/edit" \
+      "?token=#{user.confirmation_token}"
 
     email = ClearanceMailer.change_password(user)
 
-    expect(email.body.raw_source).to include(
-      I18n.t("clearance_mailer.change_password.closing")
+    expect(email.text_part.body).to include(link)
+    expect(email.html_part.body).to include(link)
+    expect(email.html_part.body).to have_css(
+      "a",
+      text: I18n.t("clearance_mailer.change_password.link_text")
     )
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -94,6 +94,7 @@ files:
 - app/controllers/clearance/users_controller.rb
 - app/mailers/clearance_mailer.rb
 - app/views/clearance_mailer/change_password.html.erb
+- app/views/clearance_mailer/change_password.text.erb
 - app/views/layouts/application.html.erb
 - app/views/passwords/create.html.erb
 - app/views/passwords/edit.html.erb
@@ -174,7 +175,6 @@ files:
 - spec/clearance/back_door_spec.rb
 - spec/clearance/constraints/signed_in_spec.rb
 - spec/clearance/constraints/signed_out_spec.rb
-- spec/clearance/contoller_spec.rb
 - spec/clearance/controller_spec.rb
 - spec/clearance/default_sign_in_guard_spec.rb
 - spec/clearance/rack_session_spec.rb

data/spec/clearance/contoller_spec.rb

@@ -1,11 +0,0 @@
-require "spec_helper"
-
-describe "Clearance::Controller", type: :controller do
-  controller(ActionController::Base) do
-    include Clearance::Controller
-  end
-
-  it "does not expose any action_methods" do
-    expect(controller.action_methods).to be_empty
-  end
-end