jcrvalidator 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e15f3d872870b687c53a8cf98ab6668afec8c3c5
-  data.tar.gz: 01250f5fe01fe29a8025f6aac9da8c83766df494
+  metadata.gz: 1e0ce8e0beaae3b56921ab98051cacb83723a621
+  data.tar.gz: 37b9cf7bb6c35389f565ef1848fff7d84b768e08
 SHA512:
-  metadata.gz: 6218f0d7f612b32759383f0869e39bbaf04850cdaf12cd4400796b164e745da40ffc371d9f564abd4e0135417805b5794c0c94af68f7282cb5c8284d3910e3fb
-  data.tar.gz: 4c1aebcccc76bd2806ca98d9d7e582e3353eda4c07a2fc1fb915a5ffcf192172b2ce04015046bfca5f566e0fa67a789164aa68421b90b3f3aee8df28e41fcc8d
+  metadata.gz: '078d9e3c1d59b82fa9b0aef8da7724900d49acb941aac381e4b73b760d83a9684ccd70eaa7ebfa9a7086545c09c9a8a54a4cf1b210c6c6f5d44f7512389898bd'
+  data.tar.gz: ed65f15f0b346a285fc2a4da36df771f43c4450b18ff2419fdc4e8baaebc5041151dfa96ec73de7120324d2c3256569f45a4449c632a04285a9172328ebc29da

data/lib/jcr/evaluate_array_rules.rb

@@ -265,7 +265,7 @@ module JCR
       else # else not group rule
 
         successes = 0
-        for i in behavior.last_index..data.length
+        for i in behavior.last_index..data.length-1
           break if successes == repeat_max
           unless behavior.checked_hash[ i ]
             e = evaluate_rule( rule, rule_atom, data[ i ], econs, nil )
@@ -296,7 +296,7 @@ module JCR
     behavior.last_index = highest_index
 
     if data.length > behavior.checked_hash.length && behavior.extra_prohibited
-      retval = Evaluation.new( false, "More items in array than specified for #{raised_rule(jcr,rule_atom)}" )
+      retval = Evaluation.new( false, "More items in array #{data.length} than specified #{behavior.checked_hash.length} for #{raised_rule(jcr,rule_atom)}" )
     end
 
     return retval

data/lib/jcr/evaluate_object_rules.rb

@@ -116,6 +116,7 @@ module JCR
       else # if not grule
 
         repeat_results = nil
+        member_found = false
 
         # do a little lookahead for member rules defined by names
         # if defined by a name, and not a regex, just pluck it from the object
@@ -132,6 +133,7 @@ module JCR
             unless behavior.checked_hash[k]
               e = evaluate_rule(rule, rule_atom, [k, v], econs, nil, nil)
               behavior.checked_hash[k] = e.success
+              member_found = true if e.member_found
               repeat_results[ k ] = v if e.success
             end
           else
@@ -153,6 +155,7 @@ module JCR
                 behavior.checked_hash[k] = e.success
                 i = i + 1 if e.success
                 found = true if e.member_found
+                member_found = true if e.member_found
                 e.success
               end
             end
@@ -174,6 +177,8 @@ module JCR
           retval = Evaluation.new( false, "object has too many #{jcr_to_s(rule)} for #{raised_rule(jcr,rule_atom)}")
         elsif repeat_step && ( repeat_results.length - repeat_min ) % repeat_step != 0
           retval = Evaluation.new( false, "object matches (#{repeat_results.length}) does not match repetition step of #{repeat_max} & #{repeat_step} for #{jcr_to_s(rule)} for #{raised_rule(jcr,rule_atom)}")
+        elsif member_found && repeat_results.length == 0 && repeat_max > 0
+          retval = Evaluation.new( false, "object contains #{jcr_to_s(rule)} with member name though incorrect value for #{raised_rule(jcr,rule_atom)}")
         else
           retval = Evaluation.new( true, nil)
         end

data/lib/jcr/evaluate_rules.rb

@@ -98,6 +98,7 @@ module JCR
   end
 
   def self.evaluate_rule jcr, rule_atom, data, econs, behavior = nil, target_annotations = nil
+    trace( econs, "Dispatching rule for #{jcr_to_s(jcr)} with data: #{data}")
     if jcr.is_a?( Hash )
       if jcr[:rule_name]
         rn = slice_to_s( jcr[:rule_name] )

data/lib/jcr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcrvalidator
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Andrew Newton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2017-12-20 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.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: JCR Validator