cddl 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c11e42eff3d540d3d5a7db2097a1e247788ffbe
-  data.tar.gz: 19183bc21865f3c17b8b89f91747a006f1c1d49c
+  metadata.gz: 14938c337d552f720d587e2b46be2c4738e48f8b
+  data.tar.gz: 9a2b6a95471d6d29b6acd051d3c838d30f1724c0
 SHA512:
-  metadata.gz: 2f19f5e350b7fd93d674f120ad6dcb43c06edacb2f3c78bf6f81c7643319268c8ddb4d65f512d381c1813eba07e3fd7cc64640f06e1e69a8743cfae9170d5bf1
-  data.tar.gz: 7423ef4fd5b04d518be5df9a597f85143b4a6b60f8a8955675805344d0a27d2646cb5df911ce6a243d52af43475ce81b1a3351a62f863df2a58a0b43dce46698
+  metadata.gz: 557ce79dad209f8577c361effcb3aea96ee43be2b4dba7914fa34fdb9f7bca9d5e5adfe079dcdadce42062f07f1eb55c2e825ec1c30833f9d23d5ffb118ecaf1
+  data.tar.gz: a1d8f53c4baf9d5c50c65a7daf3a91d40a1c5c43616978f3fedcb0c84493012906335712003c90b73d04b0f2800d9e89d081200036e5506f99b20db8a95b23d6

data/cddl.gemspec

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

data/data/prelude.cddl

@@ -38,7 +38,8 @@ float = float16-32 / float64
 
 false = #7.20
 true = #7.21
+bool = false / true
 nil = #7.22
 undefined = #7.23
 
-used_in_cddl_prelude = any / bstr / tdate / time / number / biguint / bignint / bigint / integer / decfrac / bigfloat / eb64url / eb64legacy / eb16 / encoded-cbor / uri / b64url / b64legacy / regexp / mime-message / cbor-any / float16 / float32 / float64 / float16-32 / float32-64 / float / false / true / nil / undefined / uint / nint / int / tstr
+used_in_cddl_prelude = any / bstr / tdate / time / number / biguint / bignint / bigint / integer / decfrac / bigfloat / eb64url / eb64legacy / eb16 / encoded-cbor / uri / b64url / b64legacy / regexp / mime-message / cbor-any / float16 / float32 / float64 / float16-32 / float32-64 / float / false / true / bool / nil / undefined / uint / nint / int / tstr

data/lib/cddl.rb

@@ -1,6 +1,7 @@
 require 'abnc'
 require 'pp'
 require 'pathname'
+require 'cbor-pure'
 
 module CDDL
 
@@ -35,16 +36,17 @@ module CDDL
     def rules
       @rules = {}
       ast.each :rule do |rule|
-        # p rule
-        if rulename = rule.groupname
-          fail "Duplicate rule #{rulename.to_s}" if @rules[rulename.to_s]
-          @rules[rulename.to_s] = [:grpent, *rule.group.children(:grpent)]
-        elsif rulename = rule.typename
-          fail "Duplicate rule #{rulename.to_s}" if @rules[rulename.to_s]
-          @rules[rulename.to_s] = [:type1, *rule.type.children(:type1)]
-        else
-          fail "Huh?"
-        end
+        rule_ast =
+          if rulename = rule.groupname
+            [:grpent, *rule.group.children(:grpent)]
+          elsif rulename = rule.typename
+            [:type1, *rule.type.children(:type1)]
+          else
+            fail "Huh?"
+          end
+        n = rulename.to_s
+        fail "Duplicate rule #{n}" if @rules[n]
+        @rules[n] = rule_ast
       end
       # pp @rules
       @rootrule = @rules.keys.first
@@ -97,6 +99,8 @@ module CDDL
           gen_word.force_encoding(Encoding::BINARY)
         when 3
           gen_word
+        when 6
+          CBOR::Tagged.new(where[2], generate(where[3]))
         when 7
           case where[2]
           when nil
@@ -201,6 +205,7 @@ module CDDL
       when :array
         if Array === d
           # validate1 against the record
+          # XXX do that in some recursive descent fashion
           i = 0
           where[1..-1].each { |r|
             t, s, e, _k, v = r # XXX
@@ -233,6 +238,8 @@ module CDDL
           String === d && d.encoding == Encoding::BINARY
         when 3
           String === d && d.encoding != Encoding::BINARY # cheat
+        when 6
+          CBOR::Tagged === d && d.tag == where[2] && validate1(d.data, where[3])
         when 7
           t, v = extract_value(where)
           if t
@@ -263,7 +270,7 @@ module CDDL
     private
 
     def gen_word
-      @words ||= File.read("/usr/share/dict/words").lines.shuffle
+      @words ||= (File.read("/usr/share/dict/words").lines.shuffle rescue %w{tic tac toe})
       @wordptr ||= 0
       @wordptr = 0 if @wordptr == @words.size
       w = @words[@wordptr].chomp
@@ -304,7 +311,8 @@ module CDDL
           type1(n.type1, true)              # type1 can be a group here!
         end
         if t[0] == :grpent
-          # XXX go through the members here and multiply the occs
+          # go through the members here and multiply the occs
+          # XXX only do this for maps.  Keep the structure up for the arrays!
           t1 = t[1..-1].flatten(1)
           t1.flat_map {|t2| 
             if t2[0] == :member
@@ -406,6 +414,7 @@ module CDDL
               fail unless member[0] == :member
               fail "map entry without member key given: #{member}" unless member[3]
             end
+            # XXX do the occurrence multiplier here
           end
           [type, *s]
         else

data/test/test-cddl.rb

@@ -341,4 +341,27 @@ HERE
     refute parser.validate({"f16" => 1, "foo" => 1, "f64" => 1.1}, false)
   end
 
+  def test_validate_tags
+    parser = CDDL::Parser.new <<HERE
+my_breakfast = #6.55799(breakfast)   ; cbor-any is too general!
+breakfast = cereal / porridge
+cereal = #6.998(tstr)
+porridge = #6.999([liquid, solid])
+liquid = milk / water
+milk = 0
+water = 1
+solid = tstr
+HERE
+    # pp parser.rules
+    # pp parser.generate
+    refute parser.validate({}, false)
+    refute parser.validate(CBOR::Tagged.new(55799, CBOR::Tagged.new(997, 1)), false)
+    refute parser.validate(CBOR::Tagged.new(55799, CBOR::Tagged.new(998, 1)), false)
+    assert parser.validate(CBOR::Tagged.new(55799, CBOR::Tagged.new(998, "cornflakes")))
+    assert parser.validate(CBOR::Tagged.new(55799, CBOR::Tagged.new(999, [0, "barley"])))
+    refute parser.validate(CBOR::Tagged.new(55799, CBOR::Tagged.new(999, [0, 1])), false)
+    refute parser.validate(CBOR::Tagged.new(55799, CBOR::Tagged.new(999, [0, "barley", 1])), false)
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag