cddl 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f786ac685c1f30ca4a1510ad4e40981a6403dc7f
-  data.tar.gz: 8d2a5a22918683e260bbd79331e1b9874ea649a1
+  metadata.gz: ea47a90f675f5589227fb3a10db240bddaae6c8e
+  data.tar.gz: 04f10cc045bbc451c244e2d6de26e8a1c0a64cf9
 SHA512:
-  metadata.gz: 2055bf34a4f4b366b12455723dcc86eba307064c0831dad03d864f7f6a014eab724b9283917341f88c6daf8a08ecb9d4808f269161b7127404d689684f5165db
-  data.tar.gz: b3693cc1e1277a2f7848fb886ed1665cfc885438da1d2e3fd7d94355a6081265eaa62fd4db3fafea38ade41e708d0515c51a0c0001ad453ccf711009adc8b6d4
+  metadata.gz: 7d1bda5f7bf502ba4dbb0d11ff1ac40ee249892a086e95c0c00dc4f4928e2384b6a8b26a2940c6ea7e7b342af06ec8aa5320d61ea019bce101945b287910bb8b
+  data.tar.gz: 7f69f714dcc39eb85474df6823a48b7a67b8dfdbc5fcfdb8b459ba7798a411e66673de622a690486dfe85ad6feb88ea9188ab4966b3d5b3a028982c1f97d9f75

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -415,6 +415,34 @@ module CDDL
             fail "Don't know yet how to generate #{where}"
           end
           REGEXP_FOR_STRING[regexp].random_example(max_repeater_variance: 5)
+        when :cbor, :cborseq
+          unless target == [:prim, 2]
+            fail "Don't know yet how to generate #{where}"
+          end
+          content = CBOR::encode(generate1(control))
+          if where[1] == :cborseq
+            # remove the first head
+            n = case content.getbyte(0) - (4 << 5)
+                when 0..23; 1
+                when 24; 2
+                when 25; 3
+                when 26; 5
+                when 27; 9      # unlikely :-)
+                else fail "Generated .cborseq sequence for #{where} not an array"
+                end
+            content[0...n] = ''
+          end
+          content
+        when :within, :and
+          32.times do
+            content = generate1(target)
+            if validate1(content, control)
+              return content
+            elsif where[1] == :within
+              warn "*** #{content.inspect} meets #{target.inspect} but not #{control.inspect}"
+            end
+          end
+          fail "Not smart enough to generate #{where}"
         else
           fail "Don't know yet how to generate from #{where}"
         end
@@ -684,6 +712,19 @@ module CDDL
               end
             end
             )
+          when :cbor
+            ann if validate1((CBOR::decode(d) rescue :BAD_CBOR), control)
+          when :cborseq
+            ann if validate1((CBOR::decode("\x9f".b << d << "\xff".b) rescue :BAD_CBOR), control)
+          when :within
+            if validate1(d, control)
+              ann
+            else
+              warn "*** #{d.inspect} meets #{target} but not #{control}"
+              nil
+            end
+          when :and
+            ann if validate1(d, control)
           else
             fail "Don't know yet how to validate against #{where}"
           end
@@ -996,7 +1037,7 @@ module CDDL
 
     BRACE = {"{" => :map, "[" => :array}
     RANGE_EXCLUDE_END = {".." => false, "..." => true}
-    SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp]
+    SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp, :cbor, :cborseq, :within, :and]
 
     def type1(n, canbegroup = false)
 #      puts "NVALUE #{n.value.inspect}"

data/test/test-cddl.rb

@@ -902,6 +902,104 @@ HERE
     refute parser.validate("re", false)
   end
 
+  def test_cbor_annotation1
+    parser = CDDL::Parser.new <<HERE
+test = bytes .cbor 1
+HERE
+    pp parser.rules
+    5.times do
+      gen = parser.generate
+      assert_equal "\x01", gen
+      pp gen
+      assert parser.validate(gen)
+    end
+    assert parser.validate("\x01".b)
+    assert parser.validate("\x18\x01".b)
+    refute parser.validate("1", false)
+    refute parser.validate("\x00".b, false)
+  end
+
+  def test_cbor_annotation_uint
+    parser = CDDL::Parser.new <<HERE
+test = bytes .cbor uint
+HERE
+    pp parser.rules
+    5.times do
+      gen = parser.generate
+      assert String === gen
+      assert_equal 0, gen.getbyte(0) >> 5
+      pp ["CAU", gen]
+      assert parser.validate(gen)
+    end
+    assert parser.validate("\x01".b)
+    assert parser.validate("\x00".b)
+    assert parser.validate("\x18\x01".b)
+    refute parser.validate("1", false)
+    refute parser.validate("\x00\x00".b, false)
+  end
+
+  def test_cborseq_annotation_uint
+    parser = CDDL::Parser.new <<HERE
+test = bytes .cborseq uint
+HERE
+    assert_raise {
+      parser.generate
+    }
+  end
+
+def test_cbor_annotation_uint_array
+    parser = CDDL::Parser.new <<HERE
+test = bytes .cborseq myarray
+myarray = [1*4uint]
+HERE
+    pp parser.rules
+    5.times do
+      gen = parser.generate
+      assert String === gen
+      pp ["CAUA", gen]
+      assert_equal 0, gen.getbyte(0) >> 5 unless gen == ''
+      assert parser.validate(gen)
+    end
+    assert parser.validate("\x01".b)
+    assert parser.validate("\x18\x01".b)
+    refute parser.validate("1", false)
+    refute parser.validate("\x00\x00\x00\x00\x00".b, false)
+end
+
+def test_and_annotation
+    parser = CDDL::Parser.new <<HERE
+test = mtype .and uint
+mtype = 1/2/3/4/-1
+HERE
+    pp parser.rules
+    5.times do
+      gen = parser.generate
+      assert Integer === gen
+      pp ["CAA", gen]
+      assert parser.validate(gen)
+    end
+    assert parser.validate(1)
+    refute parser.validate(-1, false)
+    refute parser.validate(0, false)
+end
+
+def test_within_annotation
+    parser = CDDL::Parser.new <<HERE
+test = mtype .within uint
+mtype = 1/2/3/4/-1
+HERE
+    pp parser.rules
+    20.times do
+      gen = parser.generate
+      assert Integer === gen
+      pp ["CWA", gen]           # should also generate some warnings
+      assert parser.validate(gen)
+    end
+    assert parser.validate(1)
+    refute parser.validate(-1, false)
+    refute parser.validate(0, false)
+end
+
   def test_dcaf
     parser1 = CDDL::Parser.new(File.read("#{TEST_DATA_DIR}/dcaf1.cddl"))
     # assert_equal EXPECTED_RULES, parser1.rules
@@ -1196,7 +1294,7 @@ HERE
     # pp parser.rules
     assert_equal(["abs"], parser.generate.keys)
     v = {}
-    10.times do
+    20.times do                 # OK, this is probabilistic...
       v[parser.generate["abs"]] = true
     end
     assert_equal({3 => true, -3 => true}, v)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag