cddl 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950428941b5165607a21122702b41893d125e76e
-  data.tar.gz: dfc923d23e1f5a8362cb48f751898e5de170e0b1
+  metadata.gz: 7338cde62dc12f53d0ebdef50710108d03570241
+  data.tar.gz: 6ab3c6679a1553bd36ad614dcd406855be6d3bd5
 SHA512:
-  metadata.gz: b22b46e3617e06bba87a85d5140d0acbaa136ab0823c7abc1eb84bece57c6e19e246ad2ffaa76f486d71b2d25191b800ddda6ea58a0f862a69a378378210eda6
-  data.tar.gz: 1e48b09c1cb23ae99eea9f1d24cab8253ddf698b37febe814640a4da18f69a5c0a2316f85b4f05e7e5b93b405541bd821701a5b337f49dcfd249c7d99539b56e
+  metadata.gz: 2d87a121c7ad9489dc74de6e6a09d05b4d303a1e6739ad887dcf142f03857079ddac3442add743916ffc580558aac800ef13f52685c68a28c54bc17206f65c93
+  data.tar.gz: 2ddc22986f4f623dff1d5bc793654a2c1f3482172fd1a4f90d30c172160d89cbc21c497ec5c48014968060e09f5ac378aaf58d24628aec7d1d8aea12a4cedd6c

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -4,6 +4,7 @@ require 'pathname'
 require 'cbor-pure' unless defined?(CBOR::Tagged)
 require 'regexp-examples'
 require 'colorize'
+require 'base64'
 
 module CDDL
 
@@ -348,7 +349,7 @@ module CDDL
           fail BackTrack.new("Need #{where[1]}..#{where[2]} of these: #{[kr, vr].inspect}") unless where[1] == 0
           []
         end
-      when :text, :int, :float
+      when :text, :int, :float, :bytes
         where[1]
       when :range
         rand(where[1])
@@ -735,7 +736,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 :text, :int, :float
+      when :text, :int, :float, :bytes
         _, v = extract_value(where)
         [] if d == v
       when :range
@@ -942,14 +943,34 @@ module CDDL
     def value(n)
       # cheat:
       # warn n
-      val = eval(n.to_s)
-      # warn val
-      [case val
-       when Integer; :int
-       when Numeric; :float
-       when String; :text
-       else fail "huh? value #{val.inspect}"
-       end, val]
+      s = n.to_s
+      if s[-1] == "'"
+        parts = s.split("'", 3)
+        if parts[2] != "" || parts[1] =~ /\\/
+          warn "*** Can't handle backslashes in #{s.inspect} yet"
+        end
+        [:bytes,
+         case parts[0]
+         when ""
+           parts[1].b
+         when "h"
+           parts[1].gsub(/\s/, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
+         when "b64"
+            Base64.urlsafe_decode64(parts[1])
+         else
+           warn "*** Can't handle byte string type #{parts[0].inspect} yet"
+         end
+        ]
+      else
+        val = eval(n.to_s)
+        # warn val
+        [case val
+         when Integer; :int
+         when Numeric; :float
+         when String; :text
+         else fail "huh? value #{val.inspect}"
+         end, val]
+      end
     end
 
     def workaround1(n)

data/test-data/badaddr.cddl

@@ -0,0 +1 @@
+badaddr = text .regexp "[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]"

data/test-data/grasp-09.cddl

@@ -0,0 +1,108 @@
+  grasp-message = (message .within message-structure) / noop-message
+
+  message-structure = [MESSAGE_TYPE, session-id, ?initiator,
+                       *grasp-option]
+
+  MESSAGE_TYPE = 0..255
+  session-id = 0..4294967295 ;up to 32 bits
+  grasp-option = any
+
+  message /= discovery-message
+  discovery-message = [M_DISCOVERY, session-id, initiator, objective]
+
+  message /= response-message ;response to Discovery
+  response-message = [M_RESPONSE, session-id, initiator, ttl,
+                     (+locator-option // divert-option), ?objective]
+
+  message /= synch-message ;response to Synchronization request
+  synch-message = [M_SYNCH, session-id, objective]
+
+  message /= flood-message
+  flood-message = [M_FLOOD, session-id, initiator, ttl,
+                  +[objective, (locator-option / [])]]
+
+  message /= request-negotiation-message
+  request-negotiation-message = [M_REQ_NEG, session-id, objective]
+
+  message /= request-synchronization-message
+  request-synchronization-message = [M_REQ_SYN, session-id, objective]
+
+  message /= negotiation-message
+  negotiation-message = [M_NEGOTIATE, session-id, objective]
+
+  message /= end-message
+  end-message = [M_END, session-id, accept-option / decline-option ]
+
+  message /= wait-message
+  wait-message = [M_WAIT, session-id, waiting-time]
+
+  message /= invalid-message
+  invalid-message = [M_INVALID, session-id, ?any]
+
+  noop-message = [M_NOOP]
+
+  divert-option = [O_DIVERT, +locator-option]
+
+  accept-option = [O_ACCEPT]
+
+  decline-option = [O_DECLINE, ?reason]
+  reason = text  ;optional error message
+
+  waiting-time = 0..4294967295 ; in milliseconds
+  ttl = 0..4294967295 ; in milliseconds
+
+  locator-option /= [O_IPv4_LOCATOR, ipv4-address,
+                     transport-proto, port-number]
+  ipv4-address = bytes .size 4
+
+  locator-option /= [O_IPv6_LOCATOR, ipv6-address,
+                     transport-proto, port-number]
+  ipv6-address = bytes .size 16
+
+  locator-option /= [O_FQDN_LOCATOR, text, transport-proto, port-number]
+
+  transport-proto = IPPROTO_TCP / IPPROTO_UDP
+  IPPROTO_TCP = 6
+  IPPROTO_UDP = 17
+  port-number = 0..65535
+
+  locator-option /= [O_URI_LOCATOR, text]
+
+  initiator = ipv4-address / ipv6-address
+
+  objective-flags = uint .bits objective-flag
+
+  objective-flag = &(
+    F_DISC: 0    ; valid for discovery
+    F_NEG: 1     ; valid for negotiation
+    F_SYNCH: 2   ; valid for synchronization
+    F_NEG_DRY: 3 ; negotiation is dry-run
+  )
+
+  objective = [objective-name, objective-flags, loop-count, ?any]
+
+  objective-name = text ;see specification for uniqueness rules
+
+  loop-count = 0..255
+
+  ; Constants for message types and option types
+
+  M_NOOP = 0
+  M_DISCOVERY = 1
+  M_RESPONSE = 2
+  M_REQ_NEG = 3
+  M_REQ_SYN = 4
+  M_NEGOTIATE = 5
+  M_END = 6
+  M_WAIT = 7
+  M_SYNCH = 8
+  M_FLOOD = 9
+  M_INVALID = 99
+
+  O_DIVERT = 100
+  O_ACCEPT = 101
+  O_DECLINE = 102
+  O_IPv6_LOCATOR = 103
+  O_IPv4_LOCATOR = 104
+  O_FQDN_LOCATOR = 105
+  O_URI_LOCATOR = 106

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -99,6 +99,7 @@ files:
 - test-data/7071-verbose.cddl
 - test-data/a.cddl
 - test-data/b.cddl
+- test-data/badaddr.cddl
 - test-data/basic_syntax_example.cddl
 - test-data/cdni-ct.cddl
 - test-data/cose.cddl
@@ -108,6 +109,7 @@ files:
 - test-data/grasp-01-extract.cddl
 - test-data/grasp-01-test.cddl
 - test-data/grasp-01.cddl
+- test-data/grasp-09.cddl
 - test-data/grasp-v1.cddl
 - test-data/grasp-v2X.cddl
 - test-data/ifmap-base-2.0v17.cddl
@@ -146,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: CDDL generator and validator.