jcrvalidator 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51482b079f0539c1cb4dc314bb0dac5fc5bb34b
-  data.tar.gz: 7aab4f0a62693d94cb6764f500b9a95558bc19c6
+  metadata.gz: 4b2351b0c65ef5e3bbe3878b08b0358319a4ad75
+  data.tar.gz: 670ebcfdeb3ff7ee1d921a7c90c0f5767991d329
 SHA512:
-  metadata.gz: f0be218960533949c2f4ba48aeaede5e18d9d54a2bd9b2fc757362814f26041e869425265232eb5e22bed56accac74d245a0e11b1e68dab9aeb473dd60a8b801
-  data.tar.gz: 5a2aedf37cde03afd16060e05e4952107893b2ad3c1ee5e040047592b1af447a12c5218285dfa40781b68b599cda67082b83bfa526305d723c46e74a98191ffe
+  metadata.gz: 0fa7a5e9d18418e33b211a963c241db5cd0a81eb8ab2fb58732e524e500037846c67dc0fbff650c09a2a41344c9776c802e91598917ca91b26325acdac3c252d
+  data.tar.gz: d9ccd993fc2d950e5954771afb82e05be924deecb81bcd1c675db37236e07cde471cdefac604f31da4b71f67cb811bf57f00441c39557616b15cf166a955c29d

data/lib/jcr/check_groups.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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

data/lib/jcr/evaluate_array_rules.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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
@@ -178,7 +178,7 @@ module JCR
 
       end # end if grule else
 
-      if repeat_step && array_index % repeat_step != 0
+      if repeat_step && ( array_index - repeat_min ) % repeat_step != 0
         retval = Evaluation.new( false, "Matches (#{array_index }) do not meat repetition step for #{repeat_max} % #{repeat_step}")
       end
 
@@ -241,7 +241,7 @@ module JCR
           retval = Evaluation.new( false, "array does not have enough #{rule} for #{raised_rule(jcr,rule_atom)}")
         elsif successes > repeat_max
           retval = Evaluation.new( false, "array has too many #{rule} for #{raised_rule(jcr,rule_atom)}")
-        elsif repeat_step && successes % repeat_step != 0
+        elsif repeat_step && ( successes - repeat_min ) % repeat_step != 0
           retval = Evaluation.new( false, "array matches (#{successes}) do not meet repetition step of #{repeat_max} % #{repeat_step} with #{rule} for #{raised_rule(jcr,rule_atom)}")
         else
           retval = Evaluation.new( true, nil )
@@ -268,7 +268,7 @@ module JCR
           retval = Evaluation.new( false, "array does not have enough #{rule} for #{raised_rule(jcr,rule_atom)}")
         elsif successes > repeat_max
           retval = Evaluation.new( false, "array has too many #{rule} for #{raised_rule(jcr,rule_atom)}")
-        elsif repeat_step && successes % repeat_step != 0
+        elsif repeat_step && ( successes - repeat_min ) % repeat_step != 0
           retval = Evaluation.new( false, "array matches (#{successes}) do not meet repetition step of #{repeat_max} % #{repeat_step} with #{rule} for #{raised_rule(jcr,rule_atom)}")
         else
           retval = Evaluation.new( true, nil)

data/lib/jcr/evaluate_group_rules.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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

data/lib/jcr/evaluate_member_rules.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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

data/lib/jcr/evaluate_object_rules.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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
@@ -95,7 +95,7 @@ module JCR
           retval = Evaluation.new( false, "object does not contain group #{rule} for #{raised_rule(jcr,rule_atom)}")
         elsif successes < repeat_min
           retval = Evaluation.new( false, "object does not have contain necessary number of group #{rule} for #{raised_rule(jcr,rule_atom)}")
-        elsif repeat_step && successes % repeat_step != 0
+        elsif repeat_step && ( successes - repeat_min ) % repeat_step != 0
           retval = Evaluation.new( false, "object matches (#{successes}) do not have contain repetition #{repeat_max} % #{repeat_step} of group #{rule} for #{raised_rule(jcr,rule_atom)}")
         else
           retval = Evaluation.new( true, nil )
@@ -160,7 +160,7 @@ module JCR
           retval = Evaluation.new( false, "object does not have enough #{rule} for #{raised_rule(jcr,rule_atom)}")
         elsif repeat_results.length > repeat_max
           retval = Evaluation.new( false, "object has too many #{rule} for #{raised_rule(jcr,rule_atom)}")
-        elsif repeat_step && repeat_results.length % repeat_step != 0
+        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 #{rule} for #{raised_rule(jcr,rule_atom)}")
         else
           retval = Evaluation.new( true, nil)

data/lib/jcr/evaluate_rules.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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
@@ -141,7 +141,10 @@ module JCR
     elsif rule[:one_or_more]
       repeat_min = 1
       repeat_max = Float::INFINITY
-      repeat_step = rule[:repetition_step].to_s.to_i if rule[:repetition_step]
+      if rule[:repetition_step]
+        repeat_step = rule[:repetition_step].to_s.to_i
+        repeat_min = repeat_step
+      end
     elsif rule[:zero_or_more]
       repeat_min = 0
       repeat_max = Float::INFINITY

data/lib/jcr/evaluate_value_rules.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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
@@ -64,7 +64,7 @@ module JCR
         return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Fixnum )
         min = jcr[:integer_min].to_s.to_i
         return bad_value( jcr, rule_atom, min, data ) unless data >= min
-      when jcr[:integer_max] == nil && jcr[:integer_max] != nil
+      when jcr[:integer_min] == nil && jcr[:integer_max] != nil
         return bad_value( jcr, rule_atom, "integer", data ) unless data.is_a?( Fixnum )
         max = jcr[:integer_max].to_s.to_i
         return bad_value( jcr, rule_atom, max, data ) unless data <= max
@@ -223,13 +223,15 @@ module JCR
       #
 
       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_scheme]
-        t = jcr[:uri_scheme].to_s
-        return bad_value( jcr, rule_atom, t, data ) unless data.is_a? String
-        return bad_value( jcr, rule_atom, t, data ) unless data.start_with?( t )
+        if jcr[:uri].is_a? Hash
+          t = jcr[:uri][:uri_scheme].to_s
+          return bad_value( jcr, rule_atom, t, data ) unless data.is_a? String
+          return bad_value( jcr, rule_atom, t, data ) unless data.start_with?( t )
+        else
+          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 )
+        end
 
       #
       # phone and email value rules
@@ -467,9 +469,11 @@ module JCR
         retval =  "idn"
 
       when rule[:uri]
-        retval =  "URI"
-      when rule[:uri_scheme]
-        retval =  "URI with specific scheme #{rule[:uri_scheme].to_s}"
+        if rule[:uri].is_a? Hash
+          retval =  "URI with specific scheme #{rule[:uri][:uri_scheme].to_s}"
+        else
+          retval =  "URI"
+        end
 
       when rule[:email]
         retval =  "email"
@@ -479,8 +483,8 @@ module JCR
 
       when rule[:hex]
         retval =  "hex"
-      when rule[:base32url]
-        retval =  "base32url"
+      when rule[:base32hex]
+        retval =  "base32hex"
       when rule[:base64url]
         retval =  "base64url"
       when rule[:base64]

data/lib/jcr/find_roots.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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

data/lib/jcr/jcr.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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
@@ -23,6 +23,7 @@ require 'jcr/check_groups'
 require 'jcr/find_roots'
 require 'jcr/map_rule_names'
 require 'jcr/process_directives'
+require 'jcr/version'
 
 module JCR
 
@@ -214,6 +215,9 @@ module JCR
       opt.separator  " 1 = parsing or other bad condition"
       opt.separator  " 2 = fall through bad condition"
       opt.separator  " 3 = unsuccessful evaluation of JSON"
+
+      opt.separator  ""
+      opt.separator  "JCR Version " + JCR::VERSION
     end
 
     opt_parser.parse! my_argv

data/lib/jcr/map_rule_names.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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

data/lib/jcr/parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014,2015 American Registry for Internet Numbers (ARIN)
+# Copyright (C) 2014-2016 American Registry for Internet Numbers (ARIN)
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -185,7 +185,7 @@ module JCR
           integer_type | integer_range | integer_value |
           sized_int_type | sized_uint_type |
           ipv4_type | ipv6_type | ipaddr_type | fqdn_type | idn_type |
-          uri_range | uri_type | phone_type | email_type |
+          uri_type | phone_type | email_type |
           datetime_type | date_type | time_type |
           hex_type | base32hex_type | base32_type | base64url_type | base64_type |
           any
@@ -197,7 +197,7 @@ module JCR
         #!             integer_type / integer_range / integer_value /
         #!             sized_int_type / sized_uint_type / ipv4_type /
         #!             ipv6_type / ipaddr_type / fqdn_type / idn_type /
-        #!             uri_range / uri_type / phone_type / email_type /
+        #!             uri_type / phone_type / email_type /
         #!             datetime_type / date_type / time_type /
         #!             hex_type / base32hex_type / base32_type /
         #!             base64url_type / base64_type / any
@@ -267,11 +267,8 @@ module JCR
     rule(:idn_type)       { str('idn').as(:idn) }
         #! idn_type = idn-kw
         #> idn-kw = "idn"
-    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
+    rule(:uri_type)       { (str('uri') >> ( str("..") >> uri_scheme ).maybe).as(:uri) }
+        #! uri_type = uri-kw [ ".." uri-scheme ]
         #> uri-kw = "uri"
     rule(:phone_type)     { str('phone').as(:phone) }
         #! phone_type = phone-kw

data/lib/jcr/process_directives.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 American Registry for Internet Numbers
+# Copyright (c) 2015-2016 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

data/lib/jcr/version.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2016 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
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+module JCR
+
+  VERSION = "0.6.4"
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcrvalidator
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Andrew Newton
@@ -89,6 +89,7 @@ files:
 - lib/jcr/map_rule_names.rb
 - lib/jcr/parser.rb
 - lib/jcr/process_directives.rb
+- lib/jcr/version.rb
 homepage: https://github.com/arineng/jcrvalidator
 licenses:
 - ISC