Ruby 3.4 compatibility

byroot · byroot · commit 19790ac5bef0 · 2024-03-28T09:56:30.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -17,6 +17,8 @@ group :development do
   gem 'rubysspi'
   gem 'rubyntlm'
   gem 'rack-ntlm-test-service'
+  gem 'webrick'
+  gem 'base64'
 end
 
 gemspec
diff --git a/lib/hexdump.rb b/lib/hexdump.rb
@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: false
 
 # This was written by Arai-san and published at
 # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/31987
diff --git a/lib/http-access2.rb b/lib/http-access2.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPAccess2 - HTTP accessing library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>.
 
diff --git a/lib/httpclient.rb b/lib/httpclient.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
@@ -1240,7 +1241,7 @@ def do_get_block(req, proxy, conn, &block)
       conn.push(res)
       return res
     end
-    content = block ? nil : ''
+    content = block ? nil : +''
     res = HTTP::Message.new_response(content, req.header)
     @debug_dev << "= Request\n\n" if @debug_dev
     sess = @session_manager.query(req, proxy)
diff --git a/lib/httpclient/auth.rb b/lib/httpclient/auth.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/lib/httpclient/connection.rb b/lib/httpclient/connection.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/lib/httpclient/cookie.rb b/lib/httpclient/cookie.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # do not override if httpclient/webagent-cookie is loaded already
 unless defined?(HTTPClient::CookieManager)
 begin # for catching LoadError and load webagent-cookie instead
diff --git a/lib/httpclient/http.rb b/lib/httpclient/http.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
diff --git a/lib/httpclient/include_client.rb b/lib/httpclient/include_client.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # It is useful to re-use a HTTPClient instance for multiple requests, to
 # re-use HTTP 1.1 persistent connections. 
 #
diff --git a/lib/httpclient/jruby_ssl_socket.rb b/lib/httpclient/jruby_ssl_socket.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/lib/httpclient/session.rb b/lib/httpclient/session.rb
@@ -875,7 +875,7 @@ def parse_content_header(key, value)
     def read_body_length(&block)
       return nil if @content_length == 0
       while true
-        buf = empty_bin_str
+        buf = "".b
         maxbytes = @read_block_size
         maxbytes = @content_length if maxbytes > @content_length && @content_length > 0
         ::Timeout.timeout(@receive_timeout, ReceiveTimeoutError) do
@@ -901,7 +901,7 @@ def read_body_length(&block)
 
     RS = "\r\n"
     def read_body_chunked(&block)
-      buf = empty_bin_str
+      buf = "".b
       while true
        ::Timeout.timeout(@receive_timeout, ReceiveTimeoutError) do
           len = @socket.gets(RS)
@@ -930,7 +930,7 @@ def read_body_rest
         @readbuf = nil
       end
       while true
-        buf = empty_bin_str
+        buf = "".b
         ::Timeout.timeout(@receive_timeout, ReceiveTimeoutError) do
           begin
             @socket.readpartial(@read_block_size, buf)
@@ -948,12 +948,6 @@ def read_body_rest
         end
       end
     end
-
-    def empty_bin_str
-      str = ''
-      str.force_encoding('BINARY') if str.respond_to?(:force_encoding)
-      str
-    end
   end
 
 
diff --git a/lib/httpclient/ssl_config.rb b/lib/httpclient/ssl_config.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/lib/httpclient/ssl_socket.rb b/lib/httpclient/ssl_socket.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/lib/httpclient/timeout.rb b/lib/httpclient/timeout.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/lib/httpclient/util.rb b/lib/httpclient/util.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/lib/httpclient/webagent-cookie.rb b/lib/httpclient/webagent-cookie.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # cookie.rb is redistributed file which is originally included in Webagent
 # version 0.6.2 by TAKAHASHI `Maki' Masayoshi.  And it contains some bug fixes.
 # You can download the entire package of Webagent from
diff --git a/lib/jsonclient.rb b/lib/jsonclient.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'httpclient'
 require 'json'
  
diff --git a/lib/oauthclient.rb b/lib/oauthclient.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # HTTPClient - HTTP client library.
 # Copyright (C) 2000-2015  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>.
 #
diff --git a/test/test_auth.rb b/test/test_auth.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require File.expand_path('helper', File.dirname(__FILE__))
 require 'digest/md5'
 require 'rack'
diff --git a/test/test_cookie.rb b/test/test_cookie.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'test/unit'
 require 'uri'
 require 'tempfile'
diff --git a/test/test_hexdump.rb b/test/test_hexdump.rb
@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
+
 require File.expand_path('helper', File.dirname(__FILE__))
 require 'hexdump'
 
diff --git a/test/test_http-access2.rb b/test/test_http-access2.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require 'http-access2'
 require File.expand_path('helper', File.dirname(__FILE__))
 require 'tempfile'
diff --git a/test/test_httpclient.rb b/test/test_httpclient.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require File.expand_path('helper', File.dirname(__FILE__))
 require 'tempfile'
 
@@ -597,12 +598,10 @@ def test_get_content_with_base_url
     assert(called)
   end
 
-  GZIP_CONTENT = "\x1f\x8b\x08\x00\x1a\x96\xe0\x4c\x00\x03\xcb\x48\xcd\xc9\xc9\x07\x00\x86\xa6\x10\x36\x05\x00\x00\x00"
-  DEFLATE_CONTENT = "\x78\x9c\xcb\x48\xcd\xc9\xc9\x07\x00\x06\x2c\x02\x15"
-  DEFLATE_NOHEADER_CONTENT = "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15"
-  [GZIP_CONTENT, DEFLATE_CONTENT, DEFLATE_NOHEADER_CONTENT].each do |content|
-    content.force_encoding('BINARY') if content.respond_to?(:force_encoding)
-  end
+  GZIP_CONTENT = "\x1f\x8b\x08\x00\x1a\x96\xe0\x4c\x00\x03\xcb\x48\xcd\xc9\xc9\x07\x00\x86\xa6\x10\x36\x05\x00\x00\x00".b
+  DEFLATE_CONTENT = "\x78\x9c\xcb\x48\xcd\xc9\xc9\x07\x00\x06\x2c\x02\x15".b
+  DEFLATE_NOHEADER_CONTENT = "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15".b
+
   def test_get_gzipped_content
     @client.transparent_gzip_decompression = false
     content = @client.get_content(serverurl + 'compressed?enc=gzip')
diff --git a/test/test_include_client.rb b/test/test_include_client.rb
@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
+
 require File.expand_path('helper', File.dirname(__FILE__))
 
 require 'httpclient/include_client'
diff --git a/test/test_jsonclient.rb b/test/test_jsonclient.rb
@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
+
 require File.expand_path('helper', File.dirname(__FILE__))
 require 'jsonclient'
 
diff --git a/test/test_ssl.rb b/test/test_ssl.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require File.expand_path('helper', File.dirname(__FILE__))
 require 'webrick/https'
 require 'time'
diff --git a/test/test_webagent-cookie.rb b/test/test_webagent-cookie.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'test/unit'
 require 'uri'
 require 'tempfile'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# encoding: binary`
	`2`	`+# frozen_string_literal: false`
`2`	`3`
`3`	`4`	`# This was written by Arai-san and published at`
`4`	`5`	`# http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/31987`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# frozen_string_literal: false`
`1`	`2`	`# HTTPAccess2 - HTTP accessing library.`
`2`	`3`	`# Copyright (C) 2000-2007 NAKAMURA, Hiroshi <[email protected]>.`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# frozen_string_literal: false`
`1`	`2`	`# HTTPClient - HTTP client library.`
`2`	`3`	`# Copyright (C) 2000-2015 NAKAMURA, Hiroshi <[email protected]>.`
`3`	`4`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# frozen_string_literal: false`
`1`	`2`	`# do not override if httpclient/webagent-cookie is loaded already`
`2`	`3`	`unless defined?(HTTPClient::CookieManager)`
`3`	`4`	`begin # for catching LoadError and load webagent-cookie instead`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# -- encoding: utf-8 --`
	`2`	`+# frozen_string_literal: false`
`2`	`3`
`3`	`4`	`# HTTPClient - HTTP client library.`
`4`	`5`	`# Copyright (C) 2000-2015 NAKAMURA, Hiroshi <[email protected]>.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# frozen_string_literal: false`
`1`	`2`	`# It is useful to re-use a HTTPClient instance for multiple requests, to`
`2`	`3`	`# re-use HTTP 1.1 persistent connections.`
`3`	`4`	`#`