tomlrb 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38bbb338f065b9b460b975285aeecad0e7bdf691
-  data.tar.gz: cd43529b21ee755922200f9ea492a84c1bb2f315
+  metadata.gz: 86c658a15f370e29296822096361be88b381124e
+  data.tar.gz: bcdc56e5d754afb1b3ee02d01737a8ecf0744435
 SHA512:
-  metadata.gz: a90025b382ec0cc530029b423f17a698b524333981907ca0559f5c37192bb7e9594df1af57f32c11adcbca04adb1423b4eaeb671ec1ec4803029542b24e88315
-  data.tar.gz: 82429533f65caaabbfdc21df7fe4800e34047e5b0680541501c39e1954ec713179abd61cf12b83a7a773072af142387963c16f1198b51723100204bd3fa73951
+  metadata.gz: fbea9023660e2807b5d90088f31027e2e3454fb07beb0893decbb3b81e6c4a65811c828cc0788c6bd7c613d7f82982803ec76e9cdd0f4a5d800e540d9cbfb752
+  data.tar.gz: 671eabff02c17040c061e12322281180c7ced933773f855534f03997e78e30ef1c91dfbcddb3e21d2cfab293f8de854761e61d92caf898d710799e3339709c8b

data/README.md

@@ -2,7 +2,7 @@
 
 [![Code Climate](https://codeclimate.com/github/fbernier/tomlrb/badges/gpa.svg)](https://codeclimate.com/github/fbernier/tomlrb) [![Build Status](https://travis-ci.org/fbernier/tomlrb.svg)](https://travis-ci.org/fbernier/tomlrb) [![Gem Version](https://badge.fury.io/rb/tomlrb.svg)](http://badge.fury.io/rb/tomlrb)
 
-A Racc based [TOML](https://github.com/toml-lang/toml) parser supporting the 0.4.0 version of the spec.
+A Racc based [TOML](https://github.com/toml-lang/toml) Ruby parser supporting the 0.4.0 version of the spec.
 
 
 ## TODO
@@ -43,6 +43,10 @@ Tomlrb.load_file('my_file', symbolize_keys: true)
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
+Do not forget to regenerate the parser when you modify rules in the `parser.y` file using `rake compile`.
+
+Run the tests using `rake test`.
+
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/lib/tomlrb/generated_parser.rb

@@ -416,7 +416,7 @@ module_eval(<<'.,.,', 'parser.y', 83)
 
 module_eval(<<'.,.,', 'parser.y', 84)
   def _reduce_43(val, _values, result)
-     result = Time.parse(val[0]) 
+     result = Time.new(*val[0])
     result
   end
 .,.,

data/lib/tomlrb/parser.y

@@ -82,7 +82,7 @@ rule
     | INTEGER { result = val[0].to_i }
     | TRUE   { result = true }
     | FALSE  { result = false }
-    | DATETIME { result = Time.parse(val[0]) }
+    | DATETIME { result = Time.new(*val[0])}
     ;
   string
     : STRING_MULTI { result = StringUtils.replace_escaped_chars(StringUtils.multiline_replacements(val[0])) }

data/lib/tomlrb/scanner.rb

@@ -9,7 +9,7 @@ module Tomlrb
     STRING_MULTI = /"{3}([\s\S]*?"{3})/m
     STRING_LITERAL = /(['])(?:\\?.)*?\1/
     STRING_LITERAL_MULTI = /'{3}([\s\S]*?'{3})/m
-    DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:t|\s)(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(z|[-+]\d{2}:\d{2})/i
+    DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)?(z|[-+]\d{2}:\d{2})/i
     FLOAT = /[+-]?(?:[0-9_]+\.[0-9_]*|\.[0-9_]+|\d+(?=[eE]))(?:[eE][+-]?[0-9_]+)?/
     INTEGER = /[+-]?\d(_?\d)*/
     TRUE   = /true/
@@ -25,7 +25,7 @@ module Tomlrb
       case
       when @ss.scan(SPACE) then next_token
       when @ss.scan(COMMENT) then next_token
-      when text = @ss.scan(DATETIME) then [:DATETIME, text]
+      when @ss.scan(DATETIME) then process_datetime
       when text = @ss.scan(STRING_MULTI) then [:STRING_MULTI, text[3..-4]]
       when text = @ss.scan(STRING_BASIC) then [:STRING_BASIC, text[1..-2]]
       when text = @ss.scan(STRING_LITERAL_MULTI) then [:STRING_LITERAL_MULTI, text[3..-4]]
@@ -40,5 +40,10 @@ module Tomlrb
         [x, x]
       end
     end
+
+    def process_datetime
+      args = [ @ss[1], @ss[2], @ss[3], @ss[4], @ss[5], @ss[6].to_f, @ss[7].gsub('Z', '+00:00') ]
+      [:DATETIME, args]
+    end
   end
 end

data/lib/tomlrb/version.rb

@@ -1,3 +1,3 @@
 module Tomlrb
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Francois Bernier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler