toml-rb 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681f49b6d33e70fda3a96c8ad18340ae87fe47de
-  data.tar.gz: 89de4dfd9c4590ddfcca2f00de5f4a7095163a2c
+  metadata.gz: 9a98aa52600a975ad1758363c0c21585444b67cd
+  data.tar.gz: c9d03ddf95c5a6f8b6775dbc9acdece8d1e96630
 SHA512:
-  metadata.gz: e503fb60c21c93a8c523584370ae4a7593a6b83536ead6c73672fe2639288020e16cf7edf357c4d90569d2e7105533d20ca74307f9c18823239f3f5437ce74ea
-  data.tar.gz: ff4151d6f24b60936a538220bb4eb7ae66f12eb5051a99c21b7c6a2eb5b86ff8a1a65792d9a821e289e5be7489f1d8a1827f857b726d5310b44a89f5339f02dd
+  metadata.gz: eaaa1515c6fe4681cf2c75000b5bfa303b3b4e1fe468647d00f320baf75646f4169d17a5a19711dd3cc828624da972c1796b85b045b957c8894ecda7b035f09e
+  data.tar.gz: d761b9378f9d0e0d0310958f42bf28a9e8a81f3c29b1b0ce1e0e12dfa3ac3cb4d0810c68344d3d7e720f20a662851e7aa8143c50750da0c175088a811b24cf82

data/lib/toml/grammars/array.citrus

@@ -2,7 +2,7 @@ grammar TomlArray
   include Primitive
 
   rule array
-    ("[" array_comments (elements)* ","? array_comments "]" indent?) { eval(to_str) }
+    ("[" array_comments (elements)? space ","? array_comments "]" indent?) { eval(to_str) }
   end
 
   rule array_comments
@@ -14,26 +14,26 @@ grammar TomlArray
   end
 
   rule float_array
-    (float ("," array_comments float)*)
+    (float (space "," array_comments float)*)
   end
 
   rule string_array
-    (string ("," array_comments string)*)
+    (string (space "," array_comments string)*)
   end
 
   rule array_array
-    (array ("," array_comments array)*)
+    (array (space "," array_comments array)*)
   end
 
   rule integer_array
-    (integer ("," array_comments integer)*)
+    (integer (space "," array_comments integer)*)
   end
 
   rule datetime_array
-    (datetime ("," array_comments datetime)*)
+    (datetime (space "," array_comments datetime)*)
   end
 
   rule bool_array
-    (bool ("," array_comments bool)*)
+    (bool (space "," array_comments bool)*)
   end
 end

data/lib/toml/grammars/document.citrus

@@ -23,15 +23,15 @@ grammar Document
   end
 
   rule inline_table_array
-    ("[" indent? (hash_array)* ","? indent? comment? indent? "]" indent?) <InlineTableArray>
+    ("[" array_comments inline_table_array_elements space ","? array_comments "]" indent?) <InlineTableArray>
   end
 
-  rule hash_array
-    comment | (inline_table ("," indent? (inline_table | comment))*)
+  rule inline_table_array_elements
+    (inline_table (space "," array_comments inline_table)*)
   end
 
   rule toml_values
-    primitive | inline_table_array | inline_table | array
+    primitive | inline_table | array | inline_table_array
   end
 
 

data/lib/toml/inline_table.rb

@@ -63,8 +63,8 @@ end
 
 module InlineTableArray
   def value
-    tables = captures[:hash_array].map { |x| x.captures[:inline_table] }
+    tables = captures[:inline_table_array_elements].map { |x| x.captures[:inline_table] }
 
-    TOML::InlineTableArray.new tables.flatten.map(&:value)
+    TOML::InlineTableArray.new(tables.flatten.map(&:value)).value
   end
 end

data/lib/toml/keygroup.rb

@@ -5,11 +5,18 @@ module TOML
     end
 
     def navigate_keys(hash, symbolize_keys = false)
-      @nested_keys.each do |key|
+      last_index = @nested_keys.length - 1
+      @nested_keys.each_with_index do |key, i|
         key = symbolize_keys ? key.to_sym : key
-        hash[key] = {} unless hash[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

data/test/errors_test.rb

@@ -65,4 +65,24 @@ class ErrorsTest < Test::Unit::TestCase
     str = "a = false\na = true"
     assert_raises(TOML::ValueOverwriteError) { TOML.parse(str) }
   end
+
+  def test_table_overwrite
+    str = "[a]\nb=1\n[a]\nc=2"
+    e = assert_raises(TOML::ValueOverwriteError) { TOML.parse(str) }
+    assert_equal "Key \"a\" is defined more than once", e.message
+
+    str = "[a]\nb=1\n[a]\nb=1"
+    e = assert_raises(TOML::ValueOverwriteError) { TOML.parse(str) }
+    assert_equal "Key \"a\" is defined more than once", e.message
+  end
+
+  def test_value_overwrite_with_table
+    str = "[a]\nb=1\n[a.b]\nc=2"
+    e = assert_raises(TOML::ValueOverwriteError) { TOML.parse(str) }
+    assert_equal "Key \"b\" is defined more than once", e.message
+
+    str = "[a]\nb=1\n[a.b.c]\nd=3"
+    e = assert_raises(TOML::ValueOverwriteError) { TOML.parse(str) }
+    assert_equal "Key \"b\" is defined more than once", e.message
+  end
 end

data/test/grammar_test.rb

@@ -146,11 +146,16 @@ 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).value
-
+                           root: :inline_table_array)
     assert_equal([{ 'one' => 1 }, { 'two' => 2, 'three' => 3 }], match.value)
   end
 
+  def test_empty_array
+    # test that [] is parsed as array and not as inline table array
+    match = Document.parse("a = []", root: :keyvalue).value
+    assert_equal [], match.value
+  end
+
   def test_multiline_array
     multiline_array = "[ \"hey\",\n   \"ho\",\n\t \"lets\", \"go\",\n ]"
     match = Document.parse(multiline_array, root: :array)
@@ -164,11 +169,11 @@ class GrammarTest < Test::Unit::TestCase
     match = Document.parse(multiline_array, root: :array)
     assert_equal([4], match.value)
 
-    multiline_array = "[\n  1,\n  # 2,\n  3,\n]"
+    multiline_array = "[\n  1,\n  # 2,\n  3 ,\n]"
     match = Document.parse(multiline_array, root: :array)
     assert_equal([1, 3], match.value)
 
-    multiline_array = "[\n  1, # useless comment\n  # 2,\n  3 #other comment\n]"
+    multiline_array = "[\n  1 , # useless comment\n  # 2,\n  3 #other comment\n]"
     match = Document.parse(multiline_array, root: :array)
     assert_equal([1, 3], match.value)
   end

data/toml-rb.gemspec

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