erb 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2863be9c08d529339d060f45fe14a92ddc56e5107c4e96d96f62c5bb3891ef
-  data.tar.gz: 5bedf59f948afda25ce5a9b34ffeba0ec9c8d69cce09ee20a00f63ab0f468363
+  metadata.gz: 675c468f525ff93b95dce4365f40d238bed3c247a2f46d116312f32933e88070
+  data.tar.gz: '0909f701d87673867c5ba63e5d74d5cdc09538ca821af6a9f46943169e9b2ada'
 SHA512:
-  metadata.gz: f3c5db15f023dd2cca0c76a9fad16746f98d44adc41284308c6baad9eebb75ac3aa54a7a89f3457f9e82ddc62cf7c42ddf1050cd5aef7811b74ab7513822a92f
-  data.tar.gz: dfb6828690e0e3ea9572692534f676d07a952d2db47726f7c3de7da38ca8a970ed4d26525698b56de04bc4956bbd032bf7b2f15515a9f649cc3c0c4dbb02a067
+  metadata.gz: f96aa045940fdd84702ff12ce46eb243fa95f0e6e912bb3f32873e3513588b8c7db94d83873f8ce8b19187b1187ac27bea00c38d9ccc479d92e222c304a8305f
+  data.tar.gz: ef97afccd0201e81ad6660e643b1c7e2d3449e75069bae06e595099cbe1f9c913710c9a7553234b40ee5834932d9d0bbf8d679a76416cc39e28df30138a8b97e

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/NEWS.md

@@ -1,12 +1,16 @@
 # Change Log
 
+## 4.0.1
+
+* Stop building the C extension for TruffleRuby [#39](https://github.com/ruby/erb/pull/39)
+
 ## 4.0.0
 
-* Optimize `ERB::Util.html_escape`
+* Optimize `ERB::Util.html_escape` [#27](https://github.com/ruby/erb/pull/27)
   * No longer duplicate an argument string when nothing is escaped.
      * This makes `ERB::Util.html_escape` faster than `CGI.escapeHTML` in no-escape cases.
   * It skips calling `#to_s` when an argument is already a String.
-* Define `ERB::Escape.html_escape` as an alias to `ERB::Util.html_escape`
+* Define `ERB::Escape.html_escape` as an alias to `ERB::Util.html_escape` [#38](https://github.com/ruby/erb/pull/38)
   * `ERB::Util.html_escape` is known to be monkey-patched by Rails.
     `ERB::Escape.html_escape` is useful when you want a non-monkey-patched version.
 * Drop deprecated `-S` option from `erb` command

data/Rakefile

@@ -7,7 +7,10 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/test_*.rb']
 end
 
-if RUBY_ENGINE != 'jruby'
+case RUBY_ENGINE
+when 'jruby', 'truffleruby'
+  # not using C extension
+else
   require 'rake/extensiontask'
   Rake::ExtensionTask.new('erb/escape')
   task test: :compile

data/ext/erb/escape/extconf.rb

@@ -1,2 +1,7 @@
 require 'mkmf'
-create_makefile 'erb/escape'
+
+if RUBY_ENGINE == 'truffleruby'
+  File.write('Makefile', dummy_makefile($srcdir).join)
+else
+  create_makefile 'erb/escape'
+end

data/lib/erb/compiler.rb

@@ -384,7 +384,7 @@ class ERB::Compiler # :nodoc:
     when '<%='
       add_insert_cmd(out, content)
     when '<%#'
-      # commented out
+      out.push("\n" * content.count("\n")) # only adjust lineno
     end
   end
 

data/lib/erb/util.rb

@@ -4,10 +4,13 @@
 # A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope
 # Rails will not monkey-patch ERB::Escape#html_escape.
 begin
-  require 'erb/escape'
-rescue LoadError # JRuby can't load .so
+  # We don't build the C extension for JRuby, TruffleRuby, and WASM
+  if $LOAD_PATH.resolve_feature_path('erb/escape')
+    require 'erb/escape'
+  end
+rescue LoadError # resolve_feature_path raises LoadError on TruffleRuby 22.3.0
 end
-unless defined?(ERB::Escape) # JRuby
+unless defined?(ERB::Escape)
   module ERB::Escape
     def html_escape(s)
       CGI.escapeHTML(s.to_s)

data/lib/erb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 class ERB
-  VERSION = '4.0.0'
+  VERSION = '4.0.2'
   private_constant :VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Masatoshi SEKI
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: libexec
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cgi
@@ -35,6 +35,7 @@ extensions:
 - ext/erb/escape/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - Gemfile
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: An easy to use but powerful templating system for Ruby.