toml-rb 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c2b333939107da6034d5d7a07235570450bef82
-  data.tar.gz: f33142272084db45e792b5f33fb18fcc750ab726
+  metadata.gz: 0db308aa87a4da538be12f2ce08fcfb5d84ef70c
+  data.tar.gz: b169b923de908e25c9d10647f97408b4a41e1bfd
 SHA512:
-  metadata.gz: 0883e07437300579d35b573db37420ce824b67038e4c0bd4435e78a09ca228212f285c2020e209c58231e460d3cdfef9024899afaf0cc4a25c0c0e657a0fe111
-  data.tar.gz: 6a78ff8893c5dcdf6bce627d1c60eee7670285ea68af5f59805ec46af5b6c220400808aa11e5e80e70038e484ff3b3d49a593f1e30cb24b3dcceaf3ceb67d175
+  metadata.gz: ce740f5eabf651cba25cc8f536f73e55ec94d40f7b8b233b654b2d44aaceff3e5db912cde59b9cae45b05edf8032f12f634f6b26d68940a3a5ac1cce58a5ea83
+  data.tar.gz: af784c37f85445e7659638de52363065df3e8665cfc15f092b1aa4613426633a74ff8e389ab85c5b7db3bbfb048ff1c28f0f3ce0f8dab48b7c7d1351bb882b9a

data/lib/toml/dumper.rb

@@ -11,20 +11,13 @@ module TOML
     private
 
     def visit(hash, prefix, extra_brackets = false)
-      if hash.empty? && !prefix.empty?
-        print_prefix prefix, extra_brackets
-      else
-        simple_pairs, nested_pairs, table_array_pairs = sort_pairs hash
+      simple_pairs, nested_pairs, table_array_pairs = sort_pairs hash
 
-        unless prefix.empty? || simple_pairs.empty?
-          print_prefix prefix, extra_brackets
-        end
-
-        # First add simple pairs, under the prefix
-        dump_simple_pairs simple_pairs
-        dump_nested_pairs nested_pairs, prefix
-        dump_table_array_pairs table_array_pairs, prefix
+      if prefix.any? && (simple_pairs.any? || hash.empty?)
+        print_prefix prefix, extra_brackets
       end
+
+      dump_pairs simple_pairs, nested_pairs, table_array_pairs, prefix
     end
 
     def sort_pairs(hash)
@@ -48,6 +41,13 @@ module TOML
       [simple_pairs, nested_pairs, table_array_pairs]
     end
 
+    def dump_pairs(simple, nested, table_array, prefix = [])
+      # First add simple pairs, under the prefix
+      dump_simple_pairs simple
+      dump_nested_pairs nested, prefix
+      dump_table_array_pairs table_array, prefix
+    end
+
     def dump_simple_pairs(simple_pairs)
       simple_pairs.each do |key, val|
         key = quote_key(key) unless bare_key? key
@@ -69,11 +69,10 @@ module TOML
         aux_prefix = prefix + [key]
 
         val.each do |child|
-          if child.empty?
-            print_prefix aux_prefix, true
-          else
-            visit child, aux_prefix, true
-          end
+          print_prefix aux_prefix, true
+          args = sort_pairs(child) << aux_prefix
+
+          dump_pairs(*args)
         end
       end
     end

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/parser.rb

@@ -19,6 +19,9 @@ module TOML
     # Read about the Visitor pattern
     # http://en.wikipedia.org/wiki/Visitor_pattern
     def visit_table_array(table_array)
+      table_array_key = table_array.full_key
+      @visited_keys.reject! { |k| k.start_with? table_array_key }
+
       @current = table_array.navigate_keys @hash, @symbolize_keys
     end
 

data/lib/toml/table_array.rb

@@ -34,6 +34,10 @@ module TOML
     def accept_visitor(parser)
       parser.visit_table_array self
     end
+
+    def full_key
+      @nested_keys.join('.')
+    end
   end
 
   # Used in document.citrus

data/test/dumper_test.rb

@@ -76,4 +76,19 @@ class DumperTest < Minitest::Test
 
     assert_equal toml, dumped
   end
+
+  def test_dump_array_tables
+    hash = { fruit: [{ physical: { color: "red" } }, { physical: { color: "blue" } }] }
+    dumped = TOML.dump(hash)
+    toml = <<-EOS.gsub(/^ {6}/, '')
+      [[fruit]]
+      [fruit.physical]
+      color = "red"
+      [[fruit]]
+      [fruit.physical]
+      color = "blue"
+    EOS
+
+    assert_equal toml, dumped
+  end
 end

data/toml-rb.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = 'toml-rb'
-  s.version     = '0.3.12'
+  s.version     = '0.3.13'
   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. '
   s.authors     = ['Emiliano Mancuso', 'Lucas Tolchinsky']
   s.email       = ['emiliano.mancuso@gmail.com', 'lucas.tolchinsky@gmail.com']
-  s.homepage    = 'http://github.com/eMancu/toml-rb'
+  s.homepage    = 'http://github.com/emancu/toml-rb'
   s.license     = 'MIT'
 
   s.files = Dir[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -65,7 +65,7 @@ files:
 - test/toml_examples.rb
 - test/toml_test.rb
 - toml-rb.gemspec
-homepage: http://github.com/eMancu/toml-rb
+homepage: http://github.com/emancu/toml-rb
 licenses:
 - MIT
 metadata: {}