compel 0.1.3 → 0.2.0

data/spec/compel/validation_spec.rb

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

data/spec/spec_helper.rb

@@ -1 +1,20 @@
+require 'simplecov'
+require 'codeclimate-test-reporter'
+
+SimpleCov.start do
+  formatter SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    CodeClimate::TestReporter::Formatter
+  ]
+end
+
 require 'compel'
+
+require 'rack/test'
+require 'support/sinatra_app'
+
+def app
+  SinatraApp
+end
+
+include Rack::Test::Methods

data/spec/support/sinatra_app.rb

@@ -0,0 +1,43 @@
+require 'sinatra/base'
+require 'compel'
+
+class SinatraApp < Sinatra::Base
+
+  set :show_exceptions, false
+  set :raise_errors, true
+
+  before do
+    content_type :json
+  end
+
+  helpers do
+
+    def compel(schema)
+      params.merge! Compel.run!(params, Compel.hash.keys(schema))
+    end
+
+  end
+
+  error Compel::InvalidHashError do |exception|
+    status 400
+    { errors: exception.errors }.to_json
+  end
+
+  configure :development do
+    set :show_exceptions, false
+    set :raise_errors, true
+  end
+
+  post '/api/posts' do
+    compel({
+      post: Compel.hash.keys({
+        title: Compel.string.required,
+        body: Compel.string,
+        published: Compel.boolean.default(false)
+      }).required
+    })
+
+    params.to_json
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compel
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Joaquim Adráz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -82,6 +82,19 @@ files:
 - Rakefile
 - compel.gemspec
 - lib/compel.rb
+- lib/compel/builder/boolean.rb
+- lib/compel/builder/common.rb
+- lib/compel/builder/common_value.rb
+- lib/compel/builder/date.rb
+- lib/compel/builder/datetime.rb
+- lib/compel/builder/float.rb
+- lib/compel/builder/hash.rb
+- lib/compel/builder/integer.rb
+- lib/compel/builder/json.rb
+- lib/compel/builder/methods.rb
+- 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
@@ -90,24 +103,28 @@ files:
 - 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/contract.rb
 - lib/compel/errors.rb
-- lib/compel/invalid_params_error.rb
-- lib/compel/param.rb
-- lib/compel/param_type_error.rb
-- lib/compel/param_validation_error.rb
+- lib/compel/exceptions/invalid_hash_error.rb
+- lib/compel/exceptions/type_error.rb
+- lib/compel/exceptions/validation_error.rb
 - lib/compel/validation.rb
+- lib/compel/validators/base.rb
+- lib/compel/validators/hash_validator.rb
+- lib/compel/validators/type_validator.rb
 - lib/compel/version.rb
+- spec/compel/builder_spec.rb
 - spec/compel/coercion_spec.rb
 - spec/compel/compel_spec.rb
-- spec/compel/contract_spec.rb
 - spec/compel/errors_spec.rb
-- spec/compel/param_spec.rb
+- spec/compel/sinatra_integration_spec.rb
 - spec/compel/validation_spec.rb
 - spec/spec_helper.rb
+- spec/support/sinatra_app.rb
 homepage: https://github.com/joaquimadraz/compel
 licenses: []
 metadata: {}
@@ -132,10 +149,11 @@ signing_key:
 specification_version: 4
 summary: Ruby Hash Coercion and Validation
 test_files:
+- spec/compel/builder_spec.rb
 - spec/compel/coercion_spec.rb
 - spec/compel/compel_spec.rb
-- spec/compel/contract_spec.rb
 - spec/compel/errors_spec.rb
-- spec/compel/param_spec.rb
+- spec/compel/sinatra_integration_spec.rb
 - spec/compel/validation_spec.rb
 - spec/spec_helper.rb
+- spec/support/sinatra_app.rb

data/lib/compel/invalid_params_error.rb

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

data/lib/compel/param.rb

@@ -1,46 +0,0 @@
-module Compel
-
-  class Param
-
-    attr_reader :name,
-                :type,
-                :options,
-                :conditions
-
-    def initialize(name, type, value, options = {}, &conditions)
-      @name = name
-      @type = type
-      @value = value
-      @options = options
-      @conditions = conditions
-    end
-
-    def value
-      default_value = if options[:default].is_a?(Proc)
-        options[:default].call
-      else
-        options[:default]
-      end
-
-      @value || default_value
-    end
-
-    def value=(value)
-      @value = value
-    end
-
-    def required?
-      !!@options[:required]
-    end
-
-    def hash?
-      @type == Hash
-    end
-
-    def conditions?
-      !!@conditions
-    end
-
-  end
-
-end

data/lib/compel/param_type_error.rb

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

data/lib/compel/param_validation_error.rb

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

data/spec/compel/contract_spec.rb

@@ -1,36 +0,0 @@
-describe Compel::Contract do
-
-  context '#conditions' do
-
-    it 'should build with conditions block option' do
-      contract = \
-        Compel::Contract.new({ first_name: 'Joaquim' }) do
-          param :address, Hash, required: true do
-            param :post_code, String
-          end
-        end
-
-      expect(contract.conditions[:address].type).to eq(Hash)
-      expect(contract.conditions[:address].required?).to eq(true)
-      expect(contract.conditions[:address].conditions?).to eq(true)
-    end
-
-  end
-
-  context 'params' do
-
-    it 'should return coerced params' do
-      contract = \
-        Compel::Contract.new(date: '2015-12-22') { param :date, DateTime }
-          .validate
-
-      expect(contract.coerced_params.date).to be_a DateTime
-      expect(contract.coerced_params.date.year).to eq(2015)
-      expect(contract.coerced_params.date.month).to eq(12)
-      expect(contract.coerced_params.date.day).to eq(22)
-    end
-
-  end
-
-
-end

data/spec/compel/param_spec.rb

@@ -1,25 +0,0 @@
-describe Compel::Param do
-
-  context 'default value' do
-
-    it 'should override default value when value is given' do
-      param = Compel::Param.new(:number, Integer, nil, { default: 123 })
-
-      expect(param.value).to eq(123)
-    end
-
-    it 'should use default value when not given a value' do
-      param = Compel::Param.new(:number, Integer, 123, { default: 456 })
-
-      expect(param.value).to eq(123)
-    end
-
-    it 'should allow proc as default value' do
-      param = Compel::Param.new(:year, Integer, nil, { default: Proc.new { Time.now.year } })
-
-      expect(param.value).to eq(Time.now.year)
-    end
-
-  end
-
-end