edn-abnf 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e126887990e8896adb3bd44950656b51afc8d8f1302621c017ecbbc914361eb
-  data.tar.gz: 9766b5bc4ec7a00e40cea828776d737b2723b6f3ae9448d1fb3dcc10a45f336a
+  metadata.gz: 17ca8476ccb59a567d0c72fa1eb3be96a637901add2544a545a5e87f8781bd8f
+  data.tar.gz: c88bba22e17635f44acbe1705cd8cb6a9c37ca4c91806e729341cfd347aa8eed
 SHA512:
-  metadata.gz: 1b6886f7d40dec4c34f5cb39c9900c5123605b97b68fb620f0d4ff40eefc1bdb27f26b1132464afdcd2e94be46a1be7d8d9e708f25b34a4047899bfb875e4ce9
-  data.tar.gz: 051ca2fbe7cb43b569d0c376b4fc7a8b1d29f4a33fb0b6b8c73da78029e73042356203b6bdc3dbb4ce4fb98fd1c0e5bcfc19eb218c72fa9b190ec7dc86b0517c
+  metadata.gz: baac80d34ad740d44e18907bda40ee83f50ab858441d61a70b44ec9f9786fa90c2d24cb988327c44f9ad19762d89af2dffb5b77b2817b1f1c23688a9390bda01
+  data.tar.gz: a6a086be5922adf1ce51f51f5dc009719ed985729efb2c94c4d27bed097054f5490c2d04ca33e32e6a9239bd5c987a31860dc24aa05e46dcdedf7c2293c37f04

data/bin/edn-abnf

@@ -39,8 +39,13 @@ end
 
 edn_file = ARGF.read
 
-edn = EDN.from_edn(edn_file)
-result = edn.tree               # XXX .tree?
+begin
+  edn = EDN.from_edn(edn_file)
+  result = edn.tree               # XXX .tree?
+rescue ArgumentError => e
+  puts "** #{e}"
+  exit 1
+end
 
 case $options.target
 when :basic, nil

data/bin/edn-abnf~

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+require 'pp'
+require 'yaml'
+require 'treetop'
+require 'json'
+
+require_relative '../lib/edn-abnf.rb'
+
+def snaky(name)
+  name.gsub(/-/, "_")
+end
+ 
+Encoding.default_external = Encoding::UTF_8
+require 'optparse'
+require 'ostruct'
+
+$options = OpenStruct.new
+begin
+  op = OptionParser.new do |opts|
+    opts.banner = "Usage: edn-abnf.rb [options] [file.edn... | -]"
+
+    opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+      $options.verbose = v
+    end
+    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format") do |v|
+      $options.target = v
+    end
+  end
+  op.parse!
+rescue Exception => e
+  warn e
+  exit 1
+end
+
+if ARGV == []
+  puts op
+  exit 1
+end
+
+edn_file = ARGF.read
+
+edn = EDN.from_edn(edn_file)
+result = edn.tree               # XXX .tree?
+
+case $options.target
+when :basic, nil
+  pp result
+when :neat, :json
+  require 'neatjson'
+  puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
+when :yaml
+  puts result.to_yaml
+when :edn, :diag
+  puts result.cbor_diagnostic
+else
+  warn ["Unknown target format: ", $options.target].inspect
+end

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.0.1"
+  s.version = "0.0.3"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'bundler', '~>1'
+  s.add_development_dependency 'abnftt', '~>0.2'
   s.add_dependency 'treetop', '~>1'
   s.add_dependency 'json', '~>2'
   s.add_dependency 'neatjson', '~>0.10'

data/lib/cbor-diagnostic-app/b64.rb

@@ -0,0 +1,16 @@
+# mockup only; needs parser!
+
+class CBOR_DIAG::App_b64
+  def self.decode(_, s)
+    t = s.gsub(/\s/, '').chars.each_slice(4).map(&:join)
+    if last = t[-1]
+      last << "=" * (4 - last.size)
+    end
+    b = t.join.tr("-_", "+/")
+    begin
+      b.unpack("m0")[0]
+    rescue ArgumentError
+      raise ArgumentError, "cbor-diagnostic: invalid base64 #{b.inspect}", caller[1..-1]
+    end
+  end
+end

data/lib/cbor-diagnostic-app/h.rb

@@ -0,0 +1,7 @@
+# mockup only; needs parser!
+
+class CBOR_DIAG::App_h
+  def self.decode(_, s)
+    s.gsub(/#.*|\s|\/[^\/]*\//, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
+  end
+end

data/lib/parser/edn-util.rb

@@ -2,6 +2,8 @@ require 'cbor-diagnostic'
 module CBOR_DIAG
 end
 require 'cbor-diagnostic-app/dt'
+require 'cbor-diagnostic-app/h'
+require 'cbor-diagnostic-app/b64'
 
 require 'treetop'
 require_relative './edngrammar'

data/lib/parser/edngrammar.rb

@@ -1077,7 +1077,7 @@ module EDNGRAMMAR
       EDNGRAMMAR.const_set(:APPS, Hash.new { |h, k|
                              h[k] = begin ::CBOR_DIAG.const_get("App_#{app}")
                                     rescue NameError
-                                      raise ArgumentError.new("cbor-diagnostic: Unknown application-oriented extension #{k}")
+                                      raise ArgumentError, "cbor-diagnostic: Unknown application-oriented extension '#{k}'", caller
                                     end
                            }) unless ::EDNGRAMMAR.const_defined?(:APPS)
       ::EDNGRAMMAR::APPS[app].decode(app, data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: abnftt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -71,11 +85,15 @@ description: edn-abnf implements converters and miscellaneous tools for CBOR EDN
 email: cabo@tzi.org
 executables:
 - edn-abnf
+- edn-abnf~
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/edn-abnf
+- bin/edn-abnf~
 - edn-abnf.gemspec
+- lib/cbor-diagnostic-app/b64.rb
+- lib/cbor-diagnostic-app/h.rb
 - lib/edn-abnf.rb
 - lib/parser/edn-util.rb
 - lib/parser/edngrammar.rb