composed_validations 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bab2327be4ff6b26f3e3551f0169068b367cf705
-  data.tar.gz: 16fca3cd1bfc62f58cd5d6cd3ab7a89fbf23d1ad
+  metadata.gz: 8d89729666fefa1d939fab5404db545fb38d54c4
+  data.tar.gz: 3840e021b0bca686a7f60671d4e011a6cc945992
 SHA512:
-  metadata.gz: 27107fce38883fd31397d2cd05e121520152a8ab8ed48c5906c7a102a7dfb4e0eda3e8129f30ec7823b122cdb9dc9e9fde4c61a5730f563e10c0fbdefa7a1713
-  data.tar.gz: 4bd68f57c44a602aa3806fb795aae0dcea9e77d572e873bde44dafb3ed2b86a0fe2316e7522dc429d53f8e889b370bb95ef88170360ff0a3b1507c5a0bffc273
+  metadata.gz: 20aab6508544be7422acec7289458517b69cdccb15327f1f19b6bbe7f4d9ff88c2eccd9549871fabb43f0eeec7f4a6ecd1c244b14b8b6e4887eea952735aec86
+  data.tar.gz: 50be9b4b2d8caa5384de8c30a11b8e472a7f3cb350374bf5e62b09c6dcc080ae003a8920acebcd207359e304d36b7b389fc6e0f97c5d4aef7d2cf01aa3536e3e

data/lib/composed_validations/and_string_joiner.rb

@@ -0,0 +1,23 @@
+module ComposedValidations
+  class AndStringJoiner
+    attr_reader :strings, :last_two
+    def initialize(*strings)
+      @strings = strings
+      @last_two = @strings.pop(2)
+    end
+
+    def to_s
+      [first_elements_string, last_two_elements_string].join(", ").gsub(/^, /,'')
+    end
+
+    private
+
+    def first_elements_string
+      strings.join(", ")
+    end
+
+    def last_two_elements_string
+      last_two.join(" and ")
+    end
+  end
+end

data/lib/composed_validations/and_validator.rb

@@ -0,0 +1,20 @@
+module ComposedValidations
+  class AndValidator
+    attr_reader :validators
+    def initialize(validators)
+      @validators = Array(validators)
+    end
+
+    def valid?(record)
+      validators.all? do |validator|
+        validator.valid?(record)
+      end
+    end
+
+    def message
+      @message ||= AndStringJoiner.new(validators.map(&:message)).to_s
+    end
+
+  end
+
+end

data/lib/composed_validations/decorate_properties.rb

@@ -15,12 +15,19 @@ module ComposedValidations
   end
 
   class Decorator < SimpleDelegator
-    attr_reader :validators
     def initialize(resource, validators)
       @validators = validators
       super(resource)
     end
 
+    def validators
+      @validator_return ||= begin
+                              Hash[@validators.map do |property, validators|
+                                [property.to_sym, Array(validators)]
+                              end]
+                            end
+    end
+
     def class
       __getobj__.class
     end

data/lib/composed_validations/validated_property.rb

@@ -1,5 +1,8 @@
 module ComposedValidations
   class ValidatedProperty
     vattr_initialize :validated_property, :property_accessor
+    def to_sym
+      validated_property
+    end
   end
 end

data/lib/composed_validations/version.rb

@@ -1,3 +1,3 @@
 module ComposedValidations
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/composed_validations.rb

@@ -7,7 +7,9 @@ module ComposedValidations
   autoload :DecorateProperties, "composed_validations/decorate_properties"
   autoload :PropertyValidator, "composed_validations/property_validator"
   autoload :OrValidator, "composed_validations/or_validator"
+  autoload :AndValidator, "composed_validations/and_validator"
   autoload :OrStringJoiner, "composed_validations/or_string_joiner"
+  autoload :AndStringJoiner, "composed_validations/and_string_joiner"
   autoload :ValidatedProperty, "composed_validations/validated_property"
 
   def ValidatedProperty(value)

data/spec/composed_validations/and_string_joiner_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+RSpec.describe ComposedValidations::AndStringJoiner do
+  subject { described_class.new(*strings) }
+  context "when there's two strings" do
+    let(:strings) { ["one", "two"] }
+    it "should join with and" do
+      expect(subject.to_s).to eq "one and two"
+    end
+  end
+  context "when there's three strings" do
+    let(:strings) { ["one", "two", "three"] }
+    it "should join with a comma and and" do
+      expect(subject.to_s).to eq "one, two and three"
+    end
+  end
+  context "when there's four strings" do
+    let(:strings) { ["one", "two", "three", "four"] }
+    it "should join nicely" do
+      expect(subject.to_s).to eq "one, two, three and four"
+    end
+  end
+end

data/spec/composed_validations/and_validator_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+RSpec.describe ComposedValidations::AndValidator do
+  subject { described_class.new(validators) }
+  let(:validators) { [ validator_1, validator_2 ] }
+  let(:validator_1) { mock_validator(valid: true) }
+  let(:validator_2) { mock_validator(valid: true) }
+
+  describe "#valid?" do
+    let(:value) { double("value") }
+    let(:result) { subject.valid?(value) }
+    context "when both validators are valid" do
+      it "should return true" do
+        expect(result).to eq true
+      end
+    end
+    context "when one is valid" do
+      let(:validator_2) { mock_validator(valid: false) }
+      it "should return false" do
+        expect(result).to eq false
+      end
+    end
+    context "when both are invalid" do
+      let(:validator_1) { mock_validator(valid: false) }
+      let(:validator_2) { mock_validator(valid: false) }
+      it "should return false" do
+        expect(result).to eq false
+      end
+      context "with one valid validator" do
+        let(:validators) { validator_1 }
+        let(:validator_1) { mock_validator(valid: true) }
+        it "should return true" do
+          expect(result).to eq true
+        end
+      end
+    end
+    describe "#message" do
+      it "should combine the two validators' messages" do
+        expect(subject.message).to eq "message and message"
+      end
+      context "with one validator" do
+        let(:validators) { validator_1 }
+        it "should just return one message when there's one" do
+          expect(subject.message).to eq "message"
+        end
+      end
+    end
+  end
+
+  def mock_validator(valid:)
+    i = double("validator")
+    allow(i).to receive(:valid?).and_return(valid)
+    allow(i).to receive(:message).and_return("message")
+    i
+  end
+end

data/spec/composed_validations/decorate_properties_spec.rb

@@ -24,10 +24,15 @@ RSpec.describe ComposedValidations::DecorateProperties do
       expect(ComposedValidations::WithValidatedProperty).to have_received(:new).with(resource, :title, validator)
       expect(ComposedValidations::WithValidatedProperty).to have_received(:new).with(result.__getobj__, :title, validator2)
     end
-    it "should respond to #validators" do
-      result = subject.run
+  end
 
-      expect(result.validators).to eq property_mapper
+  describe "#validators" do
+    it "should give back the properties" do
+      expect(subject.run.validators).to eq property_mapper
+    end
+    it "should give back accessors as keys if given a ValidatedProperty" do
+      result = described_class.new(resource, {ComposedValidations::ValidatedProperty.new(:lcsubject, :lcsubject_ids) => validator}).run
+      expect(result.validators).to eq ({:lcsubject => [validator]})
     end
   end
 

data/spec/composed_validations/validated_property_spec.rb

@@ -13,6 +13,12 @@ RSpec.describe ComposedValidations::ValidatedProperty do
     end
   end
 
+  describe "#to_sym" do
+    it "should return the validated property" do
+      expect(subject.to_sym).to eq :validated_property
+    end
+  end
+
   describe "Caster" do
     subject { ComposedValidations::ValidatedProperty(value) }
     context "when given a string" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composed_validations
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Trey Terrell
@@ -124,6 +124,8 @@ files:
 - circle.yml
 - composed_validations.gemspec
 - lib/composed_validations.rb
+- lib/composed_validations/and_string_joiner.rb
+- lib/composed_validations/and_validator.rb
 - lib/composed_validations/decorate_properties.rb
 - lib/composed_validations/or_string_joiner.rb
 - lib/composed_validations/or_validator.rb
@@ -131,6 +133,8 @@ files:
 - lib/composed_validations/validated_property.rb
 - lib/composed_validations/version.rb
 - lib/composed_validations/with_validated_property.rb
+- spec/composed_validations/and_string_joiner_spec.rb
+- spec/composed_validations/and_validator_spec.rb
 - spec/composed_validations/decorate_properties_spec.rb
 - spec/composed_validations/or_string_joiner_spec.rb
 - spec/composed_validations/or_validator_spec.rb
@@ -164,6 +168,8 @@ signing_key:
 specification_version: 4
 summary: Composes validations onto properties of an object.
 test_files:
+- spec/composed_validations/and_string_joiner_spec.rb
+- spec/composed_validations/and_validator_spec.rb
 - spec/composed_validations/decorate_properties_spec.rb
 - spec/composed_validations/or_string_joiner_spec.rb
 - spec/composed_validations/or_validator_spec.rb