remarkable_activerecord 3.0.2 → 3.0.3

data/lib/remarkable_activerecord/matchers/validate_uniqueness_of_matcher.rb

@@ -41,10 +41,12 @@ module Remarkable
           #
           def responds_to_scope?
             (@options[:scope] || []).each do |scope|
-              method = :"#{scope}="
-              return false, :method => method unless @subject.respond_to?(method)
+              setter = :"#{scope}="
+
+              return false, :method => setter unless @subject.respond_to?(setter)
+              return false, :method => scope  unless @existing.respond_to?(scope)
 
-              @subject.send(method, @existing.send(scope))
+              @subject.send(setter, @existing.send(scope))
             end
             true
           end
@@ -72,47 +74,48 @@ module Remarkable
           # Now test that the object is valid when changing the scoped attribute.
           #
           def valid_with_new_scope?
-            (@options[:scope] || []).each do |scope|
-              previous_scope_value = @subject.send(scope)
+            (@options[:scope] || []).each do |scope|
+              setter = :"#{scope}="
 
-              @subject.send("#{scope}=", new_value_for_scope(scope))
+              previous_scope_value = @subject.send(scope)
+              @subject.send(setter, new_value_for_scope(scope))
               return false, :method => scope unless good?(@value)
 
-              @subject.send("#{scope}=", previous_scope_value)
+              @subject.send(setter, previous_scope_value)
             end
             true
           end
 
-          # Change the existing object attribute to nil to run allow nil
-          # validations. If we find any problem while updating the @existing
-          # record, it's because we can't save nil values in the database. So it
-          # passes when :allow_nil is false, but should raise an error when
+          # Change the existing object attribute to nil to run allow nil
+          # validations. If we find any problem while updating the @existing
+          # record, it's because we can't save nil values in the database. So it
+          # passes when :allow_nil is false, but should raise an error when
           # :allow_nil is true
           #
-          def allow_nil?
-            return true unless @options.key?(:allow_nil)
-
+          def allow_nil?
+            return true unless @options.key?(:allow_nil)
+
             @existing.update_attribute(@attribute, nil)
-            super
-          rescue Exception => e
-            raise ScriptError, "You declared that #{@attribute} accepts nil values in validate_uniqueness_of, " <<
-                               "but I cannot save nil values in the database, got: #{e.message}" if @options[:allow_nil]
-
-            true
+            super
+          rescue Exception => e
+            raise ScriptError, "You declared that #{@attribute} accepts nil values in validate_uniqueness_of, " <<
+                               "but I cannot save nil values in the database, got: #{e.message}" if @options[:allow_nil]
+
+            true
           end
 
-          # Change the existing object attribute to blank to run allow blank
+          # Change the existing object attribute to blank to run allow blank
           # validation. It uses the same logic as :allow_nil.
           #
-          def allow_blank?
-            return true unless @options.key?(:allow_blank)
+          def allow_blank?
+            return true unless @options.key?(:allow_blank)
 
             @existing.update_attribute(@attribute, '')
-            super
-          rescue Exception => e
-            raise ScriptError, "You declared that #{@attribute} accepts blank values in validate_uniqueness_of, " <<
-                               "but I cannot save blank values in the database, got: #{e.message}" if @options[:allow_blank]
-
+            super
+          rescue Exception => e
+            raise ScriptError, "You declared that #{@attribute} accepts blank values in validate_uniqueness_of, " <<
+                               "but I cannot save blank values in the database, got: #{e.message}" if @options[:allow_blank]
+
             true
           end
 
@@ -120,10 +123,12 @@ module Remarkable
           # database and tries to return a new value which does not belong to it.
           #
           def new_value_for_scope(scope)
-            new_scope = (@existing.send(scope) || 999).next.to_s
+            values = [(@existing.send(scope) || 999).next.to_s]
 
             # Generate a range of values to search in the database
-            values = 100.times.inject([new_scope]) {|v,i| v << v.last.next }
+            100.times do
+              values << values.last.next
+            end
             conditions = { scope => values, @attribute => @value }
 
             # Get values from the database, get the scope attribute and map them to string.

data/spec/validate_uniqueness_of_matcher_spec.rb

@@ -136,9 +136,9 @@ describe 'validate_uniqueness_of' do
         end
       end
       proc { @matcher.matches?(@model) }.should_not raise_error(ScriptError)
-    end
-
-    describe 'when null or blank values are not allowed' do
+    end
+
+    describe 'when null or blank values are not allowed' do
       def define_and_validate(options={})
         @model = define_model :user, :username => [:string, {:null => false}] do
           validates_uniqueness_of :username, options
