toml-rb 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c6222b73b280deabe97bc55a0eee9224412f76
-  data.tar.gz: b48c90b9abef1ab81ffb5051be7a575ed9b6383f
+  metadata.gz: 456e1b9091b137468a277e2b17c372d501c99f4c
+  data.tar.gz: 8bedf195ab7511437086ad6c1edb9c745a272580
 SHA512:
-  metadata.gz: 0bfb79b2cd16c3291d315d94d52be611d581c6a2e7eaca967f9d838af3fc56250f377ebbf2126a11e1153318fe642b16479c2895dcc75366274c8c3ef7623c07
-  data.tar.gz: 236b967fa06c531cf2a50cca3ea22a69ea4ae9bad978ceba75fd43c381c32b7b49b10796f7c150c9d96dede5decd2c36f6c7c3b1e0332c34a2d24b906199cc55
+  metadata.gz: 53363a94a807d9c5c1ff595b2e2affc7f37bb624b3ff42218953cfb51bf6b3d0c13680af5d1ac9d15c6690ed14339825eb91e657946f4dd75816a6219a2147c8
+  data.tar.gz: e2992a3d295b23f51c20cc1a915499ea1997f63b15cbd2c8645d1e0d3bd0df4d913b9a4ccd4da5d13915822fdbdda22078941cfe0b7981792be9fc46411e6caf

data/lib/toml/inline_table.rb

@@ -1,8 +1,63 @@
+module TOML
+  class InlineTable
+    attr_reader :symbolize_keys
+
+    def initialize(keyvalue_pairs)
+      @pairs = keyvalue_pairs
+      @symbolize_keys = false
+    end
+
+    def value(symbolize_keys = false)
+      if @symbolize_keys = symbolize_keys
+        tuple = ->(kv) { [kv.key.to_sym, visit_value(kv.value)] }
+      else
+        tuple = ->(kv) { [kv.key, visit_value(kv.value)] }
+      end
+
+      Hash[@pairs.map(&tuple)]
+    end
+
+    def visit_inline_table(inline_table)
+      result = {}
+
+      inline_table.value(@symbolize_keys).each do |k, v|
+        result[key k] = visit_value v
+      end
+
+      result
+    end
+
+    def accept_visitor(keyvalue)
+      keyvalue.visit_inline_table self
+    end
+
+    private
+
+    def visit_value(a_value)
+      return a_value unless a_value.respond_to? :accept_visitor
+
+      a_value.accept_visitor self
+    end
+
+    def key(a_key)
+      symbolize_keys ? a_key.to_sym : a_key
+    end
+  end
+
+  class InlineTableArray
+    def initialize(inline_tables)
+      @inline_tables = inline_tables
+    end
+
+    def value(symbolize_keys = false)
+      @inline_tables.map { |it| it.value(symbolize_keys) }
+    end
+  end
+end
+
 module InlineTable
   def value
-    keyvalue_pairs = captures[:keyvalue].map(&:value)
-
-    Hash[keyvalue_pairs.map { |kv| [kv.key, kv.value] }]
+    TOML::InlineTable.new captures[:keyvalue].map(&:value)
   end
 end
 
@@ -10,6 +65,6 @@ module InlineTableArray
   def value
     tables = captures[:hash_array].map { |x| x.captures[:inline_table] }
 
-    tables.flatten.map(&:value)
+    TOML::InlineTableArray.new tables.flatten.map(&:value)
   end
 end

data/lib/toml/keyvalue.rb

@@ -2,21 +2,43 @@ module TOML
   class ValueOverwriteError < StandardError; end
 
   class Keyvalue
-    attr_reader :key, :value
+    attr_reader :value, :symbolize_keys
 
     def initialize(key, value)
-      @key, @value = key, value
+      @key, @value, @symbolize_keys = key, value, false
     end
 
     def assign(hash, symbolize_keys = false)
-      key = symbolize_keys ? @key.to_sym : @key
+      @symbolize_keys = symbolize_keys
       fail ValueOverwriteError if hash[key]
-      hash[key] = @value
+      hash[key] = visit_value @value
+    end
+
+    def visit_inline_table(inline_table)
+      result = {}
+
+      inline_table.value(@symbolize_keys).each do |k, v|
+        result[key k] = visit_value v
+      end
+
+      result
+    end
+
+    def key(a_key = @key)
+      symbolize_keys ? a_key.to_sym : a_key
     end
 
     def accept_visitor(parser)
       parser.visit_keyvalue self
     end
+
+    private
+
+    def visit_value(a_value)
+      return a_value unless a_value.respond_to? :accept_visitor
+
+      a_value.accept_visitor self
+    end
   end
 end
 

data/lib/toml/parser.rb

@@ -30,9 +30,5 @@ module TOML
     def visit_keyvalue(keyvalue)
       keyvalue.assign @current, @symbolize_keys
     end
-
-    def visit_inline_table(inline_table)
-      inline_table.assign @current, @symbolize_keys
-    end
   end
 end

data/test/example.toml

@@ -33,3 +33,7 @@ hosts = [
   "alpha",
   "omega"
 ]
+
+[amqp]
+exchange = {durable = true, auto_delete = false}
+

data/test/grammar_test.rb

@@ -146,7 +146,8 @@ class GrammarTest < Test::Unit::TestCase
     assert_equal([%w(hey TOML), [2, 4]], match.value)
 
     match = Document.parse('[ { one = 1 }, { two = 2, three = 3} ]',
-                           root: :inline_table_array)
+                           root: :inline_table_array).value
+
     assert_equal([{ 'one' => 1 }, { 'two' => 2, 'three' => 3 }], match.value)
   end
 
@@ -177,13 +178,14 @@ class GrammarTest < Test::Unit::TestCase
 
   def test_inline_table
     match = Document.parse('{ }', root: :inline_table)
-    assert_equal({}, match.value)
+    assert_equal({}, match.value.value)
 
     match = Document.parse('{ simple = true, params = 2 }', root: :inline_table)
-    assert_equal({ 'simple' => true, 'params' => 2 }, match.value)
+    assert_equal({ 'simple' => true, 'params' => 2 }, match.value.value)
 
-    match = Document.parse('{ nest = { hard = true } }', root: :inline_table)
-    assert_equal({ 'nest' => { 'hard' => true } }, match.value)
+    match = Document.parse('{ nest = { really = { hard = true } } }', root: :inline_table)
+    assert_equal({ 'nest' => { 'really' => { 'hard' => true } } }, match.value.value)
+    assert_equal({ nest: { really: { hard: true } } }, match.value.value(true))
   end
 
   private

data/test/toml_examples.rb

@@ -156,6 +156,12 @@ class TomlExamples
       'clients' => {
         'data' => [%w(gamma delta), [1, 2]],
         'hosts' => %w(alpha omega)
+      },
+      'amqp' => {
+        'exchange' => {
+          'durable' => true,
+          'auto_delete' => false
+        }
       }
     }
   end

data/test/toml_test.rb

@@ -67,6 +67,13 @@ class TomlTest < Test::Unit::TestCase
       clients: {
         data: [%w(gamma delta), [1, 2]],
         hosts: %w(alpha omega)
+      },
+
+      amqp: {
+        exchange: {
+          durable: true,
+          auto_delete: false
+        }
       }
     }
 

data/toml-rb.gemspec

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