passwd 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcb00a834c359109c28cbe26c845b8baa2ec93b7
-  data.tar.gz: 07cff7e7538f4f59889fecad96ab0715edd9ee05
+  metadata.gz: b9ba7557a87c9ef3d0b947b32bae95c8693ce96c
+  data.tar.gz: 07de417852343a3cdb13f6ecf27f36b95190c307
 SHA512:
-  metadata.gz: cc8ac70bace4de95e9ae1d9d6f05b16843b1c27d3c2af09b748c38100db9f79105a991da929a387b9bf76733b57a7885d98238fccc27f9b7b9b5ca5bd5af804b
-  data.tar.gz: b53e2c20abb856f932de3612a63f0cde50d6d7498ec233b7bc2a3652899c6420d63801ee5e1901c1adf7b32b0a9c6a5040f462d4ce3ab7ac21cce4dc0f20d1f9
+  metadata.gz: b1072b0d5f670f2698c0f6b5982c457a587e3a3afcd7638586233a3a2425c5ec98a4ae8a50c9b91adeacd4a10c8eb8f59f95a8db2d7eb5b855c7bd8aef6f4b32
+  data.tar.gz: 4367e04477af7a420763b8681a9a455263a3094d2190a49c6c0c1b75bbd8b5ae9398574771410d5bc926e9b1bb0c5ea9c24ab947b53a55e5aa3aa6eadcb1acb6

data/README.md

@@ -180,21 +180,30 @@ if user.save
   NoticeMailer.change_mail(user, password_text).deliver
 end
 ```
+
 `update_password` method will be set new password if the authentication successful.  
-Return the nil if authentication fails.  
 But `update_password` method doesn't call `save` method.
 
 ```ruby
 @user = User.find(params[:id])
 
-if Passwd.confirm_check(params[:new_pass], params[:new_pass_confirm])
-  if @user.update_password(old_pass, new_pass) && @user.save # => return new password(text) or false
-    NoticeMailer.change_mail(user, password_text).deliver
-  else
-    puts "Authentication failed!"
-  end
-else
-  puts "Password don't match!"
+begin
+  confirm_check(new_pass, confirm)
+  @user.update_password(old_pass, new_pass, true)
+  @user.save!
+  redirect_to bar_path, notice: "Password updated successfully"
+rescue PasswordNotMatch
+  flash.now[:alert] = "Password not match"
+  render action: :edit
+rescue AuthError
+  flash.now[:alert] = "Password is incorrect"
+  render action: :edit
+rescue PolicyNotMatch
+  flash.now[:alert] = "Policy not match"
+  render action: :edit
+rescue
+  flash.now[:alert] = "Password update failed"
+  render action: :edit
 end
 ```
 

data/lib/passwd.rb

@@ -3,6 +3,7 @@
 require "digest/sha1"
 
 require "passwd/version"
+require "passwd/errors"
 require "passwd/base"
 require "passwd/password"
 require "passwd/active_record"

data/lib/passwd/active_record.rb

@@ -39,11 +39,15 @@ module Passwd
       end
 
       def define_update_password(salt_name, password_name)
-        define_method :update_password do |old_pass, new_pass|
+        define_method :update_password do |old_pass, new_pass, policy_check=false|
           if Passwd.auth(old_pass, self.send(salt_name), self.send(password_name))
+            if policy_check
+              raise Passwd::PolicyNotMatch, "Policy not match" unless Passwd.policy_check(new_pass)
+            end
+
             set_password(new_pass)
           else
-            false
+            raise Passwd::AuthError
           end
         end
       end

data/lib/passwd/base.rb

@@ -29,7 +29,7 @@ module Passwd
     end
 
     def confirm_check(password, confirm, with_policy=false)
-      return false if password != confirm
+      raise PasswordNotMatch, "Password not match" if password != confirm
       return true unless with_policy
       Passwd.policy_check(password)
     end

data/lib/passwd/errors.rb

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+module Passwd
+  class PasswdError < StandardError
+  end
+
+  class AuthError < PasswdError
+  end
+
+  class PasswordNotMatch < PasswdError
+  end
+
+  class PolicyNotMatch < PasswdError
+  end
+end

data/lib/passwd/version.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module Passwd
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/passwd/active_record_spec.rb

@@ -12,14 +12,14 @@ describe Passwd::ActiveRecord do
   let(:password_text) {"secret"}
   let(:password_hash) {Digest::SHA1.hexdigest("#{salt}#{password_text}")}
 
-  describe ".included" do
+  describe ".#included" do
     it "define singleton methods" do
       expect(User.respond_to? :define_column).to be_true
     end
   end
 
   describe "extend methods" do
-    describe ".define_column" do
+    describe ".#define_column" do
       let(:user) {User.new}
 
       it "define singleton methods" do
@@ -41,7 +41,7 @@ describe Passwd::ActiveRecord do
   end
 
   describe "defined methods from define_column" do
-    describe ".authenticate" do
+    describe ".#authenticate" do
       let!(:record) {
         record = double("record mock")
         record.stub(:salt).and_return(salt)
@@ -126,16 +126,37 @@ describe Passwd::ActiveRecord do
         user
       }
 
-      it "should return update password" do
-        pass = "new_password"
-        user.should_receive(:set_password).with(pass).and_return(pass)
-        expect(user.update_password(password_text, pass)).to eq(pass)
+      context "without policy check" do
+        it "should return update password" do
+          pass = "new_password"
+          user.should_receive(:set_password).with(pass).and_return(pass)
+          expect(user.update_password(password_text, pass)).to eq(pass)
+        end
+
+        it "should generate exception if authentication failed" do
+          Passwd.should_receive(:auth).and_return(false)
+          user.should_not_receive(:set_password)
+          expect {
+            user.update_password("invalid_password", "new_password")
+          }.to raise_error(Passwd::AuthError)
+        end
       end
 
-      it "should return false if authentication failed" do
-        Passwd.should_receive(:auth).and_return(false)
-        user.should_not_receive(:set_password)
-        user.update_password("invalid_password", "new_password")
+      context "with policy check" do
+        it "should return update password" do
+          pass = "new_password"
+          Passwd.should_receive(:policy_check).and_return(true)
+          user.should_receive(:set_password).with(pass).and_return(pass)
+          expect(user.update_password(password_text, pass, true)).to eq(pass)
+        end
+
+        it "should generate exception if policy not match" do
+          pass = "new_password"
+          Passwd.should_receive(:policy_check).and_return(false)
+          expect {
+            user.update_password(password_text, pass, true)
+            }.to raise_error(Passwd::PolicyNotMatch)
+        end
       end
     end
   end

data/spec/passwd/base_spec.rb

@@ -81,8 +81,10 @@ describe Passwd do
 
     describe "#confirm_check" do
       context "with out policy check" do
-        it "return false if password don't match" do
-          expect(Passwd.confirm_check("secret", "invalid")).to be_false
+        it "should generate exception if password don't match" do
+          expect{
+            Passwd.confirm_check("secret", "invalid")
+            }.to raise_error(Passwd::PasswordNotMatch)
         end
 
         it "return true if password matches" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passwd
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/passwd/configuration/config.rb
 - lib/passwd/configuration/policy.rb
 - lib/passwd/configuration/tmp_config.rb
+- lib/passwd/errors.rb
 - lib/passwd/password.rb
 - lib/passwd/version.rb
 - passwd.gemspec