jcrvalidator 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e456ba6147ad0fa9bd8f9e38e8c042816f501d4f
-  data.tar.gz: 8114d7992f86d0396e0508121f8a07e62c712f15
+  metadata.gz: 1092c1613500ed477ee3eb26367ed73fee3a940f
+  data.tar.gz: 824cdfcc22c6dc6a03d55bc10ad75857c881c627
 SHA512:
-  metadata.gz: 25f08291b2a347a7d22f50de3ae182cc395b56a235004bfb454bcca7a8d1ebe43297aaba7573bee57491103378cc52119142fcf5cc4fc780ae31dbfd7561d623
-  data.tar.gz: 7c002e9126134b957ec032a06ec98e547ae59cb097be17142e75aba8582ad59bbb7c5986261c6d4a9eb1319194ef9f0c7add95986bba9547fdea296652a635e3
+  metadata.gz: 6f6f55143125ef7cf87457a53bb66edb4c3b353fb710e8513cf85e893f969d7cb3b95a78d98429fef5c55b8b25fb4306455ecb1cf9c77c449c71d1ad2dedba84
+  data.tar.gz: 9539a3d5ad7577a119f30bb69596c8cb279d1d45818574b26f22c1f71613cac0ba785268a56797f57266b5533de8cc159fa42f9055643d8272a141642b024813

data/lib/jcr/evaluate_array_rules.rb

@@ -289,6 +289,6 @@ module JCR
 
   def self.array_to_s( jcr, shallow=true )
     rules, annotations = get_rules_and_annotations( jcr )
-    return "#{annotations_to_s( annotations)} [ #{rules_to_s( rules, shallow )} ]"
+    return "#{annotations_to_s( annotations)}[ #{rules_to_s( rules, shallow )} ]"
   end
 end

data/lib/jcr/evaluate_group_rules.rb

@@ -58,7 +58,7 @@ module JCR
 
   def self.group_to_s( jcr, shallow=true)
     rules, annotations = get_rules_and_annotations( jcr )
-    return "#{annotations_to_s( annotations)} ( #{rules_to_s(rules,shallow)} )"
+    return "#{annotations_to_s( annotations)}( #{rules_to_s(rules,shallow)} )"
   end
 
 end

data/lib/jcr/evaluate_object_rules.rb

@@ -174,6 +174,6 @@ module JCR
 
   def self.object_to_s( jcr, shallow=true )
     rules, annotations = get_rules_and_annotations( jcr )
-    return "#{annotations_to_s( annotations)} { #{rules_to_s(rules,shallow)} }"
+    return "#{annotations_to_s( annotations)}{ #{rules_to_s(rules,shallow)} }"
   end
 end

data/lib/jcr/evaluate_rules.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 American Registry for Internet Numbers
+# Copyright (c) 2015-2017 American Registry for Internet Numbers
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -54,9 +54,9 @@ module JCR
   end
 
   class EvalConditions
-    attr_accessor :mapping, :callbacks, :trace, :trace_stack, :first_failure
+    attr_accessor :mapping, :callbacks, :trace, :trace_stack, :failures
     def initialize mapping, callbacks, trace = false
-      @first_failure = nil
+      @failures = {}
       @mapping = mapping
       @trace = trace
       @trace_stack = []
@@ -66,6 +66,29 @@ module JCR
         @callbacks = {}
       end
     end
+
+    def report_failure failure
+      @failures[ failure.stack_level ] = Array.new unless @failures[ failure.stack_level ]
+      @failures[ failure.stack_level ] << failure
+    end
+  end
+
+  class Failure
+    attr_accessor :data, :json, :json_elided, :evaluation, :rule, :pos, :offset, :type, :definition, :stack_level, :reason_elided
+    def initialize data, jcr, type, evaluation, stack_level
+      @json = data.to_json
+      @json_elided = JCR::elide(@json)
+      @data = JCR::rule_data( data )
+      @rule = JCR::find_first_slice( jcr )
+      @pos = @rule.line_and_column
+      @offset = @rule.offset
+      @type = type
+      @evaluation = evaluation
+      @reason_elided = "unknown reason"
+      @reason_elided = JCR::elide( @evaluation.reason ) if @evaluation.reason
+      @definition = JCR::rule_def( type, jcr )
+      @stack_level = stack_level
+    end
   end
 
   def self.evaluate_rule jcr, rule_atom, data, econs, behavior = nil
@@ -271,22 +294,30 @@ module JCR
   end
 
   def self.elide s
-    if s.length > 60
-      s = s[0..56]
+    if s.length > 45
+      s = s[0..41]
       s = s + " ..."
     end
     return s
   end
 
+  def self.rule_data data=nil
+    if data
+      if data.is_a? String
+        s = '"' + data + '"'
+      else
+        s = data.pretty_print_inspect
+      end
+      return elide(s)
+    end
+    #else
+    return nil
+  end
+
   def self.trace econs, message, data = nil
     if econs.trace
       if data
-        if data.is_a? String
-          s = '"' + data + '"'
-        else
-          s = data.pretty_print_inspect
-        end
-        message = "#{message} data: #{elide(s)}"
+        message = "#{message} data: #{rule_data( data )}"
       end
       last = econs.trace_stack.last
       pos = "#{last.line_and_column}@#{last.offset}" if last
@@ -294,6 +325,25 @@ module JCR
     end
   end
 
+  def self.rule_def type, jcr
+    s = ""
+    case type
+      when "value"
+        s = elide(value_to_s(jcr))
+      when "member"
+        s = elide(member_to_s(jcr))
+      when "object"
+        s = elide(object_to_s(jcr))
+      when "array"
+        s = elide(array_to_s(jcr))
+      when "group"
+        s = elide(group_to_s(jcr))
+      else
+        s = "** unknown rule **"
+    end
+    return "#{type} definition: #{s}"
+  end
+
   def self.trace_def econs, type, jcr, data
     if econs.trace
       s = ""
@@ -311,7 +361,7 @@ module JCR
         else
           s = "** unknown rule **"
       end
-      trace( econs, "#{type} definition: #{s}", data)
+      trace( econs, rule_def( type, jcr ) )
     end
   end
 
@@ -319,19 +369,9 @@ module JCR
     if evaluation.success
       trace( econs, "#{message} evaluation is true" )
     else
+      failure = Failure.new( data, jcr, type, evaluation, econs.trace_stack.length )
+      econs.report_failure( failure )
       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
 
@@ -373,6 +413,20 @@ module JCR
   end
 
   def self.rule_to_s( rule, shallow=true)
+    if rule[:rule_name]
+      if rule[:primitive_rule]
+        retval = "$#{rule[:rule_name].to_s} =: #{ruletype_to_s( rule, shallow )}"
+      else
+        retval = "$#{rule[:rule_name].to_s} = #{ruletype_to_s( rule, shallow )}"
+      end
+    else
+      retval = ruletype_to_s( rule, shallow )
+    end
+    return retval
+  end
+
+  def self.ruletype_to_s( rule, shallow=true )
+
     if rule[:primitive_rule]
       retval = value_to_s( rule[:primitive_rule] )
     elsif rule[:member_rule]
@@ -393,6 +447,7 @@ module JCR
       retval = "** unknown rule definition ** #{rule}"
     end
     return retval
+
   end
 
   def self.rules_to_s( rules, shallow=true)
@@ -405,7 +460,7 @@ module JCR
       elsif rule[:sequence_combiner]
         retval = retval + " , "
       end
-      retval = retval + rule_to_s( rule, shallow )
+      retval = retval + rule_to_s( rule, shallow ) + repetitions_to_s( rule )
     end
     return retval
   end
@@ -415,13 +470,13 @@ module JCR
     annotations.each do |a|
       case
         when a[:unordered_annotation]
-          retval = retval + " @{unordered}"
+          retval = retval + "@{unordered}"
         when a[:not_annotation]
-          retval = retval + " @{not}"
+          retval = retval + "@{not}"
         when a[:root_annotation]
-          retval = retval + " @{root}"
+          retval = retval + "@{root}"
         else
-          retval = retval + " @{ ** unknown annotation ** }"
+          retval = retval + "@{ ** unknown annotation ** }"
       end
     end if annotations
     retval = retval + " " if retval.length != 0
@@ -429,7 +484,50 @@ module JCR
   end
 
   def self.target_to_s( jcr )
-    return annotations_to_s( jcr[:annotations] ) + " target: " + jcr[:rule_name].to_s
+    return annotations_to_s( jcr[:annotations] ) + "$" + jcr[:rule_name].to_s
+  end
+
+  def self.repetitions_to_s rule
+    retval = ""
+    if rule[:optional]
+      retval = "?"
+    elsif rule[:one_or_more]
+      retval = "+"
+      if rule[:repetition_step]
+        retval = "%" + rule[:repetition_step].to_s
+      end
+    elsif rule[:zero_or_more]
+      retval = "*"
+      retval = retval + "%" + rule[:repetition_step].to_s if rule[:repetition_step]
+    elsif rule[:specific_repetition] && rule[:specific_repetition].is_a?( Parslet::Slice )
+      retval = "*" + rule[:specific_repetition].to_s
+    else
+      if rule[:repetition_interval]
+        min = "0"
+        max = "INF"
+        o = rule[:repetition_min]
+        if o
+          if o.is_a?(Parslet::Slice)
+            min = o.to_s
+          end
+        end
+        o = rule[:repetition_max]
+        if o
+          if o.is_a?(Parslet::Slice)
+            max = o.to_s
+          end
+        end
+        retval = "*"+min+".."+max
+      end
+      o = rule[:repetition_step]
+      if o
+        if o.is_a?( Parslet::Slice )
+          retval = retval + "%" + o.to_s
+        end
+      end
+    end
+    retval = " " + retval if retval.length != 0
+    return retval
   end
 
 end

data/lib/jcr/evaluate_value_rules.rb

@@ -55,35 +55,35 @@ module JCR
       when jcr[:integer_v]
         si = jcr[:integer_v].to_s
         if si == "integer"
-          return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Fixnum )
+          return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Integer )
         end
       when jcr[:integer]
         i = jcr[:integer].to_s.to_i
         return bad_value( jcr, rule_atom, i, data ) unless data == i
       when jcr[:integer_min] != nil && jcr[:integer_max] == nil
-        return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Fixnum )
+        return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Integer )
         min = jcr[:integer_min].to_s.to_i
         return bad_value( jcr, rule_atom, min, data ) unless data >= min
       when jcr[:integer_min] == nil && jcr[:integer_max] != nil
-        return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Fixnum )
+        return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Integer )
         max = jcr[:integer_max].to_s.to_i
         return bad_value( jcr, rule_atom, max, data ) unless data <= max
       when jcr[:integer_min],jcr[:integer_max]
-        return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Fixnum )
+        return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Integer )
         min = jcr[:integer_min].to_s.to_i
         return bad_value( jcr, rule_atom, min, data ) unless data >= min
         max = jcr[:integer_max].to_s.to_i
         return bad_value( jcr, rule_atom, max, data ) unless data <= max
       when jcr[:sized_int_v]
         bits = jcr[:sized_int_v][:bits].to_i
-        return bad_value( jcr, rule_atom, "int" + bits.to_s, data ) unless data.is_a?( Fixnum )
+        return bad_value( jcr, rule_atom, "int" + bits.to_s, data ) unless data.is_a?( Integer )
         min = -(2**(bits-1))
         return bad_value( jcr, rule_atom, min, data ) unless data >= min
         max = 2**(bits-1)-1
         return bad_value( jcr, rule_atom, max, data ) unless data <= max
       when jcr[:sized_uint_v]
         bits = jcr[:sized_uint_v][:bits].to_i
-        return bad_value( jcr, rule_atom, "int" + bits.to_s, data ) unless data.is_a?( Fixnum )
+        return bad_value( jcr, rule_atom, "int" + bits.to_s, data ) unless data.is_a?( Integer )
         min = 0
         return bad_value( jcr, rule_atom, min, data ) unless data >= min
         max = 2**bits-1
@@ -470,9 +470,9 @@ module JCR
 
       when rule[:uri]
         if rule[:uri].is_a? Hash
-          retval =  "URI with specific scheme #{rule[:uri][:uri_scheme].to_s}"
+          retval =  "uri..#{rule[:uri][:uri_scheme].to_s}"
         else
-          retval =  "URI"
+          retval =  "uri"
         end
 
       when rule[:email]

data/lib/jcr/find_roots.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 American Registry for Internet Numbers
+# Copyright (c) 2015-2017 American Registry for Internet Numbers
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,7 @@ require 'jcr/evaluate_rules'
 module JCR
 
   class Root
-    attr_accessor :nameless, :name, :rule, :default
+    attr_accessor :nameless, :name, :rule, :default, :slice, :pos, :offset, :failures
 
     def initialize rule, name = nil, nameless = true, default = false
       @rule = rule
@@ -28,6 +28,9 @@ module JCR
         @nameless = false
       end
       @default = default
+      @slice = JCR::find_first_slice( rule )
+      @pos = @slice.line_and_column
+      @offset = @slice.offset
     end
   end
 
@@ -52,18 +55,41 @@ module JCR
     rn = node[:rule][:rule_name].to_str
     rule = node[:rule]
     ruledef = get_rule_by_type( rule )
-    if ruledef
+    new_root = nil
+    # look to see if the root_annotation is in the name before assignment ( @{root} $r = ... )
+    if rule[:annotations]
+      if rule[:annotations].is_a? Array
+        rule[:annotations].each do |annotation|
+          if annotation[:root_annotation]
+            new_root = Root.new(node, rn)
+            roots << new_root
+            # root is found, now look into subrule for unnamed roots
+            subrule = get_rule_by_type( ruledef )
+            roots.concat( find_roots_in_unnamed( subrule ) ) if subrule
+          end
+        end
+      elsif rule[:annotations][:root_annotation]
+        new_root = Root.new(node, rn)
+        roots << new_root
+        # root is found, now look into subrule for unnamed roots
+        subrule = get_rule_by_type( ruledef )
+        roots.concat( find_roots_in_unnamed( subrule ) ) if subrule
+      end
+    end
+    if ruledef && !new_root
       if ruledef.is_a? Array
         ruledef.each do |rdi|
+          # if it has a @{root} annotation in the rule definition
           if rdi[:root_annotation]
-            roots << Root.new( node, rn )
-          elsif (subrule = get_rule_by_type( rdi ))
-            roots.concat( find_roots_in_unnamed( subrule ) )
+            roots << Root.new(node, rn)
+            # else look into the definition further and examine subrules
+          elsif (subrule = get_rule_by_type(rdi))
+            roots.concat(find_roots_in_unnamed(subrule))
           end
         end
       elsif ruledef.is_a? Hash
-        subrule = get_rule_by_type( ruledef )
-        roots.concat( find_roots_in_unnamed( subrule ) ) if subrule
+        subrule = get_rule_by_type(ruledef)
+        roots.concat(find_roots_in_unnamed(subrule)) if subrule
       end
     end
     return roots

data/lib/jcr/jcr.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 American Registry for Internet Numbers
+# Copyright (c) 2015-2017 American Registry for Internet Numbers
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -28,7 +28,7 @@ require 'jcr/version'
 module JCR
 
   class Context
-    attr_accessor :mapping, :callbacks, :id, :tree, :roots, :catalog, :trace
+    attr_accessor :mapping, :callbacks, :id, :tree, :roots, :catalog, :trace, :failed_roots, :failure_report
 
     def add_ruleset_alias( ruleset_alias, alias_uri )
       unless @catalog
@@ -60,6 +60,7 @@ module JCR
 
     def initialize( ruleset = nil, trace = false )
       @trace = trace
+      @failed_roots = []
       if ruleset
         ingested = JCR.ingest_ruleset( ruleset, false, nil )
         @mapping = ingested.mapping
@@ -109,30 +110,56 @@ module JCR
   end
 
   def self.evaluate_ruleset( data, ctx, root_name = nil )
-    root_rules = []
+    roots = []
     if root_name
       root_rule = ctx.mapping[root_name]
       raise "No rule by the name of #{root_name} for a root rule has been found" unless root_rule
-      root_rules << root_rule
+      root = JCR::Root.new( root_rule, root_name )
+      roots << root
     else
-      ctx.roots.each do |r|
-        root_rules << r.rule
-      end
+      roots = ctx.roots
     end
 
-    raise "No root rule defined. Specify a root rule name" if root_rules.empty?
+    raise "No root rule defined. Specify a root rule name" if roots.empty?
 
     retval = nil
-    root_rules.each do |r|
-      pp "Evaluating Root:", rule_to_s( r, false ) if ctx.trace
-      raise "Root rules cannot be member rules" if r[:member_rule]
-      retval = JCR.evaluate_rule( r, r, data, EvalConditions.new( ctx.mapping, ctx.callbacks, ctx.trace ) )
+    roots.each do |r|
+      pp "Evaluating Root:", rule_to_s( r.rule, false ) if ctx.trace
+      raise "Root rules cannot be member rules" if r.rule[:member_rule]
+      econs = EvalConditions.new( ctx.mapping, ctx.callbacks, ctx.trace )
+      retval = JCR.evaluate_rule( r.rule, r.rule, data, econs )
       break if retval.success
+      # else
+      r.failures = econs.failures
+      ctx.failed_roots << r
     end
 
+    ctx.failure_report = failure_report( ctx )
     return retval
   end
 
+  def self.failure_report ctx
+    report = []
+    ctx.failed_roots.each do |failed_root|
+      if failed_root.name
+        report << "- ** Failures for root rule named '#{failed_root.name}'"
+      else
+        report << "- ** Failures for root rule at line #{failed_root.pos[0]}"
+      end
+      failed_root.failures.sort.map do |stack_level, failures|
+        if failures.length > 1
+          report << "  - failure at rule depth #{stack_level} caused by one of the following #{failures.length} reasons"
+        else
+          report << "  - failure at rule depth #{stack_level} caused by"
+        end
+        failures.each_with_index do |failure, index|
+          report << "    - #{failure.json_elided} failed rule #{failure.definition} at #{failure.pos} because #{failure.reason_elided}"
+        end
+      end
+    end
+    return report
+  end
+
   def self.main my_argv=nil
 
     my_argv = ARGV unless my_argv
@@ -205,6 +232,10 @@ module JCR
         options[:verbose] = true
       end
 
+      opt.on("-q","quiet") do |quiet|
+        options[:quiet] = true
+      end
+
       opt.on("-h","display help") do |help|
         options[:help] = true
       end
@@ -243,7 +274,7 @@ module JCR
 
         if options[:verbose]
           pp "Ruleset Parse Tree", ctx.tree
-          pp "Ruleset Map"
+          puts "Ruleset Map"
           ctx.mapping.each do |name,rule|
             puts "Parsed Rule: #{name}"
             puts rule_to_s( rule, false )
@@ -258,7 +289,7 @@ module JCR
           return 0
         elsif options[:json]
           data = JSON.parse( options[:json] )
-          ec = cli_eval( ctx, data, options[:root_name], options[:verbose] )
+          ec = cli_eval( ctx, data, options[:root_name], options[:quiet] )
           return ec
         elsif $stdin.tty?
           ec = 0
@@ -267,35 +298,55 @@ module JCR
           else
             my_argv.each do |fn|
               data = JSON.parse( File.open( fn ).read )
-              tec = cli_eval( ctx, data, options[:root_name], options[:verbose] )
+              tec = cli_eval( ctx, data, options[:root_name], options[:quiet] )
               ec = tec if tec != 0 #record error but don't let non-error overwrite error
             end
           end
           return ec
         else
-          data = JSON.parse( ARGF.read )
-          ec = cli_eval( ctx, data, options[:root_name], options[:verbose] )
+          lines = ""
+          ec = 0
+          ARGF.each do |line|
+            lines = lines + line
+            if ARGF.eof?
+              data = JSON.parse( lines )
+              tec = cli_eval( ctx, data, options[:root_name], options[:quiet] )
+              ec = tec if tec != 0 #record error but don't let non-error overwrite error
+              lines = ""
+            end
+          end
           return ec
         end
 
       rescue Parslet::ParseFailed => failure
-        puts failure.cause.ascii_tree
+        puts failure.parse_failure_cause.ascii_tree unless options[:quiet]
+        return 1
+      rescue JSON::ParserError => parser_error
+        unless options[:quiet]
+          puts "Unable to parse JSON"
+          puts parser_error.message.inspect
+        end
+        return 3
       end
+
     end
 
   end
 
-  def self.cli_eval ctx, data, root_name, verbose
+  def self.cli_eval ctx, data, root_name, quiet
     ec = 2
     e = ctx.evaluate( data, root_name )
     if e.success
-      if verbose
+      unless quiet
         puts "Success!"
       end
       ec = 0
     else
-      if verbose
-        puts "Failure: #{e.reason}"
+      unless quiet
+        puts "Failure! Use -v for more information."
+        ctx.failure_report.each do |line|
+          puts line
+        end
       end
       ec = 3
     end

data/lib/jcr/parser.rb

@@ -72,8 +72,12 @@ module JCR
         #> jcr-version-kw = "jcr-version"
         #! major_version = non_neg_integer
         #! minor_version = non_neg_integer
-    rule(:extension_id)  { match('[a-zA-Z]') >> match('[\S]').repeat }
-        #! extension_id = ALPHA *not-space
+    rule(:extension_id)  { id }
+        #! extension_id = id
+    rule(:id)  { match('[a-zA-Z]') >> id_tail.repeat }
+        #! id = ALPHA *id-tail
+    rule(:id_tail)  { match('[^\s}]') }
+        #! id-tail = %x21-7C / %x7E-10FFFF ; not spaces, not }
     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"
@@ -82,9 +86,8 @@ module JCR
         #!            [ DSPs as_kw DSPs ruleset_id_alias ]
         #> import-kw = "import"
         #> as-kw = "as"
-    rule(:ruleset_id)        { match('[a-zA-Z]') >> match('[\S]').repeat }
-        #! ruleset_id = ALPHA *not-space
-        #! not-space = %x21-10FFFF
+    rule(:ruleset_id)        { id }
+        #! ruleset_id = id
     rule(:ruleset_id_alias)  { name.as(:ruleset_id_alias) }
         #! ruleset_id_alias = name
     rule(:one_line_tbd_directive_d) { name.as(:directive_name) >> ( wsp >> match('[^\r\n]').repeat.as(:directive_parameters) ).maybe }
@@ -309,41 +312,41 @@ module JCR
               str('{') >> spcCmnt? >> object_items.maybe >> spcCmnt? >> str('}') ).as(:object_rule) }
         #! object_rule = annotations "{" spcCmnt?
         #!                               [ object_items spcCmnt? ] "}"
-    rule(:object_items) { object_item >> (( spcCmnt? >> sequence_combiner >> spcCmnt? >> object_item ).repeat(1) |
-                                          ( spcCmnt? >> choice_combiner >> spcCmnt? >> object_item ).repeat(1) ).maybe }
-        #! object_items = object_item (*( sequence_combiner object_item ) /
-        #!                             *( choice_combiner object_item ) )
-    rule(:object_item ) { object_item_types >> spcCmnt? >> repetition.maybe }
-        #! object_item = object_item_types spcCmnt? [ repetition ]
+    rule(:object_items) { object_item >> (( sequence_combiner >> object_item ).repeat(1) |
+                                          ( choice_combiner >> object_item ).repeat(1) ).maybe }
+        #! object_items = object_item [ 1*( sequence_combiner object_item ) /
+        #!                             1*( choice_combiner object_item ) ]
+    rule(:object_item ) { object_item_types >> spcCmnt? >> ( repetition >> spcCmnt? ).maybe }
+        #! object_item = object_item_types spcCmnt? [ repetition spcCmnt? ]
     rule(:object_item_types) { object_group | member_rule | target_rule_name }
         #! object_item_types = object_group / member_rule / target_rule_name
-    rule(:object_group) { ( str('(') >> spcCmnt? >> object_items.maybe >> spcCmnt? >> str(')') ).as(:group_rule) }
-        #! object_group = "(" spcCmnt? [ object_items spcCmnt? ] ")"
+    rule(:object_group) { ( annotations >> str('(') >> spcCmnt? >> object_items.maybe >> spcCmnt? >> str(')') ).as(:group_rule) }
+        #! object_group = annotations "(" spcCmnt? [ object_items spcCmnt? ] ")"
         #!
 
       rule(:array_rule)   { ( annotations >>
               str('[') >> spcCmnt? >> array_items.maybe >> spcCmnt? >> str(']') ).as(:array_rule) }
         #! array_rule = annotations "[" spcCmnt? [ array_items spcCmnt? ] "]"
-    rule(:array_items)  { array_item >> (( spcCmnt? >> sequence_combiner >> spcCmnt? >> array_item ).repeat(1) |
-                                         ( spcCmnt? >> choice_combiner >> spcCmnt? >> array_item ).repeat(1) ).maybe }
-        #! array_items = array_item (*( sequence_combiner array_item ) /
-        #!                           *( choice_combiner array_item ) )
-    rule(:array_item)   { array_item_types >> spcCmnt? >> repetition.maybe }
-        #! array_item = array_item_types spcCmnt? [ repetition ]
+    rule(:array_items)  { array_item >> (( sequence_combiner >> array_item ).repeat(1) |
+                                         ( choice_combiner >> array_item ).repeat(1) ).maybe }
+        #! array_items = array_item [ 1*( sequence_combiner array_item ) /
+        #!                           1*( choice_combiner array_item ) ]
+    rule(:array_item)   { array_item_types >> spcCmnt? >> ( repetition >> spcCmnt? ).maybe }
+        #! array_item = array_item_types spcCmnt? [ repetition spcCmnt? ]
     rule(:array_item_types) { array_group | type_rule | explicit_type_choice }
         #! array_item_types = array_group / type_rule / explicit_type_choice
-    rule(:array_group)  { ( str('(') >> spcCmnt? >> array_items.maybe >> spcCmnt? >> str(')') ).as(:group_rule) }
-        #! array_group = "(" spcCmnt? [ array_items spcCmnt? ] ")"
+    rule(:array_group)  { ( annotations >> str('(') >> spcCmnt? >> array_items.maybe >> spcCmnt? >> str(')') ).as(:group_rule) }
+        #! array_group = annotations "(" spcCmnt? [ array_items spcCmnt? ] ")"
         #!
 
     rule(:group_rule)   { ( annotations >> str('(') >> spcCmnt? >> group_items.maybe >> spcCmnt? >> str(')') ).as(:group_rule) }
         #! group_rule = annotations "(" spcCmnt? [ group_items spcCmnt? ] ")"
-    rule(:group_items)  { group_item >> (( spcCmnt? >> sequence_combiner >> spcCmnt? >> group_item ).repeat(1) |
-                                         ( spcCmnt? >> choice_combiner >> spcCmnt? >> group_item ).repeat(1) ).maybe }
-        #! group_items = group_item (*( sequence_combiner group_item ) /
-        #!                           *( choice_combiner group_item ) )
-    rule(:group_item)   { group_item_types >> spcCmnt? >> repetition.maybe }
-        #! group_item = group_item_types spcCmnt? [ repetition ]
+    rule(:group_items)  { group_item >> (( sequence_combiner >> group_item ).repeat(1) |
+                                         ( choice_combiner >> group_item ).repeat(1) ).maybe }
+        #! group_items = group_item [ 1*( sequence_combiner group_item ) /
+        #!                           1*( choice_combiner group_item ) ]
+    rule(:group_item)   { group_item_types >> spcCmnt? >> ( repetition >> spcCmnt? ).maybe }
+        #! group_item = group_item_types spcCmnt? [ repetition spcCmnt? ]
     rule(:group_item_types) { group_group | member_rule | type_rule | explicit_type_choice }
         #! group_item_types = group_group / member_rule /
         #!                    type_rule / explicit_type_choice
@@ -351,10 +354,10 @@ module JCR
         #! group_group = group_rule
         #!
 
-    rule(:sequence_combiner)  { str(',').as(:sequence_combiner) }
-        #! sequence_combiner = spcCmnt? "," spcCmnt?
-    rule(:choice_combiner)    { str('|').as(:choice_combiner) }
-        #! choice_combiner = spcCmnt? "|" spcCmnt?
+    rule(:sequence_combiner)  { str(',').as(:sequence_combiner) >> spcCmnt? }
+        #! sequence_combiner = "," spcCmnt?
+    rule(:choice_combiner)    { str('|').as(:choice_combiner) >> spcCmnt? }
+        #! choice_combiner = "|" spcCmnt?
         #!
 
     rule(:repetition)          { optional | one_or_more |

data/lib/jcr/version.rb

@@ -15,6 +15,6 @@
 
 module JCR
 
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcrvalidator
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrew Newton
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -43,14 +43,14 @@ dependencies:
   name: email_address_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -100,19 +100,18 @@ 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.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: JCR Validator
 test_files: []
-has_rdoc: