j2119 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77e37161a3dd37e54c5bd312adf906ba4acb3f31
-  data.tar.gz: 28ec7bfb523432d79a1be3b52119aca775dfea08
+SHA256:
+  metadata.gz: 202e9050184c4caffde950c3247ff1186481b540b8dc8f9b8b3d22255f63beff
+  data.tar.gz: 70d6bde16dcbe291f7c1cb82305e0487a029b51abf3684dd6b5489abfed064be
 SHA512:
-  metadata.gz: 0ec99127e2a2db8e9708d3736952c5a0a7e61974756576ed3dc9df83f7c95dab55daad4f701dcd87356415d180dcacbe88d49c6e2ac582f0492990e93779d300
-  data.tar.gz: 317119a518e9e0d6802edfa478acb0275bd0bb0b4cd139bc4e1e9caa43c0601f319951319dc18f75c6cb9e8de1874b4cad38a4d3e6b4ceedd8c115646ac83e88
+  metadata.gz: c3e99db9fc578439cd14de9608f35ec5f524f521b351c8e180ceca6f7e2c154c2ad0a8c0f169e53eac0d3d1acbf8471c4aa75a62c9c3daaf3ead5af4694dc96a
+  data.tar.gz: 006c59bc14e255f57f368386b8283c91fd67987ec3b4874882c21105f59dc45f8391be2efbb00dd7adf292a4b8085a18a0d1636fc9424dc4b237a7328c20176d

data/j2119.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'j2119'
-  s.version     = '0.1.0'
+  s.version     = '0.2.1'
   s.date        = '2016-09-28'
   s.summary     = "JSON DSL Validator"
   s.description = "Validates JSON objects based on constraints in RFC2119-like language"

data/lib/j2119/allowed_fields.rb

@@ -19,6 +19,7 @@ module J2119
 
     def initialize
       @allowed = {}
+      @any = []
     end
 
     def set_allowed(role, child)
@@ -26,10 +27,20 @@ module J2119
       @allowed[role] << child
     end
 
+    def set_any(role)
+      @any << role
+    end
+
     def allowed?(roles, child)
-      roles.any? do |role|
+      any?(roles) || roles.any? do |role|
         @allowed[role] && @allowed[role].include?(child)
       end
     end
+
+    def any?(roles)
+      roles.any? do |role|
+        @any.include?(role)
+      end
+    end
   end
 end

data/lib/j2119/assigner.rb

@@ -58,6 +58,7 @@ module J2119
       relation = assertion['relation']
       target = assertion['target']
       strings = assertion['strings']
+      child_type = assertion['child_type']
       vals = assertion['vals']
 
       # watch out for conditionals
@@ -110,14 +111,20 @@ module J2119
       end
       
       # there can be role defs there too
-      if assertion['child_type']
+      if child_type
         @matcher.add_role assertion['child_role']
-        child_type = assertion['child_type']
         if child_type == 'value'
           @roles.add_child_role(role, field_name, assertion['child_role'])
         elsif child_type == 'element' || child_type == 'field'
           @roles.add_grandchild_role(role, field_name, assertion['child_role'])
         end
+      else
+        anyOrObjectOrArray = (!type) || (type == 'object') || (type == 'array')
+        # untyped field without a defined child role
+        if field_name && anyOrObjectOrArray && (modal != 'MUST NOT')
+          @roles.add_grandchild_role(role, field_name, field_name)
+          @allowed_fields.set_any(field_name)
+        end
       end
     end
 

data/lib/j2119/json_path_checker.rb

@@ -30,17 +30,17 @@ module J2119
       "[#{re_classes.join('')}]"
     end
 
-    @@name_re = classes_to_re(INITIAL_NAME_CLASSES) +
+    name_re = classes_to_re(INITIAL_NAME_CLASSES) +
                 classes_to_re(FOLLOWING_NAME_CLASSES) + '*'
-    dot_step = DOT_SEPARATOR + '((' + @@name_re + ')|(\*))'
-    rp_dot_step = DOT_SEPARATOR + @@name_re
-    bracket_step = '\[' + "'" + @@name_re + "'" + '\]'
+    dot_step = DOT_SEPARATOR + '((' + name_re + ')|(\*))'
+    rp_dot_step = DOT_SEPARATOR + name_re
+    bracket_step = '\[' + "'" + name_re + "'" + '\]'
     rp_num_index = '\[\d+\]'
     num_index = '\[\d+(, *\d+)?\]'
     star_index = '\[\*\]'
     colon_index = '\[(-?\d+)?:(-?\d+)?\]'
     index = '((' + num_index + ')|(' + star_index + ')|(' + colon_index + '))'
-    step = '((' + dot_step + ')|(' + bracket_step + '))' + '(' + index + ')?'
+    step = '((' + dot_step + ')|(' + bracket_step + ')|(' + index + '))' + '(' + index + ')?'
     rp_step = '((' + rp_dot_step + ')|(' + bracket_step + '))' + '(' + rp_num_index + ')?'
     path = '^\$' + '(' + step + ')+$'
     reference_path = '^\$' + '(' + rp_step + ')+$'

data/lib/j2119/matcher.rb

@@ -205,6 +205,9 @@ module J2119
     def build(re, line)
       data = {}
       match = re.match(line)
+      unless match
+        puts "No names for: #{line}"
+      end
       match.names.each do |name|
         data[name] = match[name]
       end

data/lib/j2119/node_validator.rb

@@ -56,21 +56,21 @@ module J2119
 
         # find inheritance-based roles for that field
         grandchild_roles = @parser.find_grandchild_roles(roles, name)
-
-        # recurse into grandkids
-        if val.is_a? Hash
-          val.each do |child_name, child_val|
-            validate_node(child_val, "#{path}.#{name}.#{child_name}",
-                          grandchild_roles.clone, problems)
-          end
-        elsif val.is_a? Array
-          i = 0
-          val.each do |member|
-            validate_node(member, "#{path}.#{name}[#{i}]",
-                          grandchild_roles.clone, problems)
-            i += 1
+        if !@parser.allows_any?(grandchild_roles)
+          # recurse into grandkids
+          if val.is_a? Hash
+            val.each do |child_name, child_val|
+              validate_node(child_val, "#{path}.#{name}.#{child_name}",
+                            grandchild_roles.clone, problems)
+            end
+          elsif val.is_a? Array
+            i = 0
+            val.each do |member|
+              validate_node(member, "#{path}.#{name}[#{i}]",
+                            grandchild_roles.clone, problems)
+              i += 1
+            end
           end
-          
         end
       end
     end

data/lib/j2119/parser.rb

@@ -97,5 +97,9 @@ module J2119
     def field_allowed?(roles, child)
       @allowed_fields.allowed?(roles, child)
     end
+
+    def allows_any?(roles)
+      @allowed_fields.any?(roles)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: j2119
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tim Bray
@@ -14,14 +14,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Validates JSON objects based on constraints in RFC2119-like language
@@ -30,7 +30,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - NOTICE.txt
@@ -60,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: JSON DSL Validator