sanatio 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86489fb3a7e95291f3cb895dd5ad7b46e6469501
-  data.tar.gz: 02a12e955cb9f32e3375610da45d4d2ab275a03d
+  metadata.gz: 585d48d86589b1bcc47c108afb413c9237f5d48b
+  data.tar.gz: bcd2e20c1bf6baf3efa471918f04bcd0b0e1ec16
 SHA512:
-  metadata.gz: e9a414ffd1a40f35cc81e9443258defd54156a22ec5e002e049da71d23f15bf03d54694940664440e4484d8dd455423f955afd69a660c783db8362e9c24b4783
-  data.tar.gz: 83bade7aa04d63bbfb66ca0d5c7bc0f369ba0b91bfe8cbf5d55778cbb0762a6710dd1a7c0c8c441a8883797c09c0c01a4e556e0a107bba612a84b5cb99c95189
+  metadata.gz: 309b7b52daafb90e73c41cd8c284ef43651c8802de4c07f5aaaae257cf40c37c8afe2a0c43c2c28f0b1dfa13340fbee3ee56bce9cebe40bdb3d90cec6040d91d
+  data.tar.gz: 862fc04e1f17a84fe8fd700f44848e76d15451be5d8aa5235406f42542c4248760fcd7524e82b65552dc956f39cc664f0ed23da9ead8501df2ba028d78f29732

data/README.md

@@ -331,6 +331,39 @@ Person.new("DoesNotMatch").valid? #false
 Person.new("DoesNotMatch").errors #[Error.new(:field => :name, :reason => :no_match)]
 ```
 
+#### Either
+
+This validation only passes when only one of the two fields matches the given
+validator.
+
+The validation is skipped if either field contains a value that would be
+skipped.
+
+```ruby
+class Person
+  include Sanatio
+
+  def initialize(first_name, last_name)
+    @first_name = first_name
+    @last_name = last_name
+  end
+
+  attr_reader :first_name, :last_name
+
+  ensure_that(self).is Either, :first_name, :last_name, Present
+end
+
+Person.new('Test', 'Testington').valid? #false
+Person.new('Test', nil).valid? #true
+Person.new('', 'Testington).valid? #true
+Person.new(nil, '').valid? #false
+Person.new(nil, nil).errors #[Error.new(:reason => :neither, :params =>
+                            #  [:first_name, :last_name])]
+Person.new('Test', 'Testington').errors #[Error.new(:reason => :both,
+                                        # :params =>
+                                        #   [:first_name, :last_name])]
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/sanatio.rb

@@ -35,7 +35,9 @@ module Sanatio
         validator.skip?(self)
       end.reject do |validator|
         validator.valid?(self)
-      end.map(&:error)
+      end.map do |validator|
+        validator.error(self)
+      end
     end
   end
 

data/lib/sanatio/block_validator.rb

@@ -4,8 +4,6 @@ module Sanatio
   class BlockValidator
     include Skippable
 
-    attr_accessor :reason
-
     def initialize(validation_block)
       @validation_block = validation_block
     end
@@ -13,6 +11,14 @@ module Sanatio
     def valid?(object)
       object.instance_eval(&@validation_block)
     end
+
+    def reason=(reason)
+      @reason = reason
+    end
+
+    def reason(object)
+      @reason
+    end
   end
 end
 

data/lib/sanatio/built-in.rb

@@ -8,3 +8,4 @@ require 'sanatio/built-in/not_equal_to'
 require 'sanatio/built-in/one_of'
 require 'sanatio/built-in/valid'
 require 'sanatio/built-in/matching'
+require 'sanatio/built-in/either'

data/lib/sanatio/built-in/either.rb

@@ -0,0 +1,47 @@
+class Either
+  def initialize(first_field, second_field, validator_class, *params)
+    @first_field = first_field
+    @second_field = second_field
+    @validator = validator_class.new(*params)
+  end
+
+  def skip?(value)
+    @validator.skip?(first_value(value)) || @validator.skip?(second_value(value))
+  end
+
+  def valid?(value)
+    !both?(value) && !neither?(value)
+  end
+
+  def reason(value)
+    if neither?(value)
+      :neither
+    else
+      if both?(value)
+        :both
+      end
+    end
+  end
+
+  def params
+    [@first_field, @second_field]
+  end
+
+  private
+
+  def both?(value)
+    @validator.valid?(first_value(value)) && @validator.valid?(second_value(value))
+  end
+
+  def neither?(value)
+    !@validator.valid?(first_value(value)) && !@validator.valid?(second_value(value))
+  end
+
+  def first_value(value)
+    value.send(@first_field)
+  end
+
+  def second_value(value)
+    value.send(@second_field)
+  end
+end

data/lib/sanatio/built-in/equal_to.rb

@@ -10,7 +10,7 @@ class EqualTo
     object == @value
   end
 
-  def reason
+  def reason(_)
     :not_equal_to
   end
 

data/lib/sanatio/built-in/greater_than.rb

@@ -7,7 +7,7 @@ module Sanatio
         super(value, :>)
       end
 
-      def reason
+      def reason(_)
         :less_than_or_equal_to
       end
     end

data/lib/sanatio/built-in/greater_than_or_equal_to.rb

@@ -7,7 +7,7 @@ module Sanatio
         super(value, :>=)
       end
 
-      def reason
+      def reason(_)
         :less_than
       end
     end

data/lib/sanatio/built-in/less_than.rb

@@ -7,7 +7,7 @@ module Sanatio
         super(value, :<)
       end
 
-      def reason
+      def reason(_)
         :greater_than_or_equal_to
       end
     end

data/lib/sanatio/built-in/less_than_or_equal_to.rb

@@ -7,7 +7,7 @@ module Sanatio
         super(value, :<=)
       end
 
-      def reason
+      def reason(_)
         :greater_than
       end
     end

data/lib/sanatio/built-in/matching.rb

@@ -13,7 +13,7 @@ module Sanatio
         @regex.match(value)
       end
 
-      def reason
+      def reason(_)
         :no_match
       end
 

data/lib/sanatio/built-in/not_equal_to.rb

@@ -10,7 +10,7 @@ class NotEqualTo
     object != @value
   end
 
-  def reason
+  def reason(_)
     :equal_to
   end
 

data/lib/sanatio/built-in/one_of.rb

@@ -13,7 +13,7 @@ module Sanatio
         @values.include?(object)
       end
 
-      def reason
+      def reason(_)
         :not_one_of
       end
 

data/lib/sanatio/built-in/present.rb

@@ -8,7 +8,7 @@ module Sanatio
         !object.nil? && (!object.respond_to?(:empty?) || !object.empty?)
       end
 
-      def reason
+      def reason(_)
         :not_present
       end
     end

data/lib/sanatio/built-in/valid.rb

@@ -9,7 +9,7 @@ module Sanatio
         object.valid?
       end
 
-      def reason
+      def reason(_)
         :invalid
       end
     end

data/lib/sanatio/class_validator.rb

@@ -14,8 +14,8 @@ module Sanatio
       @validator.skip?(object)
     end
 
-    def error
-      Error.new(@validator.reason, params)
+    def error(object)
+      Error.new(@validator.reason(object), params)
     end
 
     private

data/lib/sanatio/field_validator.rb

@@ -18,8 +18,8 @@ module Sanatio
       @validator.skip?(object.send(@field))
     end
 
-    def error
-      Error.new(@field, @validator.reason, params)
+    def error(object)
+      Error.new(@field, @validator.reason(object.send(@field)), params)
     end
 
     private

data/lib/sanatio/version.rb

@@ -1,3 +1,3 @@
 module Sanatio
-  VERSION = "0.5.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanatio
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Thijs Wouters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - lib/sanatio.rb
 - lib/sanatio/block_validator.rb
 - lib/sanatio/built-in.rb
+- lib/sanatio/built-in/either.rb
 - lib/sanatio/built-in/equal_to.rb
 - lib/sanatio/built-in/greater_than.rb
 - lib/sanatio/built-in/greater_than_or_equal_to.rb
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A gem for validation, without all the dependencies.