erb 5.0.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335faf3ef112b23c4f6066554480a40426ae7dc1d036f018e33bbac13c881c18
-  data.tar.gz: 341547a90647453d267fc035d0f7a2b6c05a617e958cafd45d07c4ee6b6b2ef2
+  metadata.gz: 90f0ce0edaaa7d86d9a02d7062cbf92113d69fc15abeea302b0372b2dac80964
+  data.tar.gz: 95b673abbc9477ed2dc09196bc2f06ce3c81a5cc8dc45612bffc897c8ef1d15f
 SHA512:
-  metadata.gz: fd258645b17ca0e0045bdc3c2db4311221942be033b12da3c546022ebac4742fa31b157c448d274c5c7bdd222e396d364bb96abee179810724da44fd9d70c63f
-  data.tar.gz: 81763b69563026a2b0ba3a926524aa10f0bd2cf439c22fac2b4368a31257ffd629ad1f2236eefeca30bbf733381fee28f54318b25dc43c5f24421a04cdc9d28d
+  metadata.gz: cfd7489d25b0662f8651dcafa1370403c97a7623a78b23835e963590585b4f5fe98c15d64973b3bde4187fcc1698d365ed10acced1f4d842ccdaee8b125363fe
+  data.tar.gz: 0fdfa9071e62c1c35b8104d17cf17e05c24ca91bb64faf22962adc11b03daec1d198ba96ad6165fe17fdd557a736e6dc15bbc90904f69480b67fefe25c0042cb

data/.github/workflows/sync-ruby.yml

@@ -6,7 +6,7 @@ jobs:
   sync:
     name: Sync ruby
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'ruby/erb' }}
+    if: ${{ github.repository_owner == 'ruby' }}
     steps:
       - uses: actions/checkout@v5
 
@@ -28,6 +28,6 @@ jobs:
           github_token: ${{ steps.app-token.outputs.token }}
           ref: master
           client_payload: |
-            {"gem":"erb","before":"${{ github.event.before }}","after":"${{ github.event.after }}"}
+            {"gem":"${{ github.event.repository.name }}","before":"${{ github.event.before }}","after":"${{ github.event.after }}"}
           propagate_failure: true
           wait_interval: 10

data/NEWS.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 5.1.0
+
+*  html_escape: Avoid buffer allocation for strings with no escapable character https://github.com/ruby/erb/pull/87
+
 ## 5.0.3
 
 * Update help of erb(1) [#85](https://github.com/ruby/erb/pull/85)

data/README.md

@@ -1,21 +1,21 @@
-# \ERB (Embedded Ruby)
+# ERB (Embedded Ruby)
 
-\ERB is an easy-to-use, but also very powerful, [template processor][template processor].
+ERB is an easy-to-use, but also very powerful, [template processor][template processor].
 
-\ERB is commonly used to produce:
+ERB is commonly used to produce:
 
 - Customized or personalized email messages.
 - Customized or personalized web pages.
 - Software code (in code-generating applications).
 
-Like method [sprintf][sprintf], \ERB can format run-time data into a string.
-\ERB, however, is *much more powerful*
+Like method [sprintf][sprintf], ERB can format run-time data into a string.
+ERB, however, is *much more powerful*
 
-## How \ERB Works
+## How ERB Works
 
-Using \ERB, you can create a *template*: a plain-text string that has specially-formatted *tags*,
-then store it into an \ERB object;
-when \ERB produces _result_ string, it:
+Using ERB, you can create a *template*: a plain-text string that has specially-formatted *tags*,
+then store it into an ERB object;
+when ERB produces _result_ string, it:
 
 - Inserts run-time-evaluated expressions into the result.
 - Executes snippets of Ruby code.
@@ -35,7 +35,7 @@ There are three types of tags:
 | Execution tag  |     <tt>'<% _ruby_code_ %>'</tt>     |     Execute <tt>_ruby_code_</tt>.     |        None.         |                 
 | Comment tag    |   <tt>'<%# _comment_text_ %>'</tt>   |                 None.                 |        None.         |
 
-These examples use `erb`, the \ERB command-line interface;
+These examples use `erb`, the ERB command-line interface;
 each "echoes" a string template and pipes it to `erb` as input:
 
 
@@ -56,16 +56,16 @@ each "echoes" a string template and pipes it to `erb` as input:
         echo "<%# TODO: Fix this nonsense. %> Nonsense." | erb
         " Nonsense."
 
-## How to Use \ERB
+## How to Use ERB
 
-You can use \ERB either:
+You can use ERB either:
 
 - In a program: see class ERB.
 - From the command line: see [ERB Executable][erb executable].
 
 ## Installation
 
-\ERB is installed with Ruby, and so there's no further installation needed.
+ERB is installed with Ruby, and so there's no further installation needed.
 
 ## Other Template Engines
 
@@ -77,7 +77,7 @@ Other popular template engines may be found in the [Ruby Toolbox][ruby toolbox].
 
 ## Code
 
-The \ERB source code is in GitHub project [ruby/erb][ruby/erb]/
+The ERB source code is in GitHub project [ruby/erb][ruby/erb].
 
 ## Bugs
 

data/ext/erb/escape/escape.c

@@ -39,29 +39,44 @@ static VALUE
 optimized_escape_html(VALUE str)
 {
     VALUE vbuf;
-    char *buf = ALLOCV_N(char, vbuf, escaped_length(str));
+    char *buf = NULL;
     const char *cstr = RSTRING_PTR(str);
     const char *end = cstr + RSTRING_LEN(str);
 
-    char *dest = buf;
+    const char *segment_start = cstr;
+    char *dest = NULL;
     while (cstr < end) {
         const unsigned char c = *cstr++;
         uint8_t len = html_escape_table[c].len;
         if (len) {
+            uint16_t segment_len = cstr - segment_start - 1;
+            if (!buf) {
+                buf = ALLOCV_N(char, vbuf, escaped_length(str));
+                dest = buf;
+            }
+            if (segment_len) {
+                memcpy(dest, segment_start, segment_len);
+                dest += segment_len;
+            }
+            segment_start = cstr;
             memcpy(dest, html_escape_table[c].str, len);
             dest += len;
         }
-        else {
-            *dest++ = c;
+    }
+    if (buf) {
+        uint16_t segment_len = cstr - segment_start;
+        if (segment_len) {
+            memcpy(dest, segment_start, segment_len);
+            dest += segment_len;
         }
     }
 
     VALUE escaped = str;
-    if (RSTRING_LEN(str) < (dest - buf)) {
+    if (buf) {
         escaped = rb_str_new(buf, dest - buf);
         preserve_original_state(str, escaped);
+        ALLOCV_END(vbuf);
     }
-    ALLOCV_END(vbuf);
     return escaped;
 }
 

data/lib/erb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 class ERB
   # The string \ERB version.
-  VERSION = '5.0.3'
+  VERSION = '5.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0
 platform: ruby
 authors:
 - Masatoshi SEKI