jcrvalidator 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8868c03c216591e509ab1aee8c4f3d33e7acae
-  data.tar.gz: 262f39627844782d4f6703c2767994272b88b89a
+  metadata.gz: c03cef697d981d7516ddc5548984448214d5f02b
+  data.tar.gz: d7d7e596fb44a8e24f88083574269ca13d63fd1b
 SHA512:
-  metadata.gz: f4cd4e37bcfc7428a4ae1908ecd7a9532380b36a293c29a738f73adbdc1332c8305be556c89ef223f4471b9a8536a6a97947b8129ce3f8acede8a47ac542dbf8
-  data.tar.gz: 3c9e90cef2dd39e472477f55d32730b5252215fba202abb0889cb1e99a243168be6c774cb1b62b474ed894b2abed9c6dbee8e0165d491c86dc493c29d463e1d4
+  metadata.gz: 88a219991b6d3cedacce229a592c530740d7e294898cea4d23ff021c25f4d0c512e87a2335a24b1f2b51b7a1ec5df979449dedced2469be6ade2140a447bd959
+  data.tar.gz: 8bcfc4268548f89d2a3d84cd261c4bf1d1264cb897e4f3096b5a417dfc2067b6182c32d36b1653aaeef16ee7bbdee7f9def6c76cdbb0448a0ba4f6a0cb98b1ff

data/lib/jcr/jcr.rb

@@ -94,6 +94,7 @@ module JCR
     tree = JCR.parse( ruleset )
     mapping = JCR.map_rule_names( tree, override, ruleset_alias )
     JCR.check_rule_target_names( tree, mapping )
+    JCR.check_groups( tree, mapping )
     roots = JCR.find_roots( tree )
     ctx = Context.new
     ctx.tree = tree
@@ -120,6 +121,7 @@ module JCR
 
     retval = nil
     root_rules.each do |r|
+      raise "Root rules cannot be member rules" if r[:member_rule]
       retval = JCR.evaluate_rule( r, r, data, EvalConditions.new( ctx.mapping, ctx.callbacks ) )
       break if retval.success
     end
@@ -127,7 +129,9 @@ module JCR
     return retval
   end
 
-  def self.main
+  def self.main my_argv=nil
+
+    my_argv = ARGV unless my_argv
 
     options = {}
 
@@ -136,6 +140,7 @@ module JCR
       opt.separator  ""
       opt.separator  "Evaluates JSON against JSON Content Rules (JCR)."
       opt.separator  ""
+      opt.separator  "If -J is not specified, JSON_FILES is used."
       opt.separator  "If JSON_FILES is not specified, standard input (STDIN) is used."
       opt.separator  ""
       opt.separator  "Use -v to see results, otherwise check the exit code."
@@ -158,7 +163,7 @@ module JCR
         options[:ruleset] = ruleset
       end
 
-      opt.on("-s STRING","name of root rule. All roots will be tried if none is specified") do |root_name|
+      opt.on("-S STRING","name of root rule. All roots will be tried if none is specified") do |root_name|
         if options[:root_name]
           puts "A root has already been specified. Use -h for help.", ""
           return 2
@@ -180,6 +185,14 @@ module JCR
         options[:overrides] << rule
       end
 
+      opt.on("-J STRING","string containing JSON to evaluate. Should probably be quoted") do |json|
+        if options[:json]
+          puts "JSON has already been specified. Use -h for help.", ""
+          return 2
+        end
+        options[:json] = json
+      end
+
       opt.on("-v","verbose") do |verbose|
         options[:verbose] = true
       end
@@ -189,7 +202,7 @@ module JCR
       end
     end
 
-    opt_parser.parse!
+    opt_parser.parse! my_argv
 
     if options[:help]
       puts "HELP","----",""
@@ -208,43 +221,47 @@ module JCR
         end
       end
 
-      if $stdin.tty?
-        ec = 2
-        ARGV.each do |fn|
-          data = JSON.parse( File.open( fn ).read )
-          e = ctx.evaluate( data, options[:root_name] )
-          if e.success
-            if options[:verbose]
-              puts "Success!"
-            end
-            ec = 0
-          else
-            if options[:verbose]
-              puts "Failure: #{e.reason}"
-            end
-            ec = 1
+      if options[:json]
+        data = JSON.parse( options[:json] )
+        ec = cli_eval( ctx, data, options[:root_name], options[:verbose] )
+        return ec
+      elsif $stdin.tty?
+        ec = 0
+        if my_argv.empty?
+          ec = 2
+        else
+          my_argv.each do |fn|
+            data = JSON.parse( File.open( fn ).read )
+            tec = cli_eval( ctx, data, options[:root_name], options[:verbose] )
+            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 )
-        e = ctx.evaluate( data, options[:root_name] )
-        if e.success
-          if options[:verbose]
-            puts "Success!"
-          end
-          return 0
-        else
-          if options[:verbose]
-            puts "Failure: #{e.reason}"
-          end
-          return 1
-        end
-
+        ec = cli_eval( ctx, data, options[:root_name], options[:verbose] )
+        return ec
       end
 
     end
 
   end
 
+  def self.cli_eval ctx, data, root_name, verbose
+    ec = 2
+    e = ctx.evaluate( data, root_name )
+    if e.success
+      if verbose
+        puts "Success!"
+      end
+      ec = 0
+    else
+      if verbose
+        puts "Failure: #{e.reason}"
+      end
+      ec = 1
+    end
+    return ec
+  end
+
 end

data/lib/jcr/parser.rb

@@ -43,15 +43,15 @@ module JCR
         #!
 
     rule(:directive) { ( str('#') >> spaces? >> directive_def >> match('[\r\n]') ).as(:directive) }
-        #! directive = "#" spaces? directive_def eol
+        #! directive = "#" spaces? directive_def *WSP eol
     rule(:directive_def) { jcr_version_d | ruleset_id_d | import_d | tbd_directive_d }
         #! directive_def = jcr_version_d / ruleset_id_d / import_d /
         #!                 tbd_directive_d
-    rule(:jcr_version_d) { (str('jcr-version') >> spaces >> integer.as(:major_version) >> str('.') >> integer.as(:minor_version)).as(:jcr_version_d) }
+    rule(:jcr_version_d) { (str('jcr-version') >> spaces >> p_integer.as(:major_version) >> str('.') >> p_integer.as(:minor_version)).as(:jcr_version_d) }
         #! jcr_version_d = jcr-version-kw spaces major_version "." minor_version
         #> jcr-version-kw = "jcr-version"
-        #! major_version = integer
-        #! minor_version = integer
+        #! major_version = p_integer
+        #! minor_version = p_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
         #> ruleset-id-kw = "ruleset-id"
@@ -68,13 +68,13 @@ module JCR
     rule(:tbd_directive_d) { name.as(:directive_name) >> ( spaces >> match('[^\r\n]').repeat.as(:directive_parameters) ).maybe }
         #! tbd_directive_d = directive_name [ spaces directive_parameters ]
         #! directive_name = name
-        #! directive_parameters = not_eol
+        #! directive_parameters = *not_eol
         #! not_eol = HTAB / %x20-10FFFF
         #! eol = CR / LF
         #!
 
-    rule(:root_rule) { value_rule | member_rule | group_rule } # N.B. Not target_rule_name
-        #! root_rule = value_rule / member_rule / group_rule
+    rule(:root_rule) { value_rule | group_rule } # N.B. Not target_rule_name
+        #! root_rule = value_rule / group_rule
         #!
 
     rule(:rule) { ( rule_name >> spcCmnt? >> rule_def ).as(:rule) }
@@ -355,7 +355,7 @@ module JCR
         #!
 
     rule(:uri_template) { ( match('[a-zA-Z{}]').repeat(1) >> str(':') >> match('[\S]').repeat(1) ).as(:uri_template) }
-        #! uri_template = 1*ALPHA ":" not-space
+        #! uri_template = 1*ALPHA ":" 1*not-space
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcrvalidator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Newton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies: []
 description: A JSON Content Rules (JCR) Validator library and command line utility.
 email: andy@arin.net