Simplify predicate for ValidValidator

Author: Drenmi

lib/value_objects/valid_validator.rb

@@ -4,7 +4,7 @@ module ValueObjects
   class ValidValidator < ActiveModel::EachValidator
 
     def validate_each(record, attribute, value)
-      record.errors.add(attribute, :invalid) unless value && (value.is_a?(Array) ? value.count(&:invalid?) == 0 : value.valid?)
+      record.errors.add(attribute, :invalid) unless value && [*value].all?(&:valid?)
     end
 
   end

spec/value_objects/valid_validator_spec.rb

@@ -22,6 +22,9 @@ class NilForbiddenRecord
 
   end
 
+  let(:valid_value) { instance_double('ValidValue', valid?: true) }
+  let(:invalid_value) { instance_double('InvalidValue', valid?: false) }
+
   context 'with allow_nil' do
 
     let(:record) { NilAllowedRecord.new(foo: value) }
@@ -41,7 +44,7 @@ class NilForbiddenRecord
 
     context 'and invalid value' do
 
-      let(:value) { instance_double('InvalidValue', valid?: false) }
+      let(:value) { invalid_value }
 
       it 'fails validation' do
         aggregate_failures do
@@ -54,7 +57,7 @@ class NilForbiddenRecord
 
     context 'and valid value' do
 
-      let(:value) { instance_double('ValidValue', valid?: true) }
+      let(:value) { valid_value }
 
       it 'passes validation' do
         aggregate_failures do
@@ -87,7 +90,7 @@ class NilForbiddenRecord
 
     context 'and invalid value' do
 
-      let(:value) { instance_double('InvalidValue', valid?: false) }
+      let(:value) { invalid_value }
 
       it 'fails validation' do
         aggregate_failures do
@@ -100,7 +103,7 @@ class NilForbiddenRecord
 
     context 'and valid value' do
 
-      let(:value) { instance_double('ValidValue', valid?: true) }
+      let(:value) { valid_value }
 
       it 'passes validation' do
         aggregate_failures do
@@ -133,12 +136,12 @@ class NilForbiddenRecord
     context 'and no invalid values' do
 
       let(:values) { [value1, value2] }
-      let(:value1) { instance_double('ValidValue') }
-      let(:value2) { instance_double('ValidValue') }
+      let(:value1) { valid_value }
+      let(:value2) { valid_value }
 
       it 'passes validation' do
-        expect(value1).to receive(:invalid?).and_return(false).once
-        expect(value2).to receive(:invalid?).and_return(false).once
+        expect(value1).to receive(:valid?).and_return(true).once
+        expect(value2).to receive(:valid?).and_return(true).once
         aggregate_failures do
           expect(record.valid?).to eq(true)
           expect(record.errors).to be_empty
@@ -150,12 +153,12 @@ class NilForbiddenRecord
     context 'and some invalid values' do
 
       let(:values) { [value1, value2] }
-      let(:value1) { instance_double('ValidValue') }
-      let(:value2) { instance_double('InvalidValue') }
+      let(:value1) { valid_value }
+      let(:value2) { invalid_value }
 
       it 'fails validation' do
-        expect(value1).to receive(:invalid?).and_return(false).once
-        expect(value2).to receive(:invalid?).and_return(true).once
+        expect(value1).to receive(:valid?).and_return(true).once
+        expect(value2).to receive(:valid?).and_return(false).once
         aggregate_failures do
           expect(record.valid?).to eq(false)
           expect(record.errors).to include(:foo)