update Helpers#encode_uri for Opal, add tests

2 files changed, 16 insertions, 6 deletions

diff --git a/lib/asciidoctor/helpers.rb b/lib/asciidoctor/helpers.rb
index eab10490..01319073 100644
--- a/lib/asciidoctor/helpers.rb
+++ b/lib/asciidoctor/helpers.rb
@@ -34,12 +34,7 @@ module Helpers
   # returns an encoded version of the str
   def self.encode_uri(str)
     str.gsub(REGEXP[:uri_encode_chars]) do
-      match = $&
-      buf = ''
-      match.each_byte do |c|
-        buf << sprintf('%%%02X', c)
-      end
-      buf
+      $&.each_byte.map {|c| sprintf '%%%02X', c}.join
     end
   end
 
diff --git a/test/substitutions_test.rb b/test/substitutions_test.rb
index 79137a52..080ac855 100644
--- a/test/substitutions_test.rb
+++ b/test/substitutions_test.rb
@@ -1164,4 +1164,19 @@ foo&#8201;&#8212;&#8201;)
       assert_equal [:specialcharacters], block.subs
     end
   end
+
+  # TODO move to helpers_test.rb
+  context 'Helpers' do
+    test 'should URI encode non-word characters generally' do
+      given = ' /%&?\\'
+      expect = '%20%2F%25%26%3F%5C'
+      assert_equal expect, (Asciidoctor::Helpers.encode_uri given)
+    end
+
+    test 'should not URI select non-word characters' do
+      given = '-.!~*\';:@=+$,()[]'
+      expect = given
+      assert_equal expect, (Asciidoctor::Helpers.encode_uri given)
+    end
+  end
 end