cddl 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea47a90f675f5589227fb3a10db240bddaae6c8e
-  data.tar.gz: 04f10cc045bbc451c244e2d6de26e8a1c0a64cf9
+  metadata.gz: 21c72ccd0f94ea94c2c5759a86d7f96d6756d945
+  data.tar.gz: a84cecf4ca71d4c1dd284a996b072e20a8139c7e
 SHA512:
-  metadata.gz: 7d1bda5f7bf502ba4dbb0d11ff1ac40ee249892a086e95c0c00dc4f4928e2384b6a8b26a2940c6ea7e7b342af06ec8aa5320d61ea019bce101945b287910bb8b
-  data.tar.gz: 7f69f714dcc39eb85474df6823a48b7a67b8dfdbc5fcfdb8b459ba7798a411e66673de622a690486dfe85ad6feb88ea9188ab4966b3d5b3a028982c1f97d9f75
+  metadata.gz: 0ca79dda50938e7a502ed7f5722a396eca9a55d37fd652b0944e8a031e0919ca9275c4d80433bac651a9845d7b1c1e62886f553eab9a9548732a4d48f05e9a0e
+  data.tar.gz: af8f5d8945bd7e731004d86d23ac3ac0c036b304ed4f57982a798460be51135e496662a43823179f74c047accd18c8abeb2b83e4c01d6458ce75052dabe437dd

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -383,10 +383,16 @@ module CDDL
         case where[1]
         when :size
           should_be_int = generate1(control)
-          unless target == [:prim, 2] && Integer === should_be_int
+          unless (target == [:prim, 2] || target == [:prim, 0]) && Integer === should_be_int && should_be_int >= 0
             fail "Don't know yet how to generate #{where}"
           end
-          Random.new.bytes(should_be_int)
+          s = Random.new.bytes(should_be_int)
+          if target == [:prim, 0]
+            # silently restrict to what we can put into a uint
+            s[0...8].bytes.inject(0) {|a, b| a << 8 | b }
+          else
+            s
+          end
         when :bits
           set_of_bits = Array.new(10) { generate1(control) } # XXX: ten?
           # p set_of_bits
@@ -679,7 +685,15 @@ module CDDL
           control = where[3]
           case where[1]
           when :size
-            ann if validate1(d.bytesize, control)
+            case d
+            when Integer
+              ok, v, vt = extract_value(control)
+              if ok && vt == Integer
+                ann if (d >> (8*v)) == 0
+              end
+            when String
+              ann if validate1(d.bytesize, control)
+            end
           when :bits
             if String === d
               d.each_byte.with_index.all? { |b, i|

data/test/test-cddl.rb

@@ -855,6 +855,24 @@ HERE
     assert parser.validate(gen)
   end
 
+
+  def test_uint_size_annotation
+    parser = CDDL::Parser.new <<HERE
+test = uint .size 3
+HERE
+    pp parser.rules
+    10.times do
+      gen = parser.generate
+      assert Integer === gen
+      assert gen < 2**24
+      assert gen >= 0
+      assert parser.validate(gen)
+    end
+    refute parser.validate(-1, false)
+    refute parser.validate(2**24, false)
+    refute parser.validate(2**218, false)
+  end
+
   def test_bits_annotation
     parser = CDDL::Parser.new <<HERE
 test = bstr .bits (1 / 3 / 5)

metadata

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