cddl 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f2111d3dcde0aece7da0e1cf03c4272247aee32
-  data.tar.gz: b67e1acb473b033a2297c8a14fe94a3729316f06
+  metadata.gz: bc5efc3a37bc0a936d6e03eb4f7d689196758914
+  data.tar.gz: 2ec4a61c192d6ec61ce94bbbcfa805693ef127fb
 SHA512:
-  metadata.gz: 8ee61cf0a7772ee11af3623afc996b991715f594c638b35946ffc56fef1b3e85930c8ea04b8e390e28fe611741674c9a5eeac6a9393c3a492e047428c41c20ef
-  data.tar.gz: 1008940ffc91f0b2fec830cac7bf34aa32eb3c9fde85f9d2bc6157c3429405bd4f786d29f8793649fd89778fa1bc1f75d0e797568de8536a21346508d781d060
+  metadata.gz: e09a9a2e079f8eafa1c879ed3a2d5c30f5c507624dff1222f68bf54ee1e05b8d56e30060ee9e27da2124834158ec7f9d222fe61ebb92a251da1070fd0d966509
+  data.tar.gz: 3f045307ce12737a799c238fb3eef169c9481b405d3f009af18aa6819ba12b86317e2473272685c244c278ea48f471b93c972411da7ba7610d8be3da1b36aab3

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.8.0'
+  s.version = '0.8.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

@@ -53,7 +53,8 @@ uint = ["0x" / "0b"] "0"
      / ["0x" / "0b"] DIGIT1 *DIGIT
 
 value = number
-      / string
+      / text
+      / bytes
 
 int = ["-"] uint
 
@@ -62,10 +63,15 @@ number = int ["." fraction] ["e" exponent ]
 fraction = 1*DIGIT
 exponent = int
 
-string = %x22 *SCHAR %x22
+text = %x22 *SCHAR %x22
 SCHAR = %x20-21 / %x23-7E / SESC
 SESC = "\" %x20-7E
 
+bytes = [bsqual] %x27 *BCHAR %x27
+BCHAR = %x20-26 / %x28-7E / SESC / CRLF
+bsqual = %x68 ; "h"
+       / %x62.36.34 ; "b64"
+
 id = EALPHA *(*("-" / ".") (EALPHA / DIGIT))
 ALPHA = %x41-5A / %x61-7A
 EALPHA = %x41-5A / %x61-7A / "@" / "_" / "$"
@@ -78,3 +84,4 @@ NL = COMMENT / CRLF
 COMMENT = ";" *(SP / VCHAR) CRLF
 VCHAR = %x21-7E
 CRLF = %x0A / %x0D.0A
+

data/data/prelude.cddl

@@ -22,8 +22,8 @@ unsigned = uint / biguint
 decfrac = #6.4([e10: int, m: integer])
 bigfloat = #6.5([e2: int, m: integer])
 eb64url = #6.21(any)
-eb64legacy = #6.21(any)
-eb16 = #6.21(any)
+eb64legacy = #6.22(any)
+eb16 = #6.23(any)
 encoded-cbor = #6.24(bstr)
 uri = #6.32(tstr)
 b64url = #6.33(tstr)

data/lib/cddl.rb

@@ -139,7 +139,7 @@ module CDDL
             arrayname = cname(arrayname ? arrayname.first : anno)
             subtree[1..-1].each_with_index do |x, i|
               if x[0] == :member
-                if Array === x[3] && x[3][0] == :string
+                if Array === x[3] && x[3][0] == :text
                   memname = x[3][1] # preferably use key string
                 elsif memname = x[4].cbor_annotations
                   memname = memname.first # use value annotation otherwise
@@ -348,7 +348,7 @@ module CDDL
           fail BackTrack.new("Need #{where[1]}..#{where[2]} of these: #{[kr, vr].inspect}") unless where[1] == 0
           []
         end
-      when :string, :int, :float
+      when :text, :int, :float
         where[1]
       when :range
         rand(where[1])
@@ -517,7 +517,7 @@ module CDDL
       end
     end
 
-    VALUE_TYPE = {string: String, int: Integer, float: Float}
+    VALUE_TYPE = {text: String, int: Integer, float: Float}
     SIMPLE_VALUE = {
       [:prim, 7, 20] => [true, false, :bool],
       [:prim, 7, 21] => [true, true, :bool],
@@ -642,7 +642,7 @@ module CDDL
             d_check1 = d_check.dup
             occ = 0
             ann2 = []
-            while occ < e && (ann3 = map_check(d, d_check1, entries))
+            while occ < e && (ann3 = map_check(d, d_check1, entries)) && ann3 != []
               occ += 1
               ann2.concat(ann3)
             end
@@ -724,7 +724,7 @@ module CDDL
             ann
           else
             if ENV["CDDL_TRACE"]
-              puts "MAP RESIDUAL: #{d_check.inspect}"
+              puts "MAP RESIDUAL: #{d_check.inspect} for #{where[1..-1]} and #{d.inspect}"
             end
           end
         end
@@ -735,7 +735,7 @@ module CDDL
           idx, ann = validate_forward(d, 0, where)
           ann if validate_result(idx == d.size) { "#{validate_diag.inspect} -- cannot complete (#{idx}, #{d.size}) array #{d} for #{where}" }
         end
-      when :string, :int, :float
+      when :text, :int, :float
         _, v = extract_value(where)
         [] if d == v
       when :range
@@ -947,7 +947,7 @@ module CDDL
       [case val
        when Integer; :int
        when Numeric; :float
-       when String; :string
+       when String; :text
        else fail "huh? value #{val.inspect}"
        end, val]
     end
@@ -988,7 +988,7 @@ module CDDL
             fail [n, n.children, mk, mk.children].inspect
           end
           name = bw.to_s
-          [[:member, *occ, [:string, name], type(nt)]]
+          [[:member, *occ, [:text, name], type(nt)]]
         end
       else
         t = if nbw = nt.bareword

data/test-data/7071-concise-cut.cddl

@@ -0,0 +1,48 @@
+reputation-object = {
+  application: tstr
+  reputons: [* reputon]
+}
+
+reputon = {
+  rater: tstr
+  assertion: tstr
+  rated: tstr
+  rating: float16
+  ? confidence: float16
+  ? normal-rating: float16
+  ? sample-size: uint
+  ? generated: uint
+  ? expires: uint
+  * tstr => any
+}
+
+#
+# a = b / c / d
+# a = b / (c / d)
+# b = "foo" ^ bar
+# c = "bar" ^ baz
+
+# foo: bar
+# "foo" ^ => bar
+
+
+# (rater: tstr // rater: uint)
+# (rater: tstr / uint)
+
+# (
+#  * tstr => uint
+#  rater: float16
+# )
+
+# a = b / c
+# c = e / f
+# a = b / (e / f)
+
+# a = ( a // b )
+# a = ( b // a )
+
+# a = (uint .size 3) .le 100000
+
+# name = uint .size 3
+# reserved_name = name .le 100000
+

data/test/test-cddl.rb

@@ -21,26 +21,26 @@ class TestABNF < Test::Unit::TestCase
 
   EXPECTED_RULES = [:type1,
  [:map,
-  [:member, 1, 1, [:string, "application"], [:prim, 3]],
+  [:member, 1, 1, [:text, "application"], [:prim, 3]],
   [:member,
    1,
    1,
-   [:string, "reputons"],
+   [:text, "reputons"],
    [:array,
     [:member,
      0,
      CDDL::MANY,
      nil,
      [:map,
-      [:member, 1, 1, [:string, "rater"], [:prim, 3]],
-      [:member, 1, 1, [:string, "assertion"], [:prim, 3]],
-      [:member, 1, 1, [:string, "rated"], [:prim, 3]],
-      [:member, 1, 1, [:string, "rating"], [:prim, 7, 25]],
-      [:member, 0, 1, [:string, "confidence"], [:prim, 7, 25]],
-      [:member, 0, 1, [:string, "normal-rating"], [:prim, 7, 25]],
-      [:member, 0, 1, [:string, "sample-size"], [:prim, 0]],
-      [:member, 0, 1, [:string, "generated"], [:prim, 0]],
-      [:member, 0, 1, [:string, "expires"], [:prim, 0]],
+      [:member, 1, 1, [:text, "rater"], [:prim, 3]],
+      [:member, 1, 1, [:text, "assertion"], [:prim, 3]],
+      [:member, 1, 1, [:text, "rated"], [:prim, 3]],
+      [:member, 1, 1, [:text, "rating"], [:prim, 7, 25]],
+      [:member, 0, 1, [:text, "confidence"], [:prim, 7, 25]],
+      [:member, 0, 1, [:text, "normal-rating"], [:prim, 7, 25]],
+      [:member, 0, 1, [:text, "sample-size"], [:prim, 0]],
+      [:member, 0, 1, [:text, "generated"], [:prim, 0]],
+      [:member, 0, 1, [:text, "expires"], [:prim, 0]],
       [:member, 0, CDDL::MANY, [:prim, 3], [:prim]]]]]]]]
 
   def test_aa_rfc7071_concise
@@ -182,6 +182,26 @@ HERE
     refute parser.validate_for_test([2, 1], false)
   end
 
+  def test_validate_a_map
+    parser = CDDL::Parser.new <<HERE
+test = {* one: 1}
+HERE
+    assert parser.validate_for_test({})
+    assert parser.validate_for_test({"one" => 1})
+    refute parser.validate_for_test({"one" => 2}, false)
+    refute parser.validate_for_test({"two" => 1}, false)
+  end
+
+  def test_validate_a_group_map
+    parser = CDDL::Parser.new <<HERE
+test = {* (text => 1)}
+HERE
+    assert parser.validate_for_test({})
+    assert parser.validate_for_test({"one" => 1})
+    refute parser.validate_for_test({"one" => 2}, false)
+    assert parser.validate_for_test({"one" => 1, "two" => 1}, false)
+  end
+
   def test_validate_a_string
     parser = CDDL::Parser.new <<HERE
 test = [* one: "one"]
@@ -739,7 +759,7 @@ HERE
 foo = {* bar}
 bar = (* b: 1)
 HERE
-    assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:string, "b"], [:int, 1]]]], parser.rules
+    assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:text, "b"], [:int, 1]]]], parser.rules
   end
 
   def test_nested_group_many2
