cddl 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1ea2bf2dc32b878d1b13b034af9adf11e9ded105c1247dd98a759f44c2cd053
-  data.tar.gz: be5b780a163635d0e0ff63a2e163cb4d6c3eb611b13afab275dfe34bfe6259f4
+  metadata.gz: 6c877883cb125426e061f527ba4375c0f021d70dfef060336fe0bb0f5e2ca3d4
+  data.tar.gz: 7a3dc4065f3616bf57c229b410782b35140018ecada4418c0ef45056c62aef0b
 SHA512:
-  metadata.gz: 44b483cabbfd59e46e91629d60492bf63eeb965dd94eaee4860abe7ba3210be47a19f39870f61119610d250c14d29e2d7c9933a1ecc5da18f0b03bf5b97de97f
-  data.tar.gz: 8933cc8d606b6c4492817414cb167211c5a13b5f9d55ec19a8b3fb50e919d6311909df99510144a78859ddd68bacb27158665d1efd60782dec7458ea3059e6c0
+  metadata.gz: b3987fbe82e80dddba2f650b1a12941ed6092708297302cf1a78dfe45b20b79d08e85901cb8739b5fc79eab8cde70ca8efb88698f4340da72c722a7a461565c6
+  data.tar.gz: 68c35688bac9b30411ee419e171860c463df28c3452bce1741399274e51295b609e0acc8df54e9876037f9d96ba02e369fd9465c2fe7c38bb9682d5ec19018cd

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -392,15 +392,19 @@ module CDDL
         case where[1]
         when :size
           should_be_int = generate1(control)
-          unless (target == [:prim, 2] || target == [:prim, 0]) && Integer === should_be_int && should_be_int >= 0
+          unless (Array === target && target[0] == :prim && [0, 2, 3].include?(target[1])) && Integer === should_be_int && should_be_int >= 0
             fail "Don't know yet how to generate #{where}"
           end
           s = Random.new.bytes(should_be_int)
-          if target == [:prim, 0]
+          case target[1]
+          when 0
             # silently restrict to what we can put into a uint
             s[0...8].bytes.inject(0) {|a, b| a << 8 | b }
-          else
+          when 2
             s
+          when 3
+            Base64.urlsafe_encode64(s)[0...should_be_int]
+            # XXX generate word a la w = gen_word
           end
         when :bits
           set_of_bits = Array.new(10) { generate1(control) } # XXX: ten?

data/test-data/dotsize.cddl

@@ -0,0 +1,7 @@
+foo = [a, b, c]
+
+a = uint .size 4
+
+b = bytes .size 4
+
+c = text .size (0..30)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -106,6 +106,7 @@ files:
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/dotsize.cddl
 - test-data/extractor-demo.cddl
 - test-data/grasp-01-extract.cddl
 - test-data/grasp-01-test.cddl