erubi 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd16f88fa55dfb16632b96ad51f1b9d8b4dfcb3a
-  data.tar.gz: 369980088c6de4f7309f53ccbc1f4d77c40569d7
+  metadata.gz: 7624aff12923d9d250f5d3ba715638577669ad17
+  data.tar.gz: ee918f650866fb2652d79a24a6d67f93673cb973
 SHA512:
-  metadata.gz: 5bea95cdd30ba995ffd760d40131dab30cfbbe0f4dd57c87957c8b8d55cd0a55b2e4c7fd92d692defc1e2d90ae7a0b564462d8c5b48babdd14947c7137be2708
-  data.tar.gz: a0850dc7e918bf33c5e32707f1747cdfa0cb2902f8308be7d4f19d120b006426e9efc5b384fde46c1a2b920d23fa7432a37fdaf08a636928355f0391b03df6b2
+  metadata.gz: d6b7e14a72e167dba29bbed06fa243cc21d3e0c4dfe6d3a6f42a0f4faf42bdc790cd6ae93aa18921ff0d69dbc575c2958d6d7319606eed25e5becb87d2b01dc0
+  data.tar.gz: 82b8d817f9da8862b4f7823e250f9f527d503da254650c3ade12ba24c17dea70ee04c3be7cb30cc7d0fba301eda8c9e6047ba46c7a2f6aa293f3d6512a6219a0

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.6.0 (2017-02-27)
+
+* Use cgi/escape if available for 6x faster HTML escaping (k0kubun, jeremyevans) (#4)
+
 === 1.5.0 (2017-01-26)
 
 * Drop tilt/erubi file, as tilt now ships with Erubi support (jeremyevans)

data/README.rdoc

@@ -8,8 +8,8 @@ the same basic algorithm, with the following differences:
 * Works with ruby's --enable-frozen-string-literal option
 * Automatically freezes strings for template text when ruby optimizes it (on ruby 2.1+)
 * Escapes ' (apostrophe) when escaping for better XSS protection 
-* Has 88% smaller memory footprint for base engine
-* Has 75% smaller memory footprint for tilt support
+* Has 6x faster escaping on ruby 2.3+ by using cgi/escape
+* Has 86% smaller memory footprint
 * Does no monkey patching (Erubis adds a method to Kernel)
 * Uses an immutable design (all options passed to the constructor, which returns a frozen object)
 * Has simpler internals (1 file, <150 lines of code)

data/lib/erubi.rb

@@ -1,29 +1,42 @@
 # frozen_string_literal: true
 
 module Erubi
-  ESCAPE_TABLE = {'&' => '&amp;'.freeze, '<' => '&lt;'.freeze, '>' => '&gt;'.freeze, '"' => '&quot;'.freeze, "'" => '&#039;'.freeze}.freeze
+  VERSION = '1.6.0'
   RANGE_ALL = 0..-1
 
   if RUBY_VERSION >= '1.9'
     RANGE_FIRST = 0
     RANGE_LAST = -1
     TEXT_END = RUBY_VERSION >= '2.1' ? "'.freeze;" : "';"
-
-    # Escape the following characters with their HTML/XML
-    # equivalents.
-    def self.h(value)
-      value.to_s.gsub(/[&<>"']/, ESCAPE_TABLE)
-    end
   else
     # :nocov:
     RANGE_FIRST = 0..0
     RANGE_LAST = -1..-1
     TEXT_END = "';"
+  end
 
+  begin
+    require 'cgi/escape'
+    unless CGI.respond_to?(:escapeHTML) # work around for JRuby 9.1
+      CGI = Object.new
+      CGI.extend(::CGI::Util)
+    end
     def self.h(value)
-      value.to_s.gsub(/[&<>"']/){|s| ESCAPE_TABLE[s]}
+      CGI.escapeHTML(value.to_s)
+    end
+  rescue LoadError
+    ESCAPE_TABLE = {'&' => '&amp;'.freeze, '<' => '&lt;'.freeze, '>' => '&gt;'.freeze, '"' => '&quot;'.freeze, "'" => '&#39;'.freeze}.freeze
+    if RUBY_VERSION >= '1.9'
+      # Escape the following characters with their HTML/XML
+      # equivalents.
+      def self.h(value)
+        value.to_s.gsub(/[&<>"']/, ESCAPE_TABLE)
+      end
+    else
+      def self.h(value)
+        value.to_s.gsub(/[&<>"']/){|s| ESCAPE_TABLE[s]}
+      end
     end
-    # :nocov:
   end
 
   class Engine

data/test/test.rb

@@ -101,7 +101,7 @@ END2
  <tbody>
   <tr>
    <td>1</td>
-   <td>&amp;&#039;&lt;&gt;&quot;2</td>
+   <td>&amp;&#39;&lt;&gt;&quot;2</td>
   </tr>
  </tbody>
 </table>
@@ -150,7 +150,7 @@ END2
  <tbody>
   <tr>
    <td>1</td>
-   <td>&amp;&#039;&lt;&gt;&quot;2</td>
+   <td>&amp;&#39;&lt;&gt;&quot;2</td>
   </tr>
  </tbody>
 </table>
@@ -472,7 +472,7 @@ END2
  <tbody>
   <tr>
    <td>1</td>
-   <td>&amp;&#039;&lt;&gt;&quot;2</td>
+   <td>&amp;&#39;&lt;&gt;&quot;2</td>
   </tr>
  </tbody>
 </table>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erubi
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest