1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/open-uri.rb: Specify frozen_string_literal: true.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2015-10-18 12:17:52 +00:00
parent 4eba615a0b
commit 89db37cf77
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun Oct 18 21:17:27 2015 Tanaka Akira <akr@fsij.org>
* lib/open-uri.rb: Specify frozen_string_literal: true.
Sun Oct 18 14:37:56 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sun Oct 18 14:37:56 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* random.c (fill_random_bytes_urandom): add a comment why using * random.c (fill_random_bytes_urandom): add a comment why using

2
lib/open-uri.rb
View File

@ -1,3 +1,5 @@
#
# -*- frozen_string_literal: true -*-
require 'uri' require 'uri'
require 'stringio' require 'stringio'
require 'time' require 'time'

19
test/open-uri/test_open-uri.rb
View File

@ -1,3 +1,5 @@
#
# -*- frozen_string_literal: true -*-
require 'test/unit' require 'test/unit'
require 'open-uri' require 'open-uri'
require 'webrick' require 'webrick'
@ -11,6 +13,7 @@ class TestOpenURI < Test::Unit::TestCase
NullLog = Object.new NullLog = Object.new
def NullLog.<<(arg) def NullLog.<<(arg)
#puts arg if / INFO / !~ arg
end end
def with_http(log_tester=lambda {|log| assert_equal([], log) }) def with_http(log_tester=lambda {|log| assert_equal([], log) })
@ -242,9 +245,9 @@ class TestOpenURI < Test::Unit::TestCase
def test_proxy def test_proxy
with_http {|srv, dr, url| with_http {|srv, dr, url|
proxy_log = StringIO.new('') proxy_log = StringIO.new(''.dup)
proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN) proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
proxy_auth_log = '' proxy_auth_log = ''.dup
proxy = WEBrick::HTTPProxyServer.new({ proxy = WEBrick::HTTPProxyServer.new({
:ServerType => Thread, :ServerType => Thread,
:Logger => proxy_logger, :Logger => proxy_logger,
@ -296,9 +299,9 @@ class TestOpenURI < Test::Unit::TestCase
def test_proxy_http_basic_authentication_failure def test_proxy_http_basic_authentication_failure
with_http {|srv, dr, url| with_http {|srv, dr, url|
proxy_log = StringIO.new('') proxy_log = StringIO.new(''.dup)
proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN) proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
proxy_auth_log = '' proxy_auth_log = ''.dup
proxy = WEBrick::HTTPProxyServer.new({ proxy = WEBrick::HTTPProxyServer.new({
:ServerType => Thread, :ServerType => Thread,
:Logger => proxy_logger, :Logger => proxy_logger,
@ -329,9 +332,9 @@ class TestOpenURI < Test::Unit::TestCase
def test_proxy_http_basic_authentication_success def test_proxy_http_basic_authentication_success
with_http {|srv, dr, url| with_http {|srv, dr, url|
proxy_log = StringIO.new('') proxy_log = StringIO.new(''.dup)
proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN) proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN)
proxy_auth_log = '' proxy_auth_log = ''.dup
proxy = WEBrick::HTTPProxyServer.new({ proxy = WEBrick::HTTPProxyServer.new({
:ServerType => Thread, :ServerType => Thread,
:Logger => proxy_logger, :Logger => proxy_logger,
@ -551,7 +554,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_encoding def test_encoding
with_http {|srv, dr, url| with_http {|srv, dr, url|
content_u8 = "\u3042" content_u8 = "\u3042"
content_ej = "\xa2\xa4".force_encoding("euc-jp") content_ej = "\xa2\xa4".dup.force_encoding("euc-jp")
srv.mount_proc("/u8/") {|req, res| res.body = content_u8; res['content-type'] = 'text/plain; charset=utf-8' } srv.mount_proc("/u8/") {|req, res| res.body = content_u8; res['content-type'] = 'text/plain; charset=utf-8' }
srv.mount_proc("/ej/") {|req, res| res.body = content_ej; res['content-type'] = 'TEXT/PLAIN; charset=EUC-JP' } srv.mount_proc("/ej/") {|req, res| res.body = content_ej; res['content-type'] = 'TEXT/PLAIN; charset=EUC-JP' }
srv.mount_proc("/nc/") {|req, res| res.body = "aa"; res['content-type'] = 'Text/Plain' } srv.mount_proc("/nc/") {|req, res| res.body = "aa"; res['content-type'] = 'Text/Plain' }
@ -599,7 +602,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_content_encoding def test_content_encoding
with_http {|srv, dr, url| with_http {|srv, dr, url|
content = "abc" * 10000 content = "abc" * 10000
Zlib::GzipWriter.wrap(StringIO.new(content_gz="".force_encoding("ascii-8bit"))) {|z| z.write content } Zlib::GzipWriter.wrap(StringIO.new(content_gz="".dup.force_encoding("ascii-8bit"))) {|z| z.write content }
srv.mount_proc("/data/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip' } srv.mount_proc("/data/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip' }
srv.mount_proc("/data2/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip'; res.chunked = true } srv.mount_proc("/data2/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip'; res.chunked = true }
srv.mount_proc("/noce/") {|req, res| res.body = content_gz } srv.mount_proc("/noce/") {|req, res| res.body = content_gz }

2
test/open-uri/test_ssl.rb
View File

@ -1,3 +1,5 @@
#
# -*- frozen_string_literal: true -*-
require 'test/unit' require 'test/unit'
require 'open-uri' require 'open-uri'
require 'stringio' require 'stringio'