compel 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f3b93d575f3944b1468d63d8e23ee2ecfca78c
-  data.tar.gz: 4dc2e41aec14acc27928fa800bf16831f67829f7
+  metadata.gz: 760b8bea600ef35e2feaf4f884ce9993e60308f2
+  data.tar.gz: 2d6c7964a591146d16920535d751c5e4bc786d57
 SHA512:
-  metadata.gz: e5c4eaebc721edf7480a06044ccd09f0e73773b0e7d4dcea66a3af2740258014e24a8f02e2f4523ca9f3851d59f4f9da30fdc25600f8501721fc53a1f6434b71
-  data.tar.gz: 2a72784727bf7a24a7bed5a18958db7248358962d737c8ad1f052e763c88d932bafa70d4a58bfa581685ff7d9ce4c6c33bd7fc526826aa9fc403500381fe6552
+  metadata.gz: ac24d0904ce924b9c34a44faaaa5fc138840412ad57db195e743d7ac0e40251adc0e2dc1cf37bee934acb9a9c777006abbd920743f4a6d881cc360c4bc2b81c6
+  data.tar.gz: 727af6ca9af8da14f937aacf58f3a4b52224c38a7db63cabd4ad8d1cef1d9be8609b8fae29a5e6995d3e00e36cfc8c875465c7732fd6b001a4bc480a1ebb07f9

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2.0
   - 2.2.3
+  - 2.3.0

data/lib/compel/validation/conditions/if.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Compel
   module Validation
 
@@ -5,17 +7,42 @@ module Compel
 
       def validate_value
         unless valid?
-          "'#{value}' is invalid"
+          "is invalid"
         end
       end
 
       private
 
       def valid?
-        if option_value.arity == 1
-          option_value.call(value)
+        CustomValidator.new(option_value).valid?(value)
+      end
+
+    end
+
+    class CustomValidator
+
+      attr_reader :caller,
+                  :method
+
+      def initialize(caller)
+        ❨╯°□°❩╯︵┻━┻? caller
+      end
+
+      def valid?(value)
+        caller.send(method, value)
+      end
+
+      private
+
+      def ❨╯°□°❩╯︵┻━┻? caller
+        fail unless caller.is_a?(Proc) || caller.arity > 1
+
+        if caller.arity == 1
+          @caller = caller
+          @method = 'call'
         else
-          eval("#{option_value.call}(#{value})", option_value.binding)
+          @caller = caller.binding.receiver
+          @method = caller.call
         end
       end
 

data/lib/compel/version.rb

@@ -1,3 +1,3 @@
 module Compel
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

data/spec/compel/builder_spec.rb

@@ -401,6 +401,11 @@ describe Compel::Builder do
               raise_error Compel::TypeError, 'invalid proc for if'
           end
 
+          it 'should raise_error for invalid proc 1' do
+            expect{ Compel.any.if(1) }.to \
+              raise_error Compel::TypeError, 'invalid proc for if'
+          end
+
         end
 
       end
@@ -671,21 +676,21 @@ describe Compel::Builder do
               result = Compel.any.if{:is_valid_one}.validate(2)
 
               expect(result.valid?).to eq(false)
-              expect(result.errors).to include("'2' is invalid")
+              expect(result.errors).to include('is invalid')
             end
 
             it 'should validate with lambda' do
               result = Compel.any.if(Proc.new {|value| value == 2 }).validate(1)
 
               expect(result.valid?).to eq(false)
-              expect(result.errors).to include("'1' is invalid")
+              expect(result.errors).to include('is invalid')
             end
 
             it 'should validate within an instance method' do
               result = CustomValidationsKlass.new(1).validate
 
               expect(result.valid?).to eq(false)
-              expect(result.errors).to include("'1' is invalid")
+              expect(result.errors).to include('is invalid')
             end
 
             it 'should validate within an instance method 1' do
@@ -694,7 +699,7 @@ describe Compel::Builder do
                   .validate_with_lambda(Proc.new {|value| value == [1, 2, 3] })
 
               expect(result.valid?).to eq(false)
-              expect(result.errors).to include("'two' is invalid")
+              expect(result.errors).to include('is invalid')
             end
 
             it 'should use custom message with parsed value' do
@@ -707,6 +712,35 @@ describe Compel::Builder do
               expect(result.errors).to include('give me a 1!')
             end
 
+            it 'should validate a date value' do
+              to_validate = '1969-01-01T00:00:00'
+
+              def validate_time(value)
+                value > Time.at(0)
+              end
+
+              result = Compel.time.if{:validate_time}.validate(to_validate)
+
+              expect(result.valid?).to eq(false)
+              expect(result.errors).to include('is invalid')
+            end
+
+            it 'should raise_error for invalid custom method arity' do
+              def custom_method_arity_two(value, extra_arg)
+                false
+              end
+
+              def custom_method_arity_zero
+                false
+              end
+
+              expect{ Compel.integer.if{:custom_method_arity_two}.validate(1) }.to \
+                raise_error ArgumentError
+
+              expect{ Compel.integer.if{:custom_method_arity_zero}.validate(1) }.to \
+                raise_error ArgumentError
+            end
+
           end
 
           context 'valid' do
@@ -756,6 +790,18 @@ describe Compel::Builder do
               expect(result.valid?).to eq(true)
             end
 
+            it 'should validate a date value' do
+              to_validate = '1969-01-01T00:00:00'
+
+              def validate_time(value)
+                value < Time.at(0)
+              end
+
+              result = Compel.time.if{:validate_time}.validate(to_validate)
+
+              expect(result.valid?).to eq(true)
+            end
+
           end
 
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compel
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Joaquim Adráz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Object Coercion and Validation