jcrvalidator 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e68e95dd86cf0ba170eae8a3ead3acb7c44ab59
-  data.tar.gz: fe3a8c25bf2e420c43db8c32f33e764f7356d766
+  metadata.gz: a0b80dde864c20a32ff286e29e11b5179b3fa935
+  data.tar.gz: 8670787681c6b2aa7639f5c1fad552f5843f2d88
 SHA512:
-  metadata.gz: 6d8a19a053ff78eeb76b2b46ee0c48be126465a80825737e87881cbdf4c9f7e4e1b9dae9c15b0768ddb27f091f4196e761f44ab2c65cc19a19a86288bbdb8d51
-  data.tar.gz: ba031e433185f9857056a62759caee2d7edf396cc6067d35e1bd4d3114c9dc9b27985f0bc0a299bd2128095739f0b48724afdda750e14dad575040cdb78a7a0e
+  metadata.gz: 3f3da7c4224cfe32ea94f0681a8bbc39b32dd095056ebdf94ae0cc8f55b5332b212fca7b07800b992e3c6357e01876bff05b3b282f45d914194ac4e3a0788708
+  data.tar.gz: 5cd168ff7ea72fd9671d337c4cd0830fd38e4bac75480bb4d65d7e22252186b6edf2e24576f469705483cb1dbcde127c2187c8e4c2a08c609aa5f7865f861647

data/lib/jcr/check_groups.rb

@@ -14,6 +14,7 @@
 
 require 'jcr/parser'
 require 'jcr/map_rule_names'
+require 'pp'
 
 module JCR
 
@@ -69,6 +70,9 @@ module JCR
   end
 
   def self.check_member_for_group node, mapping
+    if node.is_a? Array
+      node = node[0]
+    end
     if node[:target_rule_name]
       trule = get_name_mapping( node[:target_rule_name][:rule_name], mapping )
       disallowed_group_in_member?( trule, mapping )

data/lib/jcr/evaluate_array_rules.rb

@@ -51,7 +51,7 @@ module JCR
     trace( econs, "Evaluating array rule starting at #{slice_to_s(jcr)} against", data )
     trace_def( econs, "array", jcr, data )
     retval = evaluate_array( jcr, rule_atom, data, econs, behavior )
-    trace_eval( econs, "Array", retval )
+    trace_eval( econs, "Array", retval, jcr, data, "array" )
     pop_trace_stack( econs )
     return retval
 

data/lib/jcr/evaluate_group_rules.rb

@@ -32,7 +32,7 @@ module JCR
     trace( econs, "Evaluating group rule against ", data )
     trace_def( econs, "group", jcr, data )
     retval = evaluate_group( jcr, rule_atom, data, econs, behavior )
-    trace_eval( econs, "Group", retval )
+    trace_eval( econs, "Group", retval, jcr, data, "group" )
     pop_trace_stack( econs )
     return retval
 

data/lib/jcr/evaluate_member_rules.rb

@@ -31,7 +31,7 @@ module JCR
     trace( econs, "Evaluating member rule for key '#{data[0]}' starting at #{slice_to_s(jcr)} against ", data[1])
     trace_def( econs, "member", jcr, data )
     retval = evaluate_member( jcr, rule_atom, data, econs )
-    trace_eval( econs, "Member", retval )
+    trace_eval( econs, "Member", retval, jcr, data, "member" )
     pop_trace_stack( econs )
     return retval
 
@@ -45,7 +45,7 @@ module JCR
 
 
     rules, annotations = get_rules_and_annotations( jcr )
-    rule = rules[0]
+    rule = merge_rules( rules )
 
     member_match = false
 
@@ -55,7 +55,13 @@ module JCR
         member_match = true
       end
     else # must be regex
-      match_spec = Regexp.new( rule[:member_regex][:regex].to_s )
+      regex = rule[:member_regex][:regex]
+      if regex.is_a? Array
+        match_spec = Regexp.new( "" )
+        trace( econs, "Noting empty regular expression." )
+      else
+        match_spec = Regexp.new( rule[:member_regex][:regex].to_s )
+      end
       if match_spec =~ data[ 0 ]
         member_match = true
       end
@@ -63,6 +69,7 @@ module JCR
 
     if member_match
       e = evaluate_rule( rule, rule_atom, data[ 1 ], econs )
+      e.member_found = true
       return evaluate_not( annotations, e, econs )
     end
 
@@ -74,7 +81,7 @@ module JCR
   def self.member_to_s( jcr, shallow=true )
     rules, annotations = get_rules_and_annotations( jcr )
     retval = ""
-    rule = rules[ 0 ]
+    rule = merge_rules( rules )
     case
       when rule[:member_name]
         retval = %Q|"#{rule[:member_name][:q_string].to_s}"|

data/lib/jcr/evaluate_object_rules.rb

@@ -33,7 +33,7 @@ module JCR
     trace( econs, "Evaluating object rule starting at #{slice_to_s(jcr)} against", data )
     trace_def( econs, "object", jcr, data )
     retval = evaluate_object( jcr, rule_atom, data, econs, behavior )
-    trace_eval( econs, "Object", retval )
+    trace_eval( econs, "Object", retval, jcr, data, "object" )
     pop_trace_stack( econs )
     return retval
 
@@ -124,22 +124,32 @@ module JCR
             end
           else
             trace( econs, "No member '#{k}' found in object.")
+            e = evaluate_rule(rule, rule_atom, [nil, nil], econs, nil)
+            repeat_results[ nil ] = nil if e.success
           end
 
         else
 
-          trace( econs, "Scanning object.")
+          regex = lrules[0][:member_regex][:regex]
+          trace( econs, "Scanning object for #{regex}.")
           i = 0
+          found = false
           repeat_results = data.select do |k,v|
             unless behavior.checked_hash[k]
               if i < repeat_max
                 e = evaluate_rule(rule, rule_atom, [k, v], econs, nil)
                 behavior.checked_hash[k] = e.success
                 i = i + 1 if e.success
+                found = true if e.member_found
                 e.success
               end
             end
           end
+          unless found
+            trace( econs, "No member matching #{regex} found in object.")
+            e = evaluate_rule(rule, rule_atom, [nil, nil], econs, nil)
+            repeat_results[ nil ] = nil if e.success
+          end
 
         end
 

data/lib/jcr/evaluate_rules.rb

@@ -19,6 +19,7 @@ require 'addressable/uri'
 require 'addressable/template'
 require 'email_address_validator'
 require 'big-phoney'
+require 'json'
 
 require 'jcr/parser'
 require 'jcr/map_rule_names'
@@ -45,7 +46,7 @@ end
 module JCR
 
   class Evaluation
-    attr_accessor :success, :reason, :child_evaluation
+    attr_accessor :success, :reason, :member_found
     def initialize success, reason
       @success = success
       @reason = reason
@@ -53,8 +54,9 @@ module JCR
   end
 
   class EvalConditions
-    attr_accessor :mapping, :callbacks, :trace, :trace_stack
+    attr_accessor :mapping, :callbacks, :trace, :trace_stack, :first_failure
     def initialize mapping, callbacks, trace = false
+      @first_failure = nil
       @mapping = mapping
       @trace = trace
       @trace_stack = []
@@ -207,6 +209,16 @@ module JCR
     return rules, annotations
   end
 
+  def self.merge_rules rules
+    new_rule = Hash.new
+    rules.each do |rule|
+      new_rule.merge!(rule) do |key,oldval,newval|
+        raise "error: conflict in merge of #{rule} with #{new_rule}"
+      end
+    end
+    return new_rule
+  end
+
   def self.evaluate_not annotations, evaluation, econs
     is_not = false
     annotations.each do |a|
@@ -296,15 +308,27 @@ module JCR
         else
           s = "** unknown rule **"
       end
-      trace( econs, "#{type}: #{s}", data)
+      trace( econs, "#{type} definition: #{s}", data)
     end
   end
 
-  def self.trace_eval econs, message, evaluation
+  def self.trace_eval econs, message, evaluation, jcr, data, type
     if evaluation.success
       trace( econs, "#{message} evaluation is true" )
     else
       trace( econs, "#{message} evaluation failed: #{evaluation.reason}")
+      unless econs.first_failure
+        econs.first_failure = evaluation
+        trace( econs, "** LIKELY ROOT CAUSE FOR FAILURE **" )
+        trace( econs, "***********************************" )
+        rule = find_first_slice( jcr )
+        pos = "Failed rule at line,column: #{rule.line_and_column} file position offset: #{rule.offset}"
+        trace( econs, pos )
+        trace_def( econs, type, jcr, data )
+        data_s = "JSON that failed to validate: #{data.to_json}"
+        trace( econs, data_s )
+        trace( econs, "***********************************" )
+      end
     end
   end
 
@@ -363,7 +387,7 @@ module JCR
     elsif rule[:rule]
       retval = rule_to_s( rule[:rule], shallow )
     else
-      retval = "** unknown rule definition **"
+      retval = "** unknown rule definition ** #{rule}"
     end
     return retval
   end

data/lib/jcr/evaluate_value_rules.rb

@@ -33,7 +33,7 @@ module JCR
     rules, annotations = get_rules_and_annotations( jcr )
 
     retval = evaluate_not( annotations, evaluate_values( rules[0], rule_atom, data, econs ), econs )
-    trace_eval( econs, "Value", retval)
+    trace_eval( econs, "Value", retval, jcr, data, "value")
     pop_trace_stack( econs )
     return retval
   end
@@ -219,25 +219,17 @@ module JCR
         end
 
       #
-      # uri and uri templates
+      # uri and uri scheme
       #
 
       when jcr[:uri]
         return bad_value( jcr, rule_atom, "URI", data ) unless data.is_a?( String )
         uri = Addressable::URI.parse( data )
         return bad_value( jcr, rule_atom, "URI", data ) unless uri.is_a?( Addressable::URI )
-      when jcr[:uri_template]
-        t = jcr[:uri_template].to_s
+      when jcr[:uri_scheme]
+        t = jcr[:uri_scheme].to_s
         return bad_value( jcr, rule_atom, t, data ) unless data.is_a? String
-        template = Addressable::Template.new( t )
-        e = template.extract( data )
-        if e == nil
-          return bad_value( jcr, rule_atom, t, data )
-        else
-          e.each do |k,v|
-            return bad_value( jcr, rule_atom, t, data ) unless v
-          end
-        end
+        return bad_value( jcr, rule_atom, t, data ) unless data.start_with?( t )
 
       #
       # phone and email value rules
@@ -476,8 +468,8 @@ module JCR
 
       when rule[:uri]
         retval =  "URI"
-      when rule[:uri_template]
-        retval =  "URI template #{rule[:uri_template].to_s}"
+      when rule[:uri_scheme]
+        retval =  "URI with specific scheme #{rule[:uri_scheme].to_s}"
 
       when rule[:email]
         retval =  "email"

data/lib/jcr/jcr.rb

@@ -207,6 +207,13 @@ module JCR
       opt.on("-h","display help") do |help|
         options[:help] = true
       end
+
+      opt.separator  ""
+      opt.separator  "Return codes:"
+      opt.separator  " 0 = success"
+      opt.separator  " 1 = parsing or other bad condition"
+      opt.separator  " 2 = fall through bad condition"
+      opt.separator  " 3 = unsuccessful evaluation of JSON"
     end
 
     opt_parser.parse! my_argv
@@ -286,7 +293,7 @@ module JCR
       if verbose
         puts "Failure: #{e.reason}"
       end
-      ec = 1
+      ec = 3
     end
     return ec
   end

data/lib/jcr/parser.rb

@@ -36,34 +36,46 @@ module JCR
         #/ spaces? -> [ spaces ]
     rule(:wsp)      { match('[\t ]') }
         # WSP is a standard ABNF production so is not expanded here
-    rule(:comment)  { str(';') >> ( str('\;') | match('[^\r\n;]') ).repeat >> match('[\r\n;]') }
-        #! comment = ";" *( "\;" / comment-char ) comment-end-char
-        #! comment-char = HTAB / %x20-3A / %x3C-10FFFF
-        #!            ; Any char other than ";" / CR / LF
-        #! comment-end-char = CR / LF / ";"
+    rule(:dsps)     { spcCmnt.repeat(1) | wsp.repeat(1) }
+        #! DSPs =     ; Directive spaces
+        #!        1*WSP /     ; When in one-line directive
+        #!        1*spcCmnt   ; When in muti-line directive
+    rule(:dsps?)    { dsps.maybe }
+        #/ DSPs? -> [ DSPs ]
+    rule(:comment)  { str(';') >> match('[^\r\n]').repeat >> match('[\r\n]') }
+        #! comment = ";" *comment-char comment-end-char
+        #! comment-char = HTAB / %x20-10FFFF
+        #!            ; Any char other than CR / LF
+        #! comment-end-char = CR / LF
         #!
 
     rule(:directive) { ( str('#') >> (one_line_directive | multi_line_directive) ).as(:directive) }
         #! directive = "#" (one_line_directive / multi_line_directive)
-    rule(:one_line_directive) { ( spaces? >> ( directive_def | one_line_tbd_directive_d ) >> wsp.repeat >> match('[\r\n]') ) }
-        #! one_line_directive = spaces? 
+    rule(:one_line_directive) { ( dsps? >> ( directive_def | one_line_tbd_directive_d ) >> wsp.repeat >> match('[\r\n]') ) }
+        #! one_line_directive = DSPs? 
         #!                      (directive_def / one_line_tbd_directive_d) *WSP eol
     rule(:multi_line_directive) { str('{') >> spcCmnt? >> (directive_def | multi_line_tbd_directive_d) >> spcCmnt? >> str('}') }
         #! multi_line_directive = "{" spcCmnt?
         #!                        (directive_def / multi_line_tbd_directive_d) spcCmnt? "}"
     rule(:directive_def) { jcr_version_d | ruleset_id_d | import_d }
         #! directive_def = jcr_version_d / ruleset_id_d / import_d
-    rule(:jcr_version_d) { (str('jcr-version') >> spaces >> non_neg_integer.as(:major_version) >> str('.') >> non_neg_integer.as(:minor_version)).as(:jcr_version_d) }
-        #! jcr_version_d = jcr-version-kw spaces major_version "." minor_version
+    rule(:jcr_version_d) { ( str('jcr-version') >> dsps >>
+                             non_neg_integer.as(:major_version) >> str('.') >> non_neg_integer.as(:minor_version) >>
+                             ( dsps >> str('+') >> dsps? >> extension_id ).repeat
+                           ).as(:jcr_version_d) }
+        #! jcr_version_d = jcr-version-kw DSPs major_version "." minor_version
+        #!                 *( DSPs "+" DSPs? extension_id )
         #> jcr-version-kw = "jcr-version"
         #! major_version = non_neg_integer
         #! minor_version = non_neg_integer
-    rule(:ruleset_id_d)  { (str('ruleset-id') >> spaces >> ruleset_id.as(:ruleset_id)).as(:ruleset_id_d) }
-        #! ruleset_id_d = ruleset-id-kw spaces ruleset_id
+    rule(:extension_id)  { match('[a-zA-Z]') >> match('[\S]').repeat }
+        #! extension_id = ALPHA *not-space
+    rule(:ruleset_id_d)  { (str('ruleset-id') >> dsps >> ruleset_id.as(:ruleset_id)).as(:ruleset_id_d) }
+        #! ruleset_id_d = ruleset-id-kw DSPs ruleset_id
         #> ruleset-id-kw = "ruleset-id"
-    rule(:import_d)      { (str('import') >> spaces >> ruleset_id.as(:ruleset_id) >> ( spaces >> str('as') >> spaces >> ruleset_id_alias ).maybe).as(:import_d) }
-        #! import_d = import-kw spaces ruleset_id
-        #!            [ spaces as_kw spaces ruleset_id_alias ]
+    rule(:import_d)      { (str('import') >> dsps >> ruleset_id.as(:ruleset_id) >> ( dsps >> str('as') >> dsps >> ruleset_id_alias ).maybe).as(:import_d) }
+        #! import_d = import-kw DSPs ruleset_id
+        #!            [ DSPs as_kw DSPs ruleset_id_alias ]
         #> import-kw = "import"
         #> as-kw = "as"
     rule(:ruleset_id)        { match('[a-zA-Z]') >> match('[\S]').repeat }
@@ -77,9 +89,9 @@ module JCR
         #! one_line_directive_parameters = *not_eol
         #! not_eol = HTAB / %x20-10FFFF
         #! eol = CR / LF
-    rule(:multi_line_tbd_directive_d) { name.as(:directive_name) >> ( spaces >> multi_line_directive_parameters.as(:directive_parameters) ).maybe }
+    rule(:multi_line_tbd_directive_d) { name.as(:directive_name) >> ( spcCmnt.repeat(1) >> multi_line_directive_parameters.as(:directive_parameters) ).maybe }
         #! multi_line_tbd_directive_d = directive_name
-        #!                   [ spaces multi_line_directive_parameters ]
+        #!                   [ 1*spcCmnt multi_line_directive_parameters ]
     rule(:multi_line_directive_parameters) { multi_line_parameters }
         #! multi_line_directive_parameters = multi_line_parameters
     rule(:multi_line_parameters) { (comment | q_string | regex | match('[^"/;}]')).repeat }
@@ -243,8 +255,8 @@ module JCR
     rule(:idn_type)       { str('idn').as(:idn) }
         #! idn_type = idn-kw
         #> idn-kw = "idn"
-    rule(:uri_range)       { str('uri..') >> uri_template }
-        #! uri_range = uri-dotdot-kw uri_template
+    rule(:uri_range)       { str('uri..') >> uri_scheme }
+        #! uri_range = uri-dotdot-kw uri_scheme
         #> uri-dotdot-kw = "uri.."
     rule(:uri_type)       { str('uri').as(:uri) }
         #! uri_type = uri-kw
@@ -414,8 +426,8 @@ module JCR
         #! regex_modifiers = *( "i" / "s" / "x" )
         #!
 
-    rule(:uri_template) { ( match('[a-zA-Z{}]').repeat(1) >> str(':') >> match('[\S]').repeat(1) ).as(:uri_template) }
-        #! uri_template = 1*ALPHA ":" 1*not-space
+    rule(:uri_scheme) { ( match('[a-zA-Z]').repeat(1) ).as(:uri_scheme) }
+        #! uri_scheme = 1*ALPHA
 
   end
 

data/lib/jcr/process_directives.rb

@@ -52,10 +52,10 @@ module JCR
     major = directive[:major_version].to_str.to_i
     minor = directive[:minor_version].to_str.to_i
     if major != 0
-      raise "jcr version #{major}.#{minor} is incompatible with 0.5"
+      raise "jcr version #{major}.#{minor} is incompatible with 0.7"
     end
-    if minor != 5
-      raise "jcr version #{major}.#{minor} is incompatible with 0.5"
+    if minor != 7
+      raise "jcr version #{major}.#{minor} is incompatible with 0.7"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcrvalidator
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Newton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet