toml-rb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97909cd5d9ac3403acf5fba07cfb3177fb343458
-  data.tar.gz: ee82bae7cb2a1ec814b269390899ccd47781dabd
+  metadata.gz: d550c310fb16cc57d0bd5f2b5ca269d300c79268
+  data.tar.gz: e5be2acd18c3ee096743c749c59ef893f1f96058
 SHA512:
-  metadata.gz: ef153da7a2aa9623a2554825b1604f460dfad351bfee4ed4078f2a45b3902992d4ecc2fae2d32b39ed37ef29182d9c4948b389584264e4b499b6f3acad261fd9
-  data.tar.gz: 2869e5f5d5b5c946940d3d38cda21440378ba4162cf73c4218aac9c2904630b95e9b075151db1f2fe6449209641f4d65470307b4ac1b4ded510a44e8c0905fdc
+  metadata.gz: 2d3c00589a249387ead32123e022bb1387a39f887e9f155111b94d6e782ab29d50ecf1b5e5d464b6cec811a05f76505f35abe1b65c9a831b2eae6bfcd60f8c80
+  data.tar.gz: 6ff8631b538415e1f7806298dbc216beb952d05b944b478bad5281a78b5b393afdaacee4e3c8782e068d9f39a5d4b23ed7e545a6a7fc78a6ab491085a9d489d2

data/lib/toml/dumper.rb

@@ -11,6 +11,19 @@ module TOML
     private
 
     def visit(hash, prefix, extra_brackets = false)
+      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
+    end
+
+    def sort_pairs(hash)
       nested_pairs = []
       simple_pairs = []
       table_array_pairs = []
@@ -28,22 +41,25 @@ module TOML
         end
       end
 
-      unless prefix.empty? || simple_pairs.empty?
-        print_prefix prefix, extra_brackets
-      end
+      return simple_pairs, nested_pairs, table_array_pairs
+    end
 
-      # First add simple pairs, under the prefix
+    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"
       end
+    end
 
+    def dump_nested_pairs(nested_pairs, prefix)
       nested_pairs.each do |key, val|
         key = quote_key(key) unless bare_key? key
 
         visit val, prefix + [key], false
       end
+    end
 
+    def dump_table_array_pairs(table_array_pairs, prefix)
       table_array_pairs.each do |key, val|
         key = quote_key(key) unless bare_key? key
         aux_prefix = prefix + [key]

data/lib/toml/table_array.rb

@@ -5,14 +5,26 @@ module TOML
     end
 
     def navigate_keys(hash, symbolize_keys = false)
+      last_key = @nested_keys.pop
+
+      # Go over the parent keys
       @nested_keys.each do |key|
         key = symbolize_keys ? key.to_sym : key
-        hash[key] = [] unless hash[key]
-        hash[key] << {} if @nested_keys.last == key.to_s || hash[key].empty?
-        hash = hash[key].last
+        hash[key] = {} unless hash[key]
+
+        if hash[key].is_a? Array
+          hash[key] << {} if hash[key].empty?
+          hash = hash[key].last
+        else
+          hash = hash[key]
+        end
       end
 
-      hash
+      # Define Table Array
+      hash[last_key] = [] unless hash[last_key]
+      hash[last_key] << {}
+
+      hash[last_key].last
     end
 
     def accept_visitor(parser)

data/test/hard_example.toml

@@ -20,7 +20,17 @@ test_string = "You'll hate me after this - #"          # " Annoying, isn't it?
             # ] Oh yes I did
             ]
 
-[[nested.table.array]]
+[parent.child1]
+key = 'value'
+
+[[parent.child2]]
+key2 = 'value'
+
+[[parent.child2]]
+key3 = 'value'
+
+[[a.b]]
+c = 3
 
 # Each of the following keygroups/key value pairs should produce an error. Uncomment to them to test
 

data/test/toml_examples.rb

@@ -109,7 +109,6 @@ class TomlExamples
   def self.example
     {
       'title' => 'TOML Example',
-
       'owner' => {
         'name' => 'Tom Preston-Werner',
         'organization' => 'GitHub',
@@ -123,7 +122,6 @@ class TomlExamples
         'connection_max' => 5000,
         'enabled' => true
       },
-
       'servers' => {
         'alpha' => {
           'ip' => '10.0.0.1',
@@ -134,7 +132,6 @@ class TomlExamples
           'dc' => 'eqdc10'
         }
       },
-
       'clients' => {
         'data' => [%w(gamma delta), [1, 2]],
         'hosts' => %w(alpha omega)
@@ -157,15 +154,18 @@ class TomlExamples
           }
         }
       },
-      "nested" => [
-        {
-          "table" => [
-            {
-              "array" => [{}]
-            }
-          ]
-        }
-      ]
+      'parent' => {
+        'child1' => { 'key' => 'value' },
+        'child2' => [
+          { 'key2' => 'value' },
+          { 'key3' => 'value' }
+        ]
+      },
+      'a' => {
+        'b' => [
+          { 'c' => 3 }
+        ]
+      }
     }
   end
 end

data/toml-rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'toml-rb'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   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.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus