erb 6.0.4-java → 6.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c0647f3c42b33fcc85c6db69720a9b042f1ad5273c2a38b7ea8260016359eb
-  data.tar.gz: b9d6d76adca7f3ea81654ef41a43ed27523c382e671e5019ced076c5c148e1b8
+  metadata.gz: e1fdd0c922896e9fe7333bcdefec35a6485344f0b577157f21a27e9e0ca56455
+  data.tar.gz: d0dbe48be9caa4bd235c9cb2b6bf2da03eeb23a527a6a75f1f6e333f6204fc58
 SHA512:
-  metadata.gz: 9378aa65ed0a61329056073905ace16709524c448c642edcd0fd8a1ea52f71156e668dd98aea0b4f3c45f9beebc0d6edc2ed74e1127fcf00b0213697949b9ff0
-  data.tar.gz: 38f01de19eead39446765c257095ba7616162d2f48c155134cc7dcdb6171ba3f23477dd32b8d12493c5c9050e92033c34c9ffd1fccb7c40aa4d0d0e2e4020cc9
+  metadata.gz: 3cfadb5d42a2592d786718f4c5bf1a9ca912188dec002de1cb5474fabf0ad471e88eb37cd777fd343289872708aaccc383e1640a893d9b5f3e7a44025985528d
+  data.tar.gz: 439e139bcbd315dccd701d543c984593e166f2c99004c2c9f0b8571c392856275cd20feb5fd11dc17a847231e4b07b22b878c1b12a491d806444ebfa84466bb3

data/Gemfile

@@ -5,7 +5,12 @@ gemspec
 group :development do
   gem 'rake'
   gem 'rake-compiler'
-  gem 'rdoc'
+  if RUBY_ENGINE == 'jruby'
+    # RDoc 8 pulls in RBS 4, which attempts to build a native extension on JRuby.
+    gem 'rdoc', '< 8'
+  else
+    gem 'rdoc'
+  end
   gem 'test-unit'
   gem "test-unit-ruby-core"
 end

data/NEWS.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.0.5
+
+* Avoid overridable method dispatch in the initialization guard
+
 ## 6.0.4
 
 * Prohibit `def_method` on marshal-loaded ERB instances
@@ -12,6 +16,10 @@
 
 * Freeze `src` in `ERB#initialize` for Ractor compatibility https://github.com/ruby/erb/pull/105
 
+## 6.0.1.1
+
+* Prohibit `def_method` on marshal-loaded ERB instances
+
 ## 6.0.1
 
 * Freeze `ERB::Compiler::TrimScanner::ERB_STAG` for Ractor compatibility
@@ -55,9 +63,17 @@
 * Drop `cgi` from runtime dependencies [#59](https://github.com/ruby/erb/pull/59)
 * Make `ERB::VERSION` public
 
+## 4.0.4.1
+
+* Prohibit `def_method` on marshal-loaded ERB instances
+
 ## 4.0.4
 
-* Skip building the C extension for JRuby [#52](https://github.com/ruby/erb/pull/52)
+* Skip building the C extension for JRuby
+
+## 4.0.3.1
+
+* Prohibit `def_method` on marshal-loaded ERB instances
 
 ## 4.0.3
 

data/lib/erb/version.rb

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

data/lib/erb.rb

@@ -778,6 +778,9 @@ require 'erb/util'
 # [template processor]: https://en.wikipedia.org/wiki/Template_processor
 #
 class ERB
+  IDENTITY_METHOD = BasicObject.instance_method(:equal?) # :nodoc:
+  private_constant :IDENTITY_METHOD
+
   # :markup: markdown
   #
   # :call-seq:
@@ -889,7 +892,7 @@ class ERB
   #
   # ```
   # erb = ERB.new(template, eoutvar: '_foo')
-  # puts template.src.split('; ')
+  # puts erb.src.split('; ')
   # #coding:UTF-8
   # _foo = +''
   # _foo.<< "The time is ".freeze
@@ -1007,7 +1010,7 @@ class ERB
   # [local binding]: rdoc-ref:ERB@Local+Binding
   #
   def result(b=new_toplevel)
-    unless @_init.equal?(self.class.singleton_class)
+    unless initialized_by_new?
       raise ArgumentError, "not initialized"
     end
     eval(@src, b, (@filename || '(erb)'), @lineno)
@@ -1061,6 +1064,11 @@ class ERB
   end
   private :new_toplevel
 
+  def initialized_by_new? # :nodoc:
+    IDENTITY_METHOD.bind_call(@_init, self.class.singleton_class)
+  end
+  private :initialized_by_new?
+
   # :markup: markdown
   #
   # :call-seq:
@@ -1087,7 +1095,7 @@ class ERB
   # ```
   #
   def def_method(mod, methodname, fname='(ERB)')
-    unless @_init.equal?(self.class.singleton_class)
+    unless initialized_by_new?
       raise ArgumentError, "not initialized"
     end
     src = self.src.sub(/^(?!#|$)/) {"def #{methodname}\n"} << "\nend\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: java
 authors:
 - Masatoshi SEKI
@@ -49,7 +49,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/v6.0.4/NEWS.md
+  changelog_uri: https://github.com/ruby/erb/blob/v6.0.5/NEWS.md
 rdoc_options: []
 require_paths:
 - lib