cddl 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 386a3cb063acd7d41cf0add52b2350a063056213
-  data.tar.gz: d21891d0fd81627d7b8e935e8d739ad9f6b8f4ed
+  metadata.gz: 1f2111d3dcde0aece7da0e1cf03c4272247aee32
+  data.tar.gz: b67e1acb473b033a2297c8a14fe94a3729316f06
 SHA512:
-  metadata.gz: 78156a8375111291be6a625d8b2216a708632aeca2f2d1ad91f9bc08b4db01f5234b40191670b0a73116ae25cec5ccacaaa11253126e5de6825628a173030177
-  data.tar.gz: 4b1538133346cec19f7ff95f3ed2a5ef3dd00f480c7c662c16440fe63b1eedf433450815a4f8fb1ed01d093e24fd12b83f376e99b21bc073d544b05b390457af
+  metadata.gz: 8ee61cf0a7772ee11af3623afc996b991715f594c638b35946ffc56fef1b3e85930c8ea04b8e390e28fe611741674c9a5eeac6a9393c3a492e047428c41c20ef
+  data.tar.gz: 1008940ffc91f0b2fec830cac7bf34aa32eb3c9fde85f9d2bc6157c3429405bd4f786d29f8793649fd89778fa1bc1f75d0e797568de8536a21346508d781d060

data/cddl.gemspec

@@ -1,12 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.7.4'
+  s.version = '0.8.0'
   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.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/lib/cddl.rb

@@ -422,6 +422,47 @@ module CDDL
               a |= (1 << v)
             end
           end
+        when :default
+          # Hmm.
+          unless $default_warned
+            warn "*** Ignoring .default for now."
+            $default_warned = true
+          end
+          generate1(target, inmap)
+        when :eq
+          content = generate1(control)
+          if validate1(content, where)
+            return content
+          end
+          fail "Not smart enough to generate #{where}"
+        when :lt, :le, :gt, :ge, :ne
+          if Array === target && target[0] == :prim
+            content = generate1(control)
+            try = if Numeric === content
+                    content = Integer(content)
+                    case target[1]
+                    when 0
+                      case where[1]
+                      when :lt
+                        rand(0...content)
+                      when :le
+                        rand(0..content)
+                      end
+                    end
+                  end
+            if validate1(try, where)
+              return try
+            else
+              warn "HUH gen #{where.inspect} #{try.inspect}" unless try.nil?
+            end
+          end
+          32.times do
+            content = generate1(target)
+            if validate1(content, where)
+              return content
+            end
+          end
+          fail "Not smart enough to generate #{where}"
         when :regexp
           regexp = generate1(control)
           unless target == [:prim, 3] && String === regexp
@@ -660,6 +701,8 @@ module CDDL
       end
     end
 
+    OPERATORS = {lt: :<, le: :<=, gt: :>, ge: :>=, eq: :==, ne: :!=}
+
     def validate1(d, where)
       if ENV["CDDL_TRACE"]
         puts "DATA: #{d.inspect}"
@@ -733,6 +776,19 @@ module CDDL
                 ann if ok
               end
             end
+          when :default
+            # Hmm.
+            unless $default_warned
+              warn "*** Ignoring .default for now."
+              $default_warned = true
+            end
+            ann
+          when :lt, :le, :gt, :ge, :eq, :ne
+            op = OPERATORS[where[1]]
+            ok, v, _vt = extract_value(control)
+            if ok
+              ann if d.send(op, v) rescue nil # XXX Focus ArgumentError
+            end
           when :regexp
             ann if (
             if String === d
@@ -1069,7 +1125,8 @@ module CDDL
 
     BRACE = {"{" => :map, "[" => :array}
     RANGE_EXCLUDE_END = {".." => false, "..." => true}
-    SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp, :cbor, :cborseq, :within, :and]
+    SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp, :cbor, :cborseq, :within, :and,
+                             :default, :lt, :le, :gt, :ge, :eq, :ne]
 
     def type1(n, canbegroup = false)
 #      puts "NVALUE #{n.value.inspect}"

data/test/test-cddl.rb

@@ -64,6 +64,24 @@ HERE
     assert_equal [0x4711, 0b1011001110001111000], parser.generate
   end
 
+  def test_generate_le
+    parser = CDDL::Parser.new <<HERE
+test = uint .le 10
+HERE
+    g = parser.generate
+    p [:GLE, g]
+    assert((0..10) === g)
+  end
+
+  def test_generate_ne
+    parser = CDDL::Parser.new <<HERE
+test = uint .ne 10
+HERE
+    g = parser.generate
+    p [:GNE, g]
+    assert_not_equal 10, g
+  end
+
   def test_validate_person_occurs
     person = <<HERE
 person = (
@@ -587,6 +605,78 @@ HERE
     assert parser.validate_for_test(1.2)
   end
 
+  def test_aaaa_validate_number_le
+    parser = CDDL::Parser.new <<HERE
+test = number .le 2
+HERE
+    # pp parser.rules
+    assert parser.validate_for_test(1)
+    assert parser.validate_for_test(1.2)
+    assert parser.validate_for_test(2)
+    assert parser.validate_for_test(2.0)
+    refute parser.validate_for_test(2.1, false)
+  end
+
+  def test_aaaa_validate_number_lt
+    parser = CDDL::Parser.new <<HERE
+test = number .lt 2
+HERE
+    # pp parser.rules
+    assert parser.validate_for_test(1)
+    assert parser.validate_for_test(1.2)
+    refute parser.validate_for_test(2, false)
+    refute parser.validate_for_test(2.0, false)
+    refute parser.validate_for_test(2.1, false)
+  end
+
+  def test_aaaa_validate_number_ne
+    parser = CDDL::Parser.new <<HERE
+test = number .ne 2
+HERE
+    # pp parser.rules
+    assert parser.validate_for_test(1)
+    assert parser.validate_for_test(1.2)
+    refute parser.validate_for_test(2, false)
+    refute parser.validate_for_test(2.0, false)
+    assert parser.validate_for_test(2.1)
+  end
+
+  def test_aaaa_validate_number_default
+    parser = CDDL::Parser.new <<HERE
+test = number .default 2
+HERE
+    # pp parser.rules
+    assert parser.validate_for_test(1)
+    assert parser.validate_for_test(1.2)
+    assert parser.validate_for_test(2)
+    assert parser.validate_for_test(2.0)
+    assert parser.validate_for_test(2.1)
+  end
+
+  def test_aaaa_validate_number_eq
+    parser = CDDL::Parser.new <<HERE
+test = number .eq 2
+HERE
+    # pp parser.rules
+    refute parser.validate_for_test(1, false)
+    refute parser.validate_for_test(1.2, false)
+    assert parser.validate_for_test(2)
+    assert parser.validate_for_test(2.0)
+    refute parser.validate_for_test(2.1, false)
+  end
+
+
+  def test_aaaa_validate_string_eq
+    parser = CDDL::Parser.new <<HERE
+test = (text/bytes) .eq "foo"
+HERE
+    # pp parser.rules
+    refute parser.validate_for_test(1, false)
+    assert parser.validate_for_test("foo")
+    assert parser.validate_for_test("foo".b) #  XXX Feature!
+    refute parser.validate_for_test("bar", false)
+  end
+
   def test_validate_number_key
     parser = CDDL::Parser.new <<HERE
 test = [test1, test2, test3]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -56,16 +56,16 @@ dependencies:
   name: regexp-examples
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -145,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CDDL generator and validator.
 test_files: []
-has_rdoc: