erb 4.0.4 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03030fb364b8bce3d2b601c42f5274670bce6ceed6bc63c6ccf1e3277ce48f17
-  data.tar.gz: fb3c201f09a8d73611e65102ba06f138e3502a6f62c456f18fef5d9922ecd50b
+  metadata.gz: 9d97394bb3c0dc798f7831317ba555cdb80baf4a8b8aa27b232c3e3fcce18c9d
+  data.tar.gz: b08b02f467e3a42ac68a8646b59b18a7e0db813888b657c6926849f118fda98a
 SHA512:
-  metadata.gz: c968d506080390520a3cfe5743f762006d65e6ebb7451e2aa7356bc23ec29848899d7e5bedfaad17112d419a84d7eb5df010f51f5f5548fcf29cc8db67402253
-  data.tar.gz: a4c3f4013ee6673a2d835b90ebc6ad4564162b912cfde279bded8b96389c0a18a1c23dd1fafef336c1d90340fec79633a7a9a2934b9287c229cd647780c7fe92
+  metadata.gz: 3f1d5bdb914e2449c484117f50334483105fa60f6dab0ed15bead0a0288ba7ba463a6ab599b915930ff875520ac14b19b10355232f5e480c9b3ef796a577001a
+  data.tar.gz: 59b8f7b61c4f91c6be9562cf44ccebcc8a55cf196ef3590b9d10d389cd7d809cf53e48cbbc844060969e7e23d3bfc87ba5d93491136818a7ae482102664c2455

data/.document

@@ -0,0 +1,6 @@
+LICENSE.txt
+NEWS.md
+README.md
+ext/
+lib/
+_doc/

data/.rdoc_options

@@ -0,0 +1 @@
+main_page: README.md

data/BDSL

@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/COPYING

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
+
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
+
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
+
+   b. use the modified software only within your corporation or
+      organization.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+3. You may distribute the software in object code or binary form,
+   provided that you do at least ONE of the following:
+
+   a. distribute the binaries and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
+
+   b. accompany the distribution with the machine-readable source of
+      the software.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
+
+   For the list of those files and their copying conditions, see the
+   file LEGAL.
+
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
+
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.

data/LICENSE.txt

@@ -1,22 +1,2 @@
-Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+All the files in this distribution are covered under either the Ruby's
+license (see the file COPYING) or BSD-2-Clause license (see the file BSDL).

data/NEWS.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.0.0
+
+* Bump `required_ruby_version` to Ruby 3.2+ [#60](https://github.com/ruby/erb/pull/60)
+* Drop `cgi` from runtime dependencies [#59](https://github.com/ruby/erb/pull/59)
+* Make `ERB::VERSION` public
+
 ## 4.0.4
 
 * Skip building the C extension for JRuby [#52](https://github.com/ruby/erb/pull/52)

data/_doc/cgi.rb

@@ -0,0 +1,3 @@
+# See {CGI document}[https://docs.ruby-lang.org/en/master/CGI.html]
+module CGI
+end

data/erb.gemspec

@@ -7,14 +7,13 @@ end
 
 Gem::Specification.new do |spec|
   spec.name          = 'erb'
-  spec.version       = ERB.const_get(:VERSION, false)
+  spec.version       = ERB::VERSION
   spec.authors       = ['Masatoshi SEKI', 'Takashi Kokubun']
   spec.email         = ['seki@ruby-lang.org', 'k0kubun@ruby-lang.org']
 
   spec.summary       = %q{An easy to use but powerful templating system for Ruby.}
   spec.description   = %q{An easy to use but powerful templating system for Ruby.}
   spec.homepage      = 'https://github.com/ruby/erb'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
   spec.licenses      = ['Ruby', 'BSD-2-Clause']
 
   spec.metadata['homepage_uri'] = spec.homepage
@@ -27,12 +26,11 @@ Gem::Specification.new do |spec|
   spec.executables   = ['erb']
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 3.2.0'
+
   if RUBY_ENGINE == 'jruby'
     spec.platform = 'java'
   else
-    spec.required_ruby_version = '>= 2.7.0'
     spec.extensions = ['ext/erb/escape/extconf.rb']
   end
-
-  spec.add_dependency 'cgi', '>= 0.3.3'
 end

data/ext/erb/escape/escape.c

@@ -65,9 +65,12 @@ optimized_escape_html(VALUE str)
     return escaped;
 }
 
-// ERB::Util.html_escape is different from CGI.escapeHTML in the following two parts:
-//   * ERB::Util.html_escape converts an argument with #to_s first (only if it's not T_STRING)
-//   * ERB::Util.html_escape does not allocate a new string when nothing needs to be escaped
+/*
+ * ERB::Util.html_escape is similar to CGI.escapeHTML but different in the following two parts:
+ *
+ * * ERB::Util.html_escape converts an argument with #to_s first (only if it's not T_STRING)
+ * * ERB::Util.html_escape does not allocate a new string when nothing needs to be escaped
+ */
 static VALUE
 erb_escape_html(VALUE self, VALUE str)
 {

data/lib/erb/compiler.rb

@@ -80,10 +80,16 @@ class ERB::Compiler # :nodoc:
   end
 
   class Scanner # :nodoc:
-    @scanner_map = {}
+    @scanner_map = defined?(Ractor) ? Ractor.make_shareable({}) : {}
     class << self
-      def register_scanner(klass, trim_mode, percent)
-        @scanner_map[[trim_mode, percent]] = klass
+      if defined?(Ractor)
+        def register_scanner(klass, trim_mode, percent)
+          @scanner_map = Ractor.make_shareable({ **@scanner_map, [trim_mode, percent] => klass })
+        end
+      else
+        def register_scanner(klass, trim_mode, percent)
+          @scanner_map[[trim_mode, percent]] = klass
+        end
       end
       alias :regist_scanner :register_scanner
     end
@@ -466,7 +472,17 @@ class ERB::Compiler # :nodoc:
     return enc, frozen
   end
 
+  # :stopdoc:
+  WARNING_UPLEVEL = Class.new {
+    attr_reader :c
+    def initialize from
+      @c = caller.length - from.length
+    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 + 1
+    warn "Invalid ERB trim mode: #{mode.inspect} (trim_mode: nil, 0, 1, 2, or String composed of '%' and/or '-', '>', '<>')", uplevel: uplevel + WARNING_UPLEVEL
   end
 end

data/lib/erb/def_method.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-#--
+
 # ERB::DefMethod
 #
 # Utility module to define eRuby script as instance method.

data/lib/erb/util.rb

@@ -1,17 +1,22 @@
 # frozen_string_literal: true
-#--
-# ERB::Escape
-#
-# A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope
-# Rails will not monkey-patch ERB::Escape#html_escape.
-begin
-  # 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)
+
+# 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.
+# JRuby: cgi.gem has a Java extension 'cgi/escape'.
+# TruffleRuby: lib/truffle/cgi/escape.rb requires 'cgi/util'.
+require 'cgi/escape'
+
+# Load or define ERB::Escape#html_escape.
+# We don't build the C extention 'cgi/escape' for JRuby, TruffleRuby, and WASM.
+if $LOAD_PATH.resolve_feature_path('erb/escape')
+  require 'erb/escape'
+else
+  # ERB::Escape
+  #
+  # 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
     def html_escape(s)
       CGI.escapeHTML(s.to_s)
@@ -20,7 +25,6 @@ unless defined?(ERB::Escape)
   end
 end
 
-#--
 # ERB::Util
 #
 # A utility module for conversion routines, often handy in HTML generation.
@@ -54,8 +58,16 @@ module ERB::Util
   #
   #   Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
   #
-  def url_encode(s)
-    CGI.escapeURIComponent(s.to_s)
+  if CGI.respond_to?(:escapeURIComponent)
+    def url_encode(s)
+      CGI.escapeURIComponent(s.to_s)
+    end
+  else # cgi.gem <= v0.3.2
+    def url_encode(s)
+      s.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/n) do |m|
+        sprintf("%%%02X", m.unpack1("C"))
+      end
+    end
   end
   alias u url_encode
   module_function :u

data/lib/erb/version.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 class ERB
-  VERSION = '4.0.4'
-  private_constant :VERSION
+  VERSION = '5.0.0'
 end

data/lib/erb.rb

@@ -12,7 +12,6 @@
 #
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require 'cgi/util'
 require 'erb/version'
 require 'erb/compiler'
 require 'erb/def_method'
@@ -294,7 +293,7 @@ class ERB
   #  # build data class
   #  class Listings
   #    PRODUCT = { :name => "Chicken Fried Steak",
-  #                :desc => "A well messages pattie, breaded and fried.",
+  #                :desc => "A well messaged pattie, breaded and fried.",
   #                :cost => 9.95 }
   #
   #    attr_reader :product, :price
@@ -327,10 +326,10 @@ class ERB
   # _Generates_
   #
   #  Chicken Fried Steak
-  #  A well messages pattie, breaded and fried.
+  #  A well massaged pattie, breaded and fried.
   #
   #  Chicken Fried Steak -- 9.95
-  #  A well messages pattie, breaded and fried.
+  #  A well massaged pattie, breaded and fried.
   #
   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.
@@ -353,7 +352,7 @@ class ERB
     @lineno = 0
     @_init = self.class.singleton_class
   end
-  NOT_GIVEN = Object.new
+  NOT_GIVEN = defined?(Ractor) ? Ractor.make_shareable(Object.new) : Object.new
   private_constant :NOT_GIVEN
 
   ##
@@ -416,8 +415,7 @@ class ERB
 
   #
   # Executes the generated ERB code to produce a completed template, returning
-  # the results of that code.  (See ERB::new for details on how this process
-  # can be affected by _safe_level_.)
+  # the results of that code.
   #
   # _b_ accepts a Binding object which is used to set the context of
   # code evaluation.

metadata

@@ -1,30 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 5.0.0
 platform: ruby
 authors:
 - Masatoshi SEKI
 - Takashi Kokubun
-autorequire: 
 bindir: libexec
 cert_chain: []
-date: 2024-01-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: cgi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.3
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: An easy to use but powerful templating system for Ruby.
 email:
 - seki@ruby-lang.org
@@ -35,14 +20,19 @@ extensions:
 - ext/erb/escape/extconf.rb
 extra_rdoc_files: []
 files:
+- ".document"
 - ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".rdoc_options"
+- BDSL
+- COPYING
 - Gemfile
 - LICENSE.txt
 - NEWS.md
 - README.md
 - Rakefile
+- _doc/cgi.rb
 - bin/console
 - bin/setup
 - erb.gemspec
@@ -61,7 +51,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/erb
   source_code_uri: https://github.com/ruby/erb
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -69,15 +58,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: An easy to use but powerful templating system for Ruby.
 test_files: []