cddl 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1070fa01f476cb900016c1b95c4c484aa8554e6
-  data.tar.gz: 424df46b269ae91a60fcb9cf4276b8f6f55f5f93
+  metadata.gz: 192e487f56aa32371186d7bfe2156cb4c7a465fb
+  data.tar.gz: 8160ada742e24c3d9141cd7d20e7dc83d2665cb8
 SHA512:
-  metadata.gz: 621214556cefefda17498ef05c345755d72cd0bc3264b5c2540c5c2285abf86ea74a6ef99df78fedcc9fe30408f97b4be00506e648dfc02795512ea87086ca30
-  data.tar.gz: f31756c68e80f4ccf514aa85dbc3dca77cdb73b4605c3db6edd2cab3e094e091ea8c3cc1bb62088f31aa156dbed68e27231fac495c1334dabfecaeebe2d5c8b0
+  metadata.gz: a14e09892b6831a6db72a6442a2b009daa7f2d2c2047c3b1b5ea37d0da6d659c8451a2595b94f7b58a796b2f3afe555ddc1cf05a45065fa554172d54c483d181
+  data.tar.gz: f5672a56a37cf50d9d8aacff38563d6ed4d8037917c52cedd4f43ab261feb8f071b1021d11b184c8dd6145f5b59ef63866e84816084c1836821a193e4eaa0651

data/cddl.gemspec

@@ -1,12 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.2.1'
+  s.version = '0.2.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')
+  s.add_dependency('regexp-examples', '~> 1.1', '>= 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

@@ -108,10 +108,6 @@ module CDDL
       h[k] = Regexp.new("\\A#{k}\\z")
     }
 
-    REGEXP_EXAMPLES = Hash.new {|h, k|
-      h[k] = REGEXP_FOR_STRING[k].examples
-    }
-
     def generate(where=rules, inmap = false)
       case where[0]
       when :type1
@@ -205,7 +201,7 @@ module CDDL
           unless target == [:prim, 3] && String === regexp
             fail "Don't know yet how to generate #{where}"
           end
-          REGEXP_EXAMPLES[regexp].sample
+          REGEXP_FOR_STRING[regexp].random_example(max_repeater_variance: 5)
         else
           fail "Don't know yet how to generate from #{where}"
         end

data/test/test-cddl.rb

@@ -651,10 +651,12 @@ HERE
 test = tstr .regexp "reg.*"
 HERE
     pp parser.rules
-    gen = parser.generate
-    assert String === gen
-    pp gen
-    assert parser.validate(gen)
+    5.times do
+      gen = parser.generate
+      assert String === gen
+      pp gen
+      assert parser.validate(gen)
+    end
     assert parser.validate("reg")
     assert parser.validate("regfoo")
     refute parser.validate("foo", false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -56,16 +56,22 @@ dependencies:
   name: regexp-examples
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        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: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement