toml 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 21fdb895a9bab72e0d83617219b906ad14e56f58
-  data.tar.gz: 0cfdac6172ef69b7c1d217109d416457ff6360a6
+SHA256:
+  metadata.gz: 6fe891b78d0c8ef3788c8abe359d4350bc1a1a9774d2576c94b8840160acee62
+  data.tar.gz: 948287584ed396f0f07bdaf358f4263f25528a5de4ccb3b8cfecabc1514936fb
 SHA512:
-  metadata.gz: 37c9a523b090f8afb92d050397ffe0e22ce342f90a30ae72d6e62c033907b1496cd9859252ce70079440b880b4e01849f0ea9aa9fb1dba624cb883f0ae0da0f9
-  data.tar.gz: 38835f89d190d8b7b018739602a96cccc2c8e41b9ce8aa268b8899e9cf56716403c10c7265134e836b56cc5704ebefef13e61dc31b624f19ad0b4b30aa86d836
+  metadata.gz: 867a7f6183e52213106e50d68e8e2e1262b87875a6cbe20e43637803011d3796bc77ad50e5e6c64e778cd84ebb833fad474f39ac8abc605e1a436e41aff24edd
+  data.tar.gz: efd7be04b02c6487ce8a1bc686e8943f426ceb8054852eebb944ba655bcab152b299dd6a189f73d5671df16446cdeeb11d0bea2fe51171aad661c392efbfb4bb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.3.0 / 2020-06-09
+
+- Fix "undefined method `ascii_tree' for nil:NilClass" when printing parse error
+- Fixes TOML to work with version 2.0 of Parslet
+
+## 0.2.0 / 2017-11-11
+
+- Add support for underscored Integers and Floats
+- Fixes TOML to work with version 1.8.0 of Parslet
+
 ## 0.1.2 / 2014-10-16
 
 - Add support for `CR` and `CRLF` newlines (#13)

data/README.md

@@ -1,17 +1,25 @@
 # TOML
 
-A sane configuration format from @mojombo.  More information here: https://github.com/mojombo/toml
+A Ruby parser for [TOML](https://github.com/mojombo/toml), built on [parslet](https://github.com/kschiess/parslet).
 
 This is far superior to YAML and JSON because it doesn't suck.  Really it doesn't.
 
-**There is a bug in Rails 2.3's vendored version of BlankSlate (a dependency of Parslet which is used for parsing TOML) that breaks Parslet; please see this [Gist](https://gist.github.com/dirk/5264004) for a workaround.**
+<<<<<<< HEAD
+=======
+[![Gem Version](https://badge.fury.io/rb/toml.svg)](http://badge.fury.io/rb/toml)
 
+>>>>>>> Update README
 ## Usage
 
-Add to your Gemfile:
+Install this library:
 
+<<<<<<< HEAD
 ```ruby
-gem "toml", "~> 0.0.3"
+gem "toml", "~> 0.3.0"
+=======
+```bash
+gem install "toml"
+>>>>>>> Update README
 ```
 
 It's simple, really.
@@ -40,6 +48,8 @@ TOML.load_file("my_file.toml")
 # => {"whatever" => "keys"}
 ```
 
+In case a syntax error occurs, the parser will raise a `Parslet::ParseFailed` exception.
+
 There's also a beta feature for generating a TOML file from a Ruby hash. Please note this will likely not give beautiful output right now.
 
 ```ruby

data/lib/toml/monkey_patch.rb

@@ -82,6 +82,6 @@ class Numeric
 end
 class DateTime
   def to_toml(path = "")
-    self.to_time.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+    self.rfc3339
   end
 end

data/lib/toml/parser.rb

@@ -6,13 +6,8 @@ module TOML
       # Make sure we have a newline on the end
       
       markup += "\n" unless markup.end_with?("\n") || markup.length == 0
-      begin
-        tree = Parslet.new.parse(markup)
-      rescue Parslet::ParseFailed => failure
-        puts failure.cause.ascii_tree
-      end
-      
-      
+      tree = Parslet.new.parse(markup)
+
       parts = Transformer.new.apply(tree) || []
       @parsed = {}
       @current = @parsed

data/lib/toml/parslet.rb

@@ -2,7 +2,7 @@ module TOML
   class Parslet < ::Parslet::Parser
     rule(:document) {
       all_space >>
-      (table | table_array | key_value | comment_line).repeat >>
+      (comment_line | table | table_array | key_value).repeat >>
       all_space
     }
     root :document
@@ -11,15 +11,16 @@ module TOML
       array |
       string |
       datetime.as(:datetime) |
+      datetime_rfc3339.as(:datetime_rfc3339) |
       float.as(:float) |
       integer.as(:integer) |
       boolean
     }
-    
+
     # Finding comments in multiline arrays requires accepting a bunch of
     # possible newlines and stuff before the comment
     rule(:array_comments) { (all_space >> comment_line).repeat }
-    
+
     rule(:array) {
       str("[") >> all_space >> array_comments >>
       ( array_comments >> # Match any comments on first line
@@ -32,10 +33,10 @@ module TOML
         ).repeat >>
         (all_space >> str(",")).maybe >> # possible trailing comma
         all_space >> array_comments # Grab any remaining comments just in case
-      ).maybe.as(:array) >> str("]") 
+      ).maybe.as(:array) >> str("]")
     }
-    
-    rule(:key_value) { 
+
+    rule(:key_value) {
       space >> key.as(:key) >>
       space >> str("=") >>
       space >> value.as(:value) >>
@@ -53,7 +54,7 @@ module TOML
       str("]]") >>
       space >> comment.maybe >> str("\n") >> all_space
     }
-    
+
     rule(:key) { match["^. \t\\]"].repeat(1) }
     rule(:table_name) { key.as(:key) >> (str(".") >> key.as(:key)).repeat }
 
@@ -63,17 +64,17 @@ module TOML
     rule(:space) { match[" \t"].repeat }
     rule(:all_space) { match[" \t\r\n"].repeat }
     rule(:newline) { str("\r").maybe >> str("\n") | str("\r") >> str("\n").maybe }
-        
+
     rule(:string) {
       str('"') >> (
       match["^\"\\\\"] |
       (str("\\") >> match["0tnr\"\\\\"])
       ).repeat.as(:string) >> str('"')
     }
-    
+
     rule(:sign) { str("-") }
     rule(:sign?) { sign.maybe }
-    
+
     rule(:integer) {
       str("0") | sign? >>
       (match["1-9"] >> (match["_"].maybe >> match["0-9"]).repeat)
@@ -85,7 +86,7 @@ module TOML
     }
 
     rule(:boolean) { str("true").as(:true) | str("false").as(:false) }
-    
+
     rule(:date) {
       match["0-9"].repeat(4,4) >> str("-") >>
       match["0-9"].repeat(2,2) >> str("-") >>
@@ -98,6 +99,16 @@ module TOML
       match["0-9"].repeat(2,2)
     }
 
+    rule(:timezone) {
+      match["0-9"].repeat(2,2) >> str(":") >>
+      match["0-9"].repeat(2,2)
+    }
+
     rule(:datetime) { date >> str("T") >> time >> str("Z") }
+
+    rule(:datetime_rfc3339) {
+      # rfc3339 section 5.6 allows replacing 'T' with a space.
+      date >> (str("T") | str(" ")) >> time >> (str("+") | str("-")) >> timezone
+    }
   end
-end
+end

data/lib/toml/transformer.rb

@@ -52,6 +52,7 @@ module TOML
       ""
     }
     rule(:datetime => simple(:d)) { DateTime.iso8601(d) }
+    rule(:datetime_rfc3339 => simple(:d)) { DateTime.rfc3339(d) }
     rule(:true => simple(:b)) { true }
     rule(:false => simple(:b)) { false }
     

data/lib/toml/version.rb

@@ -1,3 +1,3 @@
 module TOML
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: toml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeremy McAnally
 - Dirk Gadsden
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +70,7 @@ homepage: http://github.com/jm/toml
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -80,9 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 2
 summary: Parse your TOML.
 test_files: []