@@ -147,14 +147,14 @@ describe 'validate_uniqueness_of' do
         # Create a model
         User.create(:username => Time.now)
         validate_uniqueness_of(:username)
-      end
-
-      it { should define_and_validate }
-      it { should define_and_validate.allow_nil(false) }
-
-      it 'should raise an error if allow nil is true but we cannot save nil values in the database'do
-        proc { should define_and_validate.allow_nil }.should raise_error(ScriptError, /You declared that username accepts nil values in validate_uniqueness_of, but I cannot save nil values in the database, got/)
-      end
+      end
+
+      it { should define_and_validate }
+      it { should define_and_validate.allow_nil(false) }
+
+      it 'should raise an error if allow nil is true but we cannot save nil values in the database'do
+        proc { should define_and_validate.allow_nil }.should raise_error(ScriptError, /You declared that username accepts nil values in validate_uniqueness_of, but I cannot save nil values in the database, got/)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_activerecord
 version: !ruby/object:Gem::Version 
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors: 
 - Carlos Brando
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 +02:00
+date: 2009-04-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.2
+        version: 3.0.3
     version: 
 description: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
 email: 
@@ -45,22 +45,22 @@ files:
 - lib/remarkable_activerecord/base.rb
 - lib/remarkable_activerecord/human_names.rb
 - lib/remarkable_activerecord/matchers
-- lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb
-- lib/remarkable_activerecord/matchers/allow_values_for_matcher.rb
-- lib/remarkable_activerecord/matchers/association_matcher.rb
-- lib/remarkable_activerecord/matchers/have_column_matcher.rb
-- lib/remarkable_activerecord/matchers/have_index_matcher.rb
-- lib/remarkable_activerecord/matchers/have_readonly_attributes_matcher.rb
-- lib/remarkable_activerecord/matchers/have_scope_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_acceptance_of_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_associated_matcher.rb
 - lib/remarkable_activerecord/matchers/validate_confirmation_of_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_exclusion_of_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_inclusion_of_matcher.rb
 - lib/remarkable_activerecord/matchers/validate_length_of_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_numericality_of_matcher.rb
+- lib/remarkable_activerecord/matchers/have_readonly_attributes_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_exclusion_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_associated_matcher.rb
+- lib/remarkable_activerecord/matchers/have_column_matcher.rb
+- lib/remarkable_activerecord/matchers/association_matcher.rb
 - lib/remarkable_activerecord/matchers/validate_presence_of_matcher.rb
+- lib/remarkable_activerecord/matchers/have_scope_matcher.rb
+- lib/remarkable_activerecord/matchers/allow_values_for_matcher.rb
+- lib/remarkable_activerecord/matchers/have_index_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_inclusion_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_acceptance_of_matcher.rb
 - lib/remarkable_activerecord/matchers/validate_uniqueness_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_numericality_of_matcher.rb
+- lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb
 - lib/remarkable_activerecord.rb
 - locale/en.yml
 has_rdoc: true
@@ -90,23 +90,23 @@ signing_key:
 specification_version: 2
 summary: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
 test_files: 
-- spec/allow_mass_assignment_of_matcher_spec.rb
-- spec/allow_values_for_matcher_spec.rb
-- spec/association_matcher_spec.rb
-- spec/have_column_matcher_spec.rb
-- spec/have_index_matcher_spec.rb
-- spec/have_readonly_attributes_matcher_spec.rb
-- spec/have_scope_matcher_spec.rb
-- spec/model_builder.rb
+- spec/validate_associated_matcher_spec.rb
+- spec/validate_length_of_matcher_spec.rb
 - spec/rcov.opts
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/validate_acceptance_of_matcher_spec.rb
-- spec/validate_associated_matcher_spec.rb
+- spec/allow_mass_assignment_of_matcher_spec.rb
+- spec/have_scope_matcher_spec.rb
+- spec/validate_inclusion_of_matcher_spec.rb
+- spec/spec.opts
+- spec/have_readonly_attributes_matcher_spec.rb
 - spec/validate_confirmation_of_matcher_spec.rb
+- spec/allow_values_for_matcher_spec.rb
+- spec/validate_uniqueness_of_matcher_spec.rb
+- spec/have_column_matcher_spec.rb
+- spec/have_index_matcher_spec.rb
+- spec/association_matcher_spec.rb
 - spec/validate_exclusion_of_matcher_spec.rb
-- spec/validate_inclusion_of_matcher_spec.rb
-- spec/validate_length_of_matcher_spec.rb
+- spec/model_builder.rb
 - spec/validate_numericality_of_matcher_spec.rb
 - spec/validate_presence_of_matcher_spec.rb
-- spec/validate_uniqueness_of_matcher_spec.rb