toml-rb 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c08aa29a171d7d63f32f49b003ba684889066e10
-  data.tar.gz: 6e691196c2fbf7f76d84bd9e3d9c4f404dc4b44b
+  metadata.gz: 49771b4d2a6fdf577cafa264b5da35661c74610f
+  data.tar.gz: c4d4032d52979ef02600913a61719ec28164c435
 SHA512:
-  metadata.gz: afc71aad3baf66c57e2e5edb067a3bf03855a35abb9f983e6b1300d3d7ca1ebfdcdb7fce5a82fc04067300ee84f1b7b9563832bc98ff9d97a9156ce5a6bd921a
-  data.tar.gz: 7e779c92833849403f5b805883126611212d43582a9e852395254eb99d78831d1d5cae33d4485eb1faf8f62ea0306fe85bb77000f176833835cfabdfdff96130
+  metadata.gz: 75df0a53ca6c3c98a9b8e9a53a4201538fb6e2d3afe9f19f8edf7f1016fa95ddf8b6ceb93d6e6961a53b86a2465b3c0b186fc60d3a505ca3d64e1d3f64957f0f
+  data.tar.gz: 8bf0535e21dce48b87e5ffa774be8155c8427278db6f2a8bcaaf790b6f2591f4e680c2d5ed61e2b9a63cbf3cbfae88fbd9dd34f957644ebf1b9ffdf7a9f287f5

data/lib/toml/grammars/document.citrus

@@ -7,15 +7,15 @@ grammar TOML::Document
   end
 
   rule table_array
-    (space? '[[' ((key "."?)+|'"'(space? key space? "."?)+'"') ']]' space? comment?) <TOML::TableArrayParser>
+    (space? '[[' stripped_key ("." stripped_key)* ']]' comment?) <TOML::TableArrayParser>
   end
 
   rule keygroup
-    (space? '[' ((key "."?)+|'"'(space? key space? "."?)+'"') ']' space? comment?) <TOML::KeygroupParser>
+    (space? '[' stripped_key ("." stripped_key)* ']' comment?) <TOML::KeygroupParser>
   end
 
   rule keyvalue
-    (space? key space? '=' space? v:(toml_values) comment?) <TOML::KeyvalueParser>
+    (stripped_key '=' space? v:(toml_values) comment?) <TOML::KeyvalueParser>
   end
 
   rule inline_table
@@ -34,5 +34,7 @@ grammar TOML::Document
     primitive | inline_table | array | inline_table_array
   end
 
-
+  rule stripped_key
+    (space? key space?) { captures[:key].first.value }
+  end
 end

data/lib/toml/grammars/primitive.citrus

@@ -34,8 +34,8 @@ grammar TOML::Primitive
   ##
 
   rule datetime
-    (date_skeleton ("Z" | date_offset | [,\.] frac:(/\d/1*6) date_offset)) {
-      skeleton = captures[:date_skeleton].first
+    ( skeleton:(datetime_skeleton | date_skeleton) ("Z" | date_offset | [,\.] frac:(/\d/1*6) date_offset?)? ) {
+      skeleton = captures[:skeleton].first
       y,m,d,h,mi,s = skeleton.value
       offset = captures[:date_offset].first || "+00:00"
       sec_frac = captures[:frac].first || 0
@@ -45,7 +45,7 @@ grammar TOML::Primitive
     }
   end
 
-  rule date_skeleton
+  rule datetime_skeleton
     (y:/\d\d\d\d/ "-" m:/\d\d/ "-" d:/\d\d/ "T" h:/\d\d/ ":" mi:/\d\d/ ":" s:/\d\d/) {
       [:y,:m,:d,:h,:mi,:s].map{ |s| capture(s).value }
     }
@@ -55,6 +55,12 @@ grammar TOML::Primitive
     offset:(sign /\d\d/ ":" /\d\d/)
   end
 
+  rule date_skeleton
+    (y:/\d\d\d\d/ "-" m:/\d\d/ "-" d:/\d\d/) {
+      [:y,:m,:d].map{ |s| capture(s).value } + [0, 0, 0]
+    }
+  end
+
   ##
   # Number rules
   ##

data/lib/toml/keygroup.rb

@@ -34,7 +34,7 @@ module TOML
   # Used in document.citrus
   module KeygroupParser
     def value
-      TOML::Keygroup.new(captures[:key].map(&:value))
+      TOML::Keygroup.new(captures[:stripped_key].map(&:value))
     end
   end
 end

data/lib/toml/keyvalue.rb

@@ -43,7 +43,7 @@ module TOML
   # Used in document.citrus
   module KeyvalueParser
     def value
-      TOML::Keyvalue.new(capture(:key).value, capture(:v).value)
+      TOML::Keyvalue.new(capture(:stripped_key).value, capture(:v).value)
     end
   end
 end

data/lib/toml/table_array.rb

@@ -39,7 +39,7 @@ module TOML
   # Used in document.citrus
   module TableArrayParser
     def value
-      TOML::TableArray.new(captures[:key].map(&:value))
+      TOML::TableArray.new(captures[:stripped_key].map(&:value))
     end
   end
 end

data/test/grammar_test.rb

@@ -34,8 +34,12 @@ class GrammarTest < Minitest::Test
     assert_equal(['first key', 'second key'],
                  match.value.instance_variable_get('@nested_keys'))
 
+    match = TOML::Document.parse('[ owner . emancu ]', root: :keygroup)
+    assert_equal(%w(owner emancu),
+                 match.value.instance_variable_get('@nested_keys'))
+
     assert_raises Citrus::ParseError do
-      TOML::Document.parse('[ owner . emancu ]', root: :keygroup)
+      TOML::Document.parse('[ owner emancu ]', root: :keygroup)
     end
   end
 
@@ -189,6 +193,8 @@ class GrammarTest < Minitest::Test
     assert_equal([1, 3], match.value)
   end
 
+  # Dates are really hard to test from JSON, due the imposibility to represent
+  # datetimes without quotes.
   def test_datetime
     match = TOML::Document.parse('1986-08-28T15:15:00Z', root: :datetime)
     assert_equal(Time.utc(1986, 8, 28, 15, 15), match.value)
@@ -198,6 +204,15 @@ class GrammarTest < Minitest::Test
 
     match = TOML::Document.parse('1986-08-28T15:15:00.123-03:00', root: :datetime)
     assert_equal(Time.utc(1986, 8, 28, 18, 15, 0.123), match.value)
+
+    match = TOML::Document.parse('1986-08-28', root: :datetime)
+    assert_equal(Time.utc(1986, 8, 28, 0, 0, 0), match.value)
+
+    match = TOML::Document.parse('1986-08-28T15:15:00', root: :datetime)
+    assert_equal(Time.utc(1986, 8, 28, 15, 15), match.value)
+
+    match = TOML::Document.parse('1986-08-28T15:15:00.999999', root: :datetime)
+    assert_equal(Time.utc(1986, 8, 28, 15, 15, 0.999999), match.value)
   end
 
   def test_inline_table

data/toml-rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'toml-rb'
-  s.version     = '0.3.10'
+  s.version     = '0.3.11'
   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.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus