cddl 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18e49f92e707d92bff7762be5f4905702b48f179
-  data.tar.gz: 4f3fb0f3fc4573ec189ab16cf280ae1fcb63ead0
+  metadata.gz: 069ab5627679f8b9c644f6469eff2a3760c4c911
+  data.tar.gz: 39c18606d5c35934d4933ff96c444a7f685f7003
 SHA512:
-  metadata.gz: 81b2b4241507fdb26f88164daacff36dc73e7f67df3d85662a9f76999f1aa7d7ae2fce72e93e87fbe55991a7b3f8459aa064cfff47f545f05e1904a3e1bef20a
-  data.tar.gz: 89b707e68854724d991785432dac1ed3e2814ae0d92791e3b30ade4e769eeb8508cfb457e0f4fc19b36494320ddbc98caa1ad04b7551359e15c59d4aae7a7a0f
+  metadata.gz: 65ff54e705aa476af42d7157cfa87120678b59d6c8177d86a6552abd5c4ee135531b8c17dcb078c34fed3a773c67aaddc6e30c645e9c40af22bb1fca6c6d1a08
+  data.tar.gz: 32049a27a9a6a2ca7080a7d9bffde7fa7c3e2f0e88eaac030fb9ea97b87e0bd0b5844d660ec730ca321665f96d01eb68af78f119c809974178bde444bb7b8638

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.1.7'
+  s.version = '0.1.8'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')

data/data/cddl.abnf

@@ -7,7 +7,7 @@ groupname = id
 
 type = type1 S *("/" S type1 S)
 
-type1 = type2 [rangeop type2]
+type1 = type2 [S (rangeop / annotation) S type2]
      / "#" "6" ["." uint] "(" S type S ")" ; note no space!
      / "#" DIGIT ["." uint]                ; major/ai
      / "#"                                 ; any
@@ -22,6 +22,8 @@ type2 = value
 
 rangeop = "..." / ".."
 
+annotation = "." id
+
 group = "(" S *grpent S ")"
       / *grpent
 
@@ -57,8 +59,9 @@ string = %x22 *SCHAR %x22
 SCHAR = %x20-21 / %x23-7E / SESC
 SESC = "\" %x20-7E
 
-id = ALPHA *(ALPHA / DIGIT / "_" / "-")
+id = EALPHA *(*("-" / ".") (EALPHA / DIGIT))
 ALPHA = %x41-5A / %x61-7A
+EALPHA = %x41-5A / %x61-7A / "@" / "_"
 DIGIT = %x30-39
 DIGIT1 = %x31-39
 S = *WS

data/lib/cddl.rb

@@ -37,6 +37,12 @@ module CDDL
       @abnf.parse_results
     end
 
+    def strip_nodes(n)
+      [n[0], *n[1..-1].map {|e|
+        e._strip
+      }]
+    end
+
     def rules
       @rules = {}
       ast.each :rule do |rule|
@@ -49,7 +55,15 @@ module CDDL
             fail "Huh?"
           end
         n = rulename.to_s
-        fail "Duplicate rule #{n}" if @rules[n]
+        if @rules[n]
+          a = strip_nodes(rule_ast).inspect
+          b = strip_nodes(@rules[n]).inspect
+          if a == b
+            warn "*** Warning: Identical redefinition of #{n} as #{a}"
+          else
+            fail "Duplicate rule definition #{n} as #{b} (was #{a})"
+          end
+        end
         @rules[n] = rule_ast
       end
       # pp @rules
@@ -102,7 +116,7 @@ module CDDL
       when :prim
         case where[1]
         when nil
-          gen_word
+          gen_word              # XXX: maybe always returning a string is confusing
         when 0
           rand(4711)
         when 1
@@ -131,6 +145,42 @@ module CDDL
         else
           fail "Can't generate prim #{where[1]}"
         end
+      when :anno
+        target = where[2]
+        control = where[3]
+        case where[1]
+        when :size
+          should_be_int = generate(control)
+          unless target == [:prim, 2] && Integer === should_be_int
+            fail "Don't know yet how to generate #{where}"
+          end
+          Random.new.bytes(should_be_int)
+        when :bits
+          set_of_bits = Array.new(10) { generate(control) } # XXX: ten?
+          p set_of_bits
+          unless target == [:prim, 2] && set_of_bits.all? {|x| Integer === x && x >= 0 }
+            fail "Don't know yet how to generate #{where}"
+          end
+          s = String.new
+          set_of_bits.each do |i|
+            n = i >> 3
+            bit = 1 << (i & 7)
+            if v = s.getbyte(n)
+              s.setbyte(n, v | bit)
+            else
+              s << "\0" * (s.size - n) << bit.chr(Encoding::BINARY)
+            end
+          end
+          s
+        when :regexp
+          regexp = generate(control)
+          unless target == [:prim, 3] && String === regexp
+            fail "Don't know yet how to generate #{where}"
+          end
+          "regexp /#{regexp}/ punt for now"
+        else
+          fail "Don't know yet how to generate from #{where}"
+        end
       else
         fail "Don't know how to generate from #{where[0]}"
       end
@@ -255,6 +305,35 @@ module CDDL
         d == v
       when :range
         where[2] === d && where[1].include?(d)
+      when :anno
+        target = where[2]
+        if validate1(d, target)
+          control = where[3]
+          case where[1]
+          when :size
+            validate1(d.bytesize, control)
+          when :bits
+            if String === d
+              d.each_byte.with_index.all? { |b, i|
+                bit = i << 3
+                8.times.all? { |nb|
+                  b[nb] == 0 || validate1(bit+nb, control)
+                }
+              }
+            end
+          when :regexp
+            if String === d
+              ok, v, vt = extract_value(control)
+              if ok && vt == String
+                re = Regexp.new("\\A#{v}\\z")
+                pp re
+                d.match(re)
+              end
+            end
+          else
+            fail "Don't know yet how to generate from #{where}"
+          end
+        end
       when :prim
         # warn "validate prim WI #{where.inspect} #{d.inspect}"
         case where[1]
@@ -343,7 +422,7 @@ module CDDL
         if t[0] == :grpent && (@insides.last != :array || occ == [1, 1])
           # go through the members here and multiply the occs
           t1 = t[1..-1].flatten(1)
-          t1.flat_map {|t2| 
+          t1.flat_map {|t2|
             if t2[0] == :member
               [t2]
             else
@@ -429,13 +508,15 @@ module CDDL
 
     BRACE = {"{" => :map, "[" => :array}
     RANGE_EXCLUDE_END = {".." => false, "..." => true}
+    SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp]
 
     def type1(n, canbegroup = false)
 #      puts "NVALUE #{n.value.inspect}"
       if v = n.type2
+        ch = n.children(:type2)
         if ro = n.rangeop
           cats = []
-          [:range, Range.new(*n.children(:type2).map {|l|
+          [:range, Range.new(*ch.map {|l|
              ok, val, cat = extract_value(type2(l))
              fail "Can't have range with #{l}" unless ok
              # XXX really should be checking type coherence of range
@@ -443,6 +524,12 @@ module CDDL
              val
            }, RANGE_EXCLUDE_END[ro.to_s]),
            cats[0] == cats[1] ? cats[0] : fail("Incompatible range #{cats}")]
+        elsif anno = n.annotation
+          annotyp = anno.id.to_s.intern
+          unless SUPPORTED_ANNOTATIONS.include?(annotyp)
+            fail "Unsupported annotation .#{annotyp}"
+          end
+          [:anno, annotyp, *ch.map {|t| type2(t)}]
         else
           type2(v, canbegroup)
         end

data/test-data/jcr-ex.cddl

@@ -0,0 +1,42 @@
+root = nameserver / entity ; just to root things here
+
+nameserver = {
+  name: fqdn,
+  ipAddresses: [* ipaddress],
+  common,
+}
+
+entity = {
+  names: [* string],
+  roles: [* string],
+  postalAddress: [* string],
+  emails: [* email],
+  phones: {
+      office: [* phone],
+      fax: [* phone],
+      mobile: [* phone],
+  },
+  common,
+}
+
+common = (
+  handle: string,
+  status: [* string],
+  remarks: [* string],
+  uris: [* { type: string, "uri": uri }],
+  port43: fqdn,
+  sponsoredBy: string,
+  resoldBy: string,
+  registrationBy: string,
+  registrationDate: tdate,
+  lastChangedDate: tdate,
+  lastChangedBy: string,
+)
+
+string = tstr
+email = tstr
+phone = tstr
+fqdn = tstr
+ipaddress = ip4 / ip6
+ip4 = bstr ; could pull a #2.4 here, but don't
+ip6 = bstr ; could pull a #2.16 here, but don't

data/test/test-cddl.rb

@@ -190,7 +190,7 @@ HERE
     assert parser.validate([1, 2])
   end
 
-  
+
   def test_validate_not_unknown_key_paren
     # $debug_ast = true
     parser = CDDL::Parser.new <<HERE
@@ -313,7 +313,7 @@ HERE
     # pp parser.rules
     # puts "APR:"
     # pp parser.apr
-    pp parser.generate
+    assert_includes [[1, 2, 1, 2], [1, 2, 1, 2, 1, 2]], parser.generate
     refute parser.validate([], false)
     refute parser.validate([1], false)
     refute parser.validate([1, 2], false)
@@ -337,7 +337,7 @@ HERE
     # pp parser.rules
     # puts "APR:"
     # pp parser.apr
-    pp parser.generate
+    assert_includes [[1, 2, 1, 2], [1, 2, 1, 2, 1, 2]], parser.generate
     refute parser.validate([], false)
     refute parser.validate([1], false)
     refute parser.validate([1, 2], false)
@@ -369,8 +369,8 @@ f16: float16
 }
 beer = 3.14 / 6.28
 HERE
-    pp parser.rules
-    pp parser.generate
+    # pp parser.rules
+    # pp parser.generate
     refute parser.validate({}, false)
     assert parser.validate({"f16" => 1.5, "foo" => 1, "f64" => 1.1, "bar" => 3.14})
     assert parser.validate({"f16" => 1.5, "foo" => 1, "f64" => 1.1, "bar" => 6.28})
@@ -403,7 +403,7 @@ HERE
 
   def test_nested_group_many1
     parser = CDDL::Parser.new <<HERE
-foo = {* bar} 
+foo = {* bar}
 bar = (* b: 1)
 HERE
     assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:string, "b"], [:int, 1]]]], parser.rules
@@ -411,7 +411,7 @@ HERE
 
   def test_nested_group_many2
     parser = CDDL::Parser.new <<HERE
-foo = {* bar} 
+foo = {* bar}
 bar = (b: 1)
 HERE
     assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:string, "b"], [:int, 1]]]], parser.rules
@@ -419,7 +419,7 @@ HERE
 
   def test_nested_group_many3
     parser = CDDL::Parser.new <<HERE
-foo = {* bar} 
+foo = {* bar}
 bar = (4*6 b: 1)
 HERE
     assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:string, "b"], [:int, 1]]]], parser.rules
@@ -449,7 +449,7 @@ HERE
     }
     assert parser.validate(0)
     assert parser.validate(7)
-    refute parser.validate(7.0)
+    refute parser.validate(7.0, false)
     assert parser.validate(12)
     refute parser.validate(-1, false)
     refute parser.validate(13, false)
@@ -460,14 +460,14 @@ HERE
 color = 0.5..max
 max = 12.5
 HERE
-    pp parser.rules
+    # pp parser.rules
     10.times {
       assert parser.generate.between?(0.5, 12.5)
     }
     refute parser.validate(0.0, false)
     assert parser.validate(0.5)
     assert parser.validate(7.0)
-    refute parser.validate(7)
+    refute parser.validate(7, false)
     assert parser.validate(12.0)
     assert parser.validate(12.5)
     refute parser.validate(-1.0, false)
@@ -589,5 +589,76 @@ HERE
     assert_raise { parser.validate({}) }
   end
 
+  def test_identical_redefinition
+    parser = CDDL::Parser.new <<HERE
+test =
+  "Cephalotaxus Germanism dovekey Istiophorus" / foo
+test = "Cephalotaxus Germanism dovekey Istiophorus"
+/ foo
+foo = 1
+HERE
+    pp parser.rules
+  end
+
+  def test_bad_redefinition
+    parser = CDDL::Parser.new <<HERE
+test =
+  "Cephalotaxus Germanism dovekey Istiophorus" / foo
+test = "Cephalotaxus Germanism dovekey Istiophorus"
+/ fob
+foo = 1
+fob = 1
+HERE
+    assert_raise {
+      pp parser.rules
+    }
+  end
+
+  def test_bad_annotation
+    parser = CDDL::Parser.new <<HERE
+test = int .foo 3
+HERE
+    assert_raise {
+      pp parser.rules
+    }
+  end
+
+  def test_size_annotation
+    parser = CDDL::Parser.new <<HERE
+test = bstr .size 3
+HERE
+    pp parser.rules
+    gen = parser.generate
+    assert String === gen
+    assert gen.bytesize == 3
+    pp gen
+    assert parser.validate(gen)
+  end
+
+  def test_bits_annotation
+    parser = CDDL::Parser.new <<HERE
+test = bstr .bits (1 / 3 / 5)
+HERE
+    pp parser.rules
+    gen = parser.generate
+    assert String === gen
+    pp gen                      # should mostly be "*"
+    assert parser.validate(gen)
+  end
+
+  def test_regexp_annotation
+    parser = CDDL::Parser.new <<HERE
+test = tstr .regexp "reg.*"
+HERE
+    pp parser.rules
+    gen = parser.generate
+    assert String === gen
+    pp gen
+    assert parser.validate(gen)
+    assert parser.validate("reg")
+    assert parser.validate("regfoo")
+    refute parser.validate("foo", false)
+    refute parser.validate("re", false)
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -67,6 +67,7 @@ files:
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
 - test-data/basic_syntax_example.cddl
+- test-data/jcr-ex.cddl
 - test-data/minimal.cddl
 - test-data/reused_named_group.cddl
 - test-data/structure.cddl