active_repository 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c96cb1c73d748941744088071c5c2e38e5bf1ce
-  data.tar.gz: 569ad040981ca167751a6aca43eb8f7e1d809cf7
+  metadata.gz: 88bcc2de4247471046b40735b92062c68435132f
+  data.tar.gz: 9b496d88de8a8d0b784e7bd2eca531b5acf6484a
 SHA512:
-  metadata.gz: 7ad1edf741dc80857368b16fe74eadce70b7055b1d30bce92b2af0fcc1d6c944363a6563f71d58b749620941f25b66ba1ade30b18a3ecbf002494c412a7557ec
-  data.tar.gz: d59b12b7c096d7560716d42bf63015aa2a9ae2703140576b333f38560bb8ab911a7eb0fccef445c296a2e94be373aeb2a167c8dc9cdfad751b10214b1123be56
+  metadata.gz: f1464d3c00f1ad26e2dcab554a1e8db0d176b25598e43760853120da7cd70d2027620772c026a0328dcad21f18c80b5fd8e341cec6d82e81fa223be0c7031962
+  data.tar.gz: 91dfb8189cf36f725807d0483b63d430f92aeb72277194187959bcea90d1d152d9ea6c78ffe5e579e985e16228ac267036b4ce3807aeb11631f894e0d7766a22

data/lib/active_repository/uniqueness.rb

@@ -8,7 +8,15 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        query = (record.id ? "id <> #{record.id}" : 'id is not null')
+        query  = (record.id ? "id <> #{record.id}" : 'id is not null')
+        
+        if(options[:scope])
+          value = record.send(options[:scope])
+          query += " and #{options[:scope]} = "
+          query += value.is_a?(String) ? "'#{value}'" : value
+        end
+
+
         duplicate = record.class.where(query).all.select do |object|
           object.id != record.id && object.send(attribute) == record.send(attribute)
         end

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.3.10"
+  VERSION = "0.4.0"
 end

data/spec/active_repository/base_spec.rb

@@ -105,6 +105,7 @@ describe ActiveRepository, "Base" do
     it_behaves_like '.delete_all'
     it_behaves_like '#delete'
     it_behaves_like 'uniqueness'
+    it_behaves_like 'uniqueness_with_scope'
   end
 
   context "active_record", :active_record do
@@ -172,6 +173,7 @@ describe ActiveRepository, "Base" do
     it_behaves_like '.delete_all'
     it_behaves_like '#delete'
     it_behaves_like 'uniqueness'
+    it_behaves_like 'uniqueness_with_scope'
   end
 
   context "mongoid", :mongoid do
@@ -244,5 +246,6 @@ describe ActiveRepository, "Base" do
     it_behaves_like '.delete_all'
     it_behaves_like '#delete'
     it_behaves_like 'uniqueness'
+    it_behaves_like 'uniqueness_with_scope'
   end
 end

data/spec/support/shared_examples.rb

@@ -769,4 +769,23 @@ shared_examples "uniqueness" do
     Country.count.should == 1
     Country.all.should == [country1]
   end
-end
+end
+
+shared_examples "uniqueness_with_scope" do
+  before do
+    Country.delete_all
+    Country.validates_uniqueness_of :language, scope: 'name'
+  end
+
+  it "does not accept duplicated ids" do
+    country1 = Country.create(name: 'USA',    language: 'English')
+    country2 = Country.create(name: 'Canada', language: 'English')
+    country3 = Country.create(name: 'USA',    language: 'English')
+
+    country1.should be_valid
+    country2.should be_valid
+    country3.should_not be_valid
+    Country.count.should == 2
+    Country.all.should == [country1, country2]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash