sanatio 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479bf5da1408bc5c3ff984ad7baa6899a49a5152
-  data.tar.gz: 1dff2a76f7fe9f3393ee37b4312df7a30cf9e6a0
+  metadata.gz: 0519a019706d7b884adb4aadb461e572bb966395
+  data.tar.gz: c92a11cf8416f2209bdabbbcb0c1d9b13a85ec5b
 SHA512:
-  metadata.gz: 3703329eb46d2bd728dab0e55c0e38a59f3569fbe005767f36f2d23952c588ffde5e8e27a48ea93496ac9e7e2e77823bc0ca14f5072d109c4758c0399e00ccad
-  data.tar.gz: 74bf2a27049e5d97281505679c3a71fde78d10176844fc6f987e94546148efa7761bd3a1a34b29c2b1fe96fb4fe561c071826fda580b281da425ddfc300f65d9
+  metadata.gz: 873be4fe9aa533a5c879b5b2fa94d4b95b501bf27e94fcc64fad2bd4b4ff400493c4d940eb4a40e457407f44d5565928f4165ae7bd4031d6cd069bd50535545a
+  data.tar.gz: 85fb148a1ea81e9f23e1b8d7d67a8f3c177701aebca7ad20c7d98c27e1730f96c6d8accc02274dca8c49ed282f7ece2d09ef4fe4136706ed1694bfb4269368c6

data/README.md

@@ -71,6 +71,28 @@ error.reason # :name_not_nil
 person.valid? # false
 ```
 
+### Skipping validations
+
+You can skip validations if they are not needed or if they cannot run.
+
+```ruby
+class Person
+  include Sanatio
+
+  def initialize(name)
+    @name = name
+  end
+
+  attr_reader :name
+
+  # NilClass#empty? does not exist, so the validation will fail when the name is nil.
+  ensure_that(:name).is { !empty? }.skip_if { nil? }.reason = :not_empty
+end
+
+Person.new(nil).valid? # true
+Person.new("").valid? # false
+```
+
 ## 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/block_validator.rb

@@ -0,0 +1,13 @@
+module Sanatio
+  module BlockValidator
+    def is(&validation_block)
+      raise UsageError.new("You need to give a block to #is.") unless block_given?
+      @validation_block = validation_block
+      self
+    end
+
+    def valid?(object)
+      evaluate(object, @validation_block)
+    end
+  end
+end

data/lib/sanatio/class_validator.rb

@@ -1,23 +1,17 @@
 require 'sanatio/usage_error'
+require 'sanatio/skippable'
+require 'sanatio/block_validator'
 
 module Sanatio
   class ClassValidator
-    attr_accessor :reason
-
-    def initialize
-    end
+    include Skippable
+    include BlockValidator
 
-    def is(&validation_block)
-      unless block_given?
-        raise UsageError.new("self")
-      end
-
-      @validation_block = validation_block
-      self
-    end
+    attr_accessor :reason
 
-    def valid?(object)
-      object.instance_eval(&@validation_block)
+    private
+    def evaluate(object, block)
+      object.instance_eval(&block)
     end
   end
 end

data/lib/sanatio/field_validator.rb

@@ -1,7 +1,12 @@
 require 'sanatio/usage_error'
+require 'sanatio/skippable'
+require 'sanatio/block_validator'
 
 module Sanatio
   class FieldValidator
+    include Skippable
+    include BlockValidator
+
     attr_reader :field
     attr_accessor :reason
 
@@ -9,17 +14,9 @@ module Sanatio
       @field = field
     end
 
-    def is(&validation_block)
-      unless block_given?
-        raise UsageError.new(":#{field}")
-      end
-
-      @validation_block = validation_block
-      self
-    end
-
-    def valid?(object)
-      object.send(@field).instance_eval &@validation_block
+    private
+    def evaluate(object, test)
+      object.send(@field).instance_eval &test
     end
   end
 end

data/lib/sanatio/skippable.rb

@@ -0,0 +1,19 @@
+require 'sanatio/usage_error'
+
+module Sanatio
+  module Skippable
+    def skip_if(&skip_test)
+      raise UsageError.new("You need to give a block to #skip_if.") unless block_given?
+      @skip_test = skip_test
+      self
+    end
+
+    def skip_test
+      @skip_test ||= Proc.new { false }
+    end
+
+    def skip?(object)
+      evaluate(object, skip_test)
+    end
+  end
+end

data/lib/sanatio/usage_error.rb

@@ -1,7 +1,7 @@
 module Sanatio
   class UsageError < StandardError
-    def initialize(target)
-      super("You need to give a block to #is. The correct usage is:\nensure_that(#{target}).is { validation_test }")
+    def initialize(message)
+      super
     end
   end
 end

data/lib/sanatio/version.rb

@@ -1,3 +1,3 @@
 module Sanatio
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/sanatio.rb

@@ -22,6 +22,8 @@ module Sanatio
 
     def errors
       self.class.validators.reject do |validator|
+        validator.skip?(self)
+      end.reject do |validator|
         validator.valid?(self)
       end.map(&Error.method(:new))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanatio
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thijs Wouters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,9 +70,11 @@ files:
 - bin/console
 - bin/setup
 - lib/sanatio.rb
+- lib/sanatio/block_validator.rb
 - lib/sanatio/class_validator.rb
 - lib/sanatio/error.rb
 - lib/sanatio/field_validator.rb
+- lib/sanatio/skippable.rb
 - lib/sanatio/usage_error.rb
 - lib/sanatio/validator_factory.rb
 - lib/sanatio/version.rb