compel 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd80b5474b8218a24a20053cbf9a52645965acd3
-  data.tar.gz: c793b3161901f6aa6872b0763a7fb9570c9864d9
+  metadata.gz: 032ba6894d54a63ee956025716cb973156d601b0
+  data.tar.gz: 0121184a327f472d7750180db68411253f91d465
 SHA512:
-  metadata.gz: 78f27f5b101c0255540f8a99018d750247ddae79eca4847b1a656fbbd527e4af1445ce12567f5049b201fc1309bdd1b594af225876937b450689fc269f2b92c6
-  data.tar.gz: 6c1d7772d9cd20a21f6e36fe0f1c717bebb358a4a98ed2c3fb6831f986770895d4040901bf4a8ccc25e3b0ccd16cd72ae34ed0b142e9c02330bb83a4946c4ebf
+  metadata.gz: 4fb359e62420fc5a8b780297bfc05a9ffcc986034d362e4cace62626a4f8e67c0e75a38013335f8fe1eb48c93a560ba2bbc41b9ecdfd49eeaa591443fcfb1f71
+  data.tar.gz: f933cdda27071b04278ff0812f91c7956a4a92e478c08c6912cef70878de9bddb88860e5b7f074bedcdcd3620c002c919c4b13a69ae9ce71abe2f58371d0480e

data/README.md

@@ -169,6 +169,8 @@ Methods `length`, `min_length` and `max_length` turn the object to validate into
 - `min(``value``)`
 - `max(``value``)`
 - `format(``regexp``)`
+- `email`
+- `url`
 
 ==========================
 

data/compel.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'hashie', '~> 3.4'
   gem.add_development_dependency 'rspec', '~> 3.2'
   gem.add_development_dependency 'rake', '~> 0'
   gem.add_development_dependency 'pry', '~> 0'

data/lib/compel.rb

@@ -1,5 +1,4 @@
 require 'time'
-require 'hashie'
 
 require 'compel/exceptions/type_error'
 require 'compel/exceptions/invalid_object_error'

data/lib/compel/builder/schema.rb

@@ -36,7 +36,7 @@ module Compel
       protected
 
       def default_options
-        Hashie::Mash.new(required: false)
+        { required: false }
       end
 
     end

data/lib/compel/coercion/types/hash.rb

@@ -4,9 +4,20 @@ module Compel
     class Hash < Type
 
       def coerce_value
-        Hashie::Mash.new(value).to_hash rescue nil
+        if ::Hash.try_convert(value)
+          symbolyze_keys(value)
+        end
       end
 
+      private
+
+      def symbolyze_keys(hash)
+        {}.tap do |symbolyzed_hash|
+          hash.each do |key, value|
+            symbolyzed_hash[key.to_sym] = value
+          end
+        end
+      end
     end
 
   end

data/lib/compel/errors.rb

@@ -3,7 +3,7 @@ module Compel
   class Errors
 
     def initialize
-      @errors = Hashie::Mash.new
+      @errors = {}
     end
 
     def add(key, error)

data/lib/compel/validators/hash_validator.rb

@@ -20,8 +20,6 @@ module Compel
           return self
         end
 
-        @input = Hashie::Mash.new(input)
-
         keys_validator = \
           HashKeysValidator.validate(input, keys_schemas)
 
@@ -32,7 +30,7 @@ module Compel
       end
 
       def serialize
-        coerced = output.is_a?(Hash) ? input.merge(output) : Hashie::Mash.new
+        coerced = output.is_a?(Hash) ? input.merge(output) : {}
 
         coerced.tap do |hash|
           if !errors.empty?

data/lib/compel/version.rb

@@ -1,3 +1,3 @@
 module Compel
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
 end

data/spec/compel/builder_spec.rb

@@ -4,11 +4,11 @@ describe Compel::Builder do
 
     context 'Build' do
 
-      it 'should build new Schema for givin type' do
+      it 'should build new Schema for given type' do
         builder = Compel.string
 
         expect(builder.type).to be(Compel::Coercion::String)
-        expect(builder.options.keys).to include('required')
+        expect(builder.options.keys).to include(:required)
         expect(builder.required?).to be false
         expect(builder.default_value).to be nil
       end
@@ -298,14 +298,14 @@ describe Compel::Builder do
 
           keys_schemas = schema.options[:keys]
 
-          expect(keys_schemas.a.type).to be Compel::Coercion::Float
-          expect(keys_schemas.b.type).to be Compel::Coercion::String
-          expect(keys_schemas.c.type).to be Compel::Coercion::Hash
-          expect(keys_schemas.d.type).to be Compel::Coercion::JSON
-          expect(keys_schemas.e.type).to be Compel::Coercion::Time
-          expect(keys_schemas.f.type).to be Compel::Coercion::DateTime
-          expect(keys_schemas.g.type).to be Compel::Coercion::Date
-          expect(keys_schemas.h.type).to be Compel::Coercion::Integer
+          expect(keys_schemas[:a].type).to be Compel::Coercion::Float
+          expect(keys_schemas[:b].type).to be Compel::Coercion::String
+          expect(keys_schemas[:c].type).to be Compel::Coercion::Hash
+          expect(keys_schemas[:d].type).to be Compel::Coercion::JSON
+          expect(keys_schemas[:e].type).to be Compel::Coercion::Time
+          expect(keys_schemas[:f].type).to be Compel::Coercion::DateTime
+          expect(keys_schemas[:g].type).to be Compel::Coercion::Date
+          expect(keys_schemas[:h].type).to be Compel::Coercion::Integer
         end
 
         it 'should raise error for invalid #keys' do
@@ -557,19 +557,19 @@ describe Compel::Builder do
 
           expect(result.value).to \
             eq({
-              "first_name" => "Joaquim",
-              "birth_date" => "1989-0",
-              "address" => {
-                "line_one" => "Lisboa",
-                "post_code" => "1100",
-                "country_code" => "PT",
-                "line_two" => "-"
+              first_name: 'Joaquim',
+              birth_date: '1989-0',
+              address: {
+                line_one: 'Lisboa',
+                post_code: '1100',
+                country_code: 'PT',
+                line_two: '-'
               },
-              "errors" => {
-                "last_name" => ["is required"],
-                "birth_date" => ["'1989-0' is not a parsable date with format: %Y-%m-%d"],
-                "address" => {
-                  "post_code" => ["must match format ^\\d{4}-\\d{3}$"]
+              errors: {
+                last_name: ['is required'],
+                birth_date: ["'1989-0' is not a parsable date with format: %Y-%m-%d"],
+                address: {
+                  post_code: ["must match format ^\\d{4}-\\d{3}$"]
                 }
               }
             })
@@ -580,7 +580,7 @@ describe Compel::Builder do
             a: Compel.float.required
           })
 
-          expect(schema.validate({ a: nil }).errors.a).to \
+          expect(schema.validate({ a: nil }).errors[:a]).to \
             include('is required')
         end
 
@@ -613,7 +613,7 @@ describe Compel::Builder do
             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}}")
+              include("must be #{value.to_hash}")
           end
 
           it 'should validate without errors' do
@@ -763,9 +763,9 @@ describe Compel::Builder do
             expect(result.valid?).to be true
             expect(result.value).to eq \
               [
-                Hashie::Mash.new({ a: 'A', b: 1 }),
-                Hashie::Mash.new({ a: 'B' }),
-                Hashie::Mash.new({ a: 'C', b: 3 })
+                { a: 'A', b: 1 },
+                { a: 'B' },
+                { a: 'C', b: 3 }
               ]
           end
 

data/spec/compel/coercion_spec.rb

@@ -149,8 +149,8 @@ describe Compel::Coercion do
         }, Compel::Coercion::Hash)
 
         expect(value).to eq({
-          'first_name' => 'Joaquim',
-          'last_name' => 'Adráz'
+          first_name: 'Joaquim',
+          last_name: 'Adráz'
         })
       end
 
@@ -161,20 +161,20 @@ describe Compel::Coercion do
         }, Compel::Coercion::Hash)
 
         expect(value).to eq({
-          'first_name' => 'Joaquim',
-          'last_name' => 'Adráz'
+          first_name: 'Joaquim',
+          last_name: 'Adráz'
         })
       end
 
       it 'should coerce 2' do
-        value = Compel::Coercion.coerce!(Hashie::Mash.new({
+        value = Compel::Coercion.coerce!({
           first_name: 'Joaquim',
           last_name: 'Adráz'
-        }), Compel::Coercion::Hash)
+        }, Compel::Coercion::Hash)
 
         expect(value).to eq({
-          'first_name' => 'Joaquim',
-          'last_name' => 'Adráz'
+          first_name: 'Joaquim',
+          last_name: 'Adráz'
         })
       end
 

data/spec/compel/compel_spec.rb

@@ -39,18 +39,16 @@ describe Compel do
 
           expect(result.valid?).to be true
           expect(result.value).to eq \
-            Hashie::Mash.new({
-              user: {
-                first_name: 'Joaquim',
-                last_name: 'Adráz',
-                birth_date: DateTime.parse('1989-08-06T09:00:00'),
-                age: 26,
-                admin: false,
-                blog_role: {
-                  admin: false
-                }
+            user: {
+              first_name: 'Joaquim',
+              last_name: 'Adráz',
+              birth_date: DateTime.parse('1989-08-06T09:00:00'),
+              age: 26,
+              admin: false,
+              blog_role: {
+                admin: false
               }
-            })
+            }
         end
 
       end
@@ -69,17 +67,15 @@ describe Compel do
 
           expect(result.valid?).to be false
           expect(result.value).to eq \
-            Hashie::Mash.new({
-              other_param: 1,
+            other_param: 1,
+            user: {
+              first_name: 'Joaquim',
+            },
+            errors: {
               user: {
-                first_name: 'Joaquim',
-              },
-              errors: {
-                user: {
-                  last_name: ['is required']
-                }
+                last_name: ['is required']
               }
-            })
+            }
         end
 
         it 'should not compel for invalid hash' do
@@ -114,16 +110,14 @@ describe Compel do
 
           expect(result.valid?).to be false
           expect(result.value).to eq \
-            Hashie::Mash.new({
-              user:{
-                first_name: 'Joaquim',
-              },
-              errors: {
-                user: {
-                  last_name: ['is required']
-                }
+            user:{
+              first_name: 'Joaquim',
+            },
+            errors: {
+              user: {
+                last_name: ['is required']
               }
-            })
+            }
         end
 
       end
@@ -181,17 +175,15 @@ describe Compel do
 
           expect(result.valid?).to be false
           expect(result.value).to eq \
-            Hashie::Mash.new({
+            address: {
+              line_two: 'Portugal'
+            },
+            errors: {
               address: {
-                line_two: 'Portugal'
-              },
-              errors: {
-                address: {
-                  line_one: ['is required'],
-                  post_code: ['is required']
-                }
+                line_one: ['is required'],
+                post_code: ['is required']
               }
-            })
+            }
         end
 
         it 'should not compel missing key and length invalid' do
@@ -211,25 +203,23 @@ describe Compel do
 
           expect(result.valid?).to be false
           expect(result.value).to eq \
-            Hashie::Mash.new({
+            address: {
+              line_two: 'Portugal',
+              post_code: {
+                prefix: 1,
+                county: {
+                  code: 'LX'
+                }
+              }
+            },
+            errors: {
               address: {
-                line_two: 'Portugal',
+                line_one: ['is required'],
                 post_code: {
-                  prefix: 1,
-                  county: {
-                    code: 'LX'
-                  }
-                }
-              },
-              errors: {
-                address: {
-                  line_one: ['is required'],
-                  post_code: {
-                    prefix: ['cannot have length different than 4']
-                  }
+                  prefix: ['cannot have length different than 4']
                 }
               }
-            })
+            }
         end
 
         it 'should not compel for givin invalid optional value' do
@@ -248,25 +238,23 @@ describe Compel do
 
           expect(result.valid?).to be false
           expect(result.value).to eq \
-            Hashie::Mash.new({
+            address: {
+              line_one: 'Line',
+              post_code: {
+                prefix: 1100,
+                suffix: 100,
+                county: {}
+              }
+            },
+            errors: {
               address: {
-                line_one: 'Line',
                 post_code: {
-                  prefix: 1100,
-                  suffix: 100,
-                  county: {}
-                }
-              },
-              errors: {
-                address: {
-                  post_code: {
-                    county: {
-                      code: ['is required']
-                    }
+                  county: {
+                    code: ['is required']
                   }
                 }
               }
-            })
+            }
 
         end
 
@@ -279,12 +267,10 @@ describe Compel do
 
           expect(result.valid?).to be false
           expect(result.value).to eq \
-            Hashie::Mash.new({
-              address: nil,
-              errors: {
-                address: ['is required']
-              }
-            })
+            address: nil,
+            errors: {
+              address: ['is required']
+            }
         end
 
         it 'should not compel for empty object' do
@@ -292,11 +278,9 @@ describe Compel do
 
           expect(result.valid?).to be false
           expect(result.value).to eq \
-            Hashie::Mash.new({
-              errors: {
-                address: ['is required']
-              }
-            })
+            errors: {
+              address: ['is required']
+            }
         end
 
       end
@@ -516,11 +500,9 @@ describe Compel do
 
           expect(make_the_call(:run!, hash)).to \
             eq \
-              Hashie::Mash.new({
-                first_name: 'Joaquim',
-                last_name: 'Adráz',
-                birth_date: DateTime.new(1988, 12, 24)
-              })
+              first_name: 'Joaquim',
+              last_name: 'Adráz',
+              birth_date: DateTime.new(1988, 12, 24)
         end
 
         it 'should raise InvalidObjectError exception for missing required key' do
@@ -539,7 +521,10 @@ describe Compel do
 
           expect{ make_the_call(:run!, hash) }.to raise_error do |exception|
             expect(exception.object).to eq \
-              Hashie::Mash.new(first_name: 'Joaquim', errors: { last_name: ['is required'] })
+              first_name: 'Joaquim',
+              errors: {
+                last_name: ['is required']
+              }
           end
         end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: compel
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Joaquim Adráz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement