hv 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0353278d4798a60106d524f47a02b0b9f823fe0a'
-  data.tar.gz: 7c0c2bf9299d9fe828bf631ec64452c76fa0e2bd
+  metadata.gz: 9ce070297444b94651fa7b6123b493acc5711fff
+  data.tar.gz: 1d560767fb9fad4d9e92743ad1a5d8fd8e0f3808
 SHA512:
-  metadata.gz: d00da52f72a809c438a7b1d27e83770893327e2eb4dd7f30f0c97365d90a792b34b8cefb6726e8df77c9b8bf2404f993fd580351cf0d20e98b3992d256eb0014
-  data.tar.gz: d083ba5b30499bee85e19abc7e482cfe4225853eb9a39a3fe78e759b92c44bafdd59060cfeed5a017dbdeae61275bce7e89ad246f85aa6360c9efcdc4b44c9aa
+  metadata.gz: d821845aba2b7d75ad702f4020b080443cdf29822f772a51d9b529200186ad2b9146e6d89d69e5683c8285bf3ef88f0e7e0dc002657c5605cbfc04e7ba85e429
+  data.tar.gz: 70dff345ce9442850dde2fbfa3d6b67b5056cfebd7db73fa5f5a3f6a89140511c2e7de17495fd86f49f926457f88667a61ef838f99637f54e694642213936223

data/.gitignore

@@ -6,3 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+test/notepad.txt
+.byebug_history
+notepad.txt

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    hv (0.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (10.0.0)
+    minitest (5.11.3)
+    rake (10.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  byebug
+  hv!
+  minitest (~> 5.0)
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.16.0

data/hv.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "byebug"
 end

data/lib/hv.rb

@@ -1,4 +1,5 @@
 require "hv/version"
+require "hv/errors_processor"
 require "hv/schema"
 
 module Hv

data/lib/hv/errors_processor.rb

@@ -0,0 +1,10 @@
+module Hv
+  module ErrorsProcessor
+    def self.call(result)
+      result.map do |path, validator, spec, given|
+        path_text = path.empty? ? "" : " in #{path}"
+        "Expected #{given.inspect}#{path_text} to be #{validator}:#{spec}"
+      end
+    end
+  end
+end

data/lib/hv/schema.rb

@@ -1,10 +1,6 @@
 module Hv
   class Schema
 
-    def allowed_validators
-      [:optional?, :format?, :min_size?, :max_size?, :size?, :lt?, :gt?, :types?, :type?, :enum?, :proc?, :array?, :empty?]
-    end
-
     def initialize(schema)
       @schema = schema
     end
@@ -13,20 +9,33 @@ module Hv
       @result
     end
 
-    def path
-      @path
-    end
-
     def validates?(input)
       @result = []
       validate_schema(@schema, input, [])
     end
 
+    def errors(errors_processor=Hv::ErrorsProcessor)
+      errors_processor.call(@result)
+    end
+
     private
 
+    def validator_key?(key)
+      allowed_validators.include?(key) ||
+      custom_validators.include?(key)
+    end
+
+    def allowed_validators
+      [:optional?, :format?, :min_size?, :max_size?, :size?, :lt?, :gt?, :types?, :type?, :enum?, :proc?, :array?, :empty?]
+    end
+
+    def custom_validators
+      []
+    end
+
     def validate_schema(spec, value, path=nil)
       spec.each do |key, _spec|
-        if !allowed_validators.include?(key)
+        if !validator_key?(key)
           _value = value[key] rescue nil
           validate_schema(_spec, _value, [path, key].flatten)
         else
@@ -34,29 +43,29 @@ module Hv
             true
           else
             next if key == :optional?
-            method("validate_#{key}").call(_spec, value)
+            method("validate_#{key}").call(_spec, value, path)
           end
-          @result << [path, key, _spec, false, value] unless match
+          @result << [path, key, _spec, value] unless match
         end
       end
       @result.empty?
     end
 
     def optional_attr?(path)
-      @schema.dig(*path)[:optional?] rescue false
+      (@schema.dig(*path) || {})[:optional?]
     end
 
-    def validate_enum?(spec, value)
+    def validate_enum?(spec, value, path)
       spec.include?(value)
     end
 
-    def validate_types?(spec, value)
+    def validate_types?(spec, value, path)
       raise "Argument for :types? must be an array of types" unless spec.is_a? Array
       spec.any? { |_type| value.is_a?(_type) }
     end
 
 
-    def validate_type?(spec, value)
+    def validate_type?(spec, value, path)
       value.is_a?(spec)
     end
 
@@ -69,27 +78,27 @@ module Hv
       end
     end
 
-    def validate_min_size?(spec, value)
+    def validate_min_size?(spec, value, path)
       validate_size(spec, value, '>=')
     end
 
-    def validate_max_size?(spec, value)
+    def validate_max_size?(spec, value, path)
       validate_size(spec, value, '<=')
     end
 
-    def validate_size?(spec, value)
+    def validate_size?(spec, value, path)
       validate_size(spec, value, '==')
     end
 
-    def validate_lt?(spec, value)
+    def validate_lt?(spec, value, path)
       validate_size(spec, value, '<')
     end
 
-    def validate_gt?(spec, value)
+    def validate_gt?(spec, value, path)
       validate_size(spec, value, '>')
     end
 
-    def validate_format?(spec, value)
+    def validate_format?(spec, value, path)
       if value.respond_to? :match?
         value.match?(spec)
       else
@@ -99,8 +108,8 @@ module Hv
 
     def validate_array?(spec, values, path=nil)
       return false unless values.is_a?(Array)
-      values.all? {|value|
-        validate_schema(spec, value, path)
+      values.to_enum.with_index.all? {|value, index|
+        validate_schema(spec, value, [path, index].flatten)
       }
     end
 

data/lib/hv/version.rb

@@ -1,3 +1,3 @@
 module Hv
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hv
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Monkey Square Lab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hash validation
 email:
 - monkeysquarelab@gmail.com
@@ -63,6 +77,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -70,8 +85,10 @@ files:
 - bin/setup
 - hv.gemspec
 - lib/hv.rb
+- lib/hv/errors_processor.rb
 - lib/hv/schema.rb
 - lib/hv/version.rb
+- releases/hv-0.1.0.gem
 homepage: https://github.com/monkeysquarelab/hv
 licenses:
 - MIT