toml-rb 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 763a2531f36107f17c09cf4b60399de4487fce09
-  data.tar.gz: 891ced2d3c3dcd42baab838a0586c12b47976c2b
+  metadata.gz: 404c0a6fb64ad42ecd9de6e9569e072c5d2d68e8
+  data.tar.gz: 7ccfabbb8c4014867a8bc3d309363e6d1bb10eb6
 SHA512:
-  metadata.gz: d8683b77c2b7dcdfc38c11af8d79ec376e6de7702cb977f3a53c0be0d2aa87151a1541eb54d3d91eef9730bcf8d011aee01820bf7185b6b4a3ba2705c94f53da
-  data.tar.gz: fe95e0553af526da664b7e8de0581a8c9b9f4eb0e1c1c636743cab830b59a555222c16e3518558bd9efe6e76eed9c29695bdb5b44c31660921d7564eeaf6d39a
+  metadata.gz: afebe6d9de4b0eaaa913829c2fc35be18d2ac30339a6a158638612ed93f15196681624df0b164fd6baae3da5b7236fba1d6f46e79b7343bba1d7b6e51eb8db2f
+  data.tar.gz: 1c7b0380404eca6e933f45a28a7fa14c7bab52024879b4bf11c7c8f68bcb59f4c86edd35946575c960215e17d6af5fc85390228d3e409d64360680549574ef6d

data/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

data/init.rb

@@ -2,6 +2,7 @@ require 'citrus'
 
 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"

data/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

data/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

data/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
 
   ##

data/lib/toml/keygroup.rb

@@ -4,27 +4,32 @@ module TOML
       @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

data/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
 

data/lib/toml/parser.rb

@@ -1,11 +1,10 @@
 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]
 
@@ -13,7 +12,7 @@ module TOML
         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 @@ module TOML
     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)

data/lib/toml/string.rb

@@ -7,13 +7,29 @@ module TOML
       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 @@ module TOML
 
   module MultilineString
     def value
+      return '' if captures[:text].empty?
       aux = captures[:text].first.value
 
       # Remove spaces on multilined Singleline strings
@@ -36,6 +53,7 @@ module TOML
 
   module MultilineLiteral
     def value
+      return '' if captures[:text].empty?
       aux = captures[:text].first.value
 
       aux.gsub(/\\\r?\n[\n\t\r ]*/, '')

data/lib/toml/table_array.rb

@@ -21,6 +21,10 @@ module TOML
       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] << {}
 

data/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)

data/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'
 

data/test/grammar_test.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require_relative 'helper'
 
-class GrammarTest < Test::Unit::TestCase
+class GrammarTest < Minitest::Test
   def test_comment
     match = TOML::Document.parse(' # A comment', root: :comment)
     assert_equal(nil, match.value)
@@ -30,9 +30,13 @@ class GrammarTest < Test::Unit::TestCase
     assert_equal(%w(owner.emancu),
                  match.value.instance_variable_get('@nested_keys'))
 
-    match = TOML::Document.parse('[ owner . emancu ]', root: :keygroup)
-    assert_equal(%w(owner emancu),
+    match = TOML::Document.parse('["first key"."second key"]', root: :keygroup)
+    assert_equal(['first key', 'second key'],
                  match.value.instance_variable_get('@nested_keys'))
+
+    assert_raises Citrus::ParseError do
+      TOML::Document.parse('[ owner . emancu ]', root: :keygroup)
+    end
   end
 
   def test_keyvalue
@@ -64,6 +68,13 @@ class GrammarTest < Test::Unit::TestCase
     assert_equal "One Two", match.value
   end
 
+  def test_empty_multiline_string
+    to_parse = '""""""'
+
+    match = TOML::Document.parse(to_parse, root: :multiline_string)
+    assert_equal '', match.value
+  end
+
   def test_special_characters
     match = TOML::Document.parse('"\0 \" \t \n \r"', root: :string)
     assert_equal("\0 \" \t \n \r", match.value)
@@ -146,7 +157,7 @@ class GrammarTest < Test::Unit::TestCase
     assert_equal([%w(hey TOML), [2, 4]], match.value)
 
     match = TOML::Document.parse('[ { one = 1 }, { two = 2, three = 3} ]',
-                           root: :inline_table_array)
+                                 root: :inline_table_array)
     assert_equal([{ 'one' => 1 }, { 'two' => 2, 'three' => 3 }], match.value)
   end
 

data/test/helper.rb

@@ -1,2 +1,2 @@
-require 'test/unit'
+require 'minitest/autorun'
 require_relative '../lib/toml'

data/test/toml_test.rb

@@ -1,7 +1,8 @@
 require_relative 'helper'
 require_relative 'toml_examples'
+require 'json'
 
-class TomlTest < Test::Unit::TestCase
+class TomlTest < Minitest::Test
   def test_file_v_0_4_0
     path = File.join(File.dirname(__FILE__), 'example-v0.4.0.toml')
     parsed = TOML.load_file(path)
@@ -84,4 +85,34 @@ class TomlTest < Test::Unit::TestCase
     parsed = TOML.parse("hello = 'world'\r\nline_break = true")
     assert_equal({ 'hello' => 'world', 'line_break' => true }, parsed)
   end
+
+  def compare_toml_files(folder, file = nil, &block)
+    file ||= '*'
+    Dir["test/examples/#{folder}/#{file}.json"].each do |json_file|
+      toml_file = File.join(File.dirname(json_file),
+                            File.basename(json_file, '.json')) + '.toml'
+      begin
+        toml = TOML.load_file(toml_file)
+      rescue TOML::Error => e
+        assert false, "Error: #{e} in #{toml_file}"
+      end
+      json = JSON.parse(File.read(json_file))
+      block.call(json, toml, toml_file)
+    end
+  end
+
+  def test_valid_cases
+    compare_toml_files 'valid' do |json, toml, file|
+      assert_equal json, toml, "In file '#{file}'"
+    end
+  end
+
+  def test_invalid_cases
+    file = '*'
+    Dir["test/examples/invalid/#{file}.toml"].each do |toml_file|
+      assert_raises(TOML::Error, "For file #{toml_file}") do
+        TOML.load_file(toml_file)
+      end
+    end
+  end
 end

data/toml-rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'toml-rb'
-  s.version     = '0.3.6'
+  s.version     = '0.3.7'
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'TOML parser in ruby, for ruby.'
   s.description = 'A TOML parser using Citrus parsing library. '

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -44,6 +44,7 @@ files:
 - init.rb
 - lib/toml.rb
 - lib/toml/dumper.rb
+- lib/toml/errors.rb
 - lib/toml/grammars/array.citrus
 - lib/toml/grammars/document.citrus
 - lib/toml/grammars/helper.citrus