clearance 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 388172ea597e347bdc3de456ef71b97a3b2cedba
-  data.tar.gz: 35009502fecdd3eac14aff84850a3f32edb05594
+  metadata.gz: 40854620afcb6b59bf196bbb4cfd0573c3eec03b
+  data.tar.gz: 69c381cdfb9a23b792b4566ea37932d8692cfc30
 SHA512:
-  metadata.gz: 05b2d5f2d0c369a99a37f34962f7772a6f0a5af66aa29e8761b40e159fc8c21921cfb50893529eb7b6b92c4c2a9ee45fbe342fa23f64b4661181838c8651bff8
-  data.tar.gz: 72e86acac7f47f097775b42f443171812bcc1e274d9d8aa96e3fe439926bfb87fec00364a69a8618ac10c79e220c2c2dd6a085345a54aa022d381f8db4e9a35d
+  metadata.gz: cb6b07886b51a27a1280aa4fa02e4eec6ec9804fc018c255e7ae573072ebf452b8347f810b6fecf4f3aba86f6cee46807bfd9e5339820f119fa1daa1403c409d
+  data.tar.gz: ef885276fba036cd91b5ed679edd62c459d0e70f6e7b74049b917b8d6c929376994a3e8942396bad490f5a5d182b1028fbe976920f50f302db37196143489dd4

data/.travis.yml

@@ -36,5 +36,6 @@ install:
 branches:
   only:
     - master
+    - 2.0
 
 sudo: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.14.1)
+    clearance (1.14.2)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)

data/NEWS.md

@@ -3,6 +3,14 @@
 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.2] - August 10, 2016
+
+### Fixed
+- Fixed incompatibility with `attr_encrypted` gem by inlining the body of the
+  `encrypt` helper method used in the BCrypt password strategy.
+
+[1.14.2]: https://github.com/thoughtbot/clearance/compare/v1.14.1...v1.14.2
+
 ## [1.14.1] - May 12, 2016
 
 ### Fixed

data/README.md

@@ -152,7 +152,8 @@ end
 See [config/routes.rb](/config/routes.rb) for the default set of routes.
 
 As of Clearance 1.5 it is recommended that you disable Clearance routes and take
-full control over routing and URL design.
+full control over routing and URL design. This ensures that your app's URL design
+won't be affected if the gem's routes and URL design are changed.
 
 To disable the routes, set `config.routes = false`. You can optionally run
 `rails generate clearance:routes` to dump a copy of the default routes into your
@@ -237,6 +238,9 @@ translation.
 See [config/locales/clearance.en.yml](/config/locales/clearance.en.yml) for the
 default behavior.
 
+You can also install [clearance-i18n](https://github.com/thoughtbot/clearance-i18n)
+for access to additional, user-contributed translations.
+
 ### User Model
 
 See [lib/clearance/user.rb](/lib/clearance/user.rb) for the default behavior.

data/lib/clearance/password_strategies/bcrypt.rb

@@ -19,30 +19,18 @@ module Clearance
         @password = new_password
 
         if new_password.present?
-          self.encrypted_password = encrypt(new_password)
-        end
-      end
+          cost = if defined?(::Rails) && ::Rails.env.test?
+                   ::BCrypt::Engine::MIN_COST
+                 else
+                   ::BCrypt::Engine::DEFAULT_COST
+                 end
 
-      private
-
-      # @api private
-      def encrypt(password)
-        ::BCrypt::Password.create(password, cost: cost)
-      end
-
-      # @api private
-      def cost
-        if test_environment?
-          ::BCrypt::Engine::MIN_COST
-        else
-          ::BCrypt::Engine::DEFAULT_COST
+          self.encrypted_password = ::BCrypt::Password.create(
+            new_password,
+            cost: cost,
+          )
         end
       end
-
-      # @api private
-      def test_environment?
-        defined?(::Rails) && ::Rails.env.test?
-      end
     end
   end
 end

data/lib/clearance/user.rb

@@ -135,7 +135,7 @@ module Clearance
       def authenticate(email, password)
         if user = find_by_normalized_email(email)
           if password.present? && user.authenticated?(password)
-            return user
+            user
           end
         end
       end

data/lib/clearance/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt