cddl 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21c72ccd0f94ea94c2c5759a86d7f96d6756d945
-  data.tar.gz: a84cecf4ca71d4c1dd284a996b072e20a8139c7e
+  metadata.gz: 8803ef067ea0ea2959c233dadcdb2c6b9efc951c
+  data.tar.gz: 59b76d0a3da17193115e4d023414d486b07b80b7
 SHA512:
-  metadata.gz: 0ca79dda50938e7a502ed7f5722a396eca9a55d37fd652b0944e8a031e0919ca9275c4d80433bac651a9845d7b1c1e62886f553eab9a9548732a4d48f05e9a0e
-  data.tar.gz: af8f5d8945bd7e731004d86d23ac3ac0c036b304ed4f57982a798460be51135e496662a43823179f74c047accd18c8abeb2b83e4c01d6458ce75052dabe437dd
+  metadata.gz: c2c84dc9a1eed0643f1bfe619fbc922290f4815d3f77e04ca5e076421b717c45eb0ccd48b00636d71a602d2324aacaaf8be2256b59bcb6f6a9712dfe40f3bc21
+  data.tar.gz: bccdb7d885651ded32f13eb95aaffaed70a2c2ad4490465f4d866703d18c49c843ce84820067834287c8adb1aeddcf658719f41ee49dd5a360d749d89d0f9b89

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -101,15 +101,22 @@ module CDDL
 
     # Generate some simple #define lines from the value-only rules
     def defines(prefix)
+      prefix ||= "CDDL"
+      if prefix =~ /%\d*\$?s/
+        format = prefix
+        format += "\n" unless format[-1] == "\n"
+      else
+        format = "#define #{prefix}_%s %s\n"
+      end
       s = {}                    # keys form crude set of defines
+      add = proc { |*a| s[format % a] = true }
       r = rules
-      prefix ||= "CDDL"
       ast.each :rule do |rule|
         if rulename = rule.typename
           t = rule.type.children(:type1)
           if t.size == 1
             if (t2 = t.first.children(:type2)) && t2.size == 1 && (v = t2.first.value)
-              s["#define #{prefix}_#{cname(rulename)} " << v.to_s << "\n"] = true
+              add.(cname(rulename), v.to_s)
             end
           end
         end
@@ -122,7 +129,7 @@ module CDDL
             subtree[1..-1].each do |x| 
               if memname = x.cbor_annotations
                 memname = "#{enumname}_#{cname(memname.first)}"
-                s["#define #{prefix}_#{memname} " << x[1].to_s << "\n"] = true
+                add.(memname, x[1].to_s)
               end
             end
           end
@@ -138,8 +145,8 @@ module CDDL
                   memname = memname.first # use value annotation otherwise
                 end
                 if memname
-                  memname = "#{arrayname}_#{cname(memname)}"
-                  s["#define #{prefix}_#{memname}_index " << i.to_s << "\n"] = true
+                  memname = "#{arrayname}_#{cname(memname)}_index"
+                  add.(memname, i.to_s)
                 end
               end
               if x[0] == :member && (x[1] != 1 || x[2] != 1)

data/test-data/cose.cddl

@@ -0,0 +1,68 @@
+COSE_MSG = [ 1, COSE_Sign ] / [2, COSE_encrypt] / [3, COSE_mac]
+
+
+COSE_Sign = (
+    headers,
+    payload : opt<bstr>,
+    signatures: ([+[COSE_signature]] / [COSE_signature])
+)
+
+COSE_SignMessage = #6.999([ COSE_Sign ])
+
+keys = int / tstr
+header_map = {+ keys => any}
+
+opt<t> = t / nil
+
+headers = (
+    protected: opt<bstr>,
+    unprotected: opt<header_map>
+)
+
+COSE_signature =  (
+    headers,
+    signaturne : bstr
+)
+
+Sig_structure = [
+    headers,
+    payload : bstr
+]
+
+COSE_encrypt = (
+  headers,
+  iv : opt<bstr>,
+  aad : opt<bstr>,
+  ciphertext : opt<bstr>,
+  recipients : ([+COSE_encrypt_a] / [COSE_encrypt] / nil)
+)
+
+COSE_encrypt_a = [COSE_encrypt]
+
+Enc_structure = [
+   protected : opt<bstr>,
+   aad : opt<bstr>
+]
+
+COSE_mac = (
+   headers,
+   payload : bstr,
+   tag : bstr,
+   recipients : ([+COSE_encrypt_a] / [COSE_encrypt] / nil)
+)
+
+MAC_structure = [
+   protected : opt<bstr>
+   payload : bstr
+]
+
+COSE_Key = {
+    "kty" : tstr,
+    ? "use" : tstr,
+    ? "key_ops" : [+tstr],
+    ? "alg" : tstr,
+    ? "kid" : tstr,
+    * keys => values
+}
+
+COSE_KeySet = [+COSE_Key]

data/test/test-cddl.rb

@@ -1191,7 +1191,7 @@ HERE
     p parser.rules
     10.times {
       g = parser.generate
-      pp ["recurse-group-test2", g]
+      # pp ["recurse-group-test2", g]
       assert parser.validate(g)
       refute parser.validate(g.merge(baz: 3), false)
     }
@@ -1564,6 +1564,27 @@ HERE
     assert_equal expected, d
   end
 
+  def test_extractor_type1_format_string
+    parser = CDDL::Parser.new <<HERE
+BAR = a/b/c
+a = 1
+b = 2
+c = 3
+d = 4
+HERE
+    expected = <<HERE
+C_a = 1
+C_b = 2
+C_c = 3
+C_d = 4
+C_BAR_a = 1
+C_BAR_b = 2
+C_BAR_c = 3
+HERE
+    d = parser.defines("C_%s = %s")
+    assert_equal expected, d
+  end
+
   def test_extractor_enum
     parser = CDDL::Parser.new <<HERE
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -100,6 +100,7 @@ files:
 - test-data/b.cddl
 - test-data/basic_syntax_example.cddl
 - test-data/cdni-ct.cddl
+- test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
 - test-data/extractor-demo.cddl