cddl 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce024a0c0c43374c481b2f099e23dfd2d5da6cda62791111cf767bc12684bd92
-  data.tar.gz: b7bea63f7fb1bc927f3ffad3d602b6544719a7bd9657e7836faae0edd2355bfe
+  metadata.gz: 33adef2ddb191ca70e7ad3742684cea679e675fe0169a139c9fa5bcc59abfaa6
+  data.tar.gz: 7b7b7d2cd0623645d6dca87c5c7a8a3d40540e7eec390411e9cbf3adcc6f7c9d
 SHA512:
-  metadata.gz: 59344f19904e61edaecb196d0ba9106a97e5d9cbcb6b77bb3abd8f0a41fc72f0a30e51325253fb718e4f8f928ad979da968b48206c0594e80a6f82e2315252aa
-  data.tar.gz: 17415dd68f227a7c642369563bb38923adc54706b104468aa05c40d322697db1fa9cf22be2c5bc18d1036835f9cf588fc8eb4c514512b4e4b9dd459d8aaf95ce
+  metadata.gz: b4a8ccd11e9dbf1b0ebf2541c03691a94a8430538fbe81db3bd178a2fab1732626114689d305048e88fb54c3336f0e95853c86f8336586d722df90639f82efa6
+  data.tar.gz: 1c6494a0fa4ead8ea548f61f3af5595dde99707359ce8aa8695c074288248334849f2452cae52620541bb762c9cf3979b159f415a1b787009d1061df54d849b5

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.10.1'
+  s.version = '0.10.2'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')
@@ -9,6 +9,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('abnftt')
   s.add_dependency('regexp-examples') # , '1.1.0')
   s.add_dependency('colorize')
+  s.add_dependency('base32', '~> 0.3')
   s.files = `git ls-files`.split("\n").grep(/^[a-z]/)
   s.files = Dir['lib/**/*.rb'] + %w(cddl.gemspec) + Dir['data/**/*.abnf'] + Dir['data/**/*.cddl'] + Dir['test-data/**/*.cddl'] + Dir['test/**/*.rb']
   s.require_path = 'lib'

data/lib/cddl.rb

@@ -6,6 +6,7 @@ require 'regexp-examples'
 require 'abnftt'
 require 'colorize'
 require 'base64'
+require 'base32'
 
 module CDDL
 
@@ -578,6 +579,51 @@ module CDDL
             content[0...n] = ''
           end
           content
+        when :json
+          unless target == [:prim, 3]
+            fail "Don't know yet how to generate #{where}"
+          end
+          content = JSON::dump(generate1(control))
+          content
+        when :decimal
+          unless target == [:prim, 3]
+            fail "Don't know yet how to generate #{where}"
+          end
+          content = Integer(generate1(control)).to_s
+          content
+        when :join
+          content = generate1(control)
+          unless Array === content && 
+                 content.all? {|x| String === x &&
+                               ((target == [:prim, 2] && x.encoding == Encoding::BINARY) ||
+                                (target == [:prim, 3] && x.encoding != Encoding::BINARY))}
+            fail "Don't know yet how to generate #{where}"
+          end
+          content = content.join
+          content
+        when :b64u, :b64c, :b32, :h32, :hex, :hexlc, :hexuc
+          content = generate1(control)
+          unless String === content
+            fail "Don't know yet how to generate #{where}"
+          end
+          content = case conop
+                    when :b64u
+                      Base64.urlsafe_encode64(content, padding: false)
+                    when :b64c
+                      Base64.strict_encode64(content)
+                    when :b32
+                      Base32.table = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"
+                      Base32.encode(content).gsub("=", "")
+                    when :h32
+                      Base32.table = "0123456789ABCDEFGHIJKLMNOPQRSTUV"
+                      Base32.encode(content).gsub("=", "")
+                    when :hex, :hexuc
+                      content.unpack("H*")[0].upcase
+                    when :hexlc
+                      content.unpack("H*")[0]
+                    else fail "Cannot happen"
+                    end
+          content
         when :within, :and
           32.times do
             content = generate1(target)
@@ -994,6 +1040,53 @@ module CDDL
             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 :json
+            ann if validate1((JSON::load(d) rescue :BAD_JSON), control)
+          when :decimal
+            ann if (
+                if /\A0|-?[1-9][0-9]*\z/ === d
+                  validate1((d.to_i rescue :BAD_JSON), control)
+                end
+              )
+          when :join
+            ok, *v = extract_array(control)
+            # warn "@@@JJJ@@@ #{ok.inspect} #{v.inspect}"
+            if ok
+              expected = v.map {|ve|
+                fail "Not a string in #{where}" unless String === ve[0]
+                ve[0]
+              }.join
+              ann if d == expected
+            else
+              fail "Don't know yet how to validate against #{where}"
+            end
+          when :b64u, :b64c, :b32, :h32, :hex, :hexlc, :hexuc
+            ann if (
+                String === d && (
+                decoded = case conop
+                    when :b64u
+                      /=/ !~ d &&
+                      Base64.urlsafe_decode64(d)
+                    when :b64c
+                      Base64.strict_decode64(d)
+                    when :b32
+                      /=/ !~ d &&
+                        (Base32.table = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567") &&
+                        Base32.decode(d)
+                    when :h32
+                      /=/ !~ d &&
+                        (Base32.table = "0123456789ABCDEFGHIJKLMNOPQRSTUV") &&
+                        Base32.decode(d)
+                    when :hex
+                      /\A[0-9a-fA-F]*\z/ =~ d && [d].pack("H*")
+                    when :hexuc
+                      /\A[0-9A-F]*\z/ =~ d && [d].pack("H*")
+                    when :hexlc
+                      /\A[0-9a-f]*\z/ =~ d && [d].pack("H*")
+                    else fail "Cannot happen"
+                    end
+                ) && validate1(decoded.b, control)
+              )
           when :within
             if validate1(d, control)
               ann
@@ -1350,7 +1443,10 @@ module CDDL
     RANGE_EXCLUDE_END = {".." => false, "..." => true}
     SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp, :cbor, :cborseq, :within, :and,
                              :default, :lt, :le, :gt, :ge, :eq, :ne,
-                             :feature, :abnf, :abnfb, :det, :cat, :plus]
+                             :feature, :abnf, :abnfb, :det, :cat, :plus,
+                             :json, :decimal, :join,
+                             :b64u, :b64c, :b32, :h32, :hex, :hexlc, :hexuc,
+                            ]
 
     def type1(n, canbegroup = false)
 #      puts "NVALUE #{n.value.inspect}"

data/test/test-cddl.rb

@@ -275,7 +275,7 @@ b = (
   (x: int // y: int), z: int
 )
 HERE
-    assert parser.validate_for_test({})
+    refute parser.validate_for_test({}, false)
     assert parser.validate_for_test({"x" => 2, "z" => 1})
     assert parser.validate_for_test({"y" => 1, "z" => 2})
     refute parser.validate_for_test({"z" => 1}, false)
@@ -293,7 +293,7 @@ b = ( z: int
   (x: int // y: int)
 )
 HERE
-    assert parser.validate_for_test({})
+    refute parser.validate_for_test({}, false)
     assert parser.validate_for_test({"x" => 2, "z" => 1})
     assert parser.validate_for_test({"y" => 1, "z" => 2})
     refute parser.validate_for_test({"z" => 1}, false)

data/test-data/b64c.cddl

@@ -0,0 +1 @@
+a = text .b64c 'mnoabcd'

data/test-data/b64u.cddl

@@ -0,0 +1 @@
+a = text .b64u 'mnoabcd'

data/test-data/base32.cddl

@@ -0,0 +1 @@
+a = text .b32 'mnoabcd'

data/test-data/base32hex.cddl

@@ -0,0 +1 @@
+a = text .h32 'mnoabcd'

data/test-data/decimal.cddl

@@ -0,0 +1 @@
+a = text .decimal uint

data/test-data/decimal2.cddl

@@ -0,0 +1 @@
+a = text .decimal 4711

data/test-data/hex.cddl

@@ -0,0 +1 @@
+a = text .hex 'mnoabcd'

data/test-data/hexlc.cddl

@@ -0,0 +1 @@
+a = text .hexlc 'mnoabcd'

data/test-data/hexuc.cddl

@@ -0,0 +1 @@
+a = text .hexuc 'mnoabcd'

data/test-data/join.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", "c"])

data/test-data/joini.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", 3])

data/test-data/joinx.cddl

@@ -0,0 +1 @@
+a = text .join (["a", "b", text])

data/test-data/json.cddl

@@ -0,0 +1 @@
+a = text .json ([4, uint .size 1, {"a": "b"}])

data/test-data/json2.cddl

@@ -0,0 +1 @@
+a = text .json ([4, uint .size 2, {"a": "b"}])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base32
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: A parser, generator, and validator for CDDL
 email: cabo@tzi.org
 executables:
@@ -119,7 +133,11 @@ files:
 - test-data/abnf3.cddl
 - test-data/ambig.cddl
 - test-data/b.cddl
+- test-data/b64c.cddl
+- test-data/b64u.cddl
 - test-data/badaddr.cddl
+- test-data/base32.cddl
+- test-data/base32hex.cddl
 - test-data/basic_syntax_example.cddl
 - test-data/bat.cddl
 - test-data/bpv7.cddl
@@ -135,6 +153,8 @@ files:
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/decimal.cddl
+- test-data/decimal2.cddl
 - test-data/det1.cddl
 - test-data/dotsize.cddl
 - test-data/extractor-demo.cddl
@@ -148,6 +168,9 @@ files:
 - test-data/grasp-09.cddl
 - test-data/grasp-v1.cddl
 - test-data/grasp-v2X.cddl
+- test-data/hex.cddl
+- test-data/hexlc.cddl
+- test-data/hexuc.cddl
 - test-data/homenet-de.cddl
 - test-data/homenet-fe.cddl
 - test-data/ifmap-base-2.0v17.cddl
@@ -157,6 +180,11 @@ files:
 - test-data/jcr-ex.cddl
 - test-data/jim-cut-2.cddl
 - test-data/jim-cut.cddl
+- test-data/join.cddl
+- test-data/joini.cddl
+- test-data/joinx.cddl
+- test-data/json.cddl
+- test-data/json2.cddl
 - test-data/jsoniodef.cddl
 - test-data/kevin5.cddl
 - test-data/lint1.cddl
@@ -217,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.