cddl 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eb59255cf976f07842ba95a028cc826ce6eb8c5
-  data.tar.gz: 899add09f2508a89d342ec656fd275b67fd953bc
+  metadata.gz: 749f3737874fddf85370630362cb408163cd5098
+  data.tar.gz: a853023378b56fc381ef51bc5d808a275e67186d
 SHA512:
-  metadata.gz: a200fef3140f3c04c291168bbe7d8a7657c0263b78d14d59a816d572d2a86612f3a142045880947baef22a578e609e5a033645ca76baa30926422d741da0d825
-  data.tar.gz: 6cac31c7fc7db9141b48874417769e8b5cd63422fc8db1ae93ccf175746de35566c3ffbecfe76e466d542232407226184fd9e6e43e9501b60f0803713cfa9a91
+  metadata.gz: 6c285291257fd627bd815bbae0372e5e0a7a8bbbd5866da15a1196f2b13a257249e1dd419ad50ac9e85858701517679883b4c6a78f3093350a1143b597f4a1af
+  data.tar.gz: 31a449e0663742bc3fa7cdbaf80b4c2c4fccfcd477096207129516e77c8accdc9f93ae87544421c7380a56d87aca1b17495776a1ffc2b0cb02a19d14213a8661

data/cddl.gemspec

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

data/lib/cddl.rb

@@ -124,13 +124,13 @@ module CDDL
           r
         end
       when :member
-        s = where[1]
-        e = [where[2], [s, 4].max].min # truncate to 4 unless must be more
-        s += rand(e + 1 - s) if e != s
+        st = where[1]
+        en = [where[2], [st, 4].max].min # truncate to 4 unless must be more
+        st += rand(en + 1 - st) if en != st
         kr = where[3]
         vr = where[4]
         fail "member key not given in map for #{where}" unless kr if inmap
-        Array.new(s) { [ (generate(kr) if kr), # XXX: need error in map context
+        Array.new(st) { [ (generate(kr) if kr), # XXX: need error in map context
                          generate(vr)
                        ]}
       when :string, :int, :float
@@ -182,20 +182,25 @@ module CDDL
         when :bits
           set_of_bits = Array.new(10) { generate(control) } # XXX: ten?
           # p set_of_bits
-          unless target == [:prim, 2] && set_of_bits.all? {|x| Integer === x && x >= 0 }
+          unless (target == [:prim, 0] || target == [:prim, 2]) &&
+                 set_of_bits.all? {|x| Integer === x && x >= 0 }
             fail "Don't know yet how to generate #{where}"
           end
-          s = String.new
-          set_of_bits.each do |i|
-            n = i >> 3
-            bit = 1 << (i & 7)
-            if v = s.getbyte(n)
-              s.setbyte(n, v | bit)
-            else
-              s << "\0" * (n - s.size) << bit.chr(Encoding::BINARY)
+          if target == [:prim, 2]
+            set_of_bits.inject(String.new) do |s, i|
+              n = i >> 3
+              bit = 1 << (i & 7)
+              if v = s.getbyte(n)
+                s.setbyte(n, v | bit); s
+              else
+                s << "\0" * (n - s.size) << bit.chr(Encoding::BINARY)
+              end
+            end
+          else                  # target == [:prim, 0]
+            set_of_bits.inject(0) do |a, v|
+              a |= (1 << v)
             end
           end
-          s
         when :regexp
           regexp = generate(control)
           unless target == [:prim, 3] && String === regexp
@@ -344,6 +349,18 @@ module CDDL
                   b[nb] == 0 || validate1(bit+nb, control)
                 }
               }
+            elsif Integer === d
+              if d >= 0
+                ok = true
+                i = 0
+                while ok && d > 0
+                  if d.odd?
+                    ok &&= validate1(i, control)
+                  end
+                  d >>= 1; i += 1
+                end
+                ok
+              end
             end
           when :regexp
             if String === d

data/test/test-cddl.rb

@@ -669,11 +669,30 @@ HERE
     parser = CDDL::Parser.new <<HERE
 test = bstr .bits (1 / 3 / 5)
 HERE
-    pp parser.rules
+    # pp parser.rules
     gen = parser.generate
     assert String === gen
     pp gen                      # should mostly be "*"
     assert parser.validate(gen)
+    assert parser.validate("\x08".b)
+    refute parser.validate("\x01".b, false)
+    refute parser.validate("\x10".b, false)
+    refute parser.validate("\x40".b, false)
+  end
+
+  def test_bits_annotation_on_uint
+    parser = CDDL::Parser.new <<HERE
+test = uint .bits (1 / 3 / 5)
+HERE
+    # pp parser.rules
+    gen = parser.generate
+    assert Integer === gen
+    pp gen                      # should mostly be 42
+    assert parser.validate(gen)
+    assert parser.validate(1 << 3)
+    refute parser.validate(1 << 0, false)
+    refute parser.validate(1 << 4, false)
+    refute parser.validate(1 << 6, false)
   end
 
   def test_regexp_annotation

metadata

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