jcrvalidator 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0ce8e0beaae3b56921ab98051cacb83723a621
-  data.tar.gz: 37b9cf7bb6c35389f565ef1848fff7d84b768e08
+  metadata.gz: 7c50c1a2af0d88092277ad46e1df5d67515ba5aa
+  data.tar.gz: 3cb4e27aa441e830103d36afc1eb2766a4184e09
 SHA512:
-  metadata.gz: '078d9e3c1d59b82fa9b0aef8da7724900d49acb941aac381e4b73b760d83a9684ccd70eaa7ebfa9a7086545c09c9a8a54a4cf1b210c6c6f5d44f7512389898bd'
-  data.tar.gz: ed65f15f0b346a285fc2a4da36df771f43c4450b18ff2419fdc4e8baaebc5041151dfa96ec73de7120324d2c3256569f45a4449c632a04285a9172328ebc29da
+  metadata.gz: db6a495f22d675dcf2729947768ec4f7978226590f84fa6a35596601d62c7eecc1a24dad83ca7dbd4a8c460ac3b036bc480b26b07f339a3b87f1c39429c4e169
+  data.tar.gz: 82cd1669d3003be226dad39c3d5048b1a8d412cc0470b8ec1fb6acca1c784a811d7fc1d479845ac9aa1066fade53c5a0251ae32aec836daaa5f167a8b2ba8d50

data/lib/jcr/evaluate_rules.rb

@@ -56,7 +56,7 @@ module JCR
   class EvalConditions
     attr_accessor :mapping, :callbacks, :trace, :trace_stack, :failures
     def initialize mapping, callbacks, trace = false
-      @failures = {}
+      @failures = []
       @mapping = mapping
       @trace = trace
       @trace_stack = []
@@ -68,21 +68,25 @@ module JCR
     end
 
     def report_failure failure
-      coord = JCR::trace_coord( self )
-      @failures[ coord ] = Array.new unless @failures[ coord ]
-      @failures[ coord ] << failure
+      stack_level = trace_stack.length - 1
+      @failures[ stack_level ] = Array.new unless @failures[ stack_level ]
+      @failures[ stack_level ] << failure
     end
 
     def report_success
-      coord = JCR::trace_coord( self )
-      @failures.delete( coord )
+      stack_level = trace_stack.length - 1
+      @failures.slice!( stack_level..-1 )
     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
+      if type == "member"
+        @json = "\"#{data[0]}\" : #{data[1].to_json} "
+      else
+        @json = data.to_json
+      end
       @json_elided = JCR::elide(@json)
       @data = JCR::rule_data( data )
       @rule = JCR::find_first_slice( jcr )

data/lib/jcr/jcr.rb

@@ -31,6 +31,7 @@ module JCR
 
   class Context
     attr_accessor :mapping, :callbacks, :id, :tree, :roots, :catalog, :trace, :failed_roots, :failure_report
+    attr_accessor :failure_report_line_length
 
     def add_ruleset_alias( ruleset_alias, alias_uri )
       unless @catalog
@@ -71,6 +72,7 @@ module JCR
         @tree = ingested.tree
         @roots = ingested.roots
       end
+      @failure_report_line_length = 80
     end
 
     def override( ruleset )
@@ -151,14 +153,14 @@ module JCR
       else
         report << "- Failures for root rule at line #{failed_root.pos[0]}"
       end
-      failed_root.failures.sort.map do |stack_level, failures|
+      failed_root.failures.each_with_index do |failures,stack_level|
         if failures.length > 1
-          report << "  - failure at rule #{stack_level} caused by one of the following #{failures.length} reasons"
+          report << "  - failure at rule level #{stack_level} caused by one of the following #{failures.length} reasons"
         else
-          report << "  - failure at rule #{stack_level} caused by"
+          report << "  - failure at rule level #{stack_level} caused by"
         end
         failures.each_with_index do |failure, index|
-          lines = breakup_message( "<< #{failure.json_elided} >> failed rule #{failure.definition} at #{failure.pos} because #{failure.evaluation.reason}", 75 )
+          lines = breakup_message( "<< #{failure.json_elided} >> failed rule #{failure.definition}", ctx.failure_report_line_length - 5 )
           lines.each_with_index do |l,i|
             if i == 0
               report << "    - #{l}"

data/lib/jcr/version.rb

@@ -15,6 +15,6 @@
 
 module JCR
 
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcrvalidator
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Andrew Newton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: JCR Validator