toml-rb 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2a2f012c91d9664b1c1656ed84aa47e1011223a2d7bad0504fe809cf71a7ea
-  data.tar.gz: 7db3fb54e407e205089396c79cd2f418ed54ffd88ad3d5b03e404132f2ec9756
+  metadata.gz: ea53f790d0b22319d57007c11b9d585bce92d0cbd1f97a7340fec49d03804271
+  data.tar.gz: 1e2e02260452b5dbd94eeeb9268116e64fed6d7f974b99f853d2cdd28cbd8fa7
 SHA512:
-  metadata.gz: 56ae22471a087c85acd872a7f7f354c4cdf0c430654d8bdfc277911015a94312960e22b82f79f7f772f62d0e73a8bb3faab8f2b7b7cc688a75343ea5fbef9fa9
-  data.tar.gz: 72d80c5c8713fd40d50e9863d3ea684c0999c991c050a4db0ba49f9a9db5fe0c6f373646b4256ca62127be54626582ba15ac2e492da0930103f9d62dbf4681dc
+  metadata.gz: aaad1b4cd6379c6b1a66ce385b442d3fa1c068b985ba374d6c526bbd441b0c1fd4014c12eec523b2ca745b00d43e943c470fef3fcd79c132cc76882f4c2f87c2
+  data.tar.gz: e979b29743c71fe8ebb48afcbe1bc70129ed8a5f8df911bf812663af9983f4fee31388b2b4d030df0b8413b26832815d313c080b9c3e3d9e362414d47f9904bd

data/README.md

@@ -1,14 +1,17 @@
+![TOML Logo](https://github.com/toml-lang/toml/blob/master/logos/toml-100.png)
+
+
 toml-rb
 =======
 
 [![Gem Version](https://badge.fury.io/rb/toml-rb.svg)](http://badge.fury.io/rb/toml-rb)
-[![Build Status](https://travis-ci.org/emancu/toml-rb.svg)](https://travis-ci.org/emancu/toml-rb)
+[![Build Status](https://github.com/emancu/toml-rb/actions/workflows/ruby.yml/badge.svg)](https://github.com/emancu/toml-rb/actions/workflows/ruby.yml)
 [![Code Climate](https://codeclimate.com/github/emancu/toml-rb/badges/gpa.svg)](https://codeclimate.com/github/emancu/toml-rb)
 [![RubyGem](https://img.shields.io/gem/dt/toml-rb.svg)](https://rubygems.org/gems/toml-rb)
 
 A [TOML](https://github.com/toml-lang/toml) parser using [Citrus](http://mjackson.github.io/citrus) library.
 
-TOML specs supported: `0.4.0`
+TOML specs supported: `0.5.0`
 
 Installation
 ------------

data/lib/toml-rb/array.rb

@@ -2,7 +2,7 @@ module TomlRB
   module ArrayParser
     def value
       elements = captures[:array_elements].first
-      return elements ? elements.value : []
+      elements ? elements.value : []
     end
   end
 end

data/lib/toml-rb/datetime.rb

@@ -14,7 +14,7 @@ module TomlRB
     def value
       year, mon, day = captures[:date_skeleton].first.value
       hour, min, sec, sec_frac = captures[:time_skeleton].first.value
-      usec = sec_frac.to_s.ljust(6, '0')
+      usec = sec_frac.to_s.ljust(6, "0")
 
       Time.local(year, mon, day, hour, min, sec, usec)
     end
@@ -23,16 +23,16 @@ module TomlRB
   module LocalDateParser
     def value
       year, mon, day = captures[:date_skeleton].first.value
-      Time.local(year,mon,day)
+      Time.local(year, mon, day)
     end
   end
 
   module LocalTimeParser
     def value
       hour, min, sec, sec_frac = captures[:time_skeleton].first.value
-      usec = sec_frac.to_s.ljust(6, '0')
+      usec = sec_frac.to_s.ljust(6, "0")
 
       Time.at(3600 * hour.to_i + 60 * min.to_i + sec.to_i, usec.to_i)
     end
   end
-end
+end

data/lib/toml-rb/dumper.rb

@@ -1,11 +1,13 @@
-require 'date'
+# frozen_string_literal: true
+
+require "date"
 
 module TomlRB
   class Dumper
     attr_reader :toml_str
 
     def initialize(hash)
-      @toml_str = ''
+      @toml_str = ""
 
       visit(hash, [])
     end
@@ -53,7 +55,7 @@ module TomlRB
     def dump_simple_pairs(simple_pairs)
       simple_pairs.each do |key, val|
         key = quote_key(key) unless bare_key? key
-        @toml_str << "#{key} = #{to_toml(val)}\n"
+        @toml_str += "#{key} = #{to_toml(val)}\n"
       end
     end
 
@@ -80,21 +82,21 @@ module TomlRB
     end
 
     def print_prefix(prefix, extra_brackets = false)
-      new_prefix = prefix.join('.')
-      new_prefix = '[' + new_prefix + ']' if extra_brackets
+      new_prefix = prefix.join(".")
+      new_prefix = "[" + new_prefix + "]" if extra_brackets
 
       @toml_str += "[" + new_prefix + "]\n"
     end
 
     def to_toml(obj)
       if obj.is_a?(Time) || obj.is_a?(DateTime)
-        obj.strftime('%Y-%m-%dT%H:%M:%SZ')
+        obj.strftime("%Y-%m-%dT%H:%M:%SZ")
       elsif obj.is_a?(Date)
-        obj.strftime('%Y-%m-%d')
+        obj.strftime("%Y-%m-%d")
       elsif obj.is_a? Regexp
         obj.inspect.inspect
       elsif obj.is_a? String
-        obj.inspect.gsub(/\\(#[@{])/, '\1')
+        obj.inspect.gsub(/\\(#[$@{])/, '\1')
       else
         obj.inspect
       end

data/lib/toml-rb/grammars/document.citrus

@@ -15,7 +15,7 @@ grammar TomlRB::Document
   end
 
   rule keyvalue
-    (stripped_key '=' space? v:(toml_values) comment?) <TomlRB::KeyvalueParser>
+    (stripped_key '=' space? v:(toml_values) comment? space) <TomlRB::KeyvalueParser>
   end
 
   rule inline_table

data/lib/toml-rb/grammars/helper.citrus

@@ -12,6 +12,6 @@ grammar TomlRB::Helper
   end
 
   rule line_break
-    (space? "\n" | space? "\r\n") { nil }
+    (space "\n" space | space "\r\n" space) { nil }
   end
 end

data/lib/toml-rb/inline_table.rb

@@ -8,7 +8,7 @@ module TomlRB
       value keyvalue.symbolize_keys
     end
 
-    def value(symbolize_keys=false)
+    def value(symbolize_keys = false)
       result = {}
       @pairs.each do |kv|
         update = kv.assign({}, [], symbolize_keys)

data/lib/toml-rb/keyvalue.rb

@@ -14,12 +14,12 @@ module TomlRB
       @symbolize_keys = symbolize_keys
       dotted_keys_str = @dotted_keys.join(".")
       keys = symbolize_keys ? @dotted_keys.map(&:to_sym) : @dotted_keys
-      update = keys.reverse.inject(visit_value @value) { |k1, k2| { k2 => k1 } }
+      update = keys.reverse.inject(visit_value(@value)) { |k1, k2| {k2 => k1} }
 
       if @value.is_a?(InlineTable)
         fully_defined_keys << dotted_keys_str
         hash.merge!(update) { |key, _, _| fail ValueOverwriteError.new(key) }
-      elsif fully_defined_keys.find{|k| update.dig(*k)}
+      elsif fully_defined_keys.find { |k| update.dig(*k) }
         hash.merge!(update) { |key, _, _| fail ValueOverwriteError.new(key) }
       else
         dotted_key_merge(hash, update)
@@ -48,6 +48,7 @@ module TomlRB
       a_value.accept_visitor self
     end
   end
+
   # Used in document.citrus
   module KeyvalueParser
     def value

data/lib/toml-rb/parser.rb

@@ -2,12 +2,12 @@ module TomlRB
   class Parser
     attr_reader :hash
 
-    def initialize(content, options = {})
+    def initialize(content, symbolize_keys: false)
       @hash = {}
       @visited_keys = []
       @fully_defined_keys = []
       @current = @hash
-      @symbolize_keys = options[:symbolize_keys]
+      @symbolize_keys = symbolize_keys
 
       begin
         parsed = TomlRB::Document.parse(content)

data/lib/toml-rb/string.rb

@@ -2,14 +2,14 @@ module TomlRB
   # Used in primitive.citrus
   module BasicString
     SPECIAL_CHARS = {
-      '\\0'  => "\0",
-      '\\t'  => "\t",
-      '\\b'  => "\b",
-      '\\f'  => "\f",
-      '\\n'  => "\n",
-      '\\r'  => "\r",
-      '\\"'  => '"',
-      '\\\\' => '\\'
+      "\\0" => "\0",
+      "\\t" => "\t",
+      "\\b" => "\b",
+      "\\f" => "\f",
+      "\\n" => "\n",
+      "\\r" => "\r",
+      '\\"' => '"',
+      "\\\\" => "\\"
     }.freeze
 
     def value
@@ -21,7 +21,7 @@ module TomlRB
     # Replace the unicode escaped characters with the corresponding character
     # e.g. \u03B4 => ?
     def self.decode_unicode(str)
-      [str[2..-1].to_i(16)].pack('U')
+      [str[2..-1].to_i(16)].pack("U")
     end
 
     def self.transform_escaped_chars(str)
@@ -29,7 +29,7 @@ module TomlRB
         if m.size == 2
           SPECIAL_CHARS[m] || parse_error(m)
         else
-          decode_unicode(m).force_encoding('UTF-8')
+          decode_unicode(m).force_encoding("UTF-8")
         end
       end
     end
@@ -47,11 +47,11 @@ module TomlRB
 
   module MultilineString
     def value
-      return '' if captures[:text].empty?
+      return "" if captures[:text].empty?
       aux = captures[:text].first.value
 
       # Remove spaces on multilined Singleline strings
-      aux.gsub!(/\\\r?\n[\n\t\r ]*/, '')
+      aux.gsub!(/\\\r?\n[\n\t\r ]*/, "")
 
       TomlRB::BasicString.transform_escaped_chars aux
     end
@@ -59,10 +59,10 @@ module TomlRB
 
   module MultilineLiteral
     def value
-      return '' if captures[:text].empty?
+      return "" if captures[:text].empty?
       aux = captures[:text].first.value
 
-      aux.gsub(/\\\r?\n[\n\t\r ]*/, '')
+      aux.gsub(/\\\r?\n[\n\t\r ]*/, "")
     end
   end
 end

data/lib/toml-rb/table.rb

@@ -18,18 +18,20 @@ module TomlRB
       current
     end
 
-    # Fail if the key was already defined with a ValueOverwriteError
-    def ensure_key_not_defined(visited_keys)
-      fail ValueOverwriteError.new(full_key) if visited_keys.include?(full_key)
-      visited_keys << full_key
-    end
-
     def accept_visitor(parser)
       parser.visit_table self
     end
 
     def full_key
-      @dotted_keys.join('.')
+      @dotted_keys.join(".")
+    end
+
+    private
+
+    # Fail if the key was already defined with a ValueOverwriteError
+    def ensure_key_not_defined(visited_keys)
+      fail ValueOverwriteError.new(full_key) if visited_keys.include?(full_key)
+      visited_keys << full_key
     end
   end
 

data/lib/toml-rb/table_array.rb

@@ -5,7 +5,7 @@ module TomlRB
     end
 
     def navigate_keys(hash, symbolize_keys = false)
-      current = hash 
+      current = hash
       keys = symbolize_keys ? @dotted_keys.map(&:to_sym) : @dotted_keys
       last_key = keys.pop
 
@@ -24,7 +24,7 @@ module TomlRB
       # Define Table Array
       if current[last_key].is_a? Hash
         fail TomlRB::ParseError,
-             "#{last_key} was defined as hash but is now redefined as a table!"
+          "#{last_key} was defined as hash but is now redefined as a table!"
       end
       current[last_key] = [] unless current[last_key]
       current[last_key] << {}
@@ -37,7 +37,7 @@ module TomlRB
     end
 
     def full_key
-      @dotted_keys.join('.')
+      @dotted_keys.join(".")
     end
   end
 

data/lib/toml-rb/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module TomlRB
+  VERSION = "2.1.1"
+end

data/lib/toml-rb.rb

@@ -1,4 +1,4 @@
-require 'citrus'
+require "citrus"
 
 require_relative "toml-rb/errors"
 require_relative "toml-rb/array"
@@ -11,18 +11,18 @@ require_relative "toml-rb/keyvalue"
 require_relative "toml-rb/parser"
 require_relative "toml-rb/dumper"
 
-ROOT = File.dirname(File.expand_path(__FILE__))
-Citrus.load "#{ROOT}/toml-rb/grammars/helper.citrus"
-Citrus.load "#{ROOT}/toml-rb/grammars/primitive.citrus"
-Citrus.load "#{ROOT}/toml-rb/grammars/array.citrus"
-Citrus.load "#{ROOT}/toml-rb/grammars/document.citrus"
+File.dirname(File.expand_path(__FILE__)).tap do |root|
+  Citrus.load "#{root}/toml-rb/grammars/helper.citrus"
+  Citrus.load "#{root}/toml-rb/grammars/primitive.citrus"
+  Citrus.load "#{root}/toml-rb/grammars/array.citrus"
+  Citrus.load "#{root}/toml-rb/grammars/document.citrus"
+end
 
 module TomlRB
   # Public: Returns a hash from *TomlRB* content.
   #
-  # content - TomlRB string to be parsed.
-  # options - The Hash options used to refine the parser (default: {}):
-  #           :symbolize_keys - true|false (optional).
+  # content         - TomlRB string to be parsed.
+  # :symbolize_keys - true | false (default: false).
   #
   #
   # Examples
@@ -43,15 +43,14 @@ module TomlRB
   # Returns a Ruby hash representation of the content according to TomlRB spec.
   # Raises ValueOverwriteError if a key is overwritten.
   # Raises ParseError if the content has invalid TomlRB.
-  def self.parse(content, options = {})
-    Parser.new(content, options).hash
+  def self.parse(content, symbolize_keys: false)
+    Parser.new(content, symbolize_keys: symbolize_keys).hash
   end
 
   # Public: Returns a hash from a *TomlRB* file.
   #
-  # path    - TomlRB File path
-  # options - The Hash options used to refine the parser (default: {}):
-  #           :symbolize_keys - true|false (optional).
+  # path            - TomlRB File path
+  # :symbolize_keys - true|false (optional).
   #
   #
   # Examples
@@ -68,8 +67,8 @@ module TomlRB
   # Raises ParseError if the content has invalid TomlRB.
   # Raises Errno::ENOENT if the file cannot be found.
   # Raises Errno::EACCES if the file cannot be accessed.
-  def self.load_file(path, options = {})
-    TomlRB.parse(File.read(path), options)
+  def self.load_file(path, symbolize_keys: false)
+    TomlRB.parse(File.read(path), symbolize_keys: symbolize_keys)
   end
 
   # Public: Returns a *TomlRB* string from a Ruby Hash.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,28 +9,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'A Toml parser using Citrus parsing library. '
 email:
 - emiliano.mancuso@gmail.com
@@ -56,6 +98,7 @@ files:
 - lib/toml-rb/string.rb
 - lib/toml-rb/table.rb
 - lib/toml-rb/table_array.rb
+- lib/toml-rb/version.rb
 homepage: https://github.com/emancu/toml-rb
 licenses:
 - MIT
@@ -75,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: Toml parser in ruby, for ruby.