edn-abnf 0.0.12 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f762b42f537b6298556bf2e2988c8612cd26d9315c980ddb9a5e355a678a40c5
-  data.tar.gz: 91b77ee973f2d4c23a6a9bb0344a16324e783c47861f7f0929dfd6322dd0f743
+  metadata.gz: 7c6889b9d7aa6148fe54cb74e2594c0235b0fe1b6d07192b942d5690aa2b4e55
+  data.tar.gz: 40a8707339bb46f5c984b292eff1ece51d0fcdb614feae79c224b83d4d9ffa1e
 SHA512:
-  metadata.gz: ecb6361fcf84f6de6d7e547093ec2de27d7cc69161d7717ee336db9b39b0b546ce50015dbcfb8ed64d81129d67acdbaa4eb0fcb64751c55fbe10996e9ca61fd1
-  data.tar.gz: 8f438a03ee42ea49f1d412b9fe249332acfae759be315a1c6e8f71304fb8159c9161f8267252e9e6f8f463577c2f4c55bfeafff33baae1da7f6c0752d6a131d9
+  metadata.gz: 9e1461595213030be64e5e778bceaf998cd105772948b51a9b3340feba463e3e6c2da6a68de1388eb9fab487b7f6d8b5d3b092b00704d67b77d15829f681266b
+  data.tar.gz: 8485df1945d7989b762a6d9a94e1395a4228f4fc2126af2c0136af749c3d273d1e72af3d160f3862f8747c33e24411eb084f5fc852138f890f1afa34a2bc4171

data/bin/edn-abnf

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# coding: utf-8-hfs
 require 'pp'
 require 'yaml'
 require 'treetop'
@@ -22,6 +23,13 @@ begin
     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
       $options.verbose = v
     end
+    opts.on("-l", "--[no-]lines", "multi-line mode") do |v|
+      require 'csv'
+      $options.lines = v
+    end
+    opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
+      $options.edn = v
+    end
     opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format") do |v|
       $options.target = v
     end
@@ -32,12 +40,51 @@ rescue Exception => e
   exit 1
 end
 
-if ARGV == []
-  puts op
-  exit 1
+
+if !$options.edn
+  if ARGV == []
+    puts op
+    exit 1
+  end
+  $options.edn = ARGF.read
+else
+  if ARGV != []
+    warn "*** file names #{ARGV.join(", ")} ignored due to -e given"
+  end
 end
 
-edn_file = ARGF.read
+edn_file = $options.edn
+
+if $options.lines
+  CSV.parse(edn_file) do |ok, edn, out|
+    if ok[0] == "#"
+      puts "# #{ok}, #{edn}, #{out}" if $options.verbose
+      next
+    end
+    begin
+      ok = ok == "="
+      puts "➔ #{ok}, #{edn}, #{out}" if $options.verbose
+      edn = EDN.from_edn(edn)
+      result = edn.tree
+      diag = result.cbor_diagnostic
+      if out == diag && !ok
+          puts "** ≠ / #{diag.inspect} / #{out.inspect}"
+      end
+      if out != diag && ok
+          puts "** ≡ / #{diag.inspect} / #{out.inspect}"
+      end
+    rescue ArgumentError => e
+      if ok
+        puts "** #{e} / #{result.inspect} / #{out.inspect}"
+      else
+        if $options.verbose
+          puts "expected failure #{e}"
+        end
+      end
+    end
+  end
+  exit
+end
 
 begin
   edn = EDN.from_edn(edn_file)

data/edn-abnf.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.0.12"
-  s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
+  s.version = "0.1.1"
+  s.summary = "CBOR Extended Diagnostic Notation implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"

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

@@ -7,7 +7,7 @@ require 'time'
 # Probably should copy over Time#xmlschema and fix that for us.
 
 class CBOR_DIAG::App_dt
-  def self.decode(_, s)
+  def self.decode(app_prefix, s)
     parser = DTGRAMMARParser.new
     ast = parser.parse(s)
     if !ast
@@ -16,10 +16,18 @@ class CBOR_DIAG::App_dt
     # ast.ast
 
     t = Time.iso8601(s)
-    if t.subsec != 0
+    tv = if t.subsec != 0
       t.to_f
     else
       t.to_i
     end
+    case app_prefix
+    when 'dt'
+      tv
+    when 'DT'
+      CBOR::Tagged.new(1, tv)
+    else
+      fail app_prefix
+    end
   end
 end

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

@@ -6,7 +6,7 @@ class CBOR_DIAG::App_ip
     parser = IPGRAMMARParser.new
     ast = parser.parse(s)
     if !ast
-      raise ArgumentError, "cbor-diagnostic: Parse Error in h'#{s}':\n" << EDN.reason(parser, s)
+      raise ArgumentError, "cbor-diagnostic: Parse Error in ip'#{s}':\n" << EDN.reason(parser, s)
     end
     fam, ipv = ast.ast
     case app_prefix
@@ -18,5 +18,4 @@ class CBOR_DIAG::App_ip
       fail app_prefix
     end
   end
-# s.gsub(/#.*|\s|\/[^\/]*\//, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
 end

data/lib/parser/edngrammar.rb

@@ -1499,7 +1499,7 @@ module EDNGRAMMAR
       app = app_prefix.text_value
       # Find a better place to put a default initialization
       EDNGRAMMAR.const_set(:APPS, Hash.new { |h, k|
-                             h[k] = begin ::CBOR_DIAG.const_get("App_#{app.downcase}")
+                             h[k] = begin ::CBOR_DIAG.const_get("App_#{k.downcase}")
   
                                     rescue NameError
                                       raise ArgumentError, "cbor-diagnostic: Unknown application-oriented extension '#{k}'", caller

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,5 +125,5 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: CDDL (Concise Data Definition Language) converters and miscellaneous tools
+summary: CBOR Extended Diagnostic Notation implemented in ABNF
 test_files: []