cddl 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b80c417f78166e91712ce4270d125de2882dbc6
-  data.tar.gz: 49627f00404731d047e12980ca3eaed9ed1e81ee
+  metadata.gz: 6c11e42eff3d540d3d5a7db2097a1e247788ffbe
+  data.tar.gz: 19183bc21865f3c17b8b89f91747a006f1c1d49c
 SHA512:
-  metadata.gz: a179a6580f45955f1b3240b4dffbf5dc0dd06efbaeb5d6058131a6d1a536c9509765d5fc3649608fe4e4b9f02de93420ba66de7a1924fe8d105d644307145f82
-  data.tar.gz: 43dd94d9885dbd746bb653ec5db7d9a27760c18bd99ad412ae449962d576bb9bdb0b5f4a54505606005694ea627da6696a1090df8b8994c2f9e9aa8e1542557e
+  metadata.gz: 2f19f5e350b7fd93d674f120ad6dcb43c06edacb2f3c78bf6f81c7643319268c8ddb4d65f512d381c1813eba07e3fd7cc64640f06e1e69a8743cfae9170d5bf1
+  data.tar.gz: 7423ef4fd5b04d518be5df9a597f85143b4a6b60f8a8955675805344d0a27d2646cb5df911ce6a243d52af43475ce81b1a3351a62f863df2a58a0b43dce46698

data/bin/cddl

@@ -15,9 +15,14 @@ def usage
   exit 1
 end
 
+def parser
+  @parser ||= CDDL::Parser.new(File.read(ARGV[0]))
+end
+
 case ARGV[1]
+when /\Ar/                      # secret
+  pp parser.rules
 when /\Ag/
-  parser = CDDL::Parser.new(File.read(ARGV[0]))
   n = 1
   n = ARGV[2].to_i if ARGV[2]
   n.times do
@@ -25,7 +30,6 @@ when /\Ag/
     puts g.cbor_diagnostic
   end
 when /\Aj/
-  parser = CDDL::Parser.new(File.read(ARGV[0]))
   n = 1
   n = ARGV[2].to_i if ARGV[2]
   n.times do
@@ -33,7 +37,6 @@ when /\Aj/
     puts JSON.pretty_generate(g)
   end
 when /\Av/
-  parser = CDDL::Parser.new(File.read(ARGV[0]))
   instance = File.read(ARGV[2])
   instance = CBOR.decode(instance.b) rescue JSON.load(instance)
   p parser.validate(instance)

data/cddl.gemspec

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

data/data/cddl.abnf

@@ -34,16 +34,18 @@ occur = [uint] "*" [uint]
       / "+"
       / "?"
 
-uint = "0"
-     / DIGIT1 *DIGIT
+uint = ["0x" / "0b"] "0"
+     / ["0x" / "0b"] DIGIT1 *DIGIT
 
-value = int
-      / float
+value = number
       / string
 
 int = ["-"] uint
 
-float = int ["." 1*DIGIT] ["e" int ]
+; This is a float if it has fraction or exponent; int otherwise
+number = int ["." fraction] ["e" exponent ]
+fraction = 1*DIGIT
+exponent = int
 
 string = %x22 *SCHAR %x22
 SCHAR = %x20-21 / %x23-7E / SESC

data/data/prelude.cddl

@@ -41,3 +41,4 @@ true = #7.21
 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

data/lib/cddl.rb

@@ -50,11 +50,18 @@ module CDDL
       @rootrule = @rules.keys.first
       # now process the rules...
       @stage1 = {}
-      r_process(@rootrule, @rules[@rootrule])
-      # @rules.each do |n, r|     # debug only loop
-      #   r_process(n, r)
+      result = r_process(@rootrule, @rules[@rootrule])
+      r_process("used_in_cddl_prelude", @rules["used_in_cddl_prelude"])
+      @rules.each do |n, r|
+      #   r_process(n, r)     # debug only loop
+        warn "Unused rule #{n}" unless @stage1[n]
+      end
+      if result[0] == :grpent
+        warn "Group at top -- first rule must be a type!"
+      end
       # end
       # @stage1
+      result
     end
 
     def generate(where=rules, inmap = false)
@@ -109,7 +116,7 @@ module CDDL
           fail "Can't generate prim #{where[1]}"
         end
       else
-        # fail where
+        fail "Don't know how to generate from #{where[0]}"
       end
     end
 
@@ -214,6 +221,7 @@ module CDDL
         _, v = extract_value(where)
         d == v
       when :prim
+        # warn "validate prim WI #{where.inspect} #{d.inspect}"
         case where[1]
         when nil
           true
@@ -242,7 +250,7 @@ module CDDL
           end
 
         else
-          fail "Can't generate prim #{where[1]}"
+          fail "Can't validate prim #{where[1]} yet"
         end
       else
         # fail where
@@ -273,7 +281,9 @@ module CDDL
 
     def value(n)
       # cheat:
+      # warn n
       val = eval(n.to_s)
+      # warn val
       [case val
        when Integer; :int
        when Numeric; :float
@@ -318,11 +328,15 @@ module CDDL
 
     def label(n)
       # if this is not a rulename, it's a bareword
-      name = n.to_s
-      if r = @rules[name]
-        r_process(name, r)
+      if n.bareword
+        name = n.to_s
+        if r = @rules[name]
+          r_process(name, r)
+        else
+          [:string, name]
+        end
       else
-        [:string, name]
+        type1(n.type1)
       end
     end
 

data/test-data/basic_syntax_example.cddl

@@ -0,0 +1,7 @@
+; This is a comment
+person = { g }
+
+g = (
+  name: tstr,
+  age: int,
+)

data/test-data/minimal.cddl

@@ -0,0 +1 @@
+foo = #

data/test-data/reused_named_group.cddl

@@ -0,0 +1,14 @@
+info = (
+  age: int,
+  name: tstr,
+)
+person = {
+    info,
+    employer: tstr,
+    }
+dog = {
+    info,
+    collar: color,
+    }
+
+color = "blue"

data/test-data/structure.cddl

@@ -0,0 +1,9 @@
+Geography = [
+  city           : tstr
+  gpsCoordinates : GpsCoordinates
+]
+
+GpsCoordinates = {
+  longitude      : uint            ; multiplied by 10^7
+  latitude       : uint            ; multiplied by 10^7
+}

data/test-data/two_anonymous_groups.cddl

@@ -0,0 +1,13 @@
+person = {(
+  age: int,
+  name: tstr,
+  collar: color,
+  )}
+
+dog = {(
+  age: int,
+  name: tstr,
+  employer: tstr,
+  )}
+
+color = "red"

data/test/test-cddl.rb

@@ -49,6 +49,39 @@ class TestABNF < Test::Unit::TestCase
     end
   end
 
+  def test_generate_hex_bin
+    parser = CDDL::Parser.new <<HERE
+test = [0x4711, 0b1011001110001111000]
+HERE
+    assert_equal [0x4711, 0b1011001110001111000], parser.generate
+  end
+
+  
+  def test_validate_person_occurs
+    person = <<HERE
+person = (
+    name: tstr,
+    age: uint,
+)
+HERE
+    parser1 = CDDL::Parser.new "unlimitedpersons = [* person ]" + person
+    parser2 = CDDL::Parser.new "oneortwoPerson = [1*2 person ]" + person
+    parser3 = CDDL::Parser.new "min2Person = [2* person ]" + person
+    
+    assert parser1.validate([])
+    refute parser2.validate([], false)
+    refute parser3.validate([], false)
+    assert parser1.validate(["Methuselah", 969])
+    assert parser2.validate(["Methuselah", 969])
+    refute parser3.validate(["Methuselah", 969], false)
+    assert parser1.validate(["Methuselah", "Methuselah", 969, 969]) # XXX Sequence
+    assert parser2.validate(["Methuselah", "Methuselah", 969, 969])
+    assert parser3.validate(["Methuselah", "Methuselah", 969, 969])
+    assert parser1.validate(["Methuselah", "Methuselah", "Methuselah", 969, 969]) # XXX Sequence
+    refute parser2.validate(["Methuselah", "Methuselah", "Methuselah", 969, 969], false)
+    assert parser3.validate(["Methuselah", "Methuselah", "Methuselah", 969, 969])
+  end
+
   def test_validate
     parser1 = CDDL::Parser.new(File.read("test-data/7071-concise.cddl"))
     g = parser1.generate
@@ -288,5 +321,24 @@ HERE
     refute parser.validate([1, 2, 1], false)
   end
 
+  def test_validate_json_float
+    parser = CDDL::Parser.new <<HERE
+test = {
+foo: int
+? bar: beer
+f16: float16
+"f64": float64
+}
+beer = 3.14 / 6.28
+HERE
+    pp parser.rules
+    pp parser.generate
+    refute parser.validate({}, false)
+    assert parser.validate({"f16" => 1.5, "foo" => 1, "f64" => 1.1, "bar" => 3.14})
+    assert parser.validate({"f16" => 1.5, "foo" => 1, "f64" => 1.1, "bar" => 6.28})
+    refute parser.validate({"f16" => 1.5, "foo" => 1, "f64" => 1.1, "bar" => 3.15}, false)
+    assert parser.validate({"f16" => 1.5, "foo" => 1, "f64" => 1.1})
+    refute parser.validate({"f16" => 1, "foo" => 1, "f64" => 1.1}, false)
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -66,6 +66,11 @@ files:
 - lib/cddl.rb
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
+- test-data/basic_syntax_example.cddl
+- test-data/minimal.cddl
+- test-data/reused_named_group.cddl
+- test-data/structure.cddl
+- test-data/two_anonymous_groups.cddl
 - test/test-cddl.rb
 homepage: http://github.com/cabo/cddl
 licenses: