cddl 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 749f3737874fddf85370630362cb408163cd5098
-  data.tar.gz: a853023378b56fc381ef51bc5d808a275e67186d
+  metadata.gz: c679a7c46cf375f7ebefc86fb2846f4c482fb67e
+  data.tar.gz: b1b1b2968c8ba46bf573074827fb818311946334
 SHA512:
-  metadata.gz: 6c285291257fd627bd815bbae0372e5e0a7a8bbbd5866da15a1196f2b13a257249e1dd419ad50ac9e85858701517679883b4c6a78f3093350a1143b597f4a1af
-  data.tar.gz: 31a449e0663742bc3fa7cdbaf80b4c2c4fccfcd477096207129516e77c8accdc9f93ae87544421c7380a56d87aca1b17495776a1ffc2b0cb02a19d14213a8661
+  metadata.gz: cff8854de5230152b6cb7223bb9078657c4296b359d244a15a5f34e3910296d0da1dead8a06c8a207d359780542cb690a1951034935d76117c7eb95b4c0b311a
+  data.tar.gz: 339c503e65b5159d14b5fd130528b8c93da567716a746d274558fb353cf72573c205bf535fc7d64b2cc3313ad1dd9ea62b422fea07876b76991f0e4ac5644c3f

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -453,17 +453,21 @@ module CDDL
       occ = occur(n.occur)
       if mk = n.memberkey       # work around unclear bug in ast generation below
         fail n.inspect unless n.type1
-        if t1 = mk.type1
+        if (t1 = mk.type1) || ((t1 = mk.s) && (t1 = t1.type) && (t1 = t1.type1)) # workaround
           [[:member, *occ, type1(t1), type1(n.type1)]]
         else
           bw = mk.bareword
-          fail unless bw
+          unless bw
+            warn @abnf.ast?
+            fail [n, n.children, mk, mk.children].inspect
+          end
           name = bw.to_s
           [[:member, *occ, [:string, name], type1(n.type1)]]
         end
       else
         t = if n.bareword # work around unclear bug, part 2
-              type1(n.bareword.type1, true)
+              t1 = n.bareword.type1 || n.bareword.s.type.type1 # workaround
+              type1(t1, true)
             else
               type1(n.type1, true)              # type1 can be a group here!
             end

data/test-data/dcaf1.cddl

@@ -0,0 +1,48 @@
+dcaf-msg = sam-information-msg
+         / access-request-msg
+         / ticket-transfer-msg
+         / ticket-grant-msg
+
+sam-information-msg = { sam, ? full-timestamp }
+
+access-request-msg = { sam, sam-ai, full-timestamp }
+
+ticket-transfer-msg = { face, verifier }
+face = (F => { sam-ai, limited-timestamp, lifetime, psk-gen } )
+verifier = (V => shared-secret )
+shared-secret = bstr
+F   = 8
+V   = 9
+
+ticket-grant-msg    = { face, verifier, ? client-info }
+client-info = (cam-ai, full-timestamp, lifetime)
+
+sam = (SAM => abs-uri)
+SAM = 0
+abs-uri = tstr ; .regexp "______"
+
+sam-ai = (SAI => [* auth-info])
+SAI = 1
+auth-info = (uri : tstr, mask : 0..15 )
+
+cam-ai = (CAI => [* auth-info])
+CAI = 2
+
+full-timestamp = (TS => date)
+TS  = 5
+date = tdate / localdate
+localdate = uint
+limited-timestamp = (TS => localdate)
+
+lifetime = (L => period)
+period = uint ; in seconds
+L   = 6
+
+psk-gen = (G => mac-algorithm)
+G   = 7
+mac-algorithm = &( hmac-sha256: 0, hmac-sha384: 1, hmac-sha512: 2 )
+
+; TO DO???
+E   = 3
+K   = 4
+

data/test/test-cddl.rb

@@ -712,4 +712,10 @@ HERE
     refute parser.validate("re", false)
   end
 
+  def test_dcaf
+    parser1 = CDDL::Parser.new(File.read("#{TEST_DATA_DIR}/dcaf1.cddl"))
+    # assert_equal EXPECTED_RULES, parser1.rules
+    pp parser1.generate
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -101,6 +101,7 @@ files:
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
 - test-data/basic_syntax_example.cddl
+- test-data/dcaf1.cddl
 - test-data/jcr-ex.cddl
 - test-data/minimal.cddl
 - test-data/reused_named_group.cddl