nanaimo 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab09d023dcf3bf46a332312b87629f53d883dfaa
-  data.tar.gz: 9cba913511d07afdac303014a0800c80ec69e71b
+  metadata.gz: 090d05915f386fcbf6f5324805f7bd16f873678e
+  data.tar.gz: baa8d42469bd66dc1f7b0a6eae353698d6fe99e3
 SHA512:
-  metadata.gz: 465b4541004574d0436c34009cdf83929287c8d23ec88dc86f7968c43d0055c47439305f61c7c472211b9a9f0ddb6633564e4d5afa21b45adde9490bb287ea13
-  data.tar.gz: c5c73509cc97dd7b2dd6fe63ff8cdd420480190972bf2964cc4b5f870b96bac9cfd1dda43a48e5a584fd8ebd99ca7216fc079e214c93160a3fc989cf47d436f7
+  metadata.gz: 2833cad61d387df8c5ac6e45118d109333484c0555a307ac566cd0d6bd50925ae5a5003191645e96d523f0d9d6e171aca7a7f3891a95f42f3119b516d77ac081
+  data.tar.gz: 7faf48d2d57caa6076f13f8d10c1b1dbac3895f7a54d2e217609574fa48316dde4f12a6e2f1054741e3982ad0a4489b0aaca5767165f53d848921663f8e3db21

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Nanaimo Changelog
 
+## 0.2.2 (2016-11-04)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix extraneously escaping single quotes when writing quoted strings.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Properly align the `^` in parse error messages when the line with the syntax
+  error contains tabs.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 0.2.1 (2016-11-03)
 
 ##### Enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanaimo (0.2.1)
+    nanaimo (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -48,6 +48,7 @@ task :generate_quote_maps do
     map[escaped[1..-1]] = value
     map
   end
+  quote_map.delete("'")
 
   0.upto(31) { |i| quote_map[[i].pack('U')] ||= format('\\U%04x', i) }
   quote_regexp = Regexp.union(quote_map.keys)

data/lib/nanaimo/reader.rb

@@ -47,12 +47,19 @@ module Nanaimo
         indicator  = "#{line_number.succ}>  "
 
         m =  ::String.new("\n")
+
         m << "#{indent}-------------------------------------------\n"
         m << lines[[line_number - n, 0].max...line_number].map do |l|
           "#{indent}#{l}\n"
         end.join
-        m << "#{indicator}#{lines[line_number]}\n"
-        m << ' ' * (column + s + 2) << "^\n"
+
+        line = lines[line_number].to_s
+        m << "#{indicator}#{line}\n"
+
+        m << ' ' * indent.size
+        m << line[0, column.pred].gsub(/[^\t]/, ' ')
+        m << "^\n"
+
         m << Array(lines[line_number.succ..[lines.count.pred, line_number + n].min]).map do |l|
           l.strip.empty? ? '' : "#{indent}#{l}\n"
         end.join

data/lib/nanaimo/unicode/quote_maps.rb

@@ -9,7 +9,6 @@ module Nanaimo
       "\t" => "\\t",
       "\v" => "\\v",
       "\n" => "\\n",
-      "'" => "\\'",
       "\"" => "\\\"",
       "\\" => "\\\\",
       "\x00" => "\\U0000",
@@ -53,6 +52,6 @@ module Nanaimo
       "\\" => "\\",
     }.freeze
 
-    QUOTE_REGEXP = /\x07|\x08|\f|\r|\t|\v|\n|'|"|\\|\x00|\x01|\x02|\x03|\x04|\x05|\x06|\x0E|\x0F|\x10|\x11|\x12|\x13|\x14|\x15|\x16|\x17|\x18|\x19|\x1A|\x1B|\x1C|\x1D|\x1E|\x1F/
+    QUOTE_REGEXP = /\x07|\x08|\f|\r|\t|\v|\n|"|\\|\x00|\x01|\x02|\x03|\x04|\x05|\x06|\x0E|\x0F|\x10|\x11|\x12|\x13|\x14|\x15|\x16|\x17|\x18|\x19|\x1A|\x1B|\x1C|\x1D|\x1E|\x1F/
   end
 end

data/lib/nanaimo/version.rb

@@ -1,3 +1,3 @@
 module Nanaimo
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanaimo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Danielle Tomlinson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler