Fix #47 and #70

.gems

@@ -1 +1,2 @@
 citrus -v 3.0.2
+minitest -v 5.7.0

Rakefile

@@ -1,5 +1,6 @@
-task :test do
-  Dir['test/*_test.rb'].each { |file| load file }
-end
+require 'rake/testtask'
 
+Rake::TestTask.new do |t|
+  t.pattern = 'test/*_test.rb'
+end
 task default: :test

init.rb

@@ -2,6 +2,7 @@
 
 ROOT = File.dirname(File.expand_path(__FILE__))
 
+require "#{ROOT}/lib/toml/errors"
 require "#{ROOT}/lib/toml/string"
 require "#{ROOT}/lib/toml/table_array"
 require "#{ROOT}/lib/toml/inline_table"

lib/toml/errors.rb

@@ -0,0 +1,17 @@
+module TOML
+  # Parent class for all TOML errors
+  Error = Class.new(StandardError)
+
+  # Error related to parsing.
+  ParseError = Class.new(Error)
+
+  # Overwrite error
+  class ValueOverwriteError < Error
+    attr_accessor :key
+
+    def initialize(key)
+      self.key = key
+      super "Key #{key.inspect} is defined more than once"
+    end
+  end
+end

lib/toml/grammars/document.citrus

@@ -7,11 +7,11 @@ grammar TOML::Document
   end
 
   rule table_array
-    (space? '[[' (space? key space? "."?)+ ']]' space? comment?) <TOML::TableArrayParser>
+    (space? '[[' ((key "."?)+|'"'(space? key space? "."?)+'"') ']]' space? comment?) <TOML::TableArrayParser>
   end
 
   rule keygroup
-    (space? '[' (space? key space? "."?)+ ']' space? comment?) <TOML::KeygroupParser>
+    (space? '[' ((key "."?)+|'"'(space? key space? "."?)+'"') ']' space? comment?) <TOML::KeygroupParser>
   end
 
   rule keyvalue

lib/toml/grammars/primitive.citrus

@@ -22,11 +22,11 @@ grammar TOML::Primitive
   end
 
   rule multiline_string
-    ('"""' line_break* text:~'"""' '"""' space) <TOML::MultilineString>
+    ('"""' line_break* (text:~'"""'|'') '"""' space) <TOML::MultilineString>
   end
 
   rule multiline_literal
-    ("'''" line_break* text:~"'''" "'''" space) <TOML::MultilineLiteral>
+    ("'''" line_break* (text:~"'''"|'') "'''" space) <TOML::MultilineLiteral>
   end
 
   ##

lib/toml/keygroup.rb

@@ -4,27 +4,32 @@ def initialize(nested_keys)
       @nested_keys = nested_keys
     end
 
-    def navigate_keys(hash, symbolize_keys = false)
-      last_index = @nested_keys.length - 1
-      @nested_keys.each_with_index do |key, i|
+    def navigate_keys(hash, visited_keys, symbolize_keys = false)
+      ensure_key_not_defined(visited_keys)
+      @nested_keys.each do |key|
         key = symbolize_keys ? key.to_sym : key
-        # do not allow to define more than once just the last key
-        if i == last_index && hash.key?(key)
-          fail ValueOverwriteError.new(key)
-        end
         hash[key] = {} unless hash.key?(key)
         element = hash[key]
         hash = element.is_a?(Array) ? element.last : element
         # check that key has not been defined before as a scalar value
         fail ValueOverwriteError.new(key) unless hash.is_a?(Hash)
       end
-
       hash
     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_keygroup self
     end
+
+    def full_key
+      @nested_keys.join('.')
+    end
   end
   # Used in document.citrus
   module KeygroupParser

lib/toml/keyvalue.rb

@@ -1,13 +1,4 @@
 module TOML
-  class ValueOverwriteError < StandardError
-    attr_accessor :key
-
-    def initialize(key)
-      self.key = key
-      super "Key #{key.inspect} is defined more than once"
-    end
-  end
-
   class Keyvalue
     attr_reader :value, :symbolize_keys
 

lib/toml/parser.rb

@@ -1,19 +1,18 @@
 module TOML
-  class ParseError < StandardError; end
-
   class Parser
     attr_reader :hash
 
     def initialize(content, options = {})
       @hash = {}
+      @visited_keys = Set.new
       @current = @hash
       @symbolize_keys = options[:symbolize_keys]
 
       begin
         parsed = TOML::Document.parse(content)
         parsed.matches.map(&:value).compact.each { |m| m.accept_visitor(self) }
       rescue Citrus::ParseError => e
-        raise ParseError.new(e.message)
+        raise TOML::ParseError.new(e.message)
       end
     end
 
@@ -24,7 +23,7 @@ def visit_table_array(table_array)
     end
 
     def visit_keygroup(keygroup)
-      @current = keygroup.navigate_keys @hash, @symbolize_keys
+      @current = keygroup.navigate_keys @hash, @visited_keys, @symbolize_keys
     end
 
     def visit_keyvalue(keyvalue)

lib/toml/string.rb

@@ -7,13 +7,29 @@ def value
       aux[1...-1]
     end
 
-    def self.transform_escaped_chars(str)
+    # Replace the unicode escaped characters with the corresponding character
+    # e.g. \u03B4 => ?
+    def self.decode_unicode(str)
+      str.gsub(/([^\\](?:\\\\)*\\u[\da-f]{4})/i) do |m|
+        m[0...-6] + [m[-4..-1].to_i(16)].pack('U')
+      end
+    end
+
+    # Replace special characters such as line feed and tabs.
+    def self.decode_special_char(str)
       str.gsub(/\\0/, "\0")
         .gsub(/\\t/, "\t")
+        .gsub(/\\b/, "\b")
+        .gsub(/\\f/, "\f")
         .gsub(/\\n/, "\n")
         .gsub(/\\\"/, '"')
         .gsub(/\\r/, "\r")
-        .gsub(/\\\\/, '\\')
+    end
+
+    def self.transform_escaped_chars(str)
+      str = decode_special_char(str)
+      str = decode_unicode(str)
+      str.gsub(/\\\\/, '\\').encode('utf-8')
     end
   end
 
@@ -25,6 +41,7 @@ def value
 
   module MultilineString
     def value
+      return '' if captures[:text].empty?
       aux = captures[:text].first.value
 
       # Remove spaces on multilined Singleline strings
@@ -36,6 +53,7 @@ def value
 
   module MultilineLiteral
     def value
+      return '' if captures[:text].empty?
       aux = captures[:text].first.value
 
       aux.gsub(/\\\r?\n[\n\t\r ]*/, '')

lib/toml/table_array.rb

@@ -21,6 +21,10 @@ def navigate_keys(hash, symbolize_keys = false)
       end
 
       # Define Table Array
+      if hash[last_key].is_a? Hash
+        fail TOML::ParseError,
+             "#{last_key} was defined as hash but is now redefined as a table!"
+      end
       hash[last_key] = [] unless hash[last_key]
       hash[last_key] << {}
 

test/dumper_test.rb

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class DumperTest < Test::Unit::TestCase
+class DumperTest < Minitest::Test
   def test_dump_empty
     dumped = TOML.dump({})
     assert_equal('', dumped)

test/errors_test.rb

@@ -1,13 +1,13 @@
 require_relative 'helper'
 
-class ErrorsTest < Test::Unit::TestCase
+class ErrorsTest < Minitest::Test
   def test_text_after_keygroup
     str = "[error] if you didn't catch this, your parser is broken"
     assert_raises(TOML::ParseError) { TOML.parse(str) }
   end
 
   def test_text_after_string
-    str =  'string = "Anything other than tabs, spaces and newline after a '
+    str = 'string = "Anything other than tabs, spaces and newline after a '
     str += 'keygroup or key value pair has ended should produce an error '
     str += 'unless it is a comment" like this'
 

test/examples/invalid/array-mixed-types-arrays-and-ints.toml

@@ -0,0 +1 @@
+arrays-and-ints =  [1, ["Arrays are not integers."]]

test/examples/invalid/array-mixed-types-ints-and-floats.toml

@@ -0,0 +1 @@
+ints-and-floats = [1, 1.1]

test/examples/invalid/array-mixed-types-strings-and-ints.toml

@@ -0,0 +1 @@
+strings-and-ints = ["hi", 42]

test/examples/invalid/datetime-malformed-no-leads.toml

@@ -0,0 +1 @@
+no-leads = 1987-7-05T17:45:00Z

test/examples/invalid/datetime-malformed-no-secs.toml

@@ -0,0 +1 @@
+no-secs = 1987-07-05T17:45Z

test/examples/invalid/datetime-malformed-no-t.toml

@@ -0,0 +1 @@
+no-t = 1987-07-0517:45:00Z

test/examples/invalid/datetime-malformed-no-z.toml

@@ -0,0 +1 @@
+no-z = 1987-07-05T17:45:00

test/examples/invalid/datetime-malformed-with-milli.toml

@@ -0,0 +1 @@
+with-milli = 1987-07-5T17:45:00.12Z

test/examples/invalid/duplicate-key-table.toml

@@ -0,0 +1,5 @@
+[fruit]
+type = "apple"
+
+[fruit.type]
+apple = "yes"

test/examples/invalid/duplicate-keys.toml

@@ -0,0 +1,2 @@
+dupe = false
+dupe = true

test/examples/invalid/duplicate-tables.toml

@@ -0,0 +1,2 @@
+[a]
+[a]

test/examples/invalid/empty-implicit-table.toml

@@ -0,0 +1 @@
+[naughty..naughty]

test/examples/invalid/empty-table.toml

@@ -0,0 +1 @@
+[]

test/examples/invalid/float-no-leading-zero.toml

@@ -0,0 +1,2 @@
+answer = .12345
+neganswer = -.12345

test/examples/invalid/float-no-trailing-digits.toml

@@ -0,0 +1,2 @@
+answer = 1.
+neganswer = -1.

test/examples/invalid/key-empty.toml

@@ -0,0 +1 @@
+ = 1

test/examples/invalid/key-hash.toml

@@ -0,0 +1 @@
+a# = 1

test/examples/invalid/key-newline.toml

@@ -0,0 +1,2 @@
+a
+= 1

test/examples/invalid/key-open-bracket.toml

@@ -0,0 +1 @@
+[abc = 1

test/examples/invalid/key-single-open-bracket.toml

@@ -0,0 +1 @@
+[

test/examples/invalid/key-space.toml

@@ -0,0 +1 @@
+a b = 1

test/examples/invalid/key-start-bracket.toml

@@ -0,0 +1,3 @@
+[a]
+[xyz = 5
+[b]

test/examples/invalid/key-two-equals.toml

@@ -0,0 +1 @@
+key= = 1

test/examples/invalid/string-no-close.toml

@@ -0,0 +1 @@
+no-ending-quote = "One time, at band camp

test/examples/invalid/table-array-implicit.toml

@@ -0,0 +1,14 @@
+# This test is a bit tricky. It should fail because the first use of
+# `[[albums.songs]]` without first declaring `albums` implies that `albums`
+# must be a table. The alternative would be quite weird. Namely, it wouldn't
+# comply with the TOML spec: "Each double-bracketed sub-table will belong to 
+# the most *recently* defined table element *above* it."
+#
+# This is in contrast to the *valid* test, table-array-implicit where
+# `[[albums.songs]]` works by itself, so long as `[[albums]]` isn't declared
+# later. (Although, `[albums]` could be.)
+[[albums.songs]]
+name = "Glory Days"
+
+[[albums]]
+name = "Born in the USA"

test/examples/invalid/table-array-malformed-bracket.toml

@@ -0,0 +1,2 @@
+[[albums]
+name = "Born to Run"

test/examples/invalid/table-array-malformed-empty.toml

@@ -0,0 +1,2 @@
+[[]]
+name = "Born to Run"

test/examples/invalid/table-empty.toml

@@ -0,0 +1 @@
+[]

test/examples/invalid/table-nested-brackets-close.toml

@@ -0,0 +1,2 @@
+[a]b]
+zyx = 42

test/examples/invalid/table-nested-brackets-open.toml

@@ -0,0 +1,2 @@
+[a[b]
+zyx = 42

test/examples/invalid/table-whitespace.toml

@@ -0,0 +1 @@
+[invalid key]

test/examples/invalid/table-with-pound.toml

@@ -0,0 +1,2 @@
+[key#group]
+answer = 42

test/examples/invalid/text-after-array-entries.toml

@@ -0,0 +1,4 @@
+array = [
+  "Is there life after an array separator?", No
+  "Entry"
+]

test/examples/invalid/text-after-integer.toml

@@ -0,0 +1 @@
+answer = 42 the ultimate answer?

test/examples/invalid/text-after-string.toml

@@ -0,0 +1 @@
+string = "Is there life after strings?" No.

test/examples/invalid/text-after-table.toml

@@ -0,0 +1 @@
+[error] this shouldn't be here

test/examples/invalid/text-before-array-separator.toml

@@ -0,0 +1,4 @@
+array = [
+  "Is there life before an array separator?" No,
+  "Entry"
+]

test/examples/invalid/text-in-array.toml

@@ -0,0 +1,5 @@
+array = [
+  "Entry 1",
+  I don't belong,
+  "Entry 2",
+]

test/examples/valid/array-empty.json

@@ -0,0 +1,3 @@
+{
+    "thevoid": [[[[[]]]]]
+}

test/examples/valid/array-empty.toml

@@ -0,0 +1 @@
+thevoid = [[[[[]]]]]

test/examples/valid/array-nospaces.json

@@ -0,0 +1,3 @@
+{
+    "ints": [1,2,3]
+}

test/examples/valid/array-nospaces.toml

@@ -0,0 +1 @@
+ints = [1,2,3]

test/examples/valid/arrays-hetergeneous.json

@@ -0,0 +1,3 @@
+{
+    "mixed": [[1, 2], ["a", "b"], [1.1, 2.1]]
+}

test/examples/valid/arrays-hetergeneous.toml

@@ -0,0 +1 @@
+mixed = [[1, 2], ["a", "b"], [1.1, 2.1]]

test/examples/valid/arrays-nested.json

@@ -0,0 +1,3 @@
+{
+    "nest": [["a"], ["b"]]
+}

test/examples/valid/arrays-nested.toml

@@ -0,0 +1 @@
+nest = [["a"], ["b"]]

test/examples/valid/arrays.json

@@ -0,0 +1,5 @@
+{
+    "ints": [1, 2, 3],
+    "floats": [1.1, 2.1, 3.1],
+    "strings": ["a", "b", "c"]
+}

test/examples/valid/arrays.toml

@@ -0,0 +1,3 @@
+ints = [1, 2, 3]
+floats = [1.1, 2.1, 3.1]
+strings = ["a", "b", "c"]

test/examples/valid/bool.json

@@ -0,0 +1,4 @@
+{
+    "f": false,
+    "t": true
+}

test/examples/valid/bool.toml

@@ -0,0 +1,2 @@
+t = true
+f = false