cddl 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2adafcd62e2e19c64d3b561c3f4fa020551ded
-  data.tar.gz: 42cfe0856afa556943bdcf10c8805bf9acf87d13
+  metadata.gz: e5369f34b05a1ece8d8f11f3b4a04d704928850e
+  data.tar.gz: a35dff8b713d0a6baca7bca0554fdfad498fd490
 SHA512:
-  metadata.gz: 3e3aaa3ec40b05a3b0afb50a13e7cf169c33cb55634289379bc481a7831fc4faf490536828097e490a172a776dc7b2c30f3b83f975595dfdc857f5b15f8c4988
-  data.tar.gz: 30308d4da1eb610ebba0d9fd67906b4615a2d701bed333a0afc4695b92d2c2a49f0a6819c61a58784c26e834e57ea496f6aaf214c314c274624bd553aec25c75
+  metadata.gz: 8d21bb24a81af9f70f698e97f38e96fa3ae37bc904841f3f29abf246b013a450816a28612729e0b82c0505a376603330156c7666e943e39ad296422c581cc818
+  data.tar.gz: 086513c70f53d7b21e7e8447f36002aa05cab7e66d1f744711600967bd0fbfad3741d318c00e4696cbbaa8b5e82ff16b440e5dd1b79129fc717c2674b5ff81f0

data/cddl.gemspec

@@ -1,12 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.6.1'
+  s.version = '0.6.2'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')
   s.add_dependency('abnc')
   s.add_dependency('json')
-  s.add_dependency('regexp-examples', '~> 1.1', '>= 1.1.0')
+  s.add_dependency('regexp-examples', '1.1.0')
   s.add_dependency('colorize')
   s.files = `git ls-files`.split("\n").grep(/^[a-z]/)
   s.files = Dir['lib/**/*.rb'] + %w(cddl.gemspec) + Dir['data/**/*.abnf'] + Dir['data/**/*.cddl'] + Dir['test-data/**/*.cddl'] + Dir['test/**/*.rb']

data/data/cddl.abnf

@@ -34,7 +34,7 @@ group = grpchoice S *("//" S grpchoice S)
 grpchoice = *grpent
 
 grpent = [occur S] [memberkey S] type optcom
-       / [occur S] groupname [genericarg] optcom   ; preempted by previous
+       / [occur S] groupname [genericarg] optcom ; preempted by above
        / [occur S] "(" S group S ")" optcom
 
 memberkey = type1 S "=>"

data/test-data/patch1.cddl

@@ -0,0 +1,13 @@
+CellList = {
+  + CellID => {
+    SlotframeID: leafref
+    SlotOffset: uint
+    ChannelOffset: uint
+    LinkType: enumeration
+    CelType: enumeration
+  }
+}
+
+CellID = uint
+leafref = tstr ; TBD
+enumeration = uint ; TBD

data/test/test-cddl.rb

@@ -1256,10 +1256,11 @@ HERE
     # puts "empty_group_sp AST:"
     # puts parser.ast_debug
     # puts "simple_type_augmented RULES:"
-    # pp parser.rules
+    pp parser.rules
     g = parser.generate
     pp g
     assert parser.validate(g)
+    assert parser.validate({"seq" => 1, "ack" => 2})
   end
 
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -56,20 +56,14 @@ dependencies:
   name: regexp-examples
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -109,6 +103,7 @@ files:
 - test-data/ifmap2.cddl
 - test-data/jcr-ex.cddl
 - test-data/minimal.cddl
+- test-data/patch1.cddl
 - test-data/reused_named_group.cddl
 - test-data/structure.cddl
 - test-data/two_anonymous_groups.cddl