active_model_validators_ex 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05737b152952959d082cacc7e93ddf422da9a9f
-  data.tar.gz: ffb49f4614ca57efbd248df84c55dae753280efc
+  metadata.gz: e29da0db036abf2741a6ef1980deb0e38f45485c
+  data.tar.gz: 20e6022a990c499f061f682ab645f1dffb424534
 SHA512:
-  metadata.gz: e66f36b5998c3b43cf40487fd130c67d8cd98e79295d8335b42ecb728559e9701f8a226dda075b07817ea2c1d09ab4f5a19d0c1a0c138db0f00f74e0e9fc711d
-  data.tar.gz: 6dd4a3d772f9d09438f10305f019bb619b75f6a6e45d8fd6221c2e7bc3933ccf2fabe6597470a14dbd85225741afce36e8395b1dd13126c067b4e7987b22cf6a
+  metadata.gz: 108c4986eef5a72652d4386d3196b7099726594784476e6c00d148efca01d8336a743cc376481792e082838840d7bfc5e29bab24241b1a0645df552f56d3cf8d
+  data.tar.gz: 17cd7e8793b02a6e32291675531fb70c0bfad74c459e6eb707fff0de6d1b1a87d232c8c2ee7c4304a4e442af21bb2d6d2d578e5643b99608f5ffcdb608126d51

data/README.md

@@ -52,9 +52,9 @@ validations:
               # defaults to false
               allow_nil: true,
 
-              # can be either true or false, indicates if it accepts empty arrays
+              # can be either true or false, indicates if it accepts blank value
               # defaults to false
-              allow_empty: true
+              allow_blank: true
             }
         end
 
@@ -67,7 +67,7 @@ validations:
         # returns true
         ExampleModel.new(array: []).valid?
 
-   Used translation keys: array, empty, array_inclusion
+   Used translation keys: array, blank, array_inclusion
 
   * ArrayFormatValidator
 
@@ -84,9 +84,9 @@ validations:
             # defaults to false
             allow_nil: true,
 
-            # can be either true or false, indicates if it accepts empty arrays
+            # can be either true or false, indicates if it accepts blank value
             # defaults to false
-            allow_empty: true
+            allow_blank: true
           }
         end
 
@@ -96,7 +96,7 @@ validations:
         # return false
         ExampleModel.new(array: ['not', 'matching']).valid?
 
-   Used translation keys: array, empty, array_format
+   Used translation keys: array, blank, array_format
 
   * TimeFormatValidator
 

data/lib/active_model_validators_ex/array_validator_base.rb

@@ -1,21 +1,28 @@
 class ArrayValidatorBase < ActiveModel::EachValidator
   def initialize(options)
     options[:allow_nil]   ||= false
-    options[:allow_empty] ||= false
+    options[:allow_blank] ||= false
 
     super(options)
   end
 
   def validate_each(record, attribute, value)
-    return if options[:allow_nil] && value.nil?
+    # TODO: extract this to a more generic class instad of ArrayValidatorBase
+    return if (options[:allow_blank] && value.blank?) ||
+              (options[:allow_nil] && value.nil?)
 
-    unless value.is_a? Array
-      record.errors.add(attribute, :array, options)
+    if !options[:allow_blank] && value.blank?
+      record.errors.add(attribute, :blank, options)
       return
     end
 
-    if !options[:allow_empty] and value.empty?
-      record.errors.add(attribute, :empty, options)
+    if !options[:allow_nil] && value.nil?
+      record.errors.add(attribute, :nil, options)
+      return
+    end
+
+    unless value.is_a? Array
+      record.errors.add(attribute, :array, options)
       return
     end
 

data/lib/active_model_validators_ex/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelValidatorsEx
-  VERSION = "0.3.2"
+  VERSION = "1.0.0"
 end

data/spec/active_model_validators_ex/array_validator_base_spec.rb

@@ -20,7 +20,7 @@ describe ArrayValidatorBase do
     end
 
     shared_examples_for :common_behavior do
-      context 'and value is a non nil, non array value' do
+      context 'value is a non nil, non array value' do
         let(:value) { :symbol }
 
         it 'sets error message in record' do
@@ -30,7 +30,7 @@ describe ArrayValidatorBase do
     end
 
     shared_examples_for :allow_nil_true do
-      context 'and value is nil' do
+      context 'value is nil' do
         let(:value) { nil }
 
         it 'does not set error messages in record' do
@@ -40,7 +40,7 @@ describe ArrayValidatorBase do
     end
 
     shared_examples_for :allow_nil_false do
-      context 'and value is nil' do
+      context 'value is nil' do
         let(:value) { nil }
 
         it 'sets error message in record' do
@@ -49,8 +49,8 @@ describe ArrayValidatorBase do
       end
     end
 
-    shared_examples_for :allow_empty_true do
-      context 'and value is an empty Array' do
+    shared_examples_for :allow_blank_true do
+      context 'value is an blank Array' do
         let(:value) { [] }
 
         it 'does not set error messages in record' do
@@ -59,8 +59,8 @@ describe ArrayValidatorBase do
       end
     end
 
-    shared_examples_for :allow_empty_false do
-      context 'and value is an empty Array' do
+    shared_examples_for :allow_blank_false do
+      context 'value is an blank Array' do
         let(:value) { [] }
 
         it 'set error messager in record' do
@@ -74,23 +74,22 @@ describe ArrayValidatorBase do
 
       it_behaves_like :common_behavior
       it_behaves_like :allow_nil_false
-      it_behaves_like :allow_empty_false
+      it_behaves_like :allow_blank_false
     end
 
-    context 'for instance initialized with allow_empty true' do
-      let(:options) { { attributes: attribute, allow_empty: true } }
+    context 'for instance initialized with allow_blank true' do
+      let(:options) { { attributes: attribute, allow_blank: true } }
 
       it_behaves_like :common_behavior
-      it_behaves_like :allow_nil_false
-      it_behaves_like :allow_empty_true
+      it_behaves_like :allow_blank_true
     end
 
-    context 'for instance initialized with allow_empty false' do
-      let(:options) { { attributes: attribute, allow_empty: false } }
+    context 'for instance initialized with allow_blank false' do
+      let(:options) { { attributes: attribute, allow_blank: false } }
 
       it_behaves_like :common_behavior
+      it_behaves_like :allow_blank_false
       it_behaves_like :allow_nil_false
-      it_behaves_like :allow_empty_false
     end
 
     context 'for instance initialized with allow_nil true' do
@@ -98,26 +97,26 @@ describe ArrayValidatorBase do
 
       it_behaves_like :common_behavior
       it_behaves_like :allow_nil_true
-      it_behaves_like :allow_empty_false
+      it_behaves_like :allow_blank_false
 
-      context 'and allow_empty true' do
+      context 'and allow_blank true' do
         let(:options) do
-          { attributes: attribute, allow_nil: true, allow_empty: true }
+          { attributes: attribute, allow_nil: true, allow_blank: true }
         end
 
         it_behaves_like :common_behavior
         it_behaves_like :allow_nil_true
-        it_behaves_like :allow_empty_true
+        it_behaves_like :allow_blank_true
       end
 
-      context 'and allow_empty false' do
+      context 'and allow_blank false' do
         let(:options) do
-          { attributes: attribute, allow_nil: true, allow_empty: false }
+          { attributes: attribute, allow_nil: true, allow_blank: false }
         end
 
         it_behaves_like :common_behavior
         it_behaves_like :allow_nil_true
-        it_behaves_like :allow_empty_false
+        it_behaves_like :allow_blank_false
       end
     end
 
@@ -126,26 +125,25 @@ describe ArrayValidatorBase do
 
       it_behaves_like :common_behavior
       it_behaves_like :allow_nil_false
-      it_behaves_like :allow_empty_false
+      it_behaves_like :allow_blank_false
 
-      context 'and allow_empty true' do
+      context 'and allow_blank true' do
         let(:options) do
-          { attributes: attribute, allow_nil: false, allow_empty: true }
+          { attributes: attribute, allow_nil: false, allow_blank: true }
         end
 
         it_behaves_like :common_behavior
-        it_behaves_like :allow_nil_false
-        it_behaves_like :allow_empty_true
+        it_behaves_like :allow_blank_true
       end
 
-      context 'and allow_empty false' do
+      context 'and allow_blank false' do
         let(:options) do
-          { attributes: attribute, allow_nil: false, allow_empty: false }
+          { attributes: attribute, allow_nil: false, allow_blank: false }
         end
 
         it_behaves_like :common_behavior
         it_behaves_like :allow_nil_false
-        it_behaves_like :allow_empty_false
+        it_behaves_like :allow_blank_false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_validators_ex
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - junhanamaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler