kdl 2.0.0 → 2.0.1

data/lib/kdl/types/url_template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module KDL
@@ -39,7 +41,7 @@ module KDL
         end
 
         def next_token
-          buffer = ''
+          buffer = +''
           context = nil
           expansion_type = nil
           loop do
@@ -49,7 +51,7 @@ module KDL
               case c
               when '{'
                 context = :expansion
-                buffer = ''
+                buffer = +''
                 n = @string[@index + 1]
                 expansion_type = case n
                                  when '+' then ReservedExpansion
@@ -64,7 +66,7 @@ module KDL
                 @index += (expansion_type == StringExpansion ? 1 : 2)
               when nil then return nil
               else
-                buffer = c
+                buffer = +c
                 @index += 1
                 context = :literal
               end

data/lib/kdl/types/uuid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
     class UUID < Value::Custom

data/lib/kdl/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module Types
     MAPPING = {}

data/lib/kdl/v1/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module V1
     class Document < ::KDL::Document

data/lib/kdl/v1/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module V1
     class Node < ::KDL::Node

data/lib/kdl/v1/string_dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module V1
     module StringDumper

data/lib/kdl/v1/tokenizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module V1
     class Tokenizer < KDL::Tokenizer
@@ -17,14 +19,14 @@ module KDL
             case c
             when '"'
               self.context = :string
-              @buffer = ''
+              @buffer = +''
               traverse(1)
             when 'r'
               if @str[@index + 1] == '"'
                 self.context = :rawstring
                 traverse(2)
                 @rawstring_hashes = 0
-                @buffer = ''
+                @buffer = +''
                 next
               elsif @str[@index + 1] == '#'
                 i = @index + 1
@@ -36,12 +38,12 @@ module KDL
                 if @str[i] == '"'
                   self.context = :rawstring
                   @index = i + 1
-                  @buffer = ''
+                  @buffer = +''
                   next
                 end
               end
               self.context = :ident
-              @buffer = c
+              @buffer = +c
               traverse(1)
             when '-'
               n = self[@index + 1]
@@ -58,16 +60,16 @@ module KDL
                 self.context = :ident
                 traverse(1)
               end
-              @buffer = c
+              @buffer = +c
             when /[0-9+]/
               n = self[@index + 1]
               if c == '0' && n =~ /[box]/
                 traverse(2)
-                @buffer = ''
+                @buffer = +''
                 self.context = integer_context(n)
               else
                 self.context = :decimal
-                @buffer = c
+                @buffer = +c
                 traverse(1)
               end
             when '\\'
@@ -76,16 +78,16 @@ module KDL
               if la[0] == :NEWLINE || la[0] == :EOF || (la[0] == :WS && (lan = t.next_token[0]) == :NEWLINE || lan == :EOF)
                 traverse_to(t.index)
                 @buffer = "#{c}#{la[1].value}"
-                @buffer += "\n" if lan == :NEWLINE
+                @buffer << "\n" if lan == :NEWLINE
                 self.context = :whitespace
               else
                 raise_error "Unexpected '\\' (#{la[0]})"
               end
             when *SYMBOLS.keys
-              return token(SYMBOLS[c], c).tap { traverse(1) }
+              return token(SYMBOLS[c], -c).tap { traverse(1) }
             when *NEWLINES, "\r"
               nl = expect_newline
-              return token(:NEWLINE, nl).tap do
+              return token(:NEWLINE, -nl).tap do
                 traverse(nl.length)
               end
             when "/"
@@ -100,12 +102,12 @@ module KDL
                 return token(:SLASHDASH, '/-').tap { traverse(2) }
               else
                 self.context = :ident
-                @buffer = c
+                @buffer = +c
                 traverse(1)
               end
             when *WHITESPACE
               self.context = :whitespace
-              @buffer = c
+              @buffer = +c
               traverse(1)
             when nil
               return [false, token(:EOF, :EOF)[1]] if @done
@@ -114,14 +116,14 @@ module KDL
               return token(:EOF, :EOF)
             when INITIAL_IDENTIFIER_CHARS
               self.context = :ident
-              @buffer = c
+              @buffer = +c
               traverse(1)
             when '('
               @type_context = true
-              return token(:LPAREN, c).tap { traverse(1) }
+              return token(:LPAREN, -c).tap { traverse(1) }
             when ')'
               @type_context = false
-              return token(:RPAREN, c).tap { traverse(1) }
+              return token(:RPAREN, -c).tap { traverse(1) }
             else
               raise_error "Unexpected character #{c.inspect}"
             end
@@ -129,13 +131,13 @@ module KDL
             case c
             when IDENTIFIER_CHARS
               traverse(1)
-              @buffer += c
+              @buffer << c
             else
               case @buffer
               when 'true'  then return token(:TRUE, true)
               when 'false' then return token(:FALSE, false)
               when 'null'  then return token(:NULL, nil)
-              else return token(:IDENT, @buffer)
+              else return token(:IDENT, -@buffer)
               end
             end
           when :string
@@ -149,16 +151,16 @@ module KDL
                 end
                 traverse(i)
               else
-                @buffer += c
-                @buffer += c2
+                @buffer << c
+                @buffer << c2
                 traverse(2)
               end
             when '"'
-              return token(:STRING, unescape(@buffer)).tap { traverse(1) }
+              return token(:STRING, -unescape(@buffer)).tap { traverse(1) }
             when nil
               raise_error "Unterminated string literal"
             else
-              @buffer += c
+              @buffer << c
               traverse(1)
             end
           when :rawstring
@@ -168,17 +170,17 @@ module KDL
               h = 0
               h += 1 while self[@index + 1 + h] == '#' && h < @rawstring_hashes
               if h == @rawstring_hashes
-                return token(:RAWSTRING, @buffer).tap { traverse(1 + h) }
+                return token(:RAWSTRING, -@buffer).tap { traverse(1 + h) }
               end
             end
 
-            @buffer += c
+            @buffer << c
             traverse(1)
           when :decimal
             case c
             when /[0-9.\-+_eE]/
               traverse(1)
-              @buffer += c
+              @buffer << c
             else
               return parse_decimal(@buffer)
             end
@@ -186,7 +188,7 @@ module KDL
             case c
             when /[0-9a-fA-F_]/
               traverse(1)
-              @buffer += c
+              @buffer << c
             else
               return parse_hexadecimal(@buffer)
             end
@@ -194,7 +196,7 @@ module KDL
             case c
             when /[0-7_]/
               traverse(1)
-              @buffer += c
+              @buffer << c
             else
               return parse_octal(@buffer)
             end
@@ -202,7 +204,7 @@ module KDL
             case c
             when /[01_]/
               traverse(1)
-              @buffer += c
+              @buffer << c
             else
               return parse_binary(@buffer)
             end
@@ -234,7 +236,7 @@ module KDL
           when :whitespace
             if WHITESPACE.include?(c)
               traverse(1)
-              @buffer += c
+              @buffer << c
             elsif c == "/" && self[@index + 1] == '*'
               self.context = :multi_line_comment
               @comment_nesting = 1
@@ -244,13 +246,13 @@ module KDL
               la = t.next_token
               if la[0] == :NEWLINE || la[0] == :EOF || (la[0] == :WS && (lan = t.next_token[0]) == :NEWLINE || lan == :EOF)
                 traverse_to(t.index)
-                @buffer += "#{c}#{la[1].value}"
-                @buffer += "\n" if lan == :NEWLINE
+                @buffer << "#{c}#{la[1].value}"
+                @buffer << "\n" if lan == :NEWLINE
               else
                 raise_error "Unexpected '\\' (#{la[0]})"
               end
             else
-              return token(:WS, @buffer)
+              return token(:WS, -@buffer)
             end
           else
             # :nocov:

data/lib/kdl/v1/value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   module V1
     class Value < ::KDL::Value

data/lib/kdl/v1.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "kdl/v1/tokenizer"
 require "kdl/v1/document"
 require "kdl/v1/value"

data/lib/kdl/value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
   class Value
     attr_reader :value, :format, :type
@@ -84,9 +86,10 @@ module KDL
         return super.upcase unless value.is_a?(BigDecimal)
 
         sign, digits, _, exponent = value.split
-        s = sign.negative? ? '-' : ''
-        s += "#{digits[0]}.#{digits[1..-1]}"
-        s += "E#{exponent.negative? ? '' : '+'}#{exponent - 1}"
+        s = +''
+        s << '-' if sign.negative?
+        s << "#{digits[0]}.#{digits[1..-1]}"
+        s << "E#{exponent.negative? ? '' : '+'}#{exponent - 1}"
         s
       end
 

data/lib/kdl/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KDL
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/kdl.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require "kdl/version"
+require "kdl/error"
 require "kdl/tokenizer"
 require "kdl/document"
 require "kdl/value"
@@ -26,8 +29,10 @@ module KDL
       Parser.new(output_module: output_module(output_version || 2), **options).parse(input)
     when 1
       V1::Parser.new.parse(input, output_module: output_module(output_version || 1), **options)
-    else
+    when nil
       auto_parse(input, output_version:, **options)
+    else
+      raise UnsupportedVersionError.new("Unsupported version '#{version}'", version)
     end
   end
 
@@ -37,7 +42,9 @@ module KDL
 
   def self.auto_parse(input, output_version: default_output_version, **options)
     parse(input, version: 2, output_version: output_version || 2, **options)
-  rescue => e
+  rescue VersionMismatchError => e
+    parse(input, version: e.version, output_version: output_version || e.version, **options)
+  rescue Tokenizer::Error, Racc::ParseError => e
     parse(input, version: 1, output_version: output_version || 1, **options) rescue raise e
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kdl
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Danielle Smith
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -89,6 +88,7 @@ files:
 - kdl.gemspec
 - lib/kdl.rb
 - lib/kdl/document.rb
+- lib/kdl/error.rb
 - lib/kdl/kdl.tab.rb
 - lib/kdl/kdl.yy
 - lib/kdl/node.rb
@@ -134,7 +134,6 @@ metadata:
   homepage_uri: https://kdl.dev
   source_code_uri: https://github.com/danini-the-panini/kdl-rb
   changelog_uri: https://github.com/danini-the-panini/kdl-rb/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: KDL Document Language
 test_files: []