edn-abnf 0.5.41 → 0.5.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fdf950deb0a96865e863046f39d4071d3856ce24fc476c1f96077457002b8d8
-  data.tar.gz: 3920f2ebfb1b4dacc025d86f8bcb6fc2ed3e59694ec174ba6c1f50ccd5650dc6
+  metadata.gz: fe28153b880f4ed0b622b3eb4405d8eb72f480729c25d8b30edee80e95e85a74
+  data.tar.gz: e10f8b6e293a1ed72f1e4aed231339318752d023e1ddf3d7af94e161c57fc2dd
 SHA512:
-  metadata.gz: 14148161150b25960f24543bb03c673632af5c8302a5773e15863b88ade9c3a9ef20e6db2ec67bbb3a58bada47c673d8f32d877df11bd0a79d9619ab43e42c1f
-  data.tar.gz: 2ad6f10909561f0a87e59c87efdbecedb1b6bbf14a559fa59c6154d9d45d550a91e2e36850457c415118d6de93b8968a9b3053e65ad1d25de368e60e54aee350
+  metadata.gz: 4e91ccd12231bc740812ba3f774cab99fa3e307b80bd5f729ec0429e8cbd8b99fa74986e8f094c6a2176f6a8dff20764b7645d5d20724b8f7c82957bbfaa52ef
+  data.tar.gz: a4834aa184a7b22a57d5a729939f10a3bbde519900faf6199b0609dcbb5473728356f053d5a6b16c0b22ea9c6507faeab23ff014af02e67303dec735259cd2e6

data/bin/edn-abnf

@@ -7,12 +7,6 @@ require 'json'
 require 'cbor-pretty'
 require 'cbor-deterministic'
 
-# Temporary fix for name conflicts between cbor-diag and edn-abnf
-diag_path = $LOAD_PATH.grep(/gems\/cbor-diag/).first
-edn_path = $LOAD_PATH.grep(/gems\/edn-abnf/).first
-$LOAD_PATH[$LOAD_PATH.index(diag_path)] = edn_path
-$LOAD_PATH << diag_path
-
 require_relative '../lib/edn-abnf.rb'
 
 def snaky(name)
@@ -216,6 +210,7 @@ begin
   end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e
   warn "** #{e}"
+  warn e.backtrace if $options.verbose
   exit 1
 rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError => e
   warn "** (encoded CBOR input:) #{e}"

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.41"
+  s.version = "0.5.43"
   s.summary = "CBOR Extended Diagnostic Notation (EDN) implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

data/lib/cbor-diag-support.rb

@@ -9,6 +9,9 @@ module CBOR
     def to_s
       value.to_s
     end
+    def to_str
+      value.to_str
+    end
     def inspect
       "#<CBOR::Box #{self.class} value=#{value.inspect}, options=#{options.inspect}>"
     end

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

@@ -1,8 +1,9 @@
 require_relative "b64grammar.rb"
 
 class CBOR_DIAG::App_b64
-  def self.decode(_, s)
+  def self.decode(prefix, s)
     parser = B64GRAMMARParser.new #  B? XXX
+    s = EDN.to_one_string(prefix, s)
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in b64'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)

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

@@ -7,8 +7,9 @@ require 'time'
 # Probably should copy over Time#xmlschema and fix that for us.
 
 class CBOR_DIAG::App_dt
-  def self.decode(app_prefix, s)
+  def self.decode(prefix, s)
     parser = DTGRAMMARParser.new
+    s = EDN.to_one_string(prefix, s)
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in dt'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)
@@ -21,13 +22,13 @@ class CBOR_DIAG::App_dt
     else
       t.to_i
     end
-    case app_prefix
+    case prefix
     when 'dt'
       tv
     when 'DT'
       CBOR::Tagged.new(1, tv)
     else
-      fail app_prefix
+      fail prefix
     end
   end
 end

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

@@ -1,8 +1,9 @@
 require_relative "hgrammar.rb"
 
 class CBOR_DIAG::App_h
-  def self.decode(_, s)
+  def self.decode(prefix, s)
     parser = HGRAMMARParser.new
+    s = EDN.to_one_string(prefix, s)
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in h'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)

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

@@ -4,20 +4,21 @@ require 'ipaddr'
 require "cbor-diagnostic-app/0"
 
 class CBOR_DIAG::App_ip
-  def self.decode(app_prefix, s)
+  def self.decode(prefix, s)
     parser = IPGRAMMARParser.new
+    s = EDN.to_one_string(prefix, s)
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in ip'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)
     end
     fam, ipv = ast.ast
-    case app_prefix
+    case prefix
     when 'ip'
       ipv
     when 'IP'
       CBOR::Tagged.new(fam, ipv)
     else
-      fail app_prefix
+      fail prefix
     end
   end
 end

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

@@ -1,14 +1,14 @@
 require "cbor-diagnostic-app/0"
 
 class CBOR_DIAG::Helper
-  def self.decode_string(app_prefix, s, to_text = false)
+  def self.decode_string(prefix, s, to_text = false)
     ret = if CBOR::Sequence === s
             args = s.elements
           else
             args = [s]
           end.map { |el|
       unless String === el || el.respond_to?(:value) && String === el.value
-        raise ArgumentError.new("cbor-diagnostic: #{app_prefix}<<>>: #{el.cbor_diagnostic} not a string: Argument Error")
+        raise ArgumentError.new("cbor-diagnostic: #{prefix}<<>>: #{el.cbor_diagnostic} not a string: Argument Error")
       end
       el.b
     }.join.b # .b needed so empty array becomes byte string, too
@@ -20,13 +20,13 @@ class CBOR_DIAG::Helper
 end
 
 class CBOR_DIAG::App_b1
-  def self.decode(app_prefix, s)
-    CBOR_DIAG::Helper.decode_string(app_prefix, s, false)
+  def self.decode(prefix, s)
+    CBOR_DIAG::Helper.decode_string(prefix, s, false)
   end
 end
 
 class CBOR_DIAG::App_t1
-  def self.decode(app_prefix, s)
-    CBOR_DIAG::Helper.decode_string(app_prefix, s, true)
+  def self.decode(prefix, s)
+    CBOR_DIAG::Helper.decode_string(prefix, s, true)
   end
 end

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

@@ -1,13 +1,13 @@
 require "cbor-diagnostic-app/0"
 
 class CBOR_DIAG::App_zzz
-  def self.decode(app_prefix, s)
-    CBOR::Tagged.new(999, [app_prefix, s])
+  def self.decode(prefix, s)
+    CBOR::Tagged.new(999, [prefix, s])
   end
 end
 
 class CBOR_DIAG::App_yyy
-  def self.decode(app_prefix, s)
-    CBOR::Tagged.new(999, [app_prefix, s])
+  def self.decode(prefix, s)
+    CBOR::Tagged.new(999, [prefix, s])
   end
 end

data/lib/edn-abnf.rb

@@ -5,6 +5,7 @@ class EDN
   @@parser = EDNGRAMMARParser.new
 
   def self.reason(parser, s)
+    s = s.to_str
     reason = [parser.failure_reason]
     parser.failure_reason =~ /^(Expected .+) after ./m
     expected = $1
@@ -16,7 +17,16 @@ class EDN
     reason.join("\n")
   end
 
+  def self.to_one_string(prefix, s)
+    begin
+      s.to_str
+    rescue NoMethodError => e
+      raise ArgumentError.new("cbor-diagnostic #{prefix}<<>>: #{e}: #{s.inspect}")
+    end
+  end
+
   def self.from_edn(s)
+    s = s.to_str
     ast = @@parser.parse s
     if !ast
       raise ArgumentError, "Parse Error:\n" << self.reason(@@parser, s)

data/lib/parser/edn-util.rb

@@ -112,8 +112,8 @@ class Treetop::Runtime::SyntaxNode
 end
 
 # MTI app-extensions:
-require 'cbor-diagnostic-app/h'
-require 'cbor-diagnostic-app/b64'
-require 'cbor-diagnostic-app/dt'
-require 'cbor-diagnostic-app/ip'
-require 'cbor-diagnostic-app/t1_b1'
+require_relative '../cbor-diagnostic-app/h'
+require_relative '../cbor-diagnostic-app/b64'
+require_relative '../cbor-diagnostic-app/dt'
+require_relative '../cbor-diagnostic-app/ip'
+require_relative '../cbor-diagnostic-app/t1_b1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.41
+  version: 0.5.43
 platform: ruby
 authors:
 - Carsten Bormann