toml-rb 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 456e1b9091b137468a277e2b17c372d501c99f4c
-  data.tar.gz: 8bedf195ab7511437086ad6c1edb9c745a272580
+  metadata.gz: 681f49b6d33e70fda3a96c8ad18340ae87fe47de
+  data.tar.gz: 89de4dfd9c4590ddfcca2f00de5f4a7095163a2c
 SHA512:
-  metadata.gz: 53363a94a807d9c5c1ff595b2e2affc7f37bb624b3ff42218953cfb51bf6b3d0c13680af5d1ac9d15c6690ed14339825eb91e657946f4dd75816a6219a2147c8
-  data.tar.gz: e2992a3d295b23f51c20cc1a915499ea1997f63b15cbd2c8645d1e0d3bd0df4d913b9a4ccd4da5d13915822fdbdda22078941cfe0b7981792be9fc46411e6caf
+  metadata.gz: e503fb60c21c93a8c523584370ae4a7593a6b83536ead6c73672fe2639288020e16cf7edf357c4d90569d2e7105533d20ca74307f9c18823239f3f5437ce74ea
+  data.tar.gz: ff4151d6f24b60936a538220bb4eb7ae66f12eb5051a99c21b7c6a2eb5b86ff8a1a65792d9a821e289e5be7489f1d8a1827f857b726d5310b44a89f5339f02dd

data/lib/toml/grammars/array.citrus

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

data/lib/toml/keyvalue.rb

@@ -1,5 +1,12 @@
 module TOML
-  class ValueOverwriteError < StandardError; end
+  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
@@ -10,7 +17,7 @@ module TOML
 
     def assign(hash, symbolize_keys = false)
       @symbolize_keys = symbolize_keys
-      fail ValueOverwriteError if hash[key]
+      fail ValueOverwriteError.new(key) if hash.key?(key)
       hash[key] = visit_value @value
     end
 

data/test/errors_test.rb

@@ -55,4 +55,14 @@ class ErrorsTest < Test::Unit::TestCase
     str = 'number = 3.14 pi <--again forgot the #'
     assert_raises(TOML::ParseError) { TOML.parse(str) }
   end
+
+  def test_value_overwrite
+    str = "a = 1\na = 2"
+    e = assert_raises(TOML::ValueOverwriteError) { TOML.parse(str) }
+    assert_equal "Key \"a\" is defined more than once", e.message
+    assert_equal "a", e.key
+
+    str = "a = false\na = true"
+    assert_raises(TOML::ValueOverwriteError) { TOML.parse(str) }
+  end
 end

data/test/grammar_test.rb

@@ -163,6 +163,14 @@ class GrammarTest < Test::Unit::TestCase
     multiline_array = "[\n# comment\n#, more comments\n4]"
     match = Document.parse(multiline_array, root: :array)
     assert_equal([4], match.value)
+
+    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]"
+    match = Document.parse(multiline_array, root: :array)
+    assert_equal([1, 3], match.value)
   end
 
   def test_datetime

data/toml-rb.gemspec

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