validates_duplicity_of 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 699497aa0d7bc19b03e80501e80cab9be63d5201
-  data.tar.gz: 039be4d1d69f1703b2d9cb00f9ee56da767aa192
+  metadata.gz: f9ca17376355188c72f408f519d8dfb9eb1050bd
+  data.tar.gz: 3a898d1fc183f1d076c6513b1884ee37f51d0aba
 SHA512:
-  metadata.gz: 0054a842cde9121f92d30b834b932f32633acae28fa187f895898451949ff62d7d4d7ec3ae7cfc3d6d6f5143aba2bd8172304c3666160d487986b82357b41f1f
-  data.tar.gz: 1d137a0ebb92072bfe9b5014cbe62acd1606db5304f2a56c954d7a85a31e3ff8fd5335550dd60fb2857844e89a3875bf237ffb77574fa4e1a98534f938904e19
+  metadata.gz: 38f7571c6b2e4780c996952ed894c9c6921a84ac2a95c600c54f1f8b700c072338cc40b8fbb1016af5f6a776cfcb0ca3badcee15196b2ecb188b11389856611e
+  data.tar.gz: 6633e52514694cd093e970a0e50bd3b8113e1745fef0f4fe3e49076260b82d009ff08c0230331795cac3a2815ca5052ae898d879921fc0c2e3b15721ccce6413

data/README.md

@@ -29,9 +29,9 @@ Or with security:
 
 ## Usage
 
-Use method `validates_duplicity_of` with attribute in your Rails model. Scope is optional.
+Use method `validates_duplicity_of` with attribute in your Rails model. Scope is optional. Default callback is `before_save`.
 
-	class Post
+	class Post < ActiveRecord::Base
 	  validates_duplicity_of :name, scope: :user_id
 	end
 	
@@ -42,6 +42,11 @@ Use method `validates_duplicity_of` with attribute in your Rails model. Scope is
 	p = Post.create name: "Foo", user_id: 1
 	p.name
 	=> "Foo (1)"
+	
+	class Note < ActiveRecord::Base
+	  validates_uniqueness_of :name
+	  validates_duplicity_of :name, callback: :before_validation
+	end
 
 
 ## Contributing

data/lib/validates_duplicity_of.rb

@@ -2,9 +2,10 @@ require 'validates_duplicity_of/version'
 require 'active_record'
 
 module ValidatesDuplicityOf
-  def validates_duplicity_of(attr_name, scope: nil)
-    before_save do
+  def validates_duplicity_of(attr_name, scope: nil, callback: :before_save)
+    validates = -> do
       return unless changed.include? attr_name.to_s
+      return unless self[attr_name].present?
       if self.class.exists?(Hash[*[attr_name, self[attr_name], scope, self[scope]].compact])
         if /#{Regexp.escape(self[attr_name])} \(\d+\)$/.match changed_attributes[attr_name.to_s]
           self[attr_name] = changed_attributes[attr_name.to_s]
@@ -17,6 +18,7 @@ module ValidatesDuplicityOf
         end
       end
     end
+    send callback, &validates
   end
 end
 

data/lib/validates_duplicity_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesDuplicityOf
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lib/validates_duplicity_of_spec.rb

@@ -40,6 +40,12 @@ describe "validates_duplicity_of" do
       post.update_attributes name: "New name"
       expect(post.name).to eq "New name (2)"
     end
+
+    it "should not update if name is not present" do
+      Post.create name: ""
+      post = Post.create name: ""
+      expect(post.name).to eq ""
+    end
   end
 
   context "with scope" do
@@ -67,4 +73,14 @@ describe "validates_duplicity_of" do
       expect(note.title).to eq "New title (11)"
     end
   end
+
+  context "with before_validation callback" do
+    before(:each) { Comment.create name: "New name" }
+    after(:each)  { Comment.delete_all }
+
+    it "should update name before validation" do
+      comment = Comment.create name: "New name"
+      expect(comment.name).to eq "New name (1)"
+    end
+  end
 end

data/spec/support/models.rb

@@ -4,4 +4,9 @@ end
 
 class Note < ActiveRecord::Base
   validates_duplicity_of :title, scope: :user_id
+end
+
+class Comment < ActiveRecord::Base
+  validates_uniqueness_of :name
+  validates_duplicity_of :name, callback: :before_validation
 end

data/spec/support/schema.rb

@@ -9,4 +9,8 @@ ActiveRecord::Schema.define do
     t.string :title
     t.integer :user_id
   end
+
+  create_table :comments, force: true do |t|
+    t.string :name
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_duplicity_of
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Vincent Durand
@@ -31,7 +31,7 @@ cert_chain:
   xDr7hfCTJQsNosd7V5q7Uz+SYPK9ALyONt5t3KKYEWS/mBCStEuQXwjIsWG/bqwr
   vqfQstIS
   -----END CERTIFICATE-----
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler