escape_utils 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d7424e692690ecb13b6eb5ee969a532bd1fe505a
-  data.tar.gz: 5dcef4bb75091869f767949c6f3f93e97facfe03
+SHA256:
+  metadata.gz: 6f26c8a24ba01ecb130e04ef9af6802ab2deb56455527ccd551ae93839736604
+  data.tar.gz: 4fc6f51b66cd0c773cf3aea923023ccb66e31cd865e9b89da81a9119540cae05
 SHA512:
-  metadata.gz: 64563f3e25b7525fac604004e6749ae05a96a156fa0dbac031b6b3dd6337833f9c4ede0a92c0d8952fa774dcfd94e87648b52b8b888a3c3730c9ecb64864922f
-  data.tar.gz: a96b091153d336cc744c445a6ff96d0ed99244e15f9628d44c492dcf393b39040404944bba55eda02badf2ab53c75b351212159c562d7ad99c08cd6652651613
+  metadata.gz: f0f6556bd83c1068189d5a3183b2ad1df88bd4a79f46f119ae7fcfdff4339544d6e1654379fe0b64cd6f07865c67eafa83b9caa236e0ac6b23de1814fd808b2e
+  data.tar.gz: dd5e1b3baf9c594d48f0580f6c71c766e7e341fce332dba8fbd7f0a36d8611bb70e043ef3808c95e9d6a774a71d088e1136ff8025c2ae43e1588f0500d8d04ad

data/.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  rubies:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ ruby-head, '3.1', '3.0', '2.7', '2.6', '2.5' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run test
+        run: rake
+      - name: Install gem
+        run: rake install
+  platforms:
+    strategy:
+      matrix:
+        os: [macos, windows]
+        ruby: ['2.5']
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run test
+        run: bundle exec rake
+      - name: Install gem
+        run: bundle exec rake install

data/.gitignore

@@ -7,4 +7,3 @@ doc/*
 tmp/
 Gemfile.lock
 vendor/*
-bin/

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Unreleased
+
+# 1.2.2
+
+- Update EscapeUtils.escape_javascript to match Rails `escape_javascript`
+  Now escapes, Backquotes (```), Dollar (`$`), `U+2000` and `U+2001`
+- Make the Rack monkey patch a noop as it's no longer correct since circa 2011.
+- Require Ruby 2.5+
+- Stop escaping `~` like `CGI.escape` does since Ruby 2.5
+
+# 1.2.1
+
+- Historical version

data/Gemfile

@@ -1,3 +1,18 @@
 source 'https://rubygems.org'
 
+group :test do
+  gem 'rake-compiler'
+  gem 'minitest'
+  gem 'actionview'
+end
+
+group :benchmark do
+  gem 'benchmark-ips'
+  gem 'rack'
+  gem 'haml'
+  gem 'fast_xs'
+  gem 'actionpack'
+  gem 'url_escape'
+end
+
 gemspec

data/README.md

@@ -2,7 +2,7 @@
 
 Being as though we're all html escaping everything these days, why not make it faster?
 
-For character encoding in 1.9, the output string's encoding is copied from the input string.
+For character encoding, the output string's encoding is copied from the input string.
 
 It has monkey-patches for Rack::Utils, CGI, URI, ERB::Util and Haml and ActionView so you can drop this in and have your app start escaping fast as balls in no time
 
@@ -10,7 +10,7 @@ It supports HTML, URL, URI and Javascript escaping/unescaping.
 
 ## Installing
 
-Compatible with Ruby 1.9.3+
+Compatible with Ruby 2.5+
 
 ``` sh
 gem install escape_utils
@@ -52,7 +52,6 @@ html = EscapeUtils.unescape_html(escaped_html)
 #### Monkey Patches
 
 ``` ruby
-require 'escape_utils/html/rack' # to patch Rack::Utils
 require 'escape_utils/html/erb' # to patch ERB::Util
 require 'escape_utils/html/cgi' # to patch CGI
 require 'escape_utils/html/haml' # to patch Haml::Helpers
@@ -84,7 +83,6 @@ EscapeUtils.unescape_url(escaped_url) == url # => true
 ``` ruby
 require 'escape_utils/url/cgi' # to patch CGI
 require 'escape_utils/url/erb' # to patch ERB::Util
-require 'escape_utils/url/rack' # to patch Rack::Utils
 require 'escape_utils/url/uri' # to patch URI
 ```
 

data/Rakefile

@@ -1,12 +1,14 @@
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.pattern = "test/**/*_test.rb"
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task :default => :test
 
-gem 'rake-compiler', '>= 0.7.5'
 require "rake/extensiontask"
 
 Rake::ExtensionTask.new('escape_utils') do |ext|

data/bin/console

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "escape_utils"
+
+require "irb"
+IRB.start(__FILE__)

data/escape_utils.gemspec

@@ -16,16 +16,5 @@ Gem::Specification.new do |s|
   s.description = %q{Quickly perform HTML, URL, URI and Javascript escaping/unescaping}
   s.test_files = `git ls-files test`.split("\n")
 
-  s.required_ruby_version = ">= 1.9.3"
-
-  # tests
-  s.add_development_dependency 'rake-compiler', ">= 0.7.5"
-  s.add_development_dependency 'minitest', ">= 5.0.0"
-  # benchmarks
-  s.add_development_dependency 'benchmark-ips'
-  s.add_development_dependency 'rack'
-  s.add_development_dependency 'haml'
-  s.add_development_dependency 'fast_xs'
-  s.add_development_dependency 'actionpack'
-  s.add_development_dependency 'url_escape'
+  s.required_ruby_version = ">= 2.5"
 end

data/ext/escape_utils/escape_utils.c

@@ -167,7 +167,7 @@ static VALUE rb_eu_escape_xml(VALUE self, VALUE str)
  */
 static VALUE rb_eu_escape_js(VALUE self, VALUE str)
 {
-	return rb_eu__generic(str, &houdini_escape_js);
+	return rb_eu__generic(rb_obj_as_string(str), &houdini_escape_js);
 }
 
 static VALUE rb_eu_unescape_js(VALUE self, VALUE str)

data/ext/escape_utils/houdini_js_e.c

@@ -7,10 +7,11 @@
 static const char JS_ESCAPE[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 
+	0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -18,8 +19,7 @@ static const char JS_ESCAPE[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
@@ -51,6 +51,18 @@ houdini_escape_js(gh_buf *ob, const uint8_t *src, size_t size)
 		ch = src[i];
 		
 		switch (ch) {
+		case 226:
+			if (i + 2 < size && src[i + 1] == 128) {
+				if (src[i + 2] == 168) {
+					gh_buf_put(ob, "&#x2028;", 8);
+					i += 2;
+				} else if (src[i + 2] == 169) {
+					gh_buf_put(ob, "&#x2029;", 8);
+					i += 2;
+				}
+			}
+			break;
+
 		case '/':
 			/*
 			 * Escape only if preceded by a lt

data/ext/escape_utils/houdini_uri_e.c

@@ -12,7 +12,7 @@ static const char URL_SAFE[] = {
 	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 
 	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 

data/lib/escape_utils/url/rack.rb

@@ -1,12 +0,0 @@
-module Rack
-  module Utils
-    def escape(url)
-      EscapeUtils.escape_url(url.to_s)
-    end
-    def unescape(url)
-      EscapeUtils.unescape_url(url.to_s)
-    end
-    module_function :escape
-    module_function :unescape
-  end
-end

data/lib/escape_utils/version.rb

@@ -1,3 +1,3 @@
 module EscapeUtils
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/escape_utils/xml/builder.rb

@@ -1,8 +1,8 @@
 module Builder
-  class XmlBase < BlankSlate
+  class XmlBase
     private
     def _escape(text)
-      EscapeUtils.escape_xml(text.to_s)
+      ::EscapeUtils.escape_xml(text.to_s)
     end
   end
 end

data/test/html/escape_test.rb

@@ -105,26 +105,24 @@ class HtmlEscapeTest < Minitest::Test
     end
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_utf8_or_ascii_input_only
-      str = "<b>Bourbon & Branch</b>"
-
-      str.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.escape_html(str)
-      end
-
-      str.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.escape_html(str)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+  def test_utf8_or_ascii_input_only
+    str = "<b>Bourbon & Branch</b>"
+
+    str.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.escape_html(str)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      str = "<b>Bourbon & Branch</b>".encode('utf-8')
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_html(str).encoding
+    str.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.escape_html(str)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    str = "<b>Bourbon & Branch</b>".encode('utf-8')
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_html(str).encoding
+  end
 end

data/test/html/unescape_test.rb

@@ -23,26 +23,24 @@ class HtmlUnescapeTest < Minitest::Test
     assert_equal "&lt", EscapeUtils.unescape_html("&lt")
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      escaped = EscapeUtils.escape_html("<b>Bourbon & Branch</b>")
-
-      escaped.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.unescape_html(escaped)
-      end
-
-      escaped.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.unescape_html(escaped)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+  def test_input_must_be_utf8_or_ascii
+    escaped = EscapeUtils.escape_html("<b>Bourbon & Branch</b>")
+
+    escaped.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.unescape_html(escaped)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      escaped = EscapeUtils.escape_html("<b>Bourbon & Branch</b>")
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_html(escaped).encoding
+    escaped.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.unescape_html(escaped)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    escaped = EscapeUtils.escape_html("<b>Bourbon & Branch</b>")
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_html(escaped).encoding
+  end
 end

data/test/javascript/escape_test.rb

@@ -1,42 +1,80 @@
 require File.expand_path("../../helper", __FILE__)
 
+require 'active_support'
+require 'active_support/json'
+require 'action_view'
+require 'action_view/helpers'
+
 class JavascriptEscapeTest < Minitest::Test
+  ActiveSupport.escape_html_entities_in_json = true
+
+  module ActionViewHelper
+    include ActionView::Helpers::JavaScriptHelper
+    extend self
+  end
+
   def test_returns_empty_string_if_nil_passed
-    assert_equal "", EscapeUtils.escape_javascript(nil)
+    assert_compatible nil
   end
 
   def test_quotes_and_newlines
-    assert_equal %(This \\"thing\\" is really\\n netos\\n\\n\\'), EscapeUtils.escape_javascript(%(This "thing" is really\n netos\r\n\n'))
+    assert_compatible %(This "thing" is really\n netos\r\n\n')
   end
 
   def test_backslashes
-    assert_equal %(backslash\\\\test), EscapeUtils.escape_javascript(%(backslash\\test))
+    assert_compatible %(backslash\\test)
   end
 
   def test_closed_html_tags
-    assert_equal %(keep <open>, but dont <\\/close> tags), EscapeUtils.escape_javascript(%(keep <open>, but dont </close> tags))
+    assert_compatible %(keep <open>, but dont </close> tags)
+  end
+
+  def test_escape_javascript
+    assert_compatible 123
+    assert_compatible :en
+    assert_compatible false
+    assert_compatible true
+    assert_compatible %(don't </close> tags)
+    assert_compatible (+%(unicode \342\200\250 newline)).force_encoding(Encoding::UTF_8).encode!
+    assert_compatible (+%(unicode \342\200\251 newline)).force_encoding(Encoding::UTF_8).encode!
+    assert_compatible %(don't </close> tags)
+  end
+
+  def test_escape_backtick
+    assert_compatible "`"
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      str = "dont </close> tags"
+  def test_escape_dollar_sign
+    assert_compatible "$"
+  end
 
-      str.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.escape_javascript(str)
-      end
+  def test_input_must_be_utf8_or_ascii
+    str = "dont </close> tags"
 
-      str.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.escape_javascript(str)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    str.force_encoding Encoding::ISO_8859_1
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.escape_javascript(str)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      str = "dont </close> tags"
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_javascript(str).encoding
+    str.force_encoding Encoding::UTF_8
+    begin
+      EscapeUtils.escape_javascript(str)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    str = "dont </close> tags"
+    assert_equal Encoding::UTF_8, EscapeUtils.escape_javascript(str).encoding
+  end
+
+  private
+
+  def assert_compatible(src)
+    assert_equal(
+      ActionViewHelper.escape_javascript(src),
+      EscapeUtils.escape_javascript(src),
+    )
+  end
 end

data/test/javascript/unescape_test.rb

@@ -21,26 +21,24 @@ class JavascriptUnescapeTest < Minitest::Test
     assert_equal "\\", EscapeUtils.unescape_javascript("\\")
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      escaped = EscapeUtils.escape_javascript("dont </close> tags")
-
-      escaped.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.unescape_javascript(escaped)
-      end
-
-      escaped.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.unescape_javascript(escaped)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+  def test_input_must_be_utf8_or_ascii
+    escaped = EscapeUtils.escape_javascript("dont </close> tags")
+
+    escaped.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.unescape_javascript(escaped)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      escaped = EscapeUtils.escape_javascript("dont </close> tags")
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_javascript(escaped).encoding
+    escaped.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.unescape_javascript(escaped)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    escaped = EscapeUtils.escape_javascript("dont </close> tags")
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_javascript(escaped).encoding
+  end
 end

data/test/query/escape_test.rb

@@ -25,26 +25,24 @@ class QueryEscapeTest < Minitest::Test
     assert_equal '%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8', EscapeUtils.escape_url(matz_name_sep)
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      str = "a space"
-
-      str.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.escape_url(str)
-      end
-
-      str.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.escape_url(str)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+  def test_input_must_be_utf8_or_ascii
+    str = "a space"
+
+    str.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.escape_url(str)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      str = "a+space"
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_url(str).encoding
+    str.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.escape_url(str)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    str = "a+space"
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_url(str).encoding
+  end
 end

data/test/query/unescape_test.rb

@@ -27,26 +27,24 @@ class QueryUnescapeTest < Minitest::Test
     assert_equal matz_name_sep, EscapeUtils.unescape_url('%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8')
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_valid_utf8_or_ascii
-      escaped = EscapeUtils.unescape_url("a+space")
-
-      escaped.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.unescape_url(escaped)
-      end
-
-      escaped.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.unescape_url(escaped)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+  def test_input_must_be_valid_utf8_or_ascii
+    escaped = EscapeUtils.unescape_url("a+space")
+
+    escaped.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.unescape_url(escaped)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      escaped = EscapeUtils.escape_url("a space")
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_url(escaped).encoding
+    escaped.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.unescape_url(escaped)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    escaped = EscapeUtils.escape_url("a space")
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_url(escaped).encoding
+  end
 end

data/test/uri/escape_test.rb

@@ -5,7 +5,7 @@ class UriEscapeTest < Minitest::Test
   def test_uri_stdlib_compatibility
     (0..127).each do |i|
       c = i.chr
-      assert_equal URI.escape(c), EscapeUtils.escape_uri(c)
+      assert_equal URI::DEFAULT_PARSER.escape(c), EscapeUtils.escape_uri(c)
     end
   end
 
@@ -33,26 +33,24 @@ class UriEscapeTest < Minitest::Test
     assert_equal "a/slash", EscapeUtils.escape_uri("a/slash")
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      str = "fo<o>bar"
+  def test_input_must_be_utf8_or_ascii
+    str = "fo<o>bar"
 
-      str.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.escape_uri(str)
-      end
-
-      str.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.escape_uri(str)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    str.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.escape_uri(str)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      str = "fo<o>bar"
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_uri(str).encoding
+    str.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.escape_uri(str)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    str = "fo<o>bar"
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_uri(str).encoding
+  end
 end

data/test/uri/unescape_test.rb

@@ -41,26 +41,24 @@ class UriUnescapeTest < Minitest::Test
     end
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_valid_utf8_or_ascii
-      escaped = EscapeUtils.escape_uri("fo<o>bar")
+  def test_input_must_be_valid_utf8_or_ascii
+    escaped = EscapeUtils.escape_uri("fo<o>bar")
 
-      escaped.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.unescape_uri(escaped)
-      end
-
-      escaped.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.unescape_uri(escaped)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    escaped.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.unescape_uri(escaped)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      escaped = EscapeUtils.escape_uri("a space")
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_uri(escaped).encoding
+    escaped.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.unescape_uri(escaped)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    escaped = EscapeUtils.escape_uri("a space")
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_uri(escaped).encoding
+  end
 end

data/test/uri_component/escape_test.rb

@@ -43,26 +43,24 @@ class UriComponentEscapeTest < Minitest::Test
     assert_equal "a%2Fslash", EscapeUtils.escape_uri_component("a/slash")
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      str = "fo<o>bar"
+  def test_input_must_be_utf8_or_ascii
+    str = "fo<o>bar"
 
-      str.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.escape_uri_component(str)
-      end
-
-      str.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.escape_uri_component(str)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    str.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.escape_uri_component(str)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      str = "fo<o>bar"
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_uri_component(str).encoding
+    str.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.escape_uri_component(str)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    str = "fo<o>bar"
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_uri_component(str).encoding
+  end
 end

data/test/uri_component/unescape_test.rb

@@ -46,26 +46,24 @@ class UriComponentUnescapeTest < Minitest::Test
     assert_equal matz_name_sep, EscapeUtils.unescape_uri_component('%E3%81%BE%E3%81%A4%20%E3%82%82%E3%81%A8')
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_valid_utf8_or_ascii
-      escaped = EscapeUtils.escape_uri_component("fo<o>bar")
+  def test_input_must_be_valid_utf8_or_ascii
+    escaped = EscapeUtils.escape_uri_component("fo<o>bar")
 
-      escaped.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.unescape_uri_component(escaped)
-      end
-
-      escaped.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.unescape_uri_component(escaped)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    escaped.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.unescape_uri_component(escaped)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      escaped = EscapeUtils.escape_uri_component("fo<o>bar")
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_uri_component(escaped).encoding
+    escaped.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.unescape_uri_component(escaped)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    escaped = EscapeUtils.escape_uri_component("fo<o>bar")
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_uri_component(escaped).encoding
+  end
 end

data/test/url/escape_test.rb

@@ -41,26 +41,24 @@ class UrlEscapeTest < Minitest::Test
     assert_equal "a%2Fslash", EscapeUtils.escape_url("a/slash")
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      str = "fo<o>bar"
+  def test_input_must_be_utf8_or_ascii
+    str = "fo<o>bar"
 
-      str.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.escape_url(str)
-      end
-
-      str.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.escape_url(str)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    str.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.escape_url(str)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      str = "fo<o>bar"
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_url(str).encoding
+    str.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.escape_url(str)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    str = "fo<o>bar"
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_url(str).encoding
+  end
 end

data/test/url/unescape_test.rb

@@ -46,26 +46,24 @@ class UrlUnescapeTest < Minitest::Test
     end
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_valid_utf8_or_ascii
-      escaped = EscapeUtils.escape_url("fo<o>bar")
+  def test_input_must_be_valid_utf8_or_ascii
+    escaped = EscapeUtils.escape_url("fo<o>bar")
 
-      escaped.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.unescape_url(escaped)
-      end
-
-      escaped.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.unescape_url(escaped)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    escaped.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.unescape_url(escaped)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      escaped = EscapeUtils.escape_url("fo<o>bar")
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_url(escaped).encoding
+    escaped.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.unescape_url(escaped)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    escaped = EscapeUtils.escape_url("fo<o>bar")
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_url(escaped).encoding
+  end
 end

data/test/xml/escape_test.rb

@@ -42,26 +42,24 @@ class XmlEscapeTest < Minitest::Test
     end
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_utf8_or_ascii
-      str = "<some_tag/>"
+  def test_input_must_be_utf8_or_ascii
+    str = "<some_tag/>"
 
-      str.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.escape_xml(str)
-      end
-
-      str.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.escape_xml(str)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    str.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.escape_xml(str)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      str = "<some_tag/>"
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_url(str).encoding
+    str.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.escape_xml(str)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
   end
+
+  def test_return_value_is_tagged_as_utf8
+    str = "<some_tag/>"
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.escape_url(str).encoding
+  end
 end

metadata

@@ -1,127 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: escape_utils
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Brian Lopez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fast_xs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: url_escape
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2022-06-07 00:00:00.000000000 Z
+dependencies: []
 description: Quickly perform HTML, URL, URI and Javascript escaping/unescaping
 email: seniorlopez@gmail.com
 executables: []
@@ -129,8 +17,9 @@ extensions:
 - ext/escape_utils/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -142,6 +31,7 @@ files:
 - benchmark/url_escape.rb
 - benchmark/url_unescape.rb
 - benchmark/xml_escape.rb
+- bin/console
 - escape_utils.gemspec
 - ext/escape_utils/buffer.c
 - ext/escape_utils/buffer.h
@@ -191,7 +81,7 @@ homepage: https://github.com/brianmario/escape_utils
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -200,16 +90,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Faster string escaping routines for your web apps
 test_files:

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - 2.3.0