cddl 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e96b926d7b91f4085b026b6416c3c468c5bffdf
-  data.tar.gz: 104a4d49f78b4f0c3fd672a00e41f4d906a38560
+  metadata.gz: 9eb59255cf976f07842ba95a028cc826ce6eb8c5
+  data.tar.gz: 899add09f2508a89d342ec656fd275b67fd953bc
 SHA512:
-  metadata.gz: bc7414656a7232c31c46567cf31420495c2586c2af513ad53d778d7cbe3dabf1d26917bd59255a4b9b9acc3acd9032e1d01b74ae99ffeae495a6510b15035e78
-  data.tar.gz: 2bcbfadaae30c0f8dae730cf4d005526a0af35780a51933b7a4f52805d9c25baa1f64fe58438a23c24d3e66143b450377f0b6f16df3cefa4171b1f88d9efa1c6
+  metadata.gz: a200fef3140f3c04c291168bbe7d8a7657c0263b78d14d59a816d572d2a86612f3a142045880947baef22a578e609e5a033645ca76baa30926422d741da0d825
+  data.tar.gz: 6cac31c7fc7db9141b48874417769e8b5cd63422fc8db1ae93ccf175746de35566c3ffbecfe76e466d542232407226184fd9e6e43e9501b60f0803713cfa9a91

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -30,9 +30,9 @@ group = "(" S *grpent S ")"
 grpent = [occur S] [memberkey S] type1 optcom
        / [occur S] groupname optcom ; always preempted by previous...
 
-memberkey = type1 S "::"
+memberkey = type1 S "=>"
           / bareword S ":"
-          / string S ":"
+          / value S ":"
 
 bareword = id
 

data/test-data/7071-concise.cddl

@@ -13,5 +13,5 @@ reputon = {
   ? sample-size: uint
   ? generated: uint
   ? expires: uint
-  * tstr:: any
+  * tstr => any
 }

data/test-data/7071-verbose.cddl

@@ -37,6 +37,6 @@ normal-value = ( normal-rating: float16 )
 sample-value = ( sample-size: uint )
 gen-value = ( generated: uint )
 expire-value = ( expires: uint )
-ext-value = ( tstr:: any )
+ext-value = ( tstr => any )
 
 

data/test/test-cddl.rb

@@ -133,7 +133,7 @@ HERE
 
   def test_validate_a_string_string
     parser = CDDL::Parser.new <<HERE
-test = [* "two":: "one"]
+test = [* "two" => "one"]
 HERE
     assert parser.validate([])
     assert parser.validate(["one"])
@@ -373,6 +373,20 @@ HERE
     assert_equal "foo", parser.generate
   end
 
+  
+  def test_validate_number_key
+    parser = CDDL::Parser.new <<HERE
+test = [test1, test2, test3]
+test1 = {1: 2}
+test2 = {3.0 => "a"}
+test3 = {foo: "bar"}
+HERE
+    # pp parser.rules
+    expected = [{1 => 2}, {3.0 => "a"}, {'foo' => "bar"}]
+    assert_equal expected, parser.generate
+    assert parser.validate(expected)
+  end
+
   def test_validate_json_float
     parser = CDDL::Parser.new <<HERE
 test = {
@@ -380,7 +394,8 @@ foo: int
 ? bar: beer
 f16: float16
 ? "f32": float32
-"f64":: float64
+? 1: float32
+"f64" => float64
 }
 beer = 3.14 / 6.28
 HERE

metadata

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