validatious-on-rails 0.4.7 → 0.4.8

data/generators/validatious/templates/v2.rails.js

@@ -62,8 +62,6 @@ v2.Validator.add({acceptEmpty: false, fn: function(field, value, params) { retur
 
    v2.Rails.initializeLastResult(name, field_element.id);
 
-   console.log(v2.Rails.lastRemoteValidationResult[name][field_element.id]);
-
    var xmlHttpRequest = new XMLHttpRequest;
    xmlHttpRequest.open('GET', url, true);
    xmlHttpRequest.onreadystatechange = function() {

data/lib/validatious-on-rails/model_validations.rb

@@ -79,9 +79,19 @@ module ValidatiousOnRails
         return validators
       end
 
+      added_validations = []
+
       # Iterate thorugh the validations for the current class,
       # and collect validation options.
       klass.reflect_on_validations_for(attribute_method.to_sym).each do |validation|
+        validation_id = [validation.macro.to_sym, validation.name.to_sym].hash
+        if added_validations.include?(validation_id)
+          ValidatiousOnRails.log "Duplicate validation detected on #{object_or_class}##{attribute_method}: #{validation.macro}." <<
+            " All except the first one will be ignored. Please remove the redundant ones, or try to merge them into just one.", :warn
+          next
+        end
+        added_validations << validation_id
+
         validates_type = validation.macro.to_s.sub(/^validates?_/, '')
         if validation.options[:client_side].nil?
           validation.options[:client_side] = ::ValidatiousOnRails.client_side_validations_by_default

data/test/test_helper.rb

@@ -68,6 +68,7 @@ build_model :bogus_items do
 
   validates_presence_of :name, :body, :variant, :file_path, :dummie
   validates_uniqueness_of :name
+  validates_uniqueness_of :name # test dupplication (that should be ignored)
   validates_confirmation_of :name
   validates_acceptance_of :signed, :accept => true
   validates_format_of :url,

data/test/validatious_on_rails/model_validations_test.rb

@@ -216,7 +216,10 @@ class ModelValidationsTest < ::ActiveSupport::TestCase
   end
 
   test "uniqueness_of" do
-    # TODO: not implemented
+    validators = ::ValidatiousOnRails::ModelValidations.uniqueness_of(validation(:validates_uniqueness_of))
+    assert_validator_class 'uniqueness_false_false', validators
+    # Ignore duplicates (Note: defined two times in TestHelper).
+    assert_equal 1, [*validators].collect { |v| v.to_class.split(' ') }.flatten.select { |c| c == 'uniqueness_false_false'}.size
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Jonas Grimfelt