cddl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae990c0c1e630a5f206d115bc5ae8cbc2e5612cd
-  data.tar.gz: 7ff78e8928e1cd3e7f60fa1086e6b055b23e39d7
+  metadata.gz: 3d195f7221754d19c72524ad9e7f813021ffbb06
+  data.tar.gz: 3db97cb441c00b2abc6a420163352243e8c89e07
 SHA512:
-  metadata.gz: 25cb1b61914141616819edfbcfa2a7de955295a1c1863f22ed6af85700f5cc1fa9897c6cbf51a9bcd65814f927f026e389fd80c916713e07a195a2b42dbb5136
-  data.tar.gz: 042f0f7497d609872bfce8b95da45d98a273a06092c67d2816704618497067910add06f4bf88abfa7d066cc90dff30f19ead71f43dc2ddcceb10e61b57866a23
+  metadata.gz: c6fe1856503d0f3b316830fc61b6b9569014981528fd5058c8390553565adf5cf7e4fb16712e4d2a47877dcb02d066ba818775d75c12121db3c41f8e63d2cb52
+  data.tar.gz: 84da634e9885f93badaeda4f0642163a9959ebf362b8e544189b4810076e1abf574378e6c470e4cc5b2eeeb560b251a0c1265734fd6b6de615891f39cdd10d81

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -77,7 +77,14 @@ module CDDL
       when :map
         Hash[where[1..-1].flat_map {|m| generate(m, true)}]
       when :array, :grpent
-        where[1..-1].flat_map {|m| generate(m).map{|e| e[1]}}
+        r = where[1..-1].flat_map {|m| generate(m).map{|e| e[1]}}
+            .flat_map {|e| Array === e && e[0] == :grpent ? e[1..-1] : [e]}
+                           # nested grpents need to be "unpacked"
+        if where[0] == :grpent
+          [:grpent, *r]
+        else
+          r
+        end
       when :member
         s = where[1]
         e = [where[2], [s, 4].max].min # truncate to 4 unless must be more

data/test/test-cddl.rb

@@ -350,6 +350,15 @@ HERE
     refute parser.validate([1, 2, 1], false)
   end
 
+
+  def test_generate_occur2  # XXX need indirection for now
+    parser = CDDL::Parser.new <<HERE
+test = [2*2 test1 1*1 test1]
+test1 = (one: 1, two: 2)
+HERE
+    assert_equal [1, 2, 1, 2, 1, 2], parser.generate
+  end
+
   def test_validate_json_float
     parser = CDDL::Parser.new <<HERE
 test = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Carsten Bormann