cgi 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f183a3260e82566353d9db4cb76de8d723bacf7d4daa78395f952855a5959c37
-  data.tar.gz: 5a765bf05577575a44ae31338a8cd7cdec8f195aeb443a3cad900a4668bbdd78
+  metadata.gz: 670bbf0eb15455e6020b95c0ca39481adb722eb4bb60fc797761b66a8f19af81
+  data.tar.gz: 9e360fdb4a408678f9edda5d3a8035e0bf05e087c946593cbac13d21d22f1998
 SHA512:
-  metadata.gz: 797faf906f497d31c332bbc5af7fabee946027e07b4f887ecc808deb111316a627f489d65e76d05245515403079ce7731ada777dc656ba8b6c167dd31ec3ca15
-  data.tar.gz: 229d5e80117e4e8162a5b4a1c4b0fb8b4cbbf8cf3282721de720161dac2ebf92ccb21dece53dba50ef78c05ce1d295e314c7967dbc0061a3981ce43a515757dc
+  metadata.gz: 4115408aa6f5dc3f17b638d9e7fc1ba0e10d4d84172910558c7d01e5ae2bf79fa198111dbd137d1602d2cb8299ae98961ae66f0aaf93bc0cf09912b3565bb664
+  data.tar.gz: 0e47613d0b6677a7062a87e6b07c7cefe3957d02fb74ed8c385ad0671146eafb0d26ec9efa29cf619b5e30a45b0c0b2bc259161a66b9dc3f778e5699806ad17a

data/Rakefile

@@ -1,13 +1,17 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+require 'rake/extensiontask'
+extask = Rake::ExtensionTask.new("cgi/escape") do |x|
+  x.lib_dir.sub!(%r[(?=/|\z)], "/#{RUBY_VERSION}/#{x.platform}")
+end
+
 Rake::TestTask.new(:test) do |t|
+  t.libs << "lib/#{RUBY_VERSION}/#{extask.platform}"
   t.libs << "test/lib"
   t.ruby_opts << "-rhelper"
   t.test_files = FileList['test/**/test_*.rb']
 end
 
-require 'rake/extensiontask'
-Rake::ExtensionTask.new("cgi/escape")
-
 task :default => :test
+task :test => :compile

data/cgi.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
 
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{\A(?:(?:test|spec|features)/|\.git)}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.extensions    = ["ext/cgi/escape/extconf.rb"]
+  spec.executables   = []
   spec.require_paths = ["lib"]
 end

data/ext/cgi/escape/depend

@@ -1,17 +1,2 @@
-# AUTOGENERATED DEPENDENCIES START
 escape.o: $(RUBY_EXTCONF_H)
-escape.o: $(arch_hdrdir)/ruby/config.h
-escape.o: $(hdrdir)/ruby.h
-escape.o: $(hdrdir)/ruby/assert.h
-escape.o: $(hdrdir)/ruby/backward.h
-escape.o: $(hdrdir)/ruby/defines.h
-escape.o: $(hdrdir)/ruby/encoding.h
-escape.o: $(hdrdir)/ruby/intern.h
-escape.o: $(hdrdir)/ruby/missing.h
-escape.o: $(hdrdir)/ruby/onigmo.h
-escape.o: $(hdrdir)/ruby/oniguruma.h
-escape.o: $(hdrdir)/ruby/ruby.h
-escape.o: $(hdrdir)/ruby/st.h
-escape.o: $(hdrdir)/ruby/subst.h
 escape.o: escape.c
-# AUTOGENERATED DEPENDENCIES END

data/ext/cgi/escape/escape.c

@@ -32,12 +32,21 @@ preserve_original_state(VALUE orig, VALUE dest)
     rb_enc_associate(dest, rb_enc_get(orig));
 }
 
+static inline long
+escaped_length(VALUE str)
+{
+    const long len = RSTRING_LEN(str);
+    if (len >= LONG_MAX / HTML_ESCAPE_MAX_LEN) {
+	ruby_malloc_size_overflow(len, HTML_ESCAPE_MAX_LEN);
+    }
+    return len * HTML_ESCAPE_MAX_LEN;
+}
+
 static VALUE
 optimized_escape_html(VALUE str)
 {
     VALUE vbuf;
-    typedef char escape_buf[HTML_ESCAPE_MAX_LEN];
-    char *buf = *ALLOCV_N(escape_buf, vbuf, RSTRING_LEN(str));
+    char *buf = ALLOCV_N(char, vbuf, escaped_length(str));
     const char *cstr = RSTRING_PTR(str);
     const char *end = cstr + RSTRING_LEN(str);
 
@@ -389,7 +398,7 @@ cgiesc_unescape(int argc, VALUE *argv, VALUE self)
 void
 Init_escape(void)
 {
-#if HAVE_RB_EXT_RACTOR_SAFE
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
     rb_ext_ractor_safe(true);
 #endif
 

data/lib/cgi/session/pstore.rb

@@ -44,20 +44,8 @@ class CGI
       # This session's PStore file will be created if it does
       # not exist, or opened if it does.
       def initialize(session, option={})
-        dir = option['tmpdir'] || Dir::tmpdir
-        prefix = option['prefix'] || ''
-        id = session.session_id
-        require 'digest/md5'
-        md5 = Digest::MD5.hexdigest(id)[0,16]
-        path = dir+"/"+prefix+md5
-        if File::exist?(path)
-          @hash = nil
-        else
-          unless session.new_session
-            raise CGI::Session::NoSession, "uninitialized session"
-          end
-          @hash = {}
-        end
+        option = {'suffix'=>''}.update(option)
+        path, @hash = session.new_store_file(option)
         @p = ::PStore.new(path)
         @p.transaction do |p|
           File.chmod(0600, p.path)

data/lib/cgi/session.rb

@@ -189,6 +189,47 @@ class CGI
     end
     private :create_new_id
 
+
+    # Create a new file to store the session data.
+    #
+    # This file will be created if it does not exist, or opened if it
+    # does.
+    #
+    # This path is generated under _tmpdir_ from _prefix_, the
+    # digested session id, and _suffix_.
+    #
+    # +option+ is a hash of options for the initializer.  The
+    # following options are recognised:
+    #
+    # tmpdir:: the directory to use for storing the FileStore
+    #          file.  Defaults to Dir::tmpdir (generally "/tmp"
+    #          on Unix systems).
+    # prefix:: the prefix to add to the session id when generating
+    #          the filename for this session's FileStore file.
+    #          Defaults to "cgi_sid_".
+    # suffix:: the prefix to add to the session id when generating
+    #          the filename for this session's FileStore file.
+    #          Defaults to the empty string.
+    def new_store_file(option={}) # :nodoc:
+      dir = option['tmpdir'] || Dir::tmpdir
+      prefix = option['prefix']
+      suffix = option['suffix']
+      require 'digest/md5'
+      md5 = Digest::MD5.hexdigest(session_id)[0,16]
+      path = dir+"/"
+      path << prefix if prefix
+      path << md5
+      path << suffix if suffix
+      if File::exist? path
+        hash = nil
+      elsif new_session
+        hash = {}
+      else
+        raise NoSession, "uninitialized session"
+      end
+      return path, hash
+    end
+
     # Create a new CGI::Session object for +request+.
     #
     # +request+ is an instance of the +CGI+ class (see cgi.rb).
@@ -373,21 +414,8 @@ class CGI
       # This session's FileStore file will be created if it does
       # not exist, or opened if it does.
       def initialize(session, option={})
-        dir = option['tmpdir'] || Dir::tmpdir
-        prefix = option['prefix'] || 'cgi_sid_'
-        suffix = option['suffix'] || ''
-        id = session.session_id
-        require 'digest/md5'
-        md5 = Digest::MD5.hexdigest(id)[0,16]
-        @path = dir+"/"+prefix+md5+suffix
-        if File::exist? @path
-          @hash = nil
-        else
-          unless session.new_session
-            raise CGI::Session::NoSession, "uninitialized session"
-          end
-          @hash = {}
-        end
+        option = {'prefix' => 'cgi_sid_'}.update(option)
+        @path, @hash = session.new_store_file(option)
       end
 
       # Restore session state from the session's FileStore file.

data/lib/cgi/util.rb

@@ -49,9 +49,12 @@ module CGI::Util
       table = Hash[TABLE_FOR_ESCAPE_HTML__.map {|pair|pair.map {|s|s.encode(enc)}}]
       string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
       string.encode!(origenc) if origenc
-      return string
+      string
+    else
+      string = string.b
+      string.gsub!(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+      string.force_encoding(enc)
     end
-    string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
   end
 
   begin
@@ -90,7 +93,8 @@ module CGI::Util
                 when Encoding::ISO_8859_1; 256
                 else 128
                 end
-    string.gsub(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
+    string = string.b
+    string.gsub!(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
       match = $1.dup
       case match
       when 'apos'                then "'"
@@ -116,6 +120,7 @@ module CGI::Util
         "&#{match};"
       end
     end
+    string.force_encoding enc
   end
 
   # Synonym for CGI.escapeHTML(str)
@@ -174,21 +179,12 @@ module CGI::Util
   # Synonym for CGI.unescapeElement(str)
   alias unescape_element unescapeElement
 
-  # Abbreviated day-of-week names specified by RFC 822
-  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
-
-  # Abbreviated month names specified by RFC 822
-  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
-
   # Format a +Time+ object as a String using the format specified by RFC 1123.
   #
   #   CGI.rfc1123_date(Time.now)
   #     # Sat, 01 Jan 2000 00:00:00 GMT
   def rfc1123_date(time)
-    t = time.clone.gmtime
-    return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
-                  RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
-                  t.hour, t.min, t.sec)
+    time.getgm.strftime("%a, %d %b %Y %T GMT")
   end
 
   # Prettify (indent) an HTML string.

data/lib/cgi.rb

@@ -288,7 +288,7 @@
 #
 
 class CGI
-  VERSION = "0.2.1"
+  VERSION = "0.3.2"
 end
 
 require 'cgi/core'

data/rakelib/changelogs.rake

@@ -0,0 +1,34 @@
+task "build" => "changelogs"
+
+changelog = proc do |output, ver = nil, prev = nil|
+  ver &&= Gem::Version.new(ver)
+  range = [[prev], [ver, "HEAD"]].map {|ver, branch| ver ? "v#{ver.to_s}" : branch}.compact.join("..")
+  IO.popen(%W[git log --format=fuller --topo-order --no-merges #{range}]) do |log|
+    line = log.gets
+    FileUtils.mkpath(File.dirname(output))
+    File.open(output, "wb") do |f|
+      f.print "-*- coding: utf-8 -*-\n\n", line
+      log.each_line do |line|
+        line.sub!(/^(?!:)(?:Author|Commit)?(?:Date)?: /, '  \&')
+        line.sub!(/ +$/, '')
+        f.print(line)
+      end
+    end
+  end
+end
+
+tags = IO.popen(%w[git tag -l v[0-9]*]).grep(/v(.*)/) {$1}
+tags.sort_by! {|tag| tag.scan(/\d+/).map(&:to_i)}
+tags.inject(nil) do |prev, tag|
+  task("logs/ChangeLog-#{tag}") {|t| changelog[t.name, tag, prev]}
+  tag
+end
+
+desc "Make ChangeLog"
+task "ChangeLog", [:ver, :prev] do |t, ver: nil, prev: tags.last|
+  changelog[t.name, ver, prev]
+end
+
+changelogs = ["ChangeLog", *tags.map {|tag| "logs/ChangeLog-#{tag}"}]
+task "changelogs" => changelogs
+CLOBBER.concat(changelogs) << "logs"

data/rakelib/epoch.rake

@@ -0,0 +1,5 @@
+task "build" => "date_epoch"
+
+task "date_epoch" do
+  ENV["SOURCE_DATE_EPOCH"] = IO.popen(%W[git -C #{__dir__} log -1 --format=%ct], &:read).chomp
+end

data/rakelib/sync_tool.rake

@@ -0,0 +1,6 @@
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
+end

data/rakelib/version.rake

@@ -0,0 +1,44 @@
+class << (helper = Bundler::GemHelper.instance)
+  def update_gemspec
+    path = gemspec.loaded_from
+    File.open(path, "r+b") do |f|
+      d = f.read
+      if d.sub!(/^(_VERSION\s*=\s*)".*"/) {$1 + gemspec.version.to_s.dump}
+        f.rewind
+        f.truncate(0)
+        f.print(d)
+      end
+    end
+  end
+
+  def commit_bump
+    sh(%W[git commit -m bump\ up\ to\ #{gemspec.version}
+          #{gemspec.loaded_from}])
+  end
+
+  def version=(v)
+    gemspec.version = v
+    update_gemspec
+    commit_bump
+  end
+end
+
+major, minor, teeny = helper.gemspec.version.segments
+
+task "bump:teeny" do
+  helper.version = Gem::Version.new("#{major}.#{minor}.#{teeny+1}")
+end
+
+task "bump:minor" do
+  helper.version = Gem::Version.new("#{major}.#{minor+1}.0")
+end
+
+task "bump:major" do
+  helper.version = Gem::Version.new("#{major+1}.0.0")
+end
+
+task "bump" => "bump:teeny"
+
+task "tag" do
+  helper.__send__(:tag_version)
+end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cgi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Yukihiro Matsumoto
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies: []
 description: Support for the Common Gateway Interface protocol.
 email:
 - matz@ruby-lang.org
 executables: []
-extensions: []
+extensions:
+- ext/cgi/escape/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/test.yml"
-- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - cgi.gemspec
 - ext/cgi/escape/depend
 - ext/cgi/escape/escape.c
@@ -36,6 +33,10 @@ files:
 - lib/cgi/session.rb
 - lib/cgi/session/pstore.rb
 - lib/cgi/util.rb
+- rakelib/changelogs.rake
+- rakelib/epoch.rake
+- rakelib/sync_tool.rake
+- rakelib/version.rake
 homepage: https://github.com/ruby/cgi
 licenses:
 - Ruby
@@ -43,7 +44,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/cgi
   source_code_uri: https://github.com/ruby/cgi
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Support for the Common Gateway Interface protocol.
 test_files: []

data/.github/workflows/test.yml

@@ -1,24 +0,0 @@
-name: test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
-    strategy:
-      matrix:
-        ruby: [ 2.7, 2.6, 2.5, head ]
-        os: [ ubuntu-latest, macos-latest ]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        gem install bundler --no-document
-        bundle install
-    - name: Run test
-      run: rake test

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/Gemfile.lock
-*.bundle
-*.so
-*.dll

data/bin/console

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "cgi"
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install