cddl 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe3ed839df42c1fd6b07c8b4ddb8e89173d7aad7
-  data.tar.gz: 181bc6679b13f2d6d3bb1e83956ce319d7e78b0e
+  metadata.gz: de407896d680d320c446c027731247c60a315a97
+  data.tar.gz: eae775c3385f92d9fde90bca5c6daa758f4c1683
 SHA512:
-  metadata.gz: 0df738339807fd13719e6fe7ba06a382b8179eace4f9f21a7a1956800ac7004a47f52d79b93055a409a7e205f6d3b5d3b99a1cf05bfef1eda6b5b96b41cd340f
-  data.tar.gz: 960d722af0ad43719aff06482a6b795f9b958379aa918a243ac2b52e94c46cfb0299a041d8b85e1d92fadc7ae9c15bbb02e03e3b37dc6656c0ba5b4ce499b419
+  metadata.gz: 45ca44b99561f01a106f615827392d83c509f43fba5cb2384c80aae133e15c611ffa487bd6109db0b18fd90bc0c6a14c233f6e81c3a266fed136234cb7424783
+  data.tar.gz: 8477bb82d3ec84c50d901c90f5af53f7f5431904fcdfe048f7d7f864835948cc9778ef87b0813815dbaff2d5b49d3f1979d2424b389915b49dccb3d36fd099e3

data/cddl.gemspec

@@ -1,11 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.1.9'
+  s.version = '0.2.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')
   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']
   s.require_path = 'lib'

data/lib/cddl.rb

@@ -2,6 +2,7 @@ require 'abnc'
 require 'pp'
 require 'pathname'
 require 'cbor-pure'
+require 'regexp-examples'
 
 module CDDL
 
@@ -84,6 +85,16 @@ module CDDL
       result
     end
 
+    # Memoize a bit here
+
+    REGEXP_FOR_STRING = Hash.new {|h, k|
+      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
@@ -177,7 +188,7 @@ module CDDL
           unless target == [:prim, 3] && String === regexp
             fail "Don't know yet how to generate #{where}"
           end
-          "regexp /#{regexp}/ punt for now"
+          REGEXP_EXAMPLES[regexp].sample
         else
           fail "Don't know yet how to generate from #{where}"
         end
@@ -325,13 +336,13 @@ module CDDL
             if String === d
               ok, v, vt = extract_value(control)
               if ok && vt == String
-                re = Regexp.new("\\A#{v}\\z")
+                re = REGEXP_FOR_STRING[v]
                 # pp re
                 d.match(re)
               end
             end
           else
-            fail "Don't know yet how to generate from #{where}"
+            fail "Don't know yet how to validate against #{where}"
           end
         end
       when :prim

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: regexp-examples
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A parser, generator, and validator for CDDL
 email: cabo@tzi.org
 executables: