tomlrb 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be502b2a9974d26ce6fd6b03288086b2aedbbffd
-  data.tar.gz: 0a8e50b7800a3e6ab2f69decb26978c2013db0a6
+  metadata.gz: 68ff6a39fb4b176a95742a9e4ac1479b043f1a3a
+  data.tar.gz: f194abd1850832fd2db66c1e27e037a9c8c76e41
 SHA512:
-  metadata.gz: 20ddd92f583df5e8eaa30359f44bcb78979b2bce0046992475db6256d15a6ff81babdc5f07841ad7f6ee8dc6466de9abb8b486ea38dd7e279fb43fb460dc826a
-  data.tar.gz: 39f8154cbae5943b80ceedc1648ec5c95bd6bb71766aa8e836fd1be5a56bce7b69e161682f946d74d85e02539de94f19b1b3eed6089d9aee48fe40bfcd4725db
+  metadata.gz: 45d1317b8f190b1ad5f8d4446e3433c9c2caa36b6dfddf7798a89a7d9c7d14f6a28a257bb46cf695b23f13b762d4cfcd0e3ad8141e209a1f111a8784a13af8f6
+  data.tar.gz: a0b2e86ae8b3a260820895a655bdb94aa280a1de2322f4307c84bb7056e1a53af5edcd6ee42f829bb78ec91f9bc395857e4e2e2b87523c9c5c94cccdc814f5e3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 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

@@ -3,8 +3,7 @@ source 'https://rubygems.org'
 group :development do
   gem "bundler"
   gem "rake"
-  gem "pry"
-  gem "pry-byebug"
+  gem "byebug"
   gem "racc"
   gem "minitest"
   gem "minitest-reporters"

data/bin/console

@@ -7,5 +7,4 @@ require "tomlrb"
 # 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 "pry"
-Pry.start
+require "byebug"

data/lib/tomlrb.rb

@@ -22,7 +22,7 @@ module Tomlrb
     begin
       handler = parser.parse
     rescue Racc::ParseError => e
-      raise ParseError.new(e.message)
+      raise ParseError, e.message
     end
 
     handler.output

data/lib/tomlrb/generated_parser.rb

@@ -522,14 +522,14 @@ module_eval(<<'.,.,', 'parser.y', 100)
 
 module_eval(<<'.,.,', 'parser.y', 101)
   def _reduce_54(val, _values, result)
-     result = StringUtils.replace_escaped_chars(StringUtils.strip_spaces(val[0])) 
+     result = StringUtils.strip_spaces(val[0]) 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 102)
   def _reduce_55(val, _values, result)
-     result = StringUtils.strip_spaces(val[0]) 
+     result = val[0] 
     result
   end
 .,.,

data/lib/tomlrb/handler.rb

@@ -35,7 +35,7 @@ module Tomlrb
         @array_names << stringified_identifier
         last_identifier = identifiers.pop
       elsif @array_names.include?(stringified_identifier)
-        raise ParseError.new('Cannot define a normal table with the same name as an already established array')
+        raise ParseError, 'Cannot define a normal table with the same name as an already established array'
       end
 
       yield(identifiers)
@@ -64,6 +64,7 @@ module Tomlrb
     def end_(type)
       array = []
       while (value = @stack.pop) != [type]
+        raise ParseError, 'Unclosed table' unless value
         array.unshift(value)
       end
       array

data/lib/tomlrb/parser.y

@@ -99,6 +99,6 @@ rule
   string
     : STRING_MULTI { result = StringUtils.replace_escaped_chars(StringUtils.multiline_replacements(val[0])) }
     | STRING_BASIC { result = StringUtils.replace_escaped_chars(val[0]) }
-    | STRING_LITERAL_MULTI { result = StringUtils.replace_escaped_chars(StringUtils.strip_spaces(val[0])) }
-    | STRING_LITERAL { result = StringUtils.strip_spaces(val[0]) }
+    | STRING_LITERAL_MULTI { result = StringUtils.strip_spaces(val[0]) }
+    | STRING_LITERAL { result = val[0] }
     ;

data/lib/tomlrb/string_utils.rb

@@ -1,18 +1,28 @@
 module Tomlrb
   class StringUtils
 
+    SPECIAL_CHARS = {
+      '\\t'  => "\t",
+      '\\b'  => "\b",
+      '\\f'  => "\f",
+      '\\n'  => "\n",
+      '\\r'  => "\r",
+      '\\"'  => '"',
+      '\\\\' => '\\'
+    }.freeze
+
     def self.multiline_replacements(str)
       strip_spaces(str).gsub(/\\\n\s+/, '')
     end
 
     def self.replace_escaped_chars(str)
-      str
-        .gsub(/\\n/, "\n")
-        .gsub(/\\0/, "\0")
-        .gsub(/\\t/, "\t")
-        .gsub(/\\r/, "\r")
-        .gsub(/\\\"/, '"')
-        .gsub(/\\\\/, '\\')
+      str.gsub(/\\(u[\da-fA-F]{4}|U[\da-fA-F]{8}|.)/) do |m|
+        if m.size == 2
+          SPECIAL_CHARS[m] || (raise Tomlrb::ParseError.new "Escape sequence #{m} is reserved")
+        else
+          m[2..-1].to_i(16).chr(Encoding::UTF_8)
+        end
+      end
     end
 
     def self.strip_spaces(str)

data/lib/tomlrb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Francois Bernier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies: []
 description: A racc based toml parser
 email: