validates_duplicity_of 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d0732a53d7733346abb9126487f5e2cf13b478
-  data.tar.gz: c672292cedde949a2a10e449f087f1b5bc282c4e
+  metadata.gz: 699497aa0d7bc19b03e80501e80cab9be63d5201
+  data.tar.gz: 039be4d1d69f1703b2d9cb00f9ee56da767aa192
 SHA512:
-  metadata.gz: c05fd1101e362a516e674764c37efe36e3fb4b10ffcedf16b08b91e9f3c464eecd199caac12eaecdcde56afd18f925cd047511d186671319acfd35867194f642
-  data.tar.gz: 918bba5b2e531a1aa1ab74dba6e1ef5dd258a003b2d5280f8f51187f4cf81ca0742d7108f5362ff44a46ae460b8f35dbeae5fd2ffc6da50852f77c4c485154b9
+  metadata.gz: 0054a842cde9121f92d30b834b932f32633acae28fa187f895898451949ff62d7d4d7ec3ae7cfc3d6d6f5143aba2bd8172304c3666160d487986b82357b41f1f
+  data.tar.gz: 1d137a0ebb92072bfe9b5014cbe62acd1606db5304f2a56c954d7a85a31e3ff8fd5335550dd60fb2857844e89a3875bf237ffb77574fa4e1a98534f938904e19

data/README.md

@@ -21,6 +21,12 @@ Or install it yourself as:
 
     $ gem install validates_duplicity_of
 
+Or with security:
+
+	$ wget https://gist.github.com/madwork/7026195/raw/6e06ae0754eecdf78cbb091e816597e860022dc1/gem-public_cert.pem -O madwork-public_cert.pem
+	$ gem cert --add madwork-public_cert.pem
+	$ gem install validates_duplicity_of --trust-policy=HighSecurity
+
 ## Usage
 
 Use method `validates_duplicity_of` with attribute in your Rails model. Scope is optional.

data/lib/validates_duplicity_of/version.rb

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

data/lib/validates_duplicity_of.rb

@@ -6,11 +6,15 @@ module ValidatesDuplicityOf
     before_save do
       return unless changed.include? attr_name.to_s
       if self.class.exists?(Hash[*[attr_name, self[attr_name], scope, self[scope]].compact])
-        realtion = scope ? self.class.where(Hash[*[scope, self[scope]]]) : self.class
-        names = realtion.where(self.class.arel_table[attr_name].matches("#{self[attr_name]} (%)")).pluck(attr_name)
-        name_ids = names.map{ |name| name.match(/\((\d+)\)$/)[1].to_i }
-        index = name_ids.sort.last.to_i + 1
-        self[attr_name].concat " (#{index})"
+        if /#{Regexp.escape(self[attr_name])} \(\d+\)$/.match changed_attributes[attr_name.to_s]
+          self[attr_name] = changed_attributes[attr_name.to_s]
+        else
+          relation = scope ? self.class.where(Hash[*[scope, self[scope]]]) : self.class
+          names = relation.where(self.class.arel_table[attr_name].matches("#{self[attr_name]} (%)")).pluck(attr_name)
+          name_ids = names.flat_map{ |name| name.match(/\((\d+)\)$/).captures }.map(&:to_i)
+          index = name_ids.sort.last.to_i + 1
+          self[attr_name].concat " (#{index})"
+        end
       end
     end
   end

data/spec/lib/validates_duplicity_of_spec.rb

@@ -33,6 +33,13 @@ describe "validates_duplicity_of" do
         expect(post.name).to eq "New name (1) (#{index + 1})"
       end
     end
+
+    it "should keep the same index with the same name" do
+      Post.create name: "New name (1)"
+      post = Post.create name: "New name (2)"
+      post.update_attributes name: "New name"
+      expect(post.name).to eq "New name (2)"
+    end
   end
 
   context "with scope" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_duplicity_of
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vincent Durand