active_model-password 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 196a3392ca7a52ab350848ddaca5810b9d9acf14
-  data.tar.gz: d06691a64b9b4a6faec580c9f9278bea29db192c
+  metadata.gz: 7032cfaaa97d36b5a31b521501b89cba1f53e2a3
+  data.tar.gz: 9d77c84a05dd700d7d1782c892ad5f8a246cfe30
 SHA512:
-  metadata.gz: c9beff8f2e9b5b791b1645d3a020babc5f1eaaee3c408774459e7187ea9908c4643f82d8550b3c085a07a6968152396312be44f7a508797a0d0b2665ad69d118
-  data.tar.gz: 5929107214bd6c1833feee6f015d66291effc6af0015b6ef370b6af3136f546c8f90faa9c5e9f122dcd322d4f9388ce848f112979699c5ee7b2f511a8762f5fc
+  metadata.gz: 9e081ff3687ed785744c68b03f80f0dcc468b59982fe8f8434afda4a3fcb9ee2a1df50d3c7184cb5c8342156e2f8698a5b0b8633fca1c968b0d51974fad62e16
+  data.tar.gz: 33ab627139e2ae5ebf22e1a7b7cbb431165aa9094af9ca7b81dfcbe74dd5385d10203a635a029fa150c7c040be4693de63aa64b3fa98520504b2db95a0528a84

data/README.md

@@ -45,12 +45,7 @@ The most popular workflow is:
     end
 
 If you don't like the default behavior, you can always inherit the
-password model and override some defaults:
-
-     class Password < ActiveModel::Password
-       validates :password, format: {with: /\A(?=.*[a-z])(?=.*[A-Z])(?=.*\d)./}, length: {in: 8..255}, if: -> { password.present? }
-     end
-
+password model and override some defaults.
 
 ## Copyright
 

data/lib/active_model/password/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Password
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/active_model/password.rb

@@ -9,16 +9,30 @@ module ActiveModel
 
     validates :user, presence: true
     validates :password, presence: true, confirmation: true
+    validate :user_password, if: :user?
+
+    def user?
+      user.present?
+    end
 
     def persisted?
-      user.present? and user.persisted?
+      user? and user.persisted?
     end
 
     def save
       return false unless valid?
       user.password = password
-      user.password_confirmation = password_confirmation
       user.save
     end
+
+    private
+
+    def user_password
+      old_password = user.password
+      user.password = password
+      errors.add(:password, user.errors[:password]) if user.invalid? and user.errors[:password].present?
+    ensure
+      user.password = old_password
+    end
   end
 end

data/test/password_test.rb

@@ -1,10 +1,13 @@
 require "test_helper"
 
 class User
+  include ActiveModel::Model
+
   attr_accessor :password, :password_confirmation, :persisted
+  validates :password, format: {with: /\A(?=.*[a-z])(?=.*[A-Z])(?=.*\d)./}, length: {in: 8..255}, if: -> { password.present? }
 
   def save
-    password == password_confirmation
+    valid?
   end
 
   def persisted?
@@ -36,6 +39,30 @@ class PasswordTest < Test::Unit::TestCase
     assert @password.errors[:password].present?
   end
 
+  test "is invalid with too short password" do
+    @password.password = "Secret1"
+    assert @password.invalid?
+    assert @password.errors[:password].present?
+  end
+
+  test "is invalid with password without uppercase letter" do
+    @password.password = "secretsecret1"
+    assert @password.invalid?
+    assert @password.errors[:password].present?
+  end
+
+  test "is invalid with password without lowercase letter" do
+    @password.password = "SECRETSECRET1"
+    assert @password.invalid?
+    assert @password.errors[:password].present?
+  end
+
+  test "is invalid with password without number" do
+    @password.password = "SecretSecret"
+    assert @password.invalid?
+    assert @password.errors[:password].present?
+  end
+
   test "is invalid without password confirmation" do
     @password.password_confirmation = ""
     assert @password.invalid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model-password
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kuba Kuźma