compel 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97cfa78c4892af6b318eb14948f7b0defccc5863
-  data.tar.gz: d30bc04383159e49098a7a861995ee61f1d1e7f0
+  metadata.gz: a0f3b93d575f3944b1468d63d8e23ee2ecfca78c
+  data.tar.gz: 4dc2e41aec14acc27928fa800bf16831f67829f7
 SHA512:
-  metadata.gz: 90ee036e1d29802696e42c90c2c2a8b179de2ccc609b71d597e75fce23389273ebbf39fed245e1dd6811ece2f7b7eb74e2f52faa3bee2abb51025e0640dfe988
-  data.tar.gz: 8848f0337a8c43b8b012e70b6c117c7352e2c5418dc7c8891063e93d6468825e4b323ccb367e9873960e7b188af4454dfde1b129978e04f18015877d3dd4e012
+  metadata.gz: e5c4eaebc721edf7480a06044ccd09f0e73773b0e7d4dcea66a3af2740258014e24a8f02e2f4523ca9f3851d59f4f9da30fdc25600f8501721fc53a1f6434b71
+  data.tar.gz: 2a72784727bf7a24a7bed5a18958db7248358962d737c8ad1f052e763c88d932bafa70d4a58bfa581685ff7d9ce4c6c33bd7fc526826aa9fc403500381fe6552

data/README.md

@@ -95,6 +95,10 @@ Methods `length`, `min_length` and `max_length` turn the object to validate into
 - `length(``integer``)`
 - `min_length(``integer``)`
 - `max_length(``integer``)`
+- `if`
+  - `if(->(value){ value == 1 })`
+  - `if{|value| value == 1 }`
+  - `if{:custom_validation} # Check the specs for now, I'm rewriting the docs ;)` 
 
 ==========================
 
@@ -291,7 +295,7 @@ end
 
 Add this line to your application's Gemfile:
 
-    gem 'compel', '~> 0.3.7'
+    gem 'compel', '~> 0.4.3'
 
 And then execute:
 

data/lib/compel/builder/common.rb

@@ -27,6 +27,24 @@ module Compel
         build_option :max_length, Coercion.coerce!(value, Coercion::Integer), options
       end
 
+      def if(lambda = nil, options = {}, &block)
+        build_option :if, coerce_if_proc(lambda || block), options
+
+        rescue
+          raise Compel::TypeError, 'invalid proc for if'
+      end
+
+      # this is lovely, refactor later
+      def coerce_if_proc(proc)
+        if proc && proc.is_a?(Proc) &&
+          (proc.arity == 1 || proc.arity == 0 &&
+            (proc.call.is_a?(::Symbol) || proc.call.is_a?(::String)))
+          proc
+        else
+          fail
+        end
+      end
+
     end
 
   end

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

@@ -29,7 +29,13 @@ module Compel
       def validate_value_with_error_message
         error_message = validate_value
 
-        options[:message] || error_message
+        if error_message
+          error_message_with_value(options[:message] || error_message)
+        end
+      end
+
+      def error_message_with_value(message)
+        message.gsub(/\{\{value\}\}/, "#{value}")
       end
 
     end

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

@@ -0,0 +1,25 @@
+module Compel
+  module Validation
+
+    class If < Condition
+
+      def validate_value
+        unless valid?
+          "'#{value}' is invalid"
+        end
+      end
+
+      private
+
+      def valid?
+        if option_value.arity == 1
+          option_value.call(value)
+        else
+          eval("#{option_value.call}(#{value})", option_value.binding)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/compel/validation/validation.rb

@@ -7,6 +7,7 @@ require 'compel/validation/conditions/format'
 require 'compel/validation/conditions/length'
 require 'compel/validation/conditions/min_length'
 require 'compel/validation/conditions/max_length'
+require 'compel/validation/conditions/if'
 
 require 'compel/validation/result'
 
@@ -24,6 +25,7 @@ module Compel
       length: Validation::Length,
       min_length: Validation::MinLength,
       max_length: Validation::MaxLength,
+      if: Validation::If,
     }
 
     def validate(value, type, options)

data/lib/compel/version.rb

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

data/spec/compel/builder_spec.rb

@@ -217,7 +217,7 @@ describe Compel::Builder do
 
         subject(:builder) { Compel.string }
 
-        context 'in' do
+        context '#in' do
 
           it 'should set in value' do
             builder.in(['a', 'b'])
@@ -366,6 +366,45 @@ describe Compel::Builder do
 
       end
 
+      context 'Any' do
+
+        context '#if' do
+
+          it 'should have a proc' do
+            _proc = Proc.new {|value| value == 1 }
+
+            schema = Compel.any.if(_proc)
+
+            expect(schema.options[:if][:value]).to eq _proc
+          end
+
+          it 'should have a block with string or symbol value' do
+            schema = Compel.any.if{:is_valid_one}
+            expect(schema.options[:if][:value].call).to eq :is_valid_one
+
+            schema = Compel.any.if{'is_valid_one'}
+            expect(schema.options[:if][:value].call).to eq 'is_valid_one'
+          end
+
+          it 'should raise_error for missing value' do
+            expect{ Compel.any.if() }.to \
+              raise_error Compel::TypeError, 'invalid proc for if'
+          end
+
+          it 'should raise_error for invalid proc' do
+            expect{ Compel.any.if('proc') }.to \
+              raise_error Compel::TypeError, 'invalid proc for if'
+          end
+
+          it 'should raise_error for invalid proc arity' do
+            expect{ Compel.any.if(Proc.new {|a, b| a == b }) }.to \
+              raise_error Compel::TypeError, 'invalid proc for if'
+          end
+
+        end
+
+      end
+
     end
 
     context 'Validate' do
@@ -526,10 +565,10 @@ describe Compel::Builder do
             end
 
             it 'should use custom error message' do
-              schema = Compel.any.length(2, message: 'not the same size')
+              schema = Compel.any.length(2, message: '({{value}}) does not have the right size')
 
-              expect(schema.validate(12).errors).to \
-                include('not the same size')
+              expect(schema.validate(123).errors).to \
+                include('(123) does not have the right size')
             end
 
           end
@@ -552,6 +591,12 @@ describe Compel::Builder do
               expect(result.valid?).to be true
             end
 
+            it 'should validate a constant object' do
+              schema = Compel.any.length(2)
+
+              expect(schema.validate(12).valid?).to eq(true)
+            end
+
           end
 
         end
@@ -586,6 +631,135 @@ describe Compel::Builder do
 
         end
 
+        context '#if' do
+
+          class CustomValidationsKlass
+
+            attr_reader :value
+
+            def initialize(value)
+              @value = value
+            end
+
+            def validate
+              Compel.any.if{:is_custom_valid?}.validate(value)
+            end
+
+            def validate_with_lambda(lambda)
+              Compel.any.if(lambda).validate(value)
+            end
+
+            private
+
+            def is_custom_valid?(value)
+              value == assert_value
+            end
+
+            def assert_value
+              [1, 2, 3]
+            end
+
+          end
+
+          context 'invalid' do
+
+            it 'should validate with custom method' do
+              def is_valid_one(value)
+                value == 1
+              end
+
+              result = Compel.any.if{:is_valid_one}.validate(2)
+
+              expect(result.valid?).to eq(false)
+              expect(result.errors).to include("'2' 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")
+            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")
+            end
+
+            it 'should validate within an instance method 1' do
+              result = \
+                CustomValidationsKlass.new('two')
+                  .validate_with_lambda(Proc.new {|value| value == [1, 2, 3] })
+
+              expect(result.valid?).to eq(false)
+              expect(result.errors).to include("'two' is invalid")
+            end
+
+            it 'should use custom message with parsed value' do
+              schema = \
+                Compel.any.if(Proc.new {|value| value == 2 }, message: 'give me a {{value}}!')
+
+              result = schema.validate(1)
+
+              expect(result.valid?).to eq(false)
+              expect(result.errors).to include('give me a 1!')
+            end
+
+          end
+
+          context 'valid' do
+
+            it 'should validate with custom method' do
+              def is_valid_one(value)
+                value == 1
+              end
+
+              result = Compel.any.if{:is_valid_one}.validate(1)
+
+              expect(result.valid?).to eq(true)
+            end
+
+            it 'should validate with custom method 1' do
+              def is_valid_one(value)
+                value == 1
+              end
+
+              result = Compel.any.if{|value| value == 1 }.validate(1)
+
+              expect(result.valid?).to eq(true)
+            end
+
+            it 'should validate with lambda' do
+              result = Compel.any.if(Proc.new {|value| value == 2 }).validate(2)
+
+              expect(result.valid?).to eq(true)
+            end
+
+            it 'should validate within an instance method' do
+              result = CustomValidationsKlass.new([1, 2, 3]).validate
+
+              expect(result.valid?).to eq(true)
+            end
+
+            it 'should validate within an instance method' do
+              result = CustomValidationsKlass.new([1, 2, 3]).validate
+              expect(result.valid?).to eq(true)
+            end
+
+            it 'should validate within an instance method 1' do
+              result = \
+                CustomValidationsKlass.new([1, 2, 3])
+                  .validate_with_lambda(Proc.new {|value| value == [1, 2, 3] })
+
+              expect(result.valid?).to eq(true)
+            end
+
+          end
+
+        end
+
       end
 
       context 'Hash' do

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'simplecov'
 require 'codeclimate-test-reporter'
 
 SimpleCov.start do
-  formatter SimpleCov::Formatter::MultiFormatter[
+  formatter SimpleCov::Formatter::MultiFormatter.new [
     SimpleCov::Formatter::HTMLFormatter,
     CodeClimate::TestReporter::Formatter
   ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compel
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Joaquim Adráz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -107,6 +107,7 @@ files:
 - lib/compel/result.rb
 - lib/compel/validation/conditions/condition.rb
 - lib/compel/validation/conditions/format.rb
+- lib/compel/validation/conditions/if.rb
 - lib/compel/validation/conditions/in.rb
 - lib/compel/validation/conditions/is.rb
 - lib/compel/validation/conditions/length.rb