tomlrb 2.0.3 → 2.0.5

data/lib/tomlrb/handler.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Tomlrb
   class Handler
     attr_reader :output, :symbolize_keys
@@ -58,7 +60,7 @@ module Tomlrb
     def assign(k)
       @keys.add_pair_key k, @current_table
       current = @current
-      while key = k.shift
+      while (key = k.shift)
         key = key.to_sym if @symbolize_keys
         current = assign_key_path(current, key, k.empty?)
       end
@@ -70,16 +72,21 @@ module Tomlrb
 
     def push_inline(inline_arrays)
       merged_inline = {}
+      keys = Keys.new
 
       inline_arrays.each do |inline_array|
         current = merged_inline
         value = inline_array.pop
+        keys.add_table_key inline_array, value.is_a?(Array)
+
         inline_array.each_with_index do |inline_key, inline_index|
           inline_key = inline_key.to_sym if @symbolize_keys
           last_key = inline_index == inline_array.size - 1
 
           if last_key
             if current[inline_key].nil?
+              keys.add_pair_key [inline_key], []
+
               current[inline_key] = value
             else
               raise Key::KeyConflict, "Inline key #{inline_key} is already used"
@@ -102,6 +109,7 @@ module Tomlrb
       array = []
       while (value = @stack.pop) != [type]
         raise ParseError, 'Unclosed table' if @stack.empty?
+
         array.unshift(value)
       end
       array
@@ -116,15 +124,18 @@ module Tomlrb
     private
 
     def assign_key_path(current, key, key_emptied)
+      existed = current.key?(key)
+      raise ParseError, "Cannot overwrite value with key #{key}" if existed && !current[key].is_a?(Hash)
       if key_emptied
+        raise ParseError, "Cannot overwrite value with key #{key}" unless current.is_a?(Hash)
 
-        raise ParseError, "Cannot overwrite value with key #{key}" unless current.kind_of?(Hash)
-        current[key] = @stack.pop
+        value = @stack.pop
+        raise ParseError, "Cannot overwrite value with key #{key}" if current[key].is_a?(Hash) && !value.is_a?(Hash)
+        current[key] = value
         return current
       end
       current[key] ||= {}
-      current = current[key]
-      current
+      current[key]
     end
   end
 
@@ -153,10 +164,10 @@ module Tomlrb
     def append_table_keys(current, table_keys, pair_keys_empty, is_array_of_tables)
       table_keys.each_with_index do |key, index|
         declared = (index == table_keys.length - 1) && pair_keys_empty
-        if index == 0
+        if index.zero?
           current = find_or_create_first_table_key(current, key, declared, is_array_of_tables)
         else
-          current = current << [key, :table, declared, is_array_of_tables]
+          current <<= [key, :table, declared, is_array_of_tables]
         end
       end
 
@@ -173,6 +184,7 @@ module Tomlrb
         raise Key::KeyConflict, "Key #{key} is already used"
       end
       k = existed || Key.new(key, :table, declared)
+      k.declared = k.declared? || declared
       current[key] = k
       k
     end
@@ -180,7 +192,7 @@ module Tomlrb
     def append_pair_keys(current, pair_keys, table_keys_empty, is_array_of_tables)
       pair_keys.each_with_index do |key, index|
         declared = index == pair_keys.length - 1
-        if index == 0 && table_keys_empty
+        if index.zero? && table_keys_empty
           current = find_or_create_first_pair_key(current, key, declared, table_keys_empty)
         else
           key = current << [key, :pair, declared, is_array_of_tables]
@@ -204,6 +216,7 @@ module Tomlrb
     class KeyConflict < ParseError; end
 
     attr_reader :key, :type
+    attr_writer :declared
 
     def initialize(key, type, declared = false)
       @key = key
@@ -233,32 +246,32 @@ module Tomlrb
 
     private
 
-    def validate_already_declared_as_different_key(type, declared, existed)
+    def validate_already_declared_as_different_key(type, _declared, existed)
       if existed && existed.declared? && existed.type != type
         raise KeyConflict, "Key #{existed.key} is already used as #{existed.type} key"
       end
     end
 
     def validate_already_declared_as_non_array_table(type, is_array_of_tables, declared, existed)
-      if declared && type == :table && existed && existed.declared? && ! is_array_of_tables
+      if declared && type == :table && existed && existed.declared? && !is_array_of_tables
         raise KeyConflict, "Key #{existed.key} is already used"
       end
     end
 
     def validate_path_already_created_as_different_type(type, declared, existed)
-      if declared && (type == :table) && existed && (existed.type == :pair) && (! existed.declared?)
+      if declared && (type == :table) && existed && (existed.type == :pair) && !existed.declared?
         raise KeyConflict, "Key #{existed.key} is already used as #{existed.type} key"
       end
     end
 
     def validate_path_already_declared_as_different_type(type, declared, existed)
-      if ! declared && (type == :pair) && existed && (existed.type == :pair) && existed.declared?
+      if !declared && (type == :pair) && existed && (existed.type == :pair) && existed.declared?
         raise KeyConflict, "Key #{key} is already used as #{type} key"
       end
     end
 
     def validate_already_declared_as_same_key(declared, existed)
-      if existed && ! existed.declared? && declared
+      if existed && !existed.declared? && declared
         raise KeyConflict, "Key #{existed.key} is already used as #{existed.type} key"
       end
     end

data/lib/tomlrb/local_date.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'forwardable'
 
 module Tomlrb
@@ -7,12 +9,13 @@ module Tomlrb
     def_delegators :@time, :year, :month, :day
 
     def initialize(year, month, day)
-      @time = Time.new(year, month, day, 0, 0, 0, '-00:00')
+      @time = Time.utc(year, month, day, 0, 0, 0)
+      raise ArgumentError, "Invalid Local Date: #{year}-#{month}-#{day}" unless day.to_i == @time.day && month.to_i == @time.month && year.to_i == @time.year
     end
 
     # @param offset see {LocalDateTime#to_time}
     # @return [Time] 00:00:00 of the date
-    def to_time(offset='-00:00')
+    def to_time(offset = '-00:00')
       return @time if offset == '-00:00'
       Time.new(year, month, day, 0, 0, 0, offset)
     end
@@ -22,12 +25,12 @@ module Tomlrb
     end
 
     def ==(other)
-      other.kind_of?(self.class) &&
+      other.is_a?(self.class) &&
         to_time == other.to_time
     end
 
     def inspect
-      "#<#{self.class}: #{to_s}>"
+      "#<#{self.class}: #{self}>"
     end
   end
 end

data/lib/tomlrb/local_date_time.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'forwardable'
 
 module Tomlrb
@@ -7,7 +9,9 @@ module Tomlrb
     def_delegators :@time, :year, :month, :day, :hour, :min, :sec, :usec, :nsec
 
     def initialize(year, month, day, hour, min, sec) # rubocop:disable Metrics/ParameterLists
-      @time = Time.new(year, month, day, hour, min, sec, '-00:00')
+      @time = Time.utc(year, month, day, hour, min, sec)
+      raise ArgumentError, "Invalid Local Date-Time: #{year}-#{month}-#{day}T#{hour}:#{min}:#{sec}" unless min.to_i == @time.min && hour.to_i == @time.hour && day.to_i == @time.day && month.to_i == @time.month && year.to_i == @time.year
+
       @sec = sec
     end
 
@@ -17,24 +21,24 @@ module Tomlrb
     #   * when +Numeric+, it is time zone offset in second.
     #   * when +nil+, local time zone offset is used.
     # @return [Time]
-    def to_time(offset='-00:00')
+    def to_time(offset = '-00:00')
       return @time if offset == '-00:00'
       Time.new(year, month, day, hour, min, @sec, offset)
     end
 
     def to_s
       frac = (@sec - sec)
-      frac_str = frac == 0 ? '' : "#{frac.to_s[1..-1]}"
-      @time.strftime("%FT%T") << frac_str
+      frac_str = frac.zero? ? '' : frac.to_s[1..-1]
+      @time.strftime('%FT%T') << frac_str
     end
 
     def ==(other)
-      other.kind_of?(self.class) &&
+      other.is_a?(self.class) &&
         to_time == other.to_time
     end
 
     def inspect
-      "#<#{self.class}: #{to_s}>"
+      "#<#{self.class}: #{self}>"
     end
   end
 end

data/lib/tomlrb/local_time.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'forwardable'
 
 module Tomlrb
@@ -7,7 +9,8 @@ module Tomlrb
     def_delegators :@time, :hour, :min, :sec, :usec, :nsec
 
     def initialize(hour, min, sec)
-      @time = Time.new(0, 1, 1, hour, min, sec, '-00:00')
+      @time = Time.utc(0, 1, 1, hour, min, sec)
+      raise ArgumentError, "Invalid Local Time: #{hour}-#{min}-#{sec}" unless min.to_i == @time.min && hour.to_i == @time.hour
       @sec = sec
     end
 
@@ -16,23 +19,23 @@ module Tomlrb
     # @param day [Integer]
     # @param offset see {LocalDateTime#to_time}
     # @return [Time] the time of the date specified by params
-    def to_time(year, month, day, offset='-00:00')
+    def to_time(year, month, day, offset = '-00:00')
       Time.new(year, month, day, hour, min, @sec, offset)
     end
 
     def to_s
       frac = (@sec - sec)
-      frac_str = frac == 0 ? '' : "#{frac.to_s[1..-1]}"
-      @time.strftime("%T") << frac_str
+      frac_str = frac.zero? ? '' : frac.to_s[1..-1]
+      @time.strftime('%T') << frac_str
     end
 
     def ==(other)
-      other.kind_of?(self.class) &&
+      other.is_a?(self.class) &&
         @time == other.to_time(0, 1, 1)
     end
 
     def inspect
-      "#<#{self.class}: #{to_s}>"
+      "#<#{self.class}: #{self}>"
     end
   end
 end

data/lib/tomlrb/parser.rb

@@ -1,4 +1,6 @@
-require "tomlrb/generated_parser"
+# frozen-string-literal: true
+
+require 'tomlrb/generated_parser'
 
 class Tomlrb::Parser < Tomlrb::GeneratedParser
 

data/lib/tomlrb/scanner.rb

@@ -1,25 +1,45 @@
+# frozen-string-literal: true
+
 require 'strscan'
 
 module Tomlrb
   class Scanner
-    COMMENT = /#[^\u0000-\u0008\u000A-\u001F\u007F]*/
-    IDENTIFIER = /[A-Za-z0-9_-]+/
-    SPACE = /[ \t]/
-    NEWLINE = /(?:[ \t]*(?:\r?\n)[ \t]*)+/
-    STRING_BASIC = /(["])(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/
-    STRING_MULTI = /"{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?(?<!\\)"{3,5})/m
-    STRING_LITERAL = /(['])(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/
-    STRING_LITERAL_MULTI = /'{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?'{3,5})/m
-    DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?))?(z|[-+]\d{2}:\d{2})?/i
-    LOCAL_TIME = /(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/
-    FLOAT = /[+-]?(?:(?:\d|[1-9](?:_?\d)*)\.\d(?:_?\d)*|\d+(?=[eE]))(?:[eE][+-]?[0-9]+(_[0-9])*[0-9]*)?(?!\w)/
-    FLOAT_KEYWORD = /[+-]?(?:inf|nan)\b/
-    INTEGER = /[+-]?([1-9](_?\d)*|0)(?![A-Za-z0-9_-]+)/
-    NON_DEC_INTEGER = /0(?:x[0-9A-Fa-f]+(?:_[0-9A-Fa-f])*[0-9A-Fa-f]*|o[0-7]+(?:_[0-7])*[0-7]*|b[01]+(?:_[01])*[01]*)/
-    BOOLEAN = /true|false/
-    SPACED_ARRAY_OF_TABLES_START = /^\[[ \t]+\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\]\]$/
-    SPACED_ARRAY_OF_TABLES_END = /^\[\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\][ \t]+\]$/
-    SPACED_ARRAY_OF_TABLES_BOTH = /^\[[ \t]+\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\][ \t]+\]$/
+    COMMENT =
+      /#[^\u0000-\u0008\u000A-\u001F\u007F]*/.freeze
+    IDENTIFIER =
+      /[A-Za-z0-9_-]+/.freeze
+    SPACE =
+      /[ \t]+/.freeze
+    NEWLINE =
+      /(?:[ \t]*(?:\r?\n)[ \t]*)+/.freeze
+    STRING_BASIC =
+      /"(?:[^\u0000-\u0008\u000A-\u001F\u007F"\\]|\\[^\u0000-\u0008\u000A-\u001F\u007F])*"/.freeze
+    STRING_MULTI =
+      /"{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?(?<!\\)"{3,5})/m.freeze
+    STRING_LITERAL =
+      /'[^\u0000-\u0008\u000A-\u001F\u007F']*'/.freeze
+    STRING_LITERAL_MULTI =
+      /'{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?'{3,5})/m.freeze
+    DATETIME =
+      /(-?\d{4})-([01]\d)-([0-3]\d)(?:(?:t|\s)([0-2]\d):([0-5]\d):([0-6]\d(?:\.\d+)?))?(z|[-+][01]\d:\d{2})?/i.freeze
+    LOCAL_TIME =
+      /([0-2]\d):([0-5]\d):([0-6]\d(?:\.\d+)?)/.freeze
+    FLOAT =
+      /[+-]?(?:(?:\d|[1-9](?:_?\d)*)\.\d(?:_?\d)*|\d+(?=[eE]))(?:[eE][+-]?[0-9]+(_[0-9])*[0-9]*)?(?!\w)/.freeze
+    FLOAT_KEYWORD =
+      /[+-]?(?:inf|nan)\b/.freeze
+    INTEGER =
+      /[+-]?([1-9](_?\d)*|0)(?![A-Za-z0-9_-]+)/.freeze
+    NON_DEC_INTEGER =
+      /0(?:x[0-9A-Fa-f](_?[0-9A-Fa-f])*|o[0-7](_?[0-7])*|b[01](_?[01])*)/.freeze
+    BOOLEAN =
+      /true|false/.freeze
+    SPACED_ARRAY_OF_TABLES_START =
+      /^\[[ \t]+\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\]\]$/.freeze
+    SPACED_ARRAY_OF_TABLES_END =
+      /^\[\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\][ \t]+\]$/.freeze
+    SPACED_ARRAY_OF_TABLES_BOTH =
+      /^\[[ \t]+\[(#{IDENTIFIER}|#{STRING_BASIC}|#{STRING_LITERAL}|#{INTEGER}|#{NON_DEC_INTEGER}|#{FLOAT_KEYWORD}|#{BOOLEAN})\][ \t]+\]$/.freeze
 
     def initialize(io)
       @ss = StringScanner.new(io.read)
@@ -29,9 +49,9 @@ module Tomlrb
     def next_token
       case
       when @ss.scan(NEWLINE) then [:NEWLINE, nil]
-      when @ss.scan(SPACED_ARRAY_OF_TABLES_START) then raise ParseError.new("Array of tables has spaces in starting brackets")
-      when @ss.scan(SPACED_ARRAY_OF_TABLES_END) then raise ParseError.new("Array of tables has spaces in ending brackets")
-      when @ss.scan(SPACED_ARRAY_OF_TABLES_BOTH) then raise ParseError.new("Array of tables has spaces in starting and ending brackets")
+      when @ss.scan(SPACED_ARRAY_OF_TABLES_START) then raise ParseError.new('Array of tables has spaces in starting brackets')
+      when @ss.scan(SPACED_ARRAY_OF_TABLES_END) then raise ParseError.new('Array of tables has spaces in ending brackets')
+      when @ss.scan(SPACED_ARRAY_OF_TABLES_BOTH) then raise ParseError.new('Array of tables has spaces in starting and ending brackets')
       when @ss.scan(SPACE) then next_token
       when @ss.scan(COMMENT) then next_token
       when @ss.scan(DATETIME) then process_datetime
@@ -52,15 +72,13 @@ module Tomlrb
     end
 
     def process_datetime
-      if @ss[7]
-        offset = @ss[7].gsub(/[zZ]/, '+00:00')
-      end
-      args = [@ss[1], @ss[2], @ss[3], @ss[4], @ss[5], @ss[6], offset]
+      offset = @ss[7].gsub(/[zZ]/, '+00:00') if @ss[7]
+      args = [@ss[0], @ss[1], @ss[2], @ss[3], @ss[4], @ss[5], @ss[6], offset]
       [:DATETIME, args]
     end
 
     def process_local_time
-      args = [@ss[1], @ss[2], @ss[3].to_f]
+      args = [@ss[0], @ss[1], @ss[2], @ss[3].to_f]
       [:LOCAL_TIME, args]
     end
 

data/lib/tomlrb/string_utils.rb

@@ -1,6 +1,7 @@
+# frozen-string-literal: true
+
 module Tomlrb
   class StringUtils
-
     SPECIAL_CHARS = {
       '\\t'  => "\t",
       '\\b'  => "\b",
@@ -12,13 +13,13 @@ module Tomlrb
     }.freeze
 
     def self.multiline_replacements(str)
-      strip_spaces(str).gsub(/\\+\s*\n\s*/) {|matched|
+      strip_spaces(str).gsub(/\\+\s*\n\s*/) do |matched|
         if matched.match(/\\+/)[0].length.odd?
           matched.gsub(/\\\s*\n\s*/, '')
         else
           matched
         end
-      }
+      end
     end
 
     def self.replace_escaped_chars(str)

data/lib/tomlrb/version.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Tomlrb
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.5'
 end

data/lib/tomlrb.rb

@@ -1,13 +1,15 @@
+# frozen-string-literal: true
+
 require 'time'
 require 'stringio'
-require "tomlrb/version"
+require 'tomlrb/version'
 require 'tomlrb/local_date_time'
 require 'tomlrb/local_date'
 require 'tomlrb/local_time'
 require 'tomlrb/string_utils'
-require "tomlrb/scanner"
-require "tomlrb/parser"
-require "tomlrb/handler"
+require 'tomlrb/scanner'
+require 'tomlrb/parser'
+require 'tomlrb/handler'
 
 module Tomlrb
   class ParseError < StandardError; end
@@ -41,7 +43,7 @@ module Tomlrb
     # By default Ruby sets the external encoding of an IO object to the
     # default external encoding. The default external encoding is set by
     # locale encoding or the interpreter -E option.
-    tmp = File.read(path, :encoding=>'utf-8')
+    tmp = File.read(path, encoding: 'utf-8')
     Tomlrb.parse(tmp, **options)
   end
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Francois Bernier
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
+        version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1.4'
 description: A racc based toml parser
 email:
 - frankbernier@gmail.com
@@ -39,7 +38,6 @@ files:
 - lib/tomlrb/local_date_time.rb
 - lib/tomlrb/local_time.rb
 - lib/tomlrb/parser.rb
-- lib/tomlrb/parser.y
 - lib/tomlrb/scanner.rb
 - lib/tomlrb/string_utils.rb
 - lib/tomlrb/version.rb
@@ -47,7 +45,6 @@ homepage: https://github.com/fbernier/tomlrb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A racc based toml parser
 test_files: []