escape_utils 1.2.0 → 1.3.0

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

@@ -39,33 +39,31 @@ class UriComponentUnescapeTest < Minitest::Test
 
   def test_multibyte_characters
     matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
-    matz_name.force_encoding('UTF-8') if matz_name.respond_to?(:force_encoding)
+    matz_name.force_encoding('UTF-8')
     assert_equal matz_name, EscapeUtils.unescape_uri_component('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8')
     matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
-    matz_name_sep.force_encoding('UTF-8') if matz_name_sep.respond_to?(:force_encoding)
+    matz_name_sep.force_encoding('UTF-8')
     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,8 @@ 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"
-
-      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
-    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
+  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

@@ -28,10 +28,10 @@ class UrlUnescapeTest < Minitest::Test
 
   def test_multibyte_characters
     matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
-    matz_name.force_encoding('UTF-8') if matz_name.respond_to?(:force_encoding)
+    matz_name.force_encoding('UTF-8')
     assert_equal matz_name, EscapeUtils.unescape_url('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8')
     matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
-    matz_name_sep.force_encoding('UTF-8') if matz_name_sep.respond_to?(:force_encoding)
+    matz_name_sep.force_encoding('UTF-8')
     assert_equal matz_name_sep, EscapeUtils.unescape_url('%E3%81%BE%E3%81%A4%20%E3%82%82%E3%81%A8')
   end
 
@@ -46,26 +46,8 @@ 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")
-
-      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
-    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
+  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.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Brian Lopez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-25 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-16 00:00:00.000000000 Z
+dependencies: []
 description: Quickly perform HTML, URL, URI and Javascript escaping/unescaping
 email: seniorlopez@gmail.com
 executables: []
@@ -129,19 +17,20 @@ extensions:
 - ext/escape_utils/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- benchmark/html_escape.rb
-- benchmark/html_unescape.rb
+- benchmark/html_escape_once.rb
 - benchmark/javascript_escape.rb
 - benchmark/javascript_unescape.rb
-- benchmark/url_escape.rb
-- benchmark/url_unescape.rb
+- benchmark/url_decode.rb
+- benchmark/url_encode.rb
 - benchmark/xml_escape.rb
+- bin/console
 - escape_utils.gemspec
 - ext/escape_utils/buffer.c
 - ext/escape_utils/buffer.h
@@ -150,7 +39,6 @@ files:
 - ext/escape_utils/houdini.h
 - ext/escape_utils/houdini_href_e.c
 - ext/escape_utils/houdini_html_e.c
-- ext/escape_utils/houdini_html_u.c
 - ext/escape_utils/houdini_js_e.c
 - ext/escape_utils/houdini_js_u.c
 - ext/escape_utils/houdini_uri_e.c
@@ -191,7 +79,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 +88,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.1.2
+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

data/benchmark/html_escape.rb

@@ -1,68 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler/setup'
-require 'benchmark/ips'
-
-require 'rack'
-require 'erb'
-require 'cgi'
-require 'haml'
-require 'fast_xs_extra'
-require 'escape_utils'
-
-module HamlBench
-  extend Haml::Helpers
-end
-
-url = "https://en.wikipedia.org/wiki/Succession_to_the_British_throne"
-html = `curl -s #{url}`
-html = html.force_encoding('utf-8') if html.respond_to?(:force_encoding)
-puts "Escaping #{html.bytesize} bytes of html from #{url}"
-
-Benchmark.ips do |x|
-  x.report "Rack::Utils.escape_html" do |times|
-    times.times do
-      Rack::Utils.escape_html(html)
-    end
-  end
-
-  x.report "Haml::Helpers.html_escape" do |times|
-    times.times do
-      HamlBench.html_escape(html)
-    end
-  end
-
-  x.report "ERB::Util.html_escape" do |times|
-    times.times do
-      ERB::Util.html_escape(html)
-    end
-  end
-
-  x.report "CGI.escapeHTML" do |times|
-    times.times do
-      CGI.escapeHTML(html)
-    end
-  end
-
-  x.report "String#gsub" do |times|
-    html_escape = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
-    times.times do
-      html.gsub(/[&"'><]/, html_escape)
-    end
-  end
-
-  x.report "fast_xs_extra#fast_xs_html" do |times|
-    times.times do
-      html.fast_xs_html
-    end
-  end
-
-  x.report "EscapeUtils.escape_html" do |times|
-    times.times do
-      EscapeUtils.escape_html(html)
-    end
-  end
-
-  x.compare!
-end

data/benchmark/html_unescape.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler/setup'
-require 'benchmark/ips'
-
-require 'cgi'
-require 'haml'
-require 'escape_utils'
-
-module HamlBench
-  extend Haml::Helpers
-end
-
-url = "https://en.wikipedia.org/wiki/Succession_to_the_British_throne"
-html = `curl -s #{url}`
-html = html.force_encoding('binary') if html.respond_to?(:force_encoding)
-escaped_html = EscapeUtils.escape_html(html)
-puts "Unescaping #{escaped_html.bytesize} bytes of escaped html, from #{url}"
-
-Benchmark.ips do |x|
-  x.report "CGI.unescapeHTML" do |times|
-    times.times do
-      CGI.unescapeHTML(escaped_html)
-    end
-  end
-
-  x.report "EscapeUtils.unescape_html" do |times|
-    times.times do
-      EscapeUtils.unescape_html(escaped_html)
-    end
-  end
-
-  x.compare!
-end

data/benchmark/url_escape.rb

@@ -1,56 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler/setup'
-require 'benchmark/ips'
-
-require 'rack'
-require 'erb'
-require 'cgi'
-require 'url_escape'
-require 'fast_xs_extra'
-require 'escape_utils'
-
-url = "https://www.yourmom.com/cgi-bin/session.cgi?sess_args=mYHcEA  dh435dqUs0moGHeeAJTSLLbdbcbd9ef----,574b95600e9ab7d27eb0bf524ac68c27----"
-url = url.force_encoding('us-ascii') if url.respond_to?(:force_encoding)
-puts "Escaping a #{url.bytesize} byte URL times"
-
-Benchmark.ips do |x|
-  x.report "ERB::Util.url_encode" do |times|
-    times.times do
-      ERB::Util.url_encode(url)
-    end
-  end
-
-  x.report "Rack::Utils.escape" do |times|
-    times.times do
-      Rack::Utils.escape(url)
-    end
-  end
-
-  x.report "CGI.escape" do |times|
-    times.times do
-      CGI.escape(url)
-    end
-  end
-
-  x.report "URLEscape#escape" do |times|
-    times.times do
-      URLEscape.escape(url)
-    end
-  end
-
-  x.report "fast_xs_extra#fast_xs_url" do |times|
-    times.times do
-      url.fast_xs_url
-    end
-  end
-
-  x.report "EscapeUtils.escape_url" do |times|
-    times.times do
-      EscapeUtils.escape_url(url)
-    end
-  end
-
-  x.compare!
-end

data/benchmark/url_unescape.rb

@@ -1,50 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler/setup'
-require 'benchmark/ips'
-
-require 'rack'
-require 'cgi'
-require 'url_escape'
-require 'fast_xs_extra'
-require 'escape_utils'
-
-url = "https://www.yourmom.com/cgi-bin/session.cgi?sess_args=mYHcEA  dh435dqUs0moGHeeAJTSLLbdbcbd9ef----,574b95600e9ab7d27eb0bf524ac68c27----"
-url = url.force_encoding('us-ascii') if url.respond_to?(:force_encoding)
-escaped_url = EscapeUtils.escape_url(url)
-puts "Escaping a #{url.bytesize} byte URL"
-
-Benchmark.ips do |x|
-  x.report "Rack::Utils.unescape" do |times|
-    times.times do
-      Rack::Utils.unescape(escaped_url)
-    end
-  end
-
-  x.report "CGI.unescape" do |times|
-    times.times do
-      CGI.unescape(escaped_url)
-    end
-  end
-
-  x.report "URLEscape#unescape" do |times|
-    times.times do
-      URLEscape.unescape(escaped_url)
-    end
-  end
-
-  x.report "fast_xs_extra#fast_uxs_cgi" do |times|
-    times.times do
-      url.fast_uxs_cgi
-    end
-  end
-
-  x.report "EscapeUtils.unescape_url" do |times|
-    times.times do
-      EscapeUtils.unescape_url(escaped_url)
-    end
-  end
-
-  x.compare!
-end