compel 0.2.0 → 0.3.1

data/spec/compel/validation_spec.rb

@@ -1,185 +1,167 @@
 describe Compel::Validation do
 
-  context 'Param validation' do
+  context 'required' do
 
-    context 'required' do
+    it 'should validate without errors' do
+      errors = Compel::Validation.validate(123, Compel::Coercion::Integer, { required: true })
 
-      it 'should validate without errors' do
-        errors = Compel::Validation.validate(123, Compel::Coercion::Integer, { required: true })
-
-        expect(errors.empty?).to eq(true)
-      end
-
-      it 'should validate with error' do
-        errors = Compel::Validation.validate(nil,  Compel::Coercion::Integer, { required: true })
+      expect(errors.empty?).to eq(true)
+    end
 
-        expect(errors.empty?).to eq(false)
-        expect(errors).to eq(['is required'])
-      end
+    it 'should validate with error' do
+      errors = Compel::Validation.validate(nil,  Compel::Coercion::Integer, { required: true })
 
+      expect(errors.empty?).to eq(false)
+      expect(errors).to eq(['is required'])
     end
 
-    context 'length' do
+  end
 
-      it 'should validate without errors' do
-        errors = Compel::Validation.validate(123,  Compel::Coercion::Integer, { length: 3 })
+  context 'length' do
 
-        expect(errors.empty?).to eq(true)
-      end
+    it 'should validate without errors' do
+      errors = Compel::Validation.validate(123,  Compel::Coercion::Integer, { length: 3 })
 
+      expect(errors.empty?).to eq(true)
     end
 
-    context 'in, within, range' do
+  end
 
-      def expect_be_in_within_range(range, value)
-        [:in, :within].each do |key|
-          errors = Compel::Validation.validate(value,  Compel::Coercion::String, { key => range })
-          yield errors
-        end
-      end
+  context 'in, within, range' do
 
-      it 'should validate without errors' do
-        expect_be_in_within_range(['PT', 'UK'], 'PT') do |errors|
-          expect(errors.empty?).to eq(true)
-        end
+    def expect_be_in_within_range(range, value)
+      [:in, :within].each do |key|
+        errors = Compel::Validation.validate(value,  Compel::Coercion::String, { key => range })
+        yield errors
       end
+    end
 
-      it 'should validate with errors' do
-        expect_be_in_within_range(['PT', 'UK'], 'US') do |errors|
-          expect(errors).to include('must be within ["PT", "UK"]')
-        end
+    it 'should validate without errors' do
+      expect_be_in_within_range(['PT', 'UK'], 'PT') do |errors|
+        expect(errors.empty?).to eq(true)
       end
+    end
 
-      context 'range' do
-
-        it 'should validate without errors' do
-          errors = Compel::Validation.validate(2, Compel::Coercion::Integer, range: (1..3))
-
-          expect(errors.empty?).to eq(true)
-        end
+    it 'should validate with errors' do
+      expect_be_in_within_range(['PT', 'UK'], 'US') do |errors|
+        expect(errors).to include('must be within ["PT", "UK"]')
+      end
+    end
 
-        it 'should validate with errors' do
-          errors = Compel::Validation.validate(4, Compel::Coercion::Integer, range: (1..3))
+    context 'range' do
 
-          expect(errors).to include('must be within 1..3')
-        end
+      it 'should validate without errors' do
+        errors = Compel::Validation.validate(2, Compel::Coercion::Integer, range: (1..3))
 
+        expect(errors.empty?).to eq(true)
       end
 
-    end
-
-    context 'format' do
-
       it 'should validate with errors' do
-        format = /^abcd/
-        errors = Compel::Validation.validate('acb', Compel::Coercion::String, format: format)
+        errors = Compel::Validation.validate(4, Compel::Coercion::Integer, range: (1..3))
 
-        expect(errors).to include("must match format ^abcd")
+        expect(errors).to include('must be within 1..3')
       end
 
-      it 'should validate with errors 1' do
-        format = /^abcd/
-        errors = Compel::Validation.validate(123, Compel::Coercion::Integer, format: format)
+    end
 
-        expect(errors).to include('must be a string if using the format validation')
-      end
+  end
 
-      it 'should validate with errors 2' do
-        format = /^abcd/
-        errors = Compel::Validation.validate(nil, Compel::Coercion::String, format: format)
+  context 'format' do
 
-        expect(errors).to include('must be a string if using the format validation')
-      end
+    it 'should validate with errors' do
+      format = /^abcd/
+      errors = Compel::Validation.validate('acb', Compel::Coercion::String, format: format)
 
-      it 'should validate without errors' do
-        format = /abcd/
-        errors = Compel::Validation.validate('abcd', Compel::Coercion::String, format: format)
-        expect(errors.empty?).to eq(true)
-      end
+      expect(errors).to include("must match format ^abcd")
+    end
 
+    it 'should validate without errors' do
+      format = /abcd/
+      errors = Compel::Validation.validate('abcd', Compel::Coercion::String, format: format)
+      expect(errors.empty?).to eq(true)
     end
 
-    context 'is' do
+  end
 
-      it 'should validate with errors' do
-        errors = Compel::Validation.validate('abcd', Compel::Coercion::Integer, is: 123)
-        expect(errors).to include('must be 123')
-      end
+  context 'is' do
 
-      it 'should validate with errors 1' do
-        errors = Compel::Validation.validate(nil, Compel::Coercion::Integer, is: 123)
-        expect(errors).to include('must be 123')
-      end
+    it 'should validate with errors' do
+      errors = Compel::Validation.validate('abcd', Compel::Coercion::Integer, is: 123)
+      expect(errors).to include('must be 123')
+    end
 
-      it 'should validate without errors' do
-        errors = Compel::Validation.validate(123, Compel::Coercion::Integer, is: 123)
-        expect(errors.empty?).to eq(true)
-      end
+    it 'should validate with errors 1' do
+      errors = Compel::Validation.validate(nil, Compel::Coercion::Integer, is: 123)
+      expect(errors).to include('must be 123')
+    end
 
+    it 'should validate without errors' do
+      errors = Compel::Validation.validate(123, Compel::Coercion::Integer, is: 123)
+      expect(errors.empty?).to eq(true)
     end
 
-    context 'min' do
+  end
 
-      it 'should validate with errors' do
-        errors = Compel::Validation.validate(1, Compel::Coercion::Integer, min: 3)
+  context 'min' do
 
-        expect(errors).to include('cannot be less than 3')
-      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
 
-    context 'max' do
+  end
 
-      it 'should validate with errors' do
-        errors = Compel::Validation.validate(3, Compel::Coercion::Integer, max: 2)
+  context 'max' do
 
-        expect(errors).to include('cannot be greater than 2')
-      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
 
-    context 'min_length' do
+  end
 
-      it 'should validate with errors' do
-        errors = Compel::Validation.validate(3, Compel::Coercion::Integer, min_length: 2)
+  context 'min_length' do
 
-        expect(errors).to include('must be a string if using the min_length validation')
-      end
+    it 'should validate with errors' do
+      errors = Compel::Validation.validate(3, Compel::Coercion::Integer, min_length: 2)
 
-      it 'should validate with errors 1' do
-        errors = Compel::Validation.validate('a', Compel::Coercion::String, min_length: 2)
+      expect(errors).to include('must be a string if using the min_length validation')
+    end
 
-        expect(errors).to include('cannot have length less than 2')
-      end
+    it 'should validate with errors 1' do
+      errors = Compel::Validation.validate('a', Compel::Coercion::String, min_length: 2)
 
-      it 'should validate without errors' do
-        errors = Compel::Validation.validate('ab', Compel::Coercion::String, min_length: 2)
+      expect(errors).to include('cannot have length less than 2')
+    end
 
-        expect(errors.empty?).to eq(true)
-      end
+    it 'should validate without errors' do
+      errors = Compel::Validation.validate('ab', Compel::Coercion::String, min_length: 2)
 
+      expect(errors.empty?).to eq(true)
     end
 
-    context 'max_length' do
+  end
 
-      it 'should validate with errors' do
-        errors = Compel::Validation.validate(1, Compel::Coercion::Integer, max_length: 2)
+  context 'max_length' do
 
-        expect(errors).to include('must be a string if using the max_length validation')
-      end
+    it 'should validate with errors' do
+      errors = Compel::Validation.validate(1, Compel::Coercion::Integer, max_length: 2)
 
-      it 'should validate with errors 1' do
-        errors = Compel::Validation.validate('abcdef', Compel::Coercion::String, max_length: 5)
+      expect(errors).to include('must be a string if using the max_length validation')
+    end
 
-        expect(errors).to include('cannot have length greater than 5')
-      end
+    it 'should validate with errors 1' do
+      errors = Compel::Validation.validate('abcdef', Compel::Coercion::String, max_length: 5)
 
-      it 'should validate without errors' do
-        errors = Compel::Validation.validate('abcde', Compel::Coercion::String, max_length: 5)
+      expect(errors).to include('cannot have length greater than 5')
+    end
 
-        expect(errors.empty?).to eq(true)
-      end
+    it 'should validate without errors' do
+      errors = Compel::Validation.validate('abcde', Compel::Coercion::String, max_length: 5)
 
+      expect(errors.empty?).to eq(true)
     end
 
   end

data/spec/support/sinatra_app.rb

@@ -18,9 +18,9 @@ class SinatraApp < Sinatra::Base
 
   end
 
-  error Compel::InvalidHashError do |exception|
+  error Compel::InvalidObjectError do |exception|
     status 400
-    { errors: exception.errors }.to_json
+    { errors: exception.object[:errors] }.to_json
   end
 
   configure :development do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joaquim Adráz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2015-12-29 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/array.rb
 - lib/compel/builder/boolean.rb
 - lib/compel/builder/common.rb
 - lib/compel/builder/common_value.rb
@@ -95,24 +96,29 @@ files:
 - lib/compel/builder/schema.rb
 - lib/compel/builder/string.rb
 - lib/compel/builder/time.rb
-- lib/compel/coercion.rb
-- lib/compel/coercion/boolean.rb
-- lib/compel/coercion/date.rb
-- lib/compel/coercion/datetime.rb
-- lib/compel/coercion/float.rb
-- lib/compel/coercion/hash.rb
-- lib/compel/coercion/integer.rb
-- lib/compel/coercion/json.rb
-- lib/compel/coercion/regexp.rb
-- lib/compel/coercion/string.rb
-- lib/compel/coercion/time.rb
-- lib/compel/coercion/type.rb
+- lib/compel/coercion/coercion.rb
+- lib/compel/coercion/nil_result.rb
+- lib/compel/coercion/result.rb
+- lib/compel/coercion/types/array.rb
+- lib/compel/coercion/types/boolean.rb
+- lib/compel/coercion/types/date.rb
+- lib/compel/coercion/types/datetime.rb
+- lib/compel/coercion/types/float.rb
+- lib/compel/coercion/types/hash.rb
+- lib/compel/coercion/types/integer.rb
+- lib/compel/coercion/types/json.rb
+- lib/compel/coercion/types/regexp.rb
+- lib/compel/coercion/types/string.rb
+- lib/compel/coercion/types/time.rb
+- lib/compel/coercion/types/type.rb
 - lib/compel/contract.rb
 - lib/compel/errors.rb
-- lib/compel/exceptions/invalid_hash_error.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/validators/array_validator.rb
 - lib/compel/validators/base.rb
 - lib/compel/validators/hash_validator.rb
 - lib/compel/validators/type_validator.rb

data/lib/compel/coercion/date.rb

@@ -1,30 +0,0 @@
-module Compel
-  module Coercion
-
-    class Date < Type
-
-      def coerce!
-        format = options[:format] || '%Y-%m-%d'
-
-        if value.is_a?(::Date)
-          @value = value.strftime(format)
-        end
-
-        coerced = ::Date.strptime(value, format)
-
-        if coerced.strftime(format) == value
-          return coerced
-        end
-
-        fail
-
-        rescue
-          raise \
-            Compel::TypeError,
-            "'#{value}' is not a parsable date with format: #{format}"
-      end
-
-    end
-
-  end
-end

data/lib/compel/coercion/datetime.rb

@@ -1,30 +0,0 @@
-module Compel
-  module Coercion
-
-    class DateTime < Type
-
-      def coerce!
-        format = options[:format] || '%FT%T'
-
-        if value.is_a?(::DateTime)
-          @value = value.strftime(format)
-        end
-
-        coerced = ::DateTime.strptime(value, format)
-
-        if coerced.strftime(format) == value
-          return coerced
-        end
-
-        fail
-
-        rescue
-          raise \
-            Compel::TypeError,
-            "'#{value}' is not a parsable datetime with format: #{format}"
-      end
-
-    end
-
-  end
-end

data/lib/compel/coercion/time.rb

@@ -1,30 +0,0 @@
-module Compel
-  module Coercion
-
-    class Time < Type
-
-      def coerce!
-        format = options[:format] || '%FT%T'
-
-        if value.is_a?(::Time)
-          @value = value.strftime(format)
-        end
-
-        coerced = ::Time.strptime(value, format)
-
-        if coerced.strftime(format) == value
-          return coerced
-        end
-
-        fail
-
-        rescue
-          raise \
-            Compel::TypeError,
-            "'#{value}' is not a parsable time with format: #{format}"
-      end
-
-    end
-
-  end
-end

data/lib/compel/coercion/type.rb

@@ -1,17 +0,0 @@
-module Compel
-  module Coercion
-
-    class Type
-
-      attr_accessor :value,
-                    :options
-
-      def initialize(value, options = {})
-        @value = value
-        @options = options
-      end
-
-    end
-
-  end
-end

data/lib/compel/coercion.rb

@@ -1,31 +0,0 @@
-module Compel
-
-  module Coercion
-
-    def valid?(value, type, options = {})
-      !!coerce!(value, type, options) rescue false
-    end
-
-    def coerce!(value, type, options = {})
-      return nil if value.nil?
-
-      begin
-        coercion_klass(type).new(value, options).coerce!
-      rescue Compel::TypeError => exception
-        raise exception
-      rescue
-        type_split = "#{type}".split('::')
-
-        raise Compel::TypeError, "'#{value}' is not a valid #{type_split[-1]}"
-      end
-    end
-
-    def coercion_klass(type)
-      Compel::Coercion.const_get("#{type}")
-    end
-
-    extend self
-
-  end
-
-end

data/lib/compel/exceptions/invalid_hash_error.rb

@@ -1,9 +0,0 @@
-module Compel
-
-  class InvalidHashError < StandardError
-
-    attr_accessor :object, :errors
-
-  end
-
-end