tomlrb 1.2.6 → 2.0.0

data/lib/tomlrb/scanner.rb

@@ -2,53 +2,91 @@ require 'strscan'
 
 module Tomlrb
   class Scanner
-    COMMENT = /#.*/
+    COMMENT = /#[^\u0000-\u0008\u000A-\u001F\u007F]*/
     IDENTIFIER = /[A-Za-z0-9_-]+/
-    SPACE = /[ \t\r\n]/
-    STRING_BASIC = /(["])(?:\\?.)*?\1/
-    STRING_MULTI = /"{3}([\s\S]*?"{3,4})/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
-    FLOAT = /[+-]?(?:[0-9_]+\.[0-9_]*|\.[0-9_]+|\d+(?=[eE]))(?:[eE][+-]?[0-9_]+)?/
-    INTEGER = /[+-]?\d(_?\d)*(?![A-Za-z0-9_-]+)/
+    SPACE = /[ \t]/
+    NEWLINE = /(\r?\n)/
+    STRING_BASIC = /(["])(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/
+    STRING_MULTI = /"{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?(?<!\\)"{3,5})/m
+    STRING_LITERAL = /(['])(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/
+    STRING_LITERAL_MULTI = /'{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?'{3,5})/m
+    DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?))?(z|[-+]\d{2}:\d{2})/i
+    LOCAL_DATETIME = /(-?\d{4})-(\d{2})-(\d{2})(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/i
+    LOCAL_DATE = /(-?\d{4})-(\d{2})-(\d{2})/
+    LOCAL_TIME = /(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/
+    FLOAT = /[+-]?(?:(?:\d|[1-9](?:_?\d)*)\.\d(?:_?\d)*|\d+(?=[eE]))(?:[eE][+-]?[0-9_]+)?(?!\w)/
+    FLOAT_INF = /[+-]?inf\b/
+    FLOAT_NAN = /[+-]?nan\b/
+    INTEGER = /[+-]?([1-9](_?\d)*|0)(?![A-Za-z0-9_-]+)/
+    HEX_INTEGER = /0x[0-9A-Fa-f][0-9A-Fa-f_]*/
+    OCT_INTEGER = /0o[0-7][0-7_]*/
+    BIN_INTEGER = /0b[01][01_]*/
     TRUE   = /true/
     FALSE  = /false/
 
     def initialize(io)
       @ss = StringScanner.new(io.read)
+      @eos = false
     end
 
     def next_token
-      return if @ss.eos?
-
       case
+      when @ss.eos? then process_eos
       when @ss.scan(SPACE) then next_token
       when @ss.scan(COMMENT) then next_token
       when @ss.scan(DATETIME) then process_datetime
+      when @ss.scan(LOCAL_DATETIME) then process_local_datetime
+      when @ss.scan(LOCAL_DATE) then process_local_date
+      when @ss.scan(LOCAL_TIME) then process_local_time
       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]]
       when text = @ss.scan(STRING_LITERAL) then [:STRING_LITERAL, text[1..-2]]
       when text = @ss.scan(FLOAT) then [:FLOAT, text]
+      when text = @ss.scan(FLOAT_INF) then [:FLOAT_INF, text]
+      when text = @ss.scan(FLOAT_NAN) then [:FLOAT_NAN, text]
       when text = @ss.scan(INTEGER) then [:INTEGER, text]
+      when text = @ss.scan(HEX_INTEGER) then [:HEX_INTEGER, text]
+      when text = @ss.scan(OCT_INTEGER) then [:OCT_INTEGER, text]
+      when text = @ss.scan(BIN_INTEGER) then [:BIN_INTEGER, text]
       when text = @ss.scan(TRUE)   then [:TRUE, text]
       when text = @ss.scan(FALSE)  then [:FALSE, text]
+      when text = @ss.scan(NEWLINE) then [:NEWLINE, text]
       when text = @ss.scan(IDENTIFIER) then [:IDENTIFIER, text]
-      else
-        x = @ss.getch
-        [x, x]
+      else x = @ss.getch; [x, x]
       end
     end
 
     def process_datetime
       if @ss[7].nil?
-        offset = Time.now.utc_offset
+        offset = '+00:00'
       else
         offset = @ss[7].gsub('Z', '+00:00')
       end
-      args = [ @ss[1], @ss[2], @ss[3], @ss[4] || 0, @ss[5] || 0, @ss[6].to_f, offset ]
+      args = [@ss[1], @ss[2], @ss[3], @ss[4] || 0, @ss[5] || 0, @ss[6].to_f, offset]
       [:DATETIME, args]
     end
+
+    def process_local_datetime
+      args = [@ss[1], @ss[2], @ss[3], @ss[4] || 0, @ss[5] || 0, @ss[6].to_f]
+      [:LOCAL_DATETIME, args]
+    end
+
+    def process_local_date
+      args = [@ss[1], @ss[2], @ss[3]]
+      [:LOCAL_DATE, args]
+    end
+
+    def process_local_time
+      args = [@ss[1], @ss[2], @ss[3].to_f]
+      [:LOCAL_TIME, args]
+    end
+
+    def process_eos
+      return if @eos
+
+      @eos = true
+      [:EOS, nil]
+    end
   end
 end

data/lib/tomlrb/string_utils.rb

@@ -12,7 +12,13 @@ module Tomlrb
     }.freeze
 
     def self.multiline_replacements(str)
-      strip_spaces(str).gsub(/\\\n\s+/, '')
+      strip_spaces(str).gsub(/\\+\s*\n\s*/) {|matched|
+        if matched.match(/\\+/)[0].length.odd?
+          matched.gsub(/\\\s*\n\s*/, '')
+        else
+          matched
+        end
+      }
     end
 
     def self.replace_escaped_chars(str)

data/lib/tomlrb/version.rb

@@ -1,3 +1,3 @@
 module Tomlrb
-  VERSION = "1.2.6"
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Francois Bernier
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies: []
 description: A racc based toml parser
 email:
@@ -17,25 +17,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- CHANGELOG.md
-- Gemfile
 - LICENSE.txt
-- README.md
-- Rakefile
-- benchmarks/bench.rb
-- bin/console
-- bin/setup
 - lib/tomlrb.rb
 - lib/tomlrb/generated_parser.rb
 - lib/tomlrb/handler.rb
+- lib/tomlrb/local_date.rb
+- lib/tomlrb/local_date_time.rb
+- lib/tomlrb/local_time.rb
 - lib/tomlrb/parser.rb
 - lib/tomlrb/parser.y
 - lib/tomlrb/scanner.rb
 - lib/tomlrb/string_utils.rb
 - lib/tomlrb/version.rb
-- tomlrb.gemspec
 homepage: https://github.com/fbernier/tomlrb
 licenses:
 - MIT
@@ -55,8 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A racc based toml parser

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-before_install:
-  - gem install bundler
-rvm:
-  - 2.2.1

data/CHANGELOG.md

@@ -1,8 +0,0 @@
-### 1.2.6 - 2017-10-23
-
-* Fix issue where an unclosed table could make the parsing loop infinitely.
-* Proper string escaping
-
-### 1.1.3 - 2015-11-24
-
-* Bare integers can be used as keys as per the spec

data/Gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-group :development do
-  gem "bundler"
-  gem "rake"
-  gem "byebug"
-  gem "racc"
-  gem "minitest"
-  gem "minitest-reporters"
-  gem "benchmark-ips"
-end
-
-gemspec

data/README.md

@@ -1,80 +0,0 @@
-# Tomlrb
-
-[![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) Ruby parser supporting the 0.4.0 version of the spec.
-
-
-## TODO
-
-* Better tests
-* Dumper
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'tomlrb'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install tomlrb
-
-## Usage
-
-```ruby
-Tomlrb.parse("[toml]\na = [\"array\", 123]")
-```
-
-or
-
-```ruby
-Tomlrb.load_file('my_file', symbolize_keys: true)
-```
-
-## Benchmark
-
-You can run the benchmark against the only other v0.4.0 compliant parser to my knowledge with `ruby benchmarks/bench.rb`.
-
-Here are the results on my machine:
-
-```
-Warming up --------------------------------------
-      emancu/toml-rb     1.000  i/100ms
-     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:      653.6 i/s
-      emancu/toml-rb:       19.2 i/s - 34.05x  slower
-```
-
-## Development
-
-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
-
-1. Fork it ( https://github.com/[my-github-username]/tomlrb/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
-
-## Thanks
-
-Thanks to [@jpbougie](https://github.com/jpbougie) for the crash course on  the Chomsky hierarchy and general tips.

data/Rakefile

@@ -1,14 +0,0 @@
-require "bundler/gem_tasks"
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/test*.rb']
-  t.verbose = true
-end
-
-task default: [:test]
-
-task :compile do
-  sh 'racc lib/tomlrb/parser.y -o lib/tomlrb/generated_parser.rb'
-end

data/benchmarks/bench.rb

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

data/bin/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "tomlrb"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "byebug"

data/bin/setup

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-rake compile

data/tomlrb.gemspec

@@ -1,22 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'tomlrb/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "tomlrb"
-  spec.version       = Tomlrb::VERSION
-  spec.authors       = ["Francois Bernier"]
-  spec.email         = ["frankbernier@gmail.com"]
-
-  spec.summary       = %q{A racc based toml parser}
-  spec.description   = %q{A racc based toml parser}
-  spec.homepage      = "https://github.com/fbernier/tomlrb"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.0'
-end