erb 5.1.3-java → 6.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ba2be7fcb5ac4a2c52d2e937bf6038b0a844387491d42e87184b872818041a
-  data.tar.gz: 61fecc3fc106b1d609da38f45b20b37dedc3e8187b95aeb7c311473ae97ea5e0
+  metadata.gz: ba1b9709ae5687dafc656b4b7cfc3321310b6861160c17fa670cd3c6469fa9d1
+  data.tar.gz: cb34212a548f3b1ea10ca1f07ed21f53729fd35cc9171799db67d558c857c4d0
 SHA512:
-  metadata.gz: 11f5b7a6b5f8330f6dc927e26c2e4a1a43b432fad7b8e07e5af8632131ece7f2971d26c1e6bdd367fefb93090b81a55aaab1a73f4304e229169bec749a1aa321
-  data.tar.gz: ceb867664c2be34b3be6e272a20f04bab639168215f80c9a3de3450385a3d207224b72b7f52b98229982317cbb91bd4b66717498ce3482dfc28ddb1d5e8b2f34
+  metadata.gz: 397d22d7c008018e40c489bb4bb7bbaf4c765457534c07f580b7b86d7f279a2aee3ed510c5df5dca9b35d403e7feb942f0273531b2561a8a9264aba7a77a98cf
+  data.tar.gz: c578aa4a8db6d5dbf05d98f90e758b71459c954f23bae1498d9ae97c81b9a28d039c27ee634c0b4b2b6a67c8abbc2e0df912b2a7b8bfa2a2974c2dfd39dcc276

data/.github/workflows/push-gem.yml

@@ -34,13 +34,13 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
+        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
         with:
           bundler-cache: true
           ruby-version: ${{ matrix.ruby }}
 
       - name: Publish to RubyGems
-        uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
+        uses: rubygems/release-gem@1c162a739e8b4cb21a676e97b087e8268d8fc40b # v1.1.2
 
       - name: Create GitHub release
         run: |
@@ -48,3 +48,4 @@ jobs:
           gh release create "${tag_name}" --verify-tag --generate-notes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ matrix.ruby == 'ruby' }}

data/.github/workflows/test.yml

@@ -33,4 +33,4 @@ jobs:
       run: bundle exec rake test
     - name: RDoc coverage
       run: |
-        rdoc -C .
+        rdoc -C --visibility=private .

data/NEWS.md

@@ -1,5 +1,10 @@
 # Change Lo
 
+## 6.0.0
+
+* Remove `safe_level` and further positional arguments from `ERB.new`
+* Remove deprecated constant `ERB::Revision`
+
 ## 5.1.3
 
 * Release v5.1.2 with trusted publishing for JRuby

data/lib/erb/compiler.rb

@@ -480,7 +480,6 @@ class ERB::Compiler # :nodoc:
     end
   }.new(caller(0)).c
   private_constant :WARNING_UPLEVEL
-  # :startdoc:
 
   def warn_invalid_trim_mode(mode, uplevel:)
     warn "Invalid ERB trim mode: #{mode.inspect} (trim_mode: nil, 0, 1, 2, or String composed of '%' and/or '-', '>', '<>')", uplevel: uplevel + WARNING_UPLEVEL

data/lib/erb/util.rb

@@ -2,8 +2,8 @@
 
 # Load CGI.escapeHTML and CGI.escapeURIComponent.
 # CRuby:
-#   cgi.gem v0.1.0+ (Ruby 2.7-3.4) and Ruby 3.5+ stdlib have 'cgi/escape' and CGI.escapeHTML.
-#   cgi.gem v0.3.3+ (Ruby 3.2-3.4) and Ruby 3.5+ stdlib have CGI.escapeURIComponent.
+#   cgi.gem v0.1.0+ (Ruby 2.7-3.4) and Ruby 4.0+ stdlib have 'cgi/escape' and CGI.escapeHTML.
+#   cgi.gem v0.3.3+ (Ruby 3.2-3.4) and Ruby 4.0+ stdlib have CGI.escapeURIComponent.
 # JRuby: cgi.gem has a Java extension 'cgi/escape'.
 # TruffleRuby: lib/truffle/cgi/escape.rb requires 'cgi/util'.
 require 'cgi/escape'
@@ -19,6 +19,7 @@ rescue LoadError
   # A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope
   # Rails will not monkey-patch ERB::Escape#html_escape.
   module ERB::Escape
+    # :stopdoc:
     def html_escape(s)
       CGI.escapeHTML(s.to_s)
     end

data/lib/erb/version.rb

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

data/lib/erb.rb

@@ -60,7 +60,7 @@ require 'erb/util'
 # \ERB supports tags of three kinds:
 #
 # - [Expression tags][expression tags]:
-#   each begins with `'<%'`, ends with `'%>'`; contains a Ruby expression;
+#   each begins with `'<%='`, ends with `'%>'`; contains a Ruby expression;
 #   in the result, the value of the expression replaces the entire tag:
 #
 #         template = 'The magic word is <%= magic_word %>.'
@@ -77,7 +77,7 @@ require 'erb/util'
 #         ERB.new('Today is <%= Date::DAYNAMES[Date.today.wday] %>.').result # => "Today is Monday."
 #
 # - [Execution tags][execution tags]:
-#   each begins with `'<%='`, ends with `'%>'`; contains Ruby code to be executed:
+#   each begins with `'<%'`, ends with `'%>'`; contains Ruby code to be executed:
 #
 #          template = '<% File.write("t.txt", "Some stuff.") %>'
 #          ERB.new(template).result
@@ -467,7 +467,7 @@ require 'erb/util'
 # ```
 #
 # You can give `trim_mode: '>'` to suppress the trailing newline
-# for each line that ends with `'%<'` (regardless of its beginning):
+# for each line that ends with `'%>'` (regardless of its beginning):
 #
 # ```
 # ERB.new(template, trim_mode: '>').result.lines.each {|line| puts line.inspect }
@@ -778,9 +778,6 @@ require 'erb/util'
 # [template processor]: https://en.wikipedia.org/wiki/Template_processor
 #
 class ERB
-  Revision = '$Date::                           $' # :nodoc: #'
-  deprecate_constant :Revision
-
   # :markup: markdown
   #
   # :call-seq:
@@ -827,46 +824,12 @@ class ERB
   #
   # It's good practice to choose a variable name that begins with an underscore: `'_'`.
   #
-  # <b>Backward Compatibility</b>
-  #
-  # The calling sequence given above -- which is the one you should use --
-  # is a simplified version of the complete formal calling sequence,
-  # which is:
-  #
-  # ```
-  # ERB.new(template,
-  # safe_level=NOT_GIVEN, legacy_trim_mode=NOT_GIVEN, legacy_eoutvar=NOT_GIVEN,
-  # trim_mode: nil, eoutvar: '_erbout')
-  # ```
-  #
-  # The second, third, and fourth positional arguments (those in the second line above) are deprecated;
-  # this method issues warnings if they are given.
-  #
-  # However, their values, if given, are handled thus:
-  #
-  # - `safe_level`: ignored.
-  # - `legacy_trim_mode`: overrides keyword argument `trim_mode`.
-  # - `legacy_eoutvar`: overrides keyword argument `eoutvar`.
-  #
   # [blank line control]: rdoc-ref:ERB@Suppressing+Unwanted+Blank+Lines
   # [combine trim modes]: rdoc-ref:ERB@Combining+Trim+Modes
   # [newline control]: rdoc-ref:ERB@Suppressing+Unwanted+Newlines
   # [shorthand format]: rdoc-ref:ERB@Shorthand+Format+for+Execution+Tags
   #
-  def initialize(str, safe_level=NOT_GIVEN, legacy_trim_mode=NOT_GIVEN, legacy_eoutvar=NOT_GIVEN, trim_mode: nil, eoutvar: '_erbout')
-    # Complex initializer for $SAFE deprecation at [Feature #14256]. Use keyword arguments to pass trim_mode or eoutvar.
-    if safe_level != NOT_GIVEN
-      warn 'Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments.', uplevel: 1
-    end
-    if legacy_trim_mode != NOT_GIVEN
-      warn 'Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead.', uplevel: 1
-      trim_mode = legacy_trim_mode
-    end
-    if legacy_eoutvar != NOT_GIVEN
-      warn 'Passing eoutvar with the 4th argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, eoutvar: ...) instead.', uplevel: 1
-      eoutvar = legacy_eoutvar
-    end
-
+  def initialize(str, trim_mode: nil, eoutvar: '_erbout')
     compiler = make_compiler(trim_mode)
     set_eoutvar(compiler, eoutvar)
     @src, @encoding, @frozen_string = *compiler.compile(str)
@@ -875,12 +838,6 @@ class ERB
     @_init = self.class.singleton_class
   end
 
-  # :markup: markdown
-  #
-  # Placeholder constant; used as default value for certain method arguments.
-  NOT_GIVEN = defined?(Ractor) ? Ractor.make_shareable(Object.new) : Object.new
-  private_constant :NOT_GIVEN
-
   # :markup: markdown
   #
   # :call-seq:
@@ -894,7 +851,6 @@ class ERB
   # # => #<ERB::Compiler:0x000001cff9467678 @insert_cmd="print", @percent=false, @post_cmd=[], @pre_cmd=[], @put_cmd="print", @trim_mode=nil>
   # ```
   #
-
   def make_compiler(trim_mode)
     ERB::Compiler.new(trim_mode)
   end
@@ -1211,7 +1167,6 @@ class ERB
   # </html>
   # ```
   #
-  #
   def def_class(superklass=Object, methodname='result')
     cls = Class.new(superklass)
     def_method(cls, methodname, @filename || '(ERB)')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 6.0.0
 platform: java
 authors:
 - Masatoshi SEKI
 - Takashi Kokubun
 bindir: libexec
 cert_chain: []
-date: 2025-10-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: An easy to use but powerful templating system for Ruby.
 email:
@@ -54,7 +54,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/erb
   source_code_uri: https://github.com/ruby/erb
-  changelog_uri: https://github.com/ruby/erb/blob/v5.1.3/NEWS.md
+  changelog_uri: https://github.com/ruby/erb/blob/v6.0.0/NEWS.md
 rdoc_options: []
 require_paths:
 - lib
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An easy to use but powerful templating system for Ruby.
 test_files: []