tomlrb 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 811f70b18b678d2f673d17c966a26cf97ee8e6a1
-  data.tar.gz: 2911f897197afd22da28e39ae45d21e552dcdcc5
+  metadata.gz: be502b2a9974d26ce6fd6b03288086b2aedbbffd
+  data.tar.gz: 0a8e50b7800a3e6ab2f69decb26978c2013db0a6
 SHA512:
-  metadata.gz: d6159d611a29b90846e278c3f006c2d461124cf97ae8ca6d637b4d072f30a6ade342b5401730acbeba3511fa6e361630786570e1f1acda46ef3a35e54f403adc
-  data.tar.gz: 1613388e7d6631cfb2250c637dee71dc231f17375d4f755b8f1f9dbc1285ffa26f60ead4cebd6879182ebf003aca55c11dd91b0e0d092e9a2a95b2e3beb5f784
+  metadata.gz: 20ddd92f583df5e8eaa30359f44bcb78979b2bce0046992475db6256d15a6ff81babdc5f07841ad7f6ee8dc6466de9abb8b486ea38dd7e279fb43fb460dc826a
+  data.tar.gz: 39f8154cbae5943b80ceedc1648ec5c95bd6bb71766aa8e836fd1be5a56bce7b69e161682f946d74d85e02539de94f19b1b3eed6089d9aee48fe40bfcd4725db

data/README.md

@@ -45,17 +45,16 @@ You can run the benchmark against the only other v0.4.0 compliant parser to my k
 Here are the results on my machine:
 
 ```
-Calculating -------------------------------------
+Warming up --------------------------------------
       emancu/toml-rb     1.000  i/100ms
-     fbernier/tomlrb    46.000  i/100ms
--------------------------------------------------
-      emancu/toml-rb     13.657  (± 7.3%) i/s -     69.000
-     fbernier/tomlrb    486.095  (± 3.5%) i/s -      2.438k
+     fbernier/tomlrb    65.000  i/100ms
+Calculating -------------------------------------
+      emancu/toml-rb     19.199  (± 5.2%) i/s -     96.000  in   5.034377s
+     fbernier/tomlrb    653.650  (± 4.0%) i/s -      3.315k in   5.081117s
 
 Comparison:
-     fbernier/tomlrb:      486.1 i/s
-      emancu/toml-rb:       13.7 i/s - 35.59x slower
-
+     fbernier/tomlrb:      653.6 i/s
+      emancu/toml-rb:       19.2 i/s - 34.05x  slower
 ```
 
 ## Development

data/benchmarks/bench.rb

@@ -1,7 +1,7 @@
 require 'benchmark/ips'
 require_relative '../lib/tomlrb'
 begin
-  require 'toml'
+  require 'toml-rb'
 rescue LoadError
   puts "Install toml-rb using 'gem install toml-rb' first."
 end
@@ -11,7 +11,7 @@ data = File.read(File.join(__dir__, '../test/example-v0.4.0.toml'))
 Benchmark.ips do |x|
 
   x.report("emancu/toml-rb") do
-    TOML.parse(data)
+    TomlRB.parse(data)
   end
 
   x.report("fbernier/tomlrb") do

data/lib/tomlrb.rb

@@ -35,6 +35,10 @@ module Tomlrb
   # @option options [Boolean] :symbolize_keys (false) whether to return the keys as symbols or strings
   # @return [Hash] the Ruby data structure represented by the input
   def self.load_file(path, **options)
-    Tomlrb.parse(File.read(path), options)
+    # By default Ruby sets the external encoding of an IO object to the
+    # default external encoding. The default external encoding is set by
+    # locale encoding or the interpreter -E option.
+    tmp = File.read(path, :encoding=>'utf-8')
+    Tomlrb.parse(tmp, options)
   end
 end

data/lib/tomlrb/scanner.rb

@@ -11,7 +11,7 @@ module Tomlrb
     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
     FLOAT = /[+-]?(?:[0-9_]+\.[0-9_]*|\.[0-9_]+|\d+(?=[eE]))(?:[eE][+-]?[0-9_]+)?/
-    INTEGER = /[+-]?\d(_?\d)*/
+    INTEGER = /[+-]?\d(_?\d)*(?![A-Za-z0-9_-]+)/
     TRUE   = /true/
     FALSE  = /false/
 

data/lib/tomlrb/version.rb

@@ -1,3 +1,3 @@
 module Tomlrb
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Francois Bernier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies: []
 description: A racc based toml parser
 email:
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A racc based toml parser