toml-rb 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c8bc0a9cbb23e1d7f74b114ccb9b562ddc5925
-  data.tar.gz: 6e1545aca165045cb3fbf22221c0779765335724
+  metadata.gz: c08aa29a171d7d63f32f49b003ba684889066e10
+  data.tar.gz: 6e691196c2fbf7f76d84bd9e3d9c4f404dc4b44b
 SHA512:
-  metadata.gz: fe091042c32d0c1bcfab2750711822e3914bc1d35b4a45a2cb28f7bd8ea64d4e86b589e6000c8f31299256138dcd209c74ecfa6e5b9ade7698051bb31b4fae09
-  data.tar.gz: 94c3033f5fc157f236d7586306e2b7d6e1d33ab38133651cfbf9ef78ac8e58afd02c98636f3702252e26df7e6d06e147037d49c53fbf6e6b0e9dc089d2b2e202
+  metadata.gz: afc71aad3baf66c57e2e5edb067a3bf03855a35abb9f983e6b1300d3d7ca1ebfdcdb7fce5a82fc04067300ee84f1b7b9563832bc98ff9d97a9156ce5a6bd921a
+  data.tar.gz: 7e779c92833849403f5b805883126611212d43582a9e852395254eb99d78831d1d5cae33d4485eb1faf8f62ea0306fe85bb77000f176833835cfabdfdff96130

data/README.md

@@ -6,7 +6,7 @@ toml-rb
 [![Code Climate](https://codeclimate.com/github/emancu/toml-rb/badges/gpa.svg)](https://codeclimate.com/github/emancu/toml-rb)
 [![Dependency Status](https://gemnasium.com/emancu/toml-rb.svg)](https://gemnasium.com/emancu/toml-rb)
 
-A [TOML](https://github.com/mojombo/toml) parser using [Citrus](http://mjackson.github.io/citrus) library.
+A [TOML](https://github.com/toml-lang/toml) parser using [Citrus](http://mjackson.github.io/citrus) library.
 
 TOML specs supported: `0.4.0`
 

data/lib/toml/errors.rb

@@ -10,7 +10,7 @@ module TOML
     attr_accessor :key
 
     def initialize(key)
-      self.key = key
+      @key = key
       super "Key #{key.inspect} is defined more than once"
     end
   end

data/lib/toml/string.rb

@@ -1,6 +1,17 @@
 module TOML
   # Used in primitive.citrus
   module BasicString
+    SPECIAL_CHARS = {
+      '\\0'  => "\0",
+      '\\t'  => "\t",
+      '\\b'  => "\b",
+      '\\f'  => "\f",
+      '\\n'  => "\n",
+      '\\r'  => "\r",
+      '\\"'  => '"',
+      '\\\\' => '\\'
+    }.freeze
+
     def value
       aux = TOML::BasicString.transform_escaped_chars first.value
 
@@ -10,26 +21,21 @@ module TOML
     # Replace the unicode escaped characters with the corresponding character
     # e.g. \u03B4 => ?
     def self.decode_unicode(str)
-      str.gsub(/([^\\](?:\\\\)*\\u[\da-f]{4})/i) do |m|
-        m[0...-6] + [m[-4..-1].to_i(16)].pack('U')
-      end
+      [str[2..-1].to_i(16)].pack('U')
     end
 
-    # Replace special characters such as line feed and tabs.
-    def self.decode_special_char(str)
-      str.gsub(/\\0/, "\0")
-        .gsub(/\\t/, "\t")
-        .gsub(/\\b/, "\b")
-        .gsub(/\\f/, "\f")
-        .gsub(/\\n/, "\n")
-        .gsub(/\\\"/, '"')
-        .gsub(/\\r/, "\r")
+    def self.transform_escaped_chars(str)
+      str.gsub(/\\(u[\da-fA-F]{4}|U[\da-fA-F]{8}|.)/) do |m|
+        if m.size == 2
+          SPECIAL_CHARS[m] || parse_error(m)
+        else
+          decode_unicode(m).force_encoding('UTF-8')
+        end
+      end
     end
 
-    def self.transform_escaped_chars(str)
-      str = decode_special_char(str)
-      str = decode_unicode(str)
-      str.gsub(/\\\\/, '\\').encode('utf-8')
+    def self.parse_error(m)
+      fail ParseError.new "Escape sequence #{m} is reserved"
     end
   end
 

data/test/grammar_test.rb

@@ -79,8 +79,8 @@ class GrammarTest < Minitest::Test
     match = TOML::Document.parse('"\0 \" \t \n \r"', root: :string)
     assert_equal("\0 \" \t \n \r", match.value)
 
-    match = TOML::Document.parse('"C:\\Documents\\virus.exe"', root: :string)
-    assert_equal('C:\\Documents\\virus.exe', match.value)
+    match = TOML::Document.parse('"C:\\\\Documents\\\\nada.exe"', root: :string)
+    assert_equal('C:\\Documents\\nada.exe', match.value)
   end
 
   def test_bool

data/toml-rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'toml-rb'
-  s.version     = '0.3.9'
+  s.version     = '0.3.10'
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'TOML parser in ruby, for ruby.'
   s.description = 'A TOML parser using Citrus parsing library. '

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus