toolchain 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 988af450afb20a81dae7333ff7ded62a2fc6ca52
-  data.tar.gz: f0cecb5a9bfe8ec82cbadab21019f4267f8ae5e5
+  metadata.gz: 42b6a53e0441d4960fdefb7aa46d2ab238d90dfd
+  data.tar.gz: d5e75f87d85cfcd542bf340f8dd0764586172bf9
 SHA512:
-  metadata.gz: 3f707cd58b11de78ce0166874d9712d6197e572dcd6919787355a56cf2821b52127b0748732d2207f238721d45a25bf28c1fc8dc7ffc5d56255682accc1fe6d0
-  data.tar.gz: 62c64f506a01f32f050f17b4418e1828a13e8c8f9f0dae62b324b3af615e5cc64f469f69af33fd2c7decb651e6fd48c4fd8eab4f579beaf69e5ab4738e6479f6
+  metadata.gz: 29dbe5cce70a0fad6e192c5649a0eb4cc343f4a370f58deee48a58033fda006a034926ed514cb738e022aa1234965fdf4d34ad79130c5b5141342ce3b909d379
+  data.tar.gz: 13d782b212ec1b7146b02998b6e194432c39b1f3421d10fc308009936960e7b420d6f0cf18794b630e3e9848c4600c0b83aca3d9e3659e1ebcae854610870164

data/lib/toolchain/validations.rb

@@ -35,9 +35,18 @@ module Toolchain::Validations
     def validates(*args)
       options, key_path = args.pop, args
 
+      _if = options.delete(:if)
+      _unless = options.delete(:unless)
+
       options.each do |key, data|
         if validator = Helpers.find_validator(key)
-          validations.push(key_path: key_path, validator: validator, data: data)
+          validations.push(
+            key_path: key_path,
+            validator: validator,
+            data: data,
+            if: _if,
+            unless: _unless
+          )
         end
       end
     end
@@ -75,7 +84,19 @@ module Toolchain::Validations
     #
     def validate
       Helpers.each_validation(self.class) do |v|
-        v[:validator].new(self, v[:key_path], v[:data]).validate
+        validate = true
+
+        if v[:if].kind_of?(Proc) && v[:if].call(self) == false
+          validate = false
+        end
+
+        if v[:unless].kind_of?(Proc) && v[:unless].call(self) == true
+          validate = false
+        end
+
+        if validate
+          v[:validator].new(self, v[:key_path], v[:data]).validate
+        end
       end
 
       Helpers.each_validation(self.class, :custom_validations) { |v| send(v) }

data/lib/toolchain/validations/validators/inclusion.rb

@@ -23,7 +23,7 @@ module Toolchain::Validations::Validators
     private
 
     def not_included?
-      !data.include?(value)
+      !data[:in].include?(value)
     end
   end
 end

data/lib/toolchain/version.rb

@@ -1,3 +1,3 @@
 module Toolchain
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/toolchain/validations/conditional_spec.rb

@@ -0,0 +1,52 @@
+require_relative "base_helper"
+
+describe Toolchain::Validations, "Conditional" do
+
+  class PersonConditionalIfTrue
+    include Toolchain::Validations
+    validates :name, presence: true, if: ->(i){ i.new }
+    attr_accessor :name
+    def new; true end
+  end
+
+  it "should validate" do
+    person = PersonConditionalIfTrue.new
+    person.should_not be_valid
+  end
+
+  class PersonConditionalIfFalse
+    include Toolchain::Validations
+    validates :name, presence: true, if: ->(i){ i.new }
+    attr_accessor :name
+    def new; false end
+  end
+
+  it "should not validate" do
+    person = PersonConditionalIfFalse.new
+    person.should be_valid
+  end
+
+  class PersonConditionalUnlessTrue
+    include Toolchain::Validations
+    validates :name, presence: true, unless: ->(i){ i.new }
+    attr_accessor :name
+    def new; true end
+  end
+
+  it "should not validate" do
+    person = PersonConditionalUnlessTrue.new
+    person.should be_valid
+  end
+
+  class PersonConditionalUnlessFalse
+    include Toolchain::Validations
+    validates :name, presence: true, unless: ->(i){ i.new }
+    attr_accessor :name
+    def new; false end
+  end
+
+  it "should validate" do
+    person = PersonConditionalUnlessFalse.new
+    person.should_not be_valid
+  end
+end

data/spec/toolchain/validations/validators/inclusion_spec.rb

@@ -5,7 +5,7 @@ describe Toolchain::Validations::Validators::Inclusion do
   class UserInclusion
     include Toolchain::Validations
     attr_accessor :color
-    validates :color, inclusion: ["red", "green", "blue"]
+    validates :color, inclusion: { in: ["red", "green", "blue"] }
   end
 
   it "should be valid if 'red'" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toolchain
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael van Rooijen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - spec/toolchain/attributes/include_attributes_spec.rb
 - spec/toolchain/attributes/initializer_spec.rb
 - spec/toolchain/validations/base_helper.rb
+- spec/toolchain/validations/conditional_spec.rb
 - spec/toolchain/validations/custom_validations_spec.rb
 - spec/toolchain/validations/delegation_spec.rb
 - spec/toolchain/validations/include_validations_spec.rb
@@ -143,6 +144,7 @@ test_files:
 - spec/toolchain/attributes/include_attributes_spec.rb
 - spec/toolchain/attributes/initializer_spec.rb
 - spec/toolchain/validations/base_helper.rb
+- spec/toolchain/validations/conditional_spec.rb
 - spec/toolchain/validations/custom_validations_spec.rb
 - spec/toolchain/validations/delegation_spec.rb
 - spec/toolchain/validations/include_validations_spec.rb