@@ -747,7 +767,7 @@ HERE
 foo = {* bar}
 bar = (b: 1)
 HERE
-    assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:string, "b"], [:int, 1]]]], parser.rules
+    assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:text, "b"], [:int, 1]]]], parser.rules
   end
 
   def test_nested_group_many3
@@ -755,7 +775,7 @@ HERE
 foo = {* bar}
 bar = (4*6 b: 1)
 HERE
-    assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:string, "b"], [:int, 1]]]], parser.rules
+    assert_equal [:type1, [:map, [:member, 0, CDDL::MANY, [:text, "b"], [:int, 1]]]], parser.rules
   end
 
   def test_range_integer
@@ -1595,9 +1615,9 @@ identifier //= ( "ifmap" // "ifmap")
 ;identifier = ( "ifmap" // "ifmap" )
 HERE
     p parser.rules
-    # - [:type1, [:array, [:member, 2, 2, nil, [:grpchoice, [[:member, 1, 1, nil, [:string, "ifmap"]]]]]]]
-    # - [:type1, [:array, [:member, 2, 2, nil, [:grpchoice, [[:grpchoice, [[:member, 1, 1, nil, [:string, "ifmap"]]], [[:member, 1, 1, nil, [:string, "ifmap"]]]]]]]]]
-    # + [:type1, [:array, [:member, 2, 2, nil, [:grpent, [:grpchoice, [[:member, 1, 1, nil, [:string, "ifmap"]]], [[:member, 1, 1, nil, [:string, "ifmap"]]]]]]]]
+    # - [:type1, [:array, [:member, 2, 2, nil, [:grpchoice, [[:member, 1, 1, nil, [:text, "ifmap"]]]]]]]
+    # - [:type1, [:array, [:member, 2, 2, nil, [:grpchoice, [[:grpchoice, [[:member, 1, 1, nil, [:text, "ifmap"]]], [[:member, 1, 1, nil, [:text, "ifmap"]]]]]]]]]
+    # + [:type1, [:array, [:member, 2, 2, nil, [:grpent, [:grpchoice, [[:member, 1, 1, nil, [:text, "ifmap"]]], [[:member, 1, 1, nil, [:text, "ifmap"]]]]]]]]
     g = parser.generate
     assert_equal g, ["ifmap", "ifmap"]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -94,6 +94,7 @@ files:
 - lib/cbor-pp-play.rb
 - lib/cbor-pp.rb
 - lib/cddl.rb
+- test-data/7071-concise-cut.cddl
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
 - test-data/a.cddl
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: CDDL generator and validator.