objecheck 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29c7a9581a27191aa05d1df83b5743bb7ad31b82cc4bad3e14c88730e65ffcd5
-  data.tar.gz: a58f1b7f322487a8211ab49ddb2188e5fa88729378bdcdc5740c4ab96ea12a1a
+  metadata.gz: 79e158220b8faff0033bfa2456ef1ac7bd10f4556261659f1217a052a2c42aef
+  data.tar.gz: 2c45f51bc1cbb634e8027f78ec1c42b472e99c241a80f422abdcc09c8c9eb2c2
 SHA512:
-  metadata.gz: c6ad10d126d6b66c26c6c5c4d8e9ee8c1ff44ec93a69dbb4a0b509af64f1f5a421b85b2f8f8d7200653a95764cf905bb758ce5a7a0e7e339238d3431acd1044a
-  data.tar.gz: 1f21d8d7f8245f9a0e4c640b91740e8adc44cc3da1bfd3750936af45b2d6c4b52278d9d3b80c16115501c4ed6086cd23ff5a7d4d6e860b83060a141097e91872
+  metadata.gz: 07f0b91db2957dbebdca3008c352750febb414ab96fb46dd37247a9799e43b3e3d8d9828fd063a3806372c7c29375f07bb8bad01c92d1806ace43ae1f125d3ab
+  data.tar.gz: 6cc64f317e3ce3feaf859282c2db9317a81388e9b69e465c0b7123105c0d0bb9f252f08fbad9153b2a97e19fa789a465d6142c9f1cafa749d4316268b9e0cb3d

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## v0.5.0
+
+### New features
+
+- Add validation mechanism for parameters of rule
+- Validate parameters of each builtin rule in `Validator#initialize`
+
+### Bug fixes
+
+- Add `eq` to builtin rules map
+
 ## v0.4.0
 
 - Add `AnyRule` as `any`

data/lib/objecheck/validator.rb

@@ -30,11 +30,14 @@ class Objecheck::Validator
     each_key: EachKeyRule,
     each_value: EachValueRule,
     key_value: KeyValueRule,
+    eq: EqRule,
     any: AnyRule
   }.freeze
 
-  def initialize(schema, rule_map = DEFAULT_RULES)
+  def initialize(schema, rule_map = DEFAULT_RULES, schema_validation = true)
     @rule_map = rule_map
+    @schema_validation = schema_validation
+    @param_validators = {} if schema_validation
     @rules = compile_schema(schema)
   end
 
@@ -48,7 +51,19 @@ class Objecheck::Validator
 
   def compile_schema(schema)
     schema.each_with_object({}) do |(rule_name, param), rules|
-      rules[rule_name] = @rule_map[rule_name].new(self, param)
+      rule_class = @rule_map[rule_name]
+      if @schema_validation && rule_class.respond_to?(:schema)
+        param_validator = @param_validators[rule_name]
+        if !param_validator
+          param_schema, param_rule_map = rule_class.schema
+          param_validator = Objecheck::Validator.new(param_schema, param_rule_map || DEFAULT_RULES, false)
+          @param_validators[:rule_name] = param_validator
+        end
+        if !(errors = param_validator.validate(param)).empty?
+          raise Objecheck::Error, "paramters for #{rule_name} rule is invalid\n  #{errors.join("\n  ")}"
+        end
+      end
+      rules[rule_name] = rule_class.new(self, param)
     end
   end
 end

data/lib/objecheck/validator/any_rule.rb

@@ -39,4 +39,8 @@ class Objecheck::Validator::AnyRule
       collector.commit(t)
     end
   end
+
+  def self.schema
+    [{ each: { type: Hash } }]
+  end
 end

data/lib/objecheck/validator/each_key_rule.rb

@@ -33,4 +33,8 @@ class Objecheck::Validator::EachKeyRule
       end
     end
   end
+
+  def self.schema
+    [{ type: Hash }]
+  end
 end

data/lib/objecheck/validator/each_rule.rb

@@ -33,4 +33,8 @@ class Objecheck::Validator::EachRule
       end
     end
   end
+
+  def self.schema
+    [{ type: Hash }]
+  end
 end

data/lib/objecheck/validator/each_value_rule.rb

@@ -33,4 +33,8 @@ class Objecheck::Validator::EachValueRule
       end
     end
   end
+
+  def self.schema
+    [{ type: Hash }]
+  end
 end

data/lib/objecheck/validator/key_value_rule.rb

@@ -42,4 +42,19 @@ class Objecheck::Validator::KeyValueRule
       end
     end
   end
+
+  def self.schema
+    [
+      {
+        type: Hash,
+        each_value: {
+          type: Hash,
+          key_value: {
+            required: { required: false, value: { type: :bool } },
+            value: { value: { type: Hash } }
+          }
+        }
+      }
+    ]
+  end
 end

data/lib/objecheck/validator/type_rule.rb

@@ -28,4 +28,8 @@ class Objecheck::Validator::TypeRule
       collector.add_error("should be a #{@type} (got #{target.class})")
     end
   end
+
+  def self.schema
+    [{ any: [{ type: Module }, { eq: :bool }] }]
+  end
 end

data/objecheck.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'objecheck'
-  spec.version       = '0.4.0'
+  spec.version       = '0.5.0'
   spec.authors       = ['autopp']
   spec.email         = ['autopp.inc@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: objecheck
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - autopp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler