validate 1.0.0 → 1.0.1

data/README.md

@@ -1,13 +1,13 @@
-# Validations
+# Validate
 
-Validations is a validations library that can validate *any* object that can be
+Validate is a validations library that can validate *any* object that can be
 converted to a hash using `to_hash`.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'validations'
+    gem 'validate'
 
 And then execute:
 
@@ -15,7 +15,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install validations
+    $ gem install validate
 
 ## Usage
 
@@ -35,7 +35,7 @@ module Store
     
     # Order matters, first include library. Also: validations are
     # executed and checked in the order in which they are defined.
-    include Validations
+    include Validate
     
     # Validations are contained within a block, so as to not pollute
     # the class namespace with a DSL's implementation.

data/lib/validate/validator.rb

@@ -11,15 +11,18 @@ module Validate
 
     def validates?(context)
       bool = @validations
-        .select do |v|
-          # `:when` is a special case, this gets processed right away and
-          # filtered out...
-          !(v[:opts] || {})[:when].is_a?(Proc) || context.instance_exec(&v[:opts][:when])
-        end
         .map do |v|
           # destructure fields
           v[:fields].map {|f| v.merge(fields: f) }
         end.flatten(1)
+        .select do |v|
+          # `:when` is a special case, this gets processed right away and
+          # filtered out...
+          when_opt = (v[:opts] || {})[:when]
+          # :is_set is short for checking if then field is set
+          when_opt = -> { self.to_hash.include?(v[:fields]) } if when_opt == :is_set
+          !when_opt.is_a?(Proc) || context.instance_exec(&when_opt)
+        end
         .map do |v|
           # lastly, execute validation
           validator = if v[:validations]

data/lib/validate/version.rb

@@ -1,4 +1,4 @@
 
 module Validate
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/validate_spec.rb

@@ -86,6 +86,31 @@ describe Validate do
     end
   end
 
+  context 'when option' do
+    before do
+      class TestClass < BaseTestClass
+        validations do
+          validates_type_of :name, is: Symbol, when: :is_set
+        end
+      end
+    end
+
+    it 'validates when when does not match' do
+      test = TestClass.new(something: false)
+      test.validates?.should == true
+    end
+    
+    it 'validates when when does match' do
+      test = TestClass.new(name: :sym)
+      test.validates?.should == true
+    end
+    
+    it 'fails' do
+      test = TestClass.new(name: 'me')
+      test.validates?.should == false
+    end
+  end
+
   context 'run_when block' do
     before do
       class TestClass < BaseTestClass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec