compel 0.3.2 → 0.3.4

data/lib/compel/validation/validation.rb

@@ -0,0 +1,62 @@
+require 'compel/validation/conditions/condition'
+require 'compel/validation/conditions/is'
+require 'compel/validation/conditions/in'
+require 'compel/validation/conditions/min'
+require 'compel/validation/conditions/max'
+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/result'
+
+module Compel
+
+  module Validation
+
+    CONDITIONS = {
+      is: Validation::Is,
+      in: Validation::In,
+      min: Validation::Min,
+      max: Validation::Max,
+      range: Validation::Range,
+      within: Validation::Within,
+      format: Validation::Format,
+      length: Validation::Length,
+      min_length: Validation::MinLength,
+      max_length: Validation::MaxLength,
+    }
+
+    def validate(value, type, options)
+      if value.nil? && !!options[:required]
+        return ['is required']
+      end
+
+      errors = Errors.new
+
+      options.each do |option, option_value|
+        next unless condition_exists?(option)
+
+        result = condition_klass(option).validate(value, option_value, type: type)
+
+        unless result.valid?
+          errors.add :base, result.error_message
+        end
+      end
+
+      errors.to_hash[:base] || []
+    end
+
+    def condition_exists?(option)
+      CONDITIONS.keys.include?(option.to_sym)
+    end
+
+    def condition_klass(option)
+      CONDITIONS[option.to_sym]
+    end
+
+    extend self
+
+  end
+
+end

data/lib/compel/validators/base.rb

@@ -27,3 +27,7 @@ module Compel
 
   end
 end
+
+require 'compel/validators/type_validator'
+require 'compel/validators/hash_validator'
+require 'compel/validators/array_validator'

data/lib/compel/validators/type_validator.rb

@@ -11,10 +11,8 @@ module Compel
           return self
         end
 
-        options = input, schema.type, schema.options
-
         # coerce
-        coercion_result = Coercion.coerce(*options)
+        coercion_result = Coercion.coerce(input, schema.type, schema.options)
 
         unless coercion_result.valid?
           @errors = [coercion_result.error]
@@ -24,7 +22,7 @@ module Compel
         @output = coercion_result.coerced
 
         # validate
-        @errors = Validation.validate(*options)
+        @errors = Validation.validate(@output, schema.type, schema.options)
 
         # validate array values
         if schema.type == Coercion::Array && errors.empty?

data/lib/compel/version.rb

@@ -1,3 +1,3 @@
 module Compel
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

data/lib/compel.rb

@@ -1,23 +1,16 @@
-require 'json'
 require 'hashie'
-require 'hashie/extensions/symbolize_keys'
 
-require 'compel/exceptions/invalid_object_error'
-require 'compel/exceptions/validation_error'
 require 'compel/exceptions/type_error'
-
-require 'compel/result'
+require 'compel/exceptions/invalid_object_error'
 
 require 'compel/validators/base'
-require 'compel/validators/type_validator'
-require 'compel/validators/hash_validator'
-require 'compel/validators/array_validator'
-
 require 'compel/builder/methods'
 require 'compel/coercion/coercion'
-require 'compel/contract'
-require 'compel/validation'
+require 'compel/validation/validation'
+
+require 'compel/result'
 require 'compel/errors'
+require 'compel/contract'
 
 module Compel
 

data/spec/compel/builder_spec.rb

@@ -180,6 +180,32 @@ describe Compel::Builder do
 
     context 'Validate' do
 
+      context 'Any' do
+
+        it 'should validate with errors and any type' do
+          schema = Compel.hash.keys({
+            a: Compel.any.required
+          })
+
+          expect(schema.validate({ a: nil }).errors.a).to \
+            include('is required')
+        end
+
+        context '#is' do
+
+          it 'should validate without errors and any type' do
+            schema = Compel.hash.keys({
+              a: Compel.any.is(123)
+            })
+
+            expect(schema.validate({ a: 122 }).errors.a).to \
+              include('must be 123')
+          end
+
+        end
+
+      end
+
       context 'Hash' do
 
         it 'should validate Hash schema' do
@@ -236,15 +262,39 @@ describe Compel::Builder do
             include('is required')
         end
 
+        context '#is' do
+
+          it 'should validate with errors' do
+            value = { a: 1, b: 2, c: { d: 3, e: 4 }}
+            schema = Compel.hash.is(value)
+
+            result = schema.validate({ a: 1, b: 2, c: 3 })
+
+            expect(result.errors[:base]).to \
+              include("must be {\"a\"=>1, \"b\"=>2, \"c\"=>{\"d\"=>3, \"e\"=>4}}")
+          end
+
+          it 'should validate without errors' do
+            schema = Compel.hash.is({ a: 1, b: 2, c: 3 })
+
+            result = schema.validate({ 'a' => 1, 'b' => 2, 'c' => 3 })
+            expect(result.valid?).to be true
+
+            result = schema.validate({ :a => 1, :b => 2, :c => 3 })
+            expect(result.valid?).to be true
+          end
+
+        end
+
       end
 
       context 'String' do
 
         it 'should validate Type schema' do
           schema = Compel.string.format(/^\d{4}-\d{3}$/).required
-          response = schema.validate('1234')
+          result = schema.validate('1234')
 
-          expect(response.errors).to \
+          expect(result.errors).to \
             include("must match format ^\\d{4}-\\d{3}$")
         end
 
@@ -420,6 +470,26 @@ describe Compel::Builder do
 
         end
 
+        context '#is' do
+
+          it 'should validate with errors' do
+            value = [1, 2, 3]
+            schema = builder.is(value)
+            result = schema.validate([1, 2])
+
+            expect(result.valid?).to be false
+            expect(result.errors[:base]).to include("must be #{value}")
+          end
+
+          it 'should validate without errors' do
+            schema = builder.is(['a', 'b', 'c'])
+            result = schema.validate(['a', 'b', 'c'])
+
+            expect(result.valid?).to be true
+          end
+
+        end
+
       end
 
       context 'Hash' do

data/spec/compel/coercion_spec.rb

@@ -5,24 +5,22 @@ describe Compel::Coercion do
     context 'Integer' do
 
       it 'should coerce' do
-        value = Compel::Coercion.coerce!(123, Integer)
+        value = Compel::Coercion.coerce!(123, Compel::Coercion::Integer)
         expect(value).to eq(123)
       end
 
       it 'should coerce 1' do
-        value = Compel::Coercion.coerce!('123', Integer)
+        value = Compel::Coercion.coerce!('123', Compel::Coercion::Integer)
         expect(value).to eq(123)
       end
 
       it 'should coerce 2' do
-        value = Compel::Coercion.coerce!(123.3, Integer)
+        value = Compel::Coercion.coerce!(123.3, Compel::Coercion::Integer)
         expect(value).to eq(123)
       end
 
       it 'should not coerce' do
-        expect(Compel::Coercion.valid?('123abc', Integer)).to eq(false)
-
-        expect { Compel::Coercion.coerce!('123abc', Integer) }.to \
+        expect { Compel::Coercion.coerce!('123abc', Compel::Coercion::Integer) }.to \
           raise_error Compel::TypeError, "'123abc' is not a valid Integer"
       end
 
@@ -31,15 +29,13 @@ describe Compel::Coercion do
     context 'Float' do
 
       it 'should coerce' do
-        value = Compel::Coercion.coerce!('1.2', Float)
+        value = Compel::Coercion.coerce!('1.2', Compel::Coercion::Float)
 
         expect(value).to eq(1.2)
       end
 
       it 'should not coerce' do
-        expect(Compel::Coercion.valid?('1.a233', Float)).to eq(false)
-
-        expect { Compel::Coercion.coerce!('1.a233', Float) }.to \
+        expect { Compel::Coercion.coerce!('1.a233', Compel::Coercion::Float) }.to \
           raise_error Compel::TypeError, "'1.a233' is not a valid Float"
       end
 
@@ -48,7 +44,7 @@ describe Compel::Coercion do
     context 'String' do
 
       it 'should coerce' do
-        value = Compel::Coercion.coerce!('abc', String)
+        value = Compel::Coercion.coerce!('abc', Compel::Coercion::String)
 
         expect(value).to eq('abc')
       end
@@ -56,9 +52,7 @@ describe Compel::Coercion do
       it 'should not coerce' do
         value = 1.2
 
-        expect(Compel::Coercion.valid?(value, String)).to eq(false)
-
-        expect { Compel::Coercion.coerce!(value, String) }.to \
+        expect { Compel::Coercion.coerce!(value, Compel::Coercion::String) }.to \
           raise_error Compel::TypeError, "'#{value}' is not a valid String"
       end
 
@@ -67,13 +61,13 @@ describe Compel::Coercion do
     context 'Date' do
 
       it 'should coerce with default format' do
-        value = Compel::Coercion.coerce!('2015-12-22', Date)
+        value = Compel::Coercion.coerce!('2015-12-22', Compel::Coercion::Date)
 
         expect(value).to eq(Date.parse('2015-12-22'))
       end
 
       it 'should coerce with format' do
-        value = Compel::Coercion.coerce!('22-12-2015', Date, { format: '%d-%m-%Y' })
+        value = Compel::Coercion.coerce!('22-12-2015', Compel::Coercion::Date, { format: '%d-%m-%Y' })
 
         expect(value).to eq(Date.strptime('22-12-2015', '%d-%m-%Y'))
       end
@@ -81,9 +75,7 @@ describe Compel::Coercion do
       it 'should not coerce' do
         value = '2015-0'
 
-        expect(Compel::Coercion.valid?(value, Date)).to eq(false)
-
-        expect { Compel::Coercion.coerce!(value, Date) }.to \
+        expect { Compel::Coercion.coerce!(value, Compel::Coercion::Date) }.to \
           raise_error \
             Compel::TypeError,
             "'#{value}' is not a parsable date with format: %Y-%m-%d"
@@ -93,7 +85,7 @@ describe Compel::Coercion do
         default_format = '%Y-%m-%d'
         value = '22-12-2015'
 
-        expect { Compel::Coercion.coerce!(value, Date) }.to \
+        expect { Compel::Coercion.coerce!(value, Compel::Coercion::Date) }.to \
           raise_error \
             Compel::TypeError,
             "'#{value}' is not a parsable date with format: #{default_format}"
@@ -105,7 +97,8 @@ describe Compel::Coercion do
 
       it 'should coerce' do
         [DateTime, Time].each do |time_klass|
-          value = Compel::Coercion.coerce!('2015-12-22', time_klass, format: '%Y-%m-%d')
+          value = Compel::Coercion.coerce! \
+            '2015-12-22', Compel::Coercion.const_get("#{time_klass}"), format: '%Y-%m-%d'
 
           expect(value).to be_a time_klass
           expect(value.year).to eq(2015)
@@ -117,7 +110,8 @@ describe Compel::Coercion do
 
       it 'should coerce iso8601 format' do
         [DateTime, Time].each do |time_klass|
-          value = Compel::Coercion.coerce!('2015-12-22T09:30:10', time_klass)
+          value = Compel::Coercion.coerce! \
+            '2015-12-22T09:30:10', Compel::Coercion.const_get("#{time_klass}")
 
           expect(value).to be_a time_klass
           expect(value.year).to eq(2015)
@@ -136,7 +130,7 @@ describe Compel::Coercion do
         [DateTime, Time].each do |time_klass|
           type_down_cased = "#{time_klass}".downcase
 
-          expect { Compel::Coercion.coerce!('22-12-2015', time_klass) }.to \
+          expect { Compel::Coercion.coerce!('22-12-2015', Compel::Coercion.const_get("#{time_klass}")) }.to \
             raise_error \
               Compel::TypeError,
               "'#{value}' is not a parsable #{type_down_cased} with format: #{default_format}"
@@ -152,7 +146,7 @@ describe Compel::Coercion do
         value = Compel::Coercion.coerce!({
           first_name: 'Joaquim',
           last_name: 'Adráz'
-        }, Hash)
+        }, Compel::Coercion::Hash)
 
         expect(value).to eq({
           'first_name' => 'Joaquim',
@@ -164,7 +158,7 @@ describe Compel::Coercion do
         value = Compel::Coercion.coerce!({
           'first_name' => 'Joaquim',
           'last_name' => 'Adráz'
-        }, Hash)
+        }, Compel::Coercion::Hash)
 
         expect(value).to eq({
           'first_name' => 'Joaquim',
@@ -176,7 +170,7 @@ describe Compel::Coercion do
         value = Compel::Coercion.coerce!(Hashie::Mash.new({
           first_name: 'Joaquim',
           last_name: 'Adráz'
-        }), Hash)
+        }), Compel::Coercion::Hash)
 
         expect(value).to eq({
           'first_name' => 'Joaquim',
@@ -185,17 +179,17 @@ describe Compel::Coercion do
       end
 
       it 'should not coerce' do
-        expect { Compel::Coercion.coerce!(123, Hash) }.to \
+        expect { Compel::Coercion.coerce!(123, Compel::Coercion::Hash) }.to \
           raise_error Compel::TypeError, "'123' is not a valid Hash"
       end
 
       it 'should not coerce 1' do
-        expect { Compel::Coercion.coerce!('hash', Hash) }.to \
+        expect { Compel::Coercion.coerce!('hash', Compel::Coercion::Hash) }.to \
           raise_error Compel::TypeError, "'hash' is not a valid Hash"
       end
 
       it 'should not coerce 2' do
-        expect { Compel::Coercion.coerce!(['hash'], Hash) }.to \
+        expect { Compel::Coercion.coerce!(['hash'], Compel::Coercion::Hash) }.to \
           raise_error Compel::TypeError, "'[\"hash\"]' is not a valid Hash"
       end
 
@@ -205,7 +199,8 @@ describe Compel::Coercion do
 
       it 'should coerce' do
         value = Compel::Coercion.coerce! \
-          "{\"first_name\":\"Joaquim\",\"last_name\":\"Adráz\"}", JSON
+          "{\"first_name\":\"Joaquim\",\"last_name\":\"Adráz\"}",
+          Compel::Coercion::JSON
 
         expect(value).to eq({
           'first_name' => 'Joaquim',

data/spec/compel/compel_spec.rb

@@ -344,14 +344,14 @@ describe Compel do
       context 'is option' do
 
         it 'should compel' do
-          expect(Compel.run?(1, Compel.boolean.is(1))).to be true
+          expect(Compel.run?(1, Compel.boolean.is(true))).to be true
         end
 
         it 'should not compel' do
-          result = Compel.run(0, Compel.boolean.is(1))
+          result = Compel.run(0, Compel.boolean.is(true))
 
           expect(result.valid?).to be false
-          expect(result.errors).to include('must be 1')
+          expect(result.errors).to include('must be true')
         end
 
       end

data/spec/compel/validation_spec.rb

@@ -104,32 +104,80 @@ describe Compel::Validation do
 
   context 'min' do
 
+    it 'should validate without errors for Integer' do
+      errors = Compel::Validation.validate(2, Compel::Coercion::Integer, min: 1)
+
+      expect(errors.empty?).to be true
+    end
+
+    it 'should validate without errors for String' do
+      errors = Compel::Validation.validate('b', Compel::Coercion::String, min: 'a')
+
+      expect(errors.empty?).to be true
+    end
+
     it 'should validate with errors' do
       errors = Compel::Validation.validate(1, Compel::Coercion::Integer, min: 3)
 
       expect(errors).to include('cannot be less than 3')
     end
 
+    it 'should validate with errors for String' do
+      errors = Compel::Validation.validate('a', Compel::Coercion::String, min: 'b')
+
+      expect(errors).to include('cannot be less than b')
+    end
+
+    it 'should validate with errors for Float' do
+      errors = Compel::Validation.validate(1.54, Compel::Coercion::Float, min: 1.55)
+
+      expect(errors).to include('cannot be less than 1.55')
+    end
+
   end
 
   context 'max' do
 
+    it 'should validate without errors' do
+      errors = Compel::Validation.validate(5, Compel::Coercion::Integer, min: 5)
+
+      expect(errors.empty?).to be true
+    end
+
     it 'should validate with errors' do
       errors = Compel::Validation.validate(3, Compel::Coercion::Integer, max: 2)
 
       expect(errors).to include('cannot be greater than 2')
     end
 
-  end
+    it 'should validate without errors for Integer' do
+      errors = Compel::Validation.validate(2, Compel::Coercion::Integer, max: 3)
 
-  context 'min_length' do
+      expect(errors.empty?).to be true
+    end
 
-    it 'should validate with errors' do
-      errors = Compel::Validation.validate(3, Compel::Coercion::Integer, min_length: 2)
+    it 'should validate without errors for String' do
+      errors = Compel::Validation.validate('b', Compel::Coercion::String, max: 'd')
+
+      expect(errors.empty?).to be true
+    end
 
-      expect(errors).to include('must be a string if using the min_length validation')
+    it 'should validate with errors for String' do
+      errors = Compel::Validation.validate('c', Compel::Coercion::String, max: 'b')
+
+      expect(errors).to include('cannot be greater than b')
+    end
+
+    it 'should validate with errors for Float' do
+      errors = Compel::Validation.validate(1.56, Compel::Coercion::Float, max: 1.55)
+
+      expect(errors).to include('cannot be greater than 1.55')
     end
 
+  end
+
+  context 'min_length' do
+
     it 'should validate with errors 1' do
       errors = Compel::Validation.validate('a', Compel::Coercion::String, min_length: 2)
 
@@ -142,15 +190,15 @@ describe Compel::Validation do
       expect(errors.empty?).to eq(true)
     end
 
-  end
+    it 'should validate without errors 1' do
+      errors = Compel::Validation.validate(3, Compel::Coercion::Integer, min_length: 2)
 
-  context 'max_length' do
+      expect(errors).to include('cannot have length less than 2')
+    end
 
-    it 'should validate with errors' do
-      errors = Compel::Validation.validate(1, Compel::Coercion::Integer, max_length: 2)
+  end
 
-      expect(errors).to include('must be a string if using the max_length validation')
-    end
+  context 'max_length' do
 
     it 'should validate with errors 1' do
       errors = Compel::Validation.validate('abcdef', Compel::Coercion::String, max_length: 5)
@@ -164,6 +212,12 @@ describe Compel::Validation do
       expect(errors.empty?).to eq(true)
     end
 
+    it 'should validate without errors 1' do
+      errors = Compel::Validation.validate(1, Compel::Coercion::Integer, max_length: 2)
+
+      expect(errors.empty?).to eq(true)
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compel
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Joaquim Adráz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -82,6 +82,7 @@ files:
 - Rakefile
 - compel.gemspec
 - lib/compel.rb
+- lib/compel/builder/any.rb
 - lib/compel/builder/array.rb
 - lib/compel/builder/boolean.rb
 - lib/compel/builder/common.rb
@@ -99,6 +100,7 @@ files:
 - lib/compel/coercion/coercion.rb
 - lib/compel/coercion/nil_result.rb
 - lib/compel/coercion/result.rb
+- lib/compel/coercion/types/any.rb
 - lib/compel/coercion/types/array.rb
 - lib/compel/coercion/types/boolean.rb
 - lib/compel/coercion/types/date.rb
@@ -115,9 +117,18 @@ files:
 - lib/compel/errors.rb
 - lib/compel/exceptions/invalid_object_error.rb
 - lib/compel/exceptions/type_error.rb
-- lib/compel/exceptions/validation_error.rb
 - lib/compel/result.rb
-- lib/compel/validation.rb
+- lib/compel/validation/conditions/condition.rb
+- lib/compel/validation/conditions/format.rb
+- lib/compel/validation/conditions/in.rb
+- lib/compel/validation/conditions/is.rb
+- lib/compel/validation/conditions/length.rb
+- lib/compel/validation/conditions/max.rb
+- lib/compel/validation/conditions/max_length.rb
+- lib/compel/validation/conditions/min.rb
+- lib/compel/validation/conditions/min_length.rb
+- lib/compel/validation/result.rb
+- lib/compel/validation/validation.rb
 - lib/compel/validators/array_validator.rb
 - lib/compel/validators/base.rb
 - lib/compel/validators/hash_validator.rb
@@ -153,7 +164,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ruby Hash Coercion and Validation
+summary: Ruby Object Coercion and Validation
 test_files:
 - spec/compel/builder_spec.rb
 - spec/compel/coercion_spec.rb

data/lib/compel/exceptions/validation_error.rb

@@ -1,7 +0,0 @@
-module Compel
-
-  class ValidatorError < StandardError
-
-  end
-
-end

data/lib/compel/validation.rb

@@ -1,60 +0,0 @@
-module Compel
-
-  module Validation
-
-    def validate(value, type, options)
-      # if a value is required and not given,
-      # don't do any other validation
-      if !!options[:required] && value.nil?
-        return ['is required']
-      end
-
-      errors = []
-
-      options.each do |option, option_value|
-        # most of this code snippet is from sinatra-param gem
-        # https://github.com/mattt/sinatra-param
-        # by Mattt Thompson (@mattt)
-        case option.to_sym
-        when :format
-          if type == Coercion::String && !value.nil?
-            errors << "must match format #{option_value.source}" unless value =~ option_value
-          end
-        when :is
-          errors << "must be #{option_value}" unless value === option_value
-        when :in, :within, :range
-          errors << "must be within #{option_value}" unless value.nil? || case option_value
-          when Range
-            option_value.include?(value)
-          else
-            Array(option_value).include?(value)
-          end
-        when :min
-          errors << "cannot be less than #{option_value}" unless value.nil? || option_value <= value
-        when :max
-          errors << "cannot be greater than #{option_value}" unless value.nil? || option_value >= value
-        when :length
-          errors << "cannot have length different than #{option_value}" unless value.nil? || option_value == "#{value}".length
-        when :min_length
-          unless value.kind_of?(String)
-            errors << 'must be a string if using the min_length validation'
-          else
-            errors << "cannot have length less than #{option_value}" unless value.nil? || option_value <= value.length
-          end
-        when :max_length
-          unless value.kind_of?(String)
-            errors << 'must be a string if using the max_length validation'
-          else
-            errors << "cannot have length greater than #{option_value}" unless value.nil? || option_value >= value.length
-          end
-        end
-      end
-
-      errors
-    end
-
-    extend self
-
-  end
-
-end