[#43610] Re: [ruby-list:48149] Re: requireが配列を取れたら便利だと思うんだけど.. — Hiroshi Nakamura <nakahiro@...>
cnVieS1saXN0GyRCJCskaTt9JEMkRk1oJF4kNyQ/ISMkRyRiQjMkKyRKJD0kJiEjGyhCCgoyMDEx
12 messages
2011/06/02
[#43612] Re: [ruby-list:48149] Re: requireが配列を取れたら便利だと思うんだけど..
— Akira Matsuda <ronnie@...>
2011/06/02
松田です。
[#43615] Re: [ruby-list:48149] Re: requireが配列を取れたら便利だと思うんだけど..
— Urabe Shyouhei <shyouhei@...>
2011/06/03
卜部です
[#43620] Module#mix — Yukihiro Matsumoto <matz@...>
まつもと ゆきひろです
9 messages
2011/06/03
[#43634] [Ruby 1.9 - Bug #4835][Open] Compilation failure of ext/tk with recent ActiveTcl — Yuki Sonoda <yugui@...>
5 messages
2011/06/06
[#43643] DateTime.new! and DateTime.jd — Aaron Patterson <aaron.patterson@...>
こんにちは、アーロンです。
25 messages
2011/06/07
[#43647] Re: DateTime.new! and DateTime.jd
— Tadayoshi Funaba <tadf@...>
2011/06/07
blocker はお前だろ。
[#43648] Re: DateTime.new! and DateTime.jd
— Yukihiro Matsumoto <matz@...>
2011/06/07
まつもと ゆきひろです
[#43651] Re: DateTime.new! and DateTime.jd
— Tadayoshi Funaba <tadf@...>
2011/06/07
> うーん、ただでさえ日英のコミュニケーション障壁があるのに、よ
[#43653] Re: DateTime.new! and DateTime.jd
— Aaron Patterson <aaron.patterson@...>
2011/06/07
2011/6/7 Tadayoshi Funaba <[email protected]>:
[#43657] Re: DateTime.new! and DateTime.jd
— Tadayoshi Funaba <tadf@...>
2011/06/07
皆さんってのに俺は入ってないみたいだな。
[#43661] Re: DateTime.new! and DateTime.jd
— Yukihiro Matsumoto <matz@...>
2011/06/07
まつもと ゆきひろです
[#43662] Re: DateTime.new! and DateTime.jd
— Tadayoshi Funaba <tadf@...>
2011/06/07
> Aaronが言ってる「リリース」は1.9.3のことだと思いますよ。
[#43664] Re: DateTime.new! and DateTime.jd
— Yukihiro Matsumoto <matz@...>
2011/06/08
まつもと ゆきひろです
[#43666] Re: DateTime.new! and DateTime.jd
— Tadayoshi Funaba <tadf@...>
2011/06/08
> Railsのリリースについては私は知りません。が、1.9.3のリリース
[#43645] Re: [ruby-core:36778] Re: 1.8.7 release next month — Urabe Shyouhei <shyouhei@...>
Moving to ruby-dev to understand strategies of backporting the Tk
13 messages
2011/06/07
[#43654] Re: [ruby-core:36778] Re: 1.8.7 release next month
— Hidetoshi NAGAI <nagai@...>
2011/06/07
永井＠知能．九工大です．
[#43677] Re: [ruby-core:36778] Re: 1.8.7 release next month
— Urabe Shyouhei <shyouhei@...>
2011/06/08
卜部です。
[#43678] Re: [ruby-core:36778] Re: 1.8.7 release next month
— Hidetoshi NAGAI <nagai@...>
2011/06/08
永井＠知能．九工大です．
[#43655] [Ruby 1.9 - Bug #4853][Assigned] ext/tk/extconf.rb fails on Mac OS X — Nobuyoshi Nakada <nobu@...>
4 messages
2011/06/07
[#43686] test.rb for make run — SASADA Koichi <ko1@...>
ささだです．
7 messages
2011/06/10
[#43700] [Ruby 1.9 - Bug #4866][Assigned] Macでmake checkするとIO.copy_streamでSEGV — Motohiro KOSAKI <kosaki.motohiro@...>
4 messages
2011/06/10
[#43710] Re: [ruby-changes:19939] kosaki:r31986 (trunk): * ext/tk/tcltklib.c (lib_eventloop_core): replace CHECK_INTS with — KOSAKI Motohiro <kosaki.motohiro@...>
永井さん
5 messages
2011/06/11
[#43754] Re: [ruby-changes:19939] kosaki:r31986 (trunk): * ext/tk/tcltklib.c (lib_eventloop_core): replace CHECK_INTS with
— Hidetoshi NAGAI <nagai@...>
2011/06/11
永井＠知能．九工大です．
[#43804] Re: [ruby-changes:19939] kosaki:r31986 (trunk): * ext/tk/tcltklib.c (lib_eventloop_core): replace CHECK_INTS with
— KOSAKI Motohiro <kosaki.motohiro@...>
2011/06/14
2011年6月12日0:00 Hidetoshi NAGAI <[email protected]>:
[#43716] [Ruby 1.9 - Bug #3137] complex.rb changes exceptions of Math — Koichi Sasada <redmine@...>
5 messages
2011/06/11
[#43717] [Ruby 1.9 - Bug #3456] bisarre comma — Koichi Sasada <redmine@...>
9 messages
2011/06/11
[#43748] Re: [Ruby 1.9 - Bug #3456] bisarre comma
— Yukihiro Matsumoto <matz@...>
2011/06/11
まつもと ゆきひろです
[#43755] Re: [Ruby 1.9 - Bug #3456] bisarre comma
— Urabe Shyouhei <shyouhei@...>
2011/06/11
メールにじかに反応したまつもとさんは読んでないと思うのでコメント#5を再掲
[#43756] Re: [Ruby 1.9 - Bug #3456] bisarre comma
— Yukihiro Matsumoto <matz@...>
2011/06/11
まつもと ゆきひろです
[#43759] Re: [Ruby 1.9 - Bug #3456] bisarre comma
— Urabe Shyouhei <shyouhei@...>
2011/06/11
卜部です。
[#43743] [Ruby 1.9 - Feature #4871][Open] envのコンパクト化 — Kazuki Tsujimoto <kazuki@...>
4 messages
2011/06/11
[#43779] Re: [ruby-cvs:38869] nobu:r31690 (trunk): * gc.c (vm_xcalloc): use calloc provided by platforms. — Yutaka Kanemoto <kinpoco@...>
こんにちは。
6 messages
2011/06/13
[#43781] Re: [ruby-cvs:38869] nobu:r31690 (trunk): * gc.c (vm_xcalloc): use calloc provided by platforms.
— Yutaka Kanemoto <kinpoco@...>
2011/06/13
金本と申します。
[#43782] Re: [ruby-cvs:38869] nobu:r31690 (trunk): * gc.c (vm_xcalloc): use calloc provided by platforms.
— KOSAKI Motohiro <kosaki.motohiro@...>
2011/06/13
>> AIXでは0 size mallocでNULLが返るのでこまったことになっています。
[#43783] Re: [ruby-cvs:38869] nobu:r31690 (trunk): * gc.c (vm_xcalloc): use calloc provided by platforms.
— SASADA Koichi <ko1@...>
2011/06/13
ささだです．
[#43787] [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか — Kenta Murata <muraken@...>
24 messages
2011/06/13
[#43788] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Yukihiro Matsumoto <matz@...>
2011/06/13
まつもと ゆきひろです
[#43789] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Tadayoshi Funaba <tadf@...>
2011/06/13
もう結論が出てしまったようですが、これは、元々 lib/complex.rb にあった
[#43794] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Kenta Murata <muraken@...>
2011/06/13
=E3=82=80=E3=82=89=E3=81=9F=E3=81=A7=E3=81=99=E3=80=82
[#43795] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Tadayoshi Funaba <tadf@...>
2011/06/13
> complex.rb をロードすると Math が CMath 相当に置き換わりますから、
[#43797] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Kenta Murata <muraken@...>
2011/06/14
=E3=82=80=E3=82=89=E3=81=9F=E3=81=A7=E3=81=99=E3=80=82
[#43799] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Yukihiro Matsumoto <matz@...>
2011/06/14
まつもと ゆきひろです
[#43800] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Kenta Murata <muraken@...>
2011/06/14
=E3=82=80=E3=82=89=E3=81=9F=E3=81=A7=E3=81=99=E3=80=82
[#43803] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Tadayoshi Funaba <tadf@...>
2011/06/14
> これに相当する事をやっているのが complex.rb なので、
[#43806] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Yusuke ENDOH <mame@...>
2011/06/14
遠藤です。
[#43807] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Tadayoshi Funaba <tadf@...>
2011/06/14
> 定義域を増やすだけにしよう、ということですよね。賛成です。
[#43809] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Yusuke ENDOH <mame@...>
2011/06/14
2011年6月14日22:17 Tadayoshi Funaba <[email protected]>:
[#43810] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Tadayoshi Funaba <tadf@...>
2011/06/14
> 互換性がないという点では同じ話だと思うのですが……。
[#43811] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Yusuke ENDOH <mame@...>
2011/06/14
2011年6月14日23:02 Tadayoshi Funaba <[email protected]>:
[#43812] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Tadayoshi Funaba <tadf@...>
2011/06/14
> いやあ、5 月末の feature freeze 時点では -2 を返していたはずなんですが、
[#43832] Re: [Ruby 1.9 - Feature #4878][Open] CMath に frexp, ldexp, hypot の3関数は不要ではないか
— Yusuke ENDOH <mame@...>
2011/06/16
遠藤です。
[#43791] [Ruby 1.9 - Bug #4879][Open] test_new(OpenSSL::TestPKeyRSA) fails on Win32 — Akio Tajima <artonx@...>
8 messages
2011/06/13
[#43829] [Ruby 1.9 - Bug #4891][Open] Vector#normalize — Kenta Murata <muraken@...>
6 messages
2011/06/16
[#43852] [Ruby 1.9 - Bug #4909][Open] trapハンドラは再入されてはいけないのではないか？ — Motohiro KOSAKI <kosaki.motohiro@...>
11 messages
2011/06/20
[#43855] Re: [Ruby 1.9 - Bug #4909][Open] trapハンドラは再入されてはいけないのではないか？
— Masaya TARUI <tarui@...>
2011/06/20
同意します。
[#45845] [ruby-trunk - Bug #4909] trapハンドラは再入されてはいけないのではないか？
— "ko1 (Koichi Sasada)" <redmine@...>
2012/06/25
[#43859] [Ruby 1.9 - Bug #4911][Open] timer_thread_function() が thead unsafe — Motohiro KOSAKI <kosaki.motohiro@...>
8 messages
2011/06/21
[#43861] Date/DateTimeの仕様について — "NARUSE, Yui" <naruse@...>
ふなばさん
5 messages
2011/06/21
[#43869] [Ruby 1.9 - Bug #4919][Open] OpenSSL::SSL::Sesssion#time= に Bignum を渡すと ArgumentError が発生する — Tomoyuki Chikanaga <nagachika00@...>
7 messages
2011/06/22
[#43872] [Ruby 1.9 - Bug #4919] OpenSSL::SSL::Sesssion#time= に Bignum を渡すと ArgumentError が発生する
— Tomoyuki Chikanaga <nagachika00@...>
2011/06/22
[#43880] Re: [Ruby 1.9 - Bug #4919] OpenSSL::SSL::Sesssion#time= に Bignum を渡すと ArgumentError が発生する
— Hiroshi Nakamura <nakahiro@...>
2011/06/23
報告ありがとうございます。32bit環境で落ちるとか考えてませんでした。。。
[#43875] [Ruby 1.9 - Feature #4921][Assigned] Remove intern.h — Yui NARUSE <redmine@...>
9 messages
2011/06/22
[#43890] [Ruby 1.9 - Bug #4072] dRubyで作成したサーバプログラムがsleepしていてもexitしてしまう — Tomoyuki Chikanaga <nagachika00@...>
4 messages
2011/06/24
[#43902] [Ruby 1.9 - Bug #4926][Open] --gc-stress付きtest/ruby/enc/test_emoji.rbが失敗する — Kazuki Tsujimoto <kazuki@...>
8 messages
2011/06/25
[#44001] socket related errors on chkbuild — SASADA Koichi <ko1@...>
ささだです．
4 messages
2011/06/30
[ruby-dev:43846] [Ruby 1.9 - Feature #4142][Open] multipart/form-data for net/http
From:
Hiroshi NAKAMURA <nakahiro@...>
Date:
2011-06-20 05:27:56 UTC
List:
ruby-dev #43846
Issue #4142 has been updated by Hiroshi NAKAMURA.
Status changed from Closed to Open
Naruse-san, would you please add an explanation of this feature to NEWS file?
----------------------------------------
Feature #4142: multipart/form-data for net/http
http://redmine.ruby-lang.org/issues/4142
Author: Yui NARUSE
Status: Open
Priority: Normal
Assignee:
Category: lib
Target version:
=begin
multipart/form-data 対応を net/http に入れませんか。
追加される API は Net::HTTPRequest#set_form になります。
akr さんからは multipart/form-data 用のデータを出力する API 案も示唆されたのですが、
chunked encoding を考慮に入れるとうまくまとまらなかったので見送っています。
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 4d475b1..2751f77 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -22,6 +22,7 @@
require 'net/protocol'
autoload :OpenSSL, 'openssl'
require 'uri'
+autoload :SecureRandom, 'securerandom'
module Net #:nodoc:
@@ -1772,7 +1773,8 @@ module Net #:nodoc:
alias content_type= set_content_type
# Set header fields and a body from HTML form data.
- # +params+ should be a Hash containing HTML form data.
+ # +params+ should be an Array of Arrays or
+ # a Hash containing HTML form data.
# Optional argument +sep+ means data record separator.
#
# Values are URL encoded as necessary and the content-type is set to
@@ -1792,6 +1794,48 @@ module Net #:nodoc:
alias form_data= set_form_data
+ # Set a HTML form data set.
+ # +params+ is the form data set; it is an Array of Arrays or a Hash
+ # +enctype is the type to encode the form data set.
+ # It is application/x-www-form-urlencoded or multipart/form-data.
+ # +formpot+ is an optional hash to specify the detail.
+ #
+ # boundary:: the boundary of the multipart message
+ # charset:: the charset of the message. All names and the values of
+ # non-file fields are encoded as the charset.
+ #
+ # Each item of params is an array and contains following items:
+ # +name+:: the name of the field
+ # +value+:: the value of the field, it should be a String or a File
+ # +opt+:: an optional hash to specify additional information
+ #
+ # Each item is a file field or a normal field.
+ # If +value+ is a File object or the +opt+ have a filename key,
+ # the item is treated as a file field.
+ #
+ # If Transfer-Encoding is set as chunked, this send the request in
+ # chunked encoding. Because chunked encoding is HTTP/1.1 feature,
+ # you must confirm the server to support HTTP/1.1 before sending it.
+ #
+ # Example:
+ # http.set_form([["q", "ruby"], ["lang", "en"]])
+ #
+ # See also RFC 2388, RFC 2616, HTML 4.01, and HTML5
+ #
+ def set_form(params, enctype='application/x-www-form-urlencoded', formopt={})
+ @body_data = params
+ @body = nil
+ @body_stream = nil
+ @form_option = formopt
+ case enctype
+ when /\Aapplication\/x-www-form-urlencoded\z/i,
+ /\Amultipart\/form-data\z/i
+ self.content_type = enctype
+ else
+ raise ArgumentError, "invalid enctype: #{enctype}"
+ end
+ end
+
# Set the Authorization: header for "Basic" authorization.
def basic_auth(account, password)
@header['authorization'] = [basic_encode(account, password)]
@@ -1849,6 +1893,7 @@ module Net #:nodoc:
self['User-Agent'] ||= 'Ruby'
@body = nil
@body_stream = nil
+ @body_data = nil
end
attr_reader :method
@@ -1876,6 +1921,7 @@ module Net #:nodoc:
def body=(str)
@body = str
@body_stream = nil
+ @body_data = nil
str
end
@@ -1884,6 +1930,7 @@ module Net #:nodoc:
def body_stream=(input)
@body = nil
@body_stream = input
+ @body_data = nil
input
end
@@ -1901,6 +1948,8 @@ module Net #:nodoc:
send_request_with_body sock, ver, path, @body
elsif @body_stream
send_request_with_body_stream sock, ver, path, @body_stream
+ elsif @body_data
+ send_request_with_body_data sock, ver, path, @body_data
else
write_header sock, ver, path
end
@@ -1935,6 +1984,92 @@ module Net #:nodoc:
end
end
+ def send_request_with_body_data(sock, ver, path, params)
+ if /\Amultipart\/form-data\z/i !~ self.content_type
+ self.content_type = 'application/x-www-form-urlencoded'
+ return send_request_with_body(sock, ver, path, URI.encode_www_form(params))
+ end
+
+ opt = @form_option.dup
+ opt[:boundary] ||= SecureRandom.urlsafe_base64(40)
+ self.set_content_type(self.content_type, boundary: opt[:boundary])
+ if chunked?
+ write_header sock, ver, path
+ encode_multipart_form_data(sock, params, opt)
+ else
+ require 'tempfile'
+ file = Tempfile.new('multipart')
+ encode_multipart_form_data(file, params, opt)
+ file.rewind
+ self.content_length = file.size
+ write_header sock, ver, path
+ IO.copy_stream(file, sock)
+ end
+ end
+
+ def encode_multipart_form_data(out, params, opt)
+ charset = opt[:charset]
+ boundary = opt[:boundary]
+ boundary ||= SecureRandom.urlsafe_base64(40)
+ chunked_p = chunked?
+
+ buf = ''
+ params.each do |key, value, h={}|
+ key = quote_string(key, charset)
+ filename =
+ h.key?(:filename) ? h[:filename] :
+ value.respond_to?(:to_path) ? File.basename(value.to_path) :
+ nil
+
+ buf << "--#{boundary}\r\n"
+ if filename
+ filename = quote_string(filename, charset)
+ type = h[:content_type] || 'application/octet-stream'
+ buf << "Content-Disposition: form-data; " \
+ "name=\"#{key}\"; filename=\"#{filename}\"\r\n" \
+ "Content-Type: #{type}\r\n\r\n"
+ if !out.respond_to?(:write) || !value.respond_to?(:read)
+ # if +out+ is not an IO or +value+ is not an IO
+ buf << (value.respond_to?(:read) ? value.read : value)
+ elsif value.respond_to?(:size) && chunked_p
+ # if +out+ is an IO and +value+ is a File, use IO.copy_stream
+ flush_buffer(out, buf, chunked_p)
+ out << "%x\r\n" % value.size if chunked_p
+ IO.copy_stream(value, out)
+ out << "\r\n" if chunked_p
+ else
+ # +out+ is an IO, and +value+ is not a File but an IO
+ flush_buffer(out, buf, chunked_p)
+ 1 while flush_buffer(out, value.read(4096), chunked_p)
+ end
+ else
+ # non-file field:
+ # HTML5 says, "The parts of the generated multipart/form-data
+ # resource that correspond to non-file fields must not have a
+ # Content-Type header specified."
+ buf << "Content-Disposition: form-data; name=\"#{key}\"\r\n\r\n"
+ buf << (value.respond_to?(:read) ? value.read : value)
+ end
+ buf << "\r\n"
+ end
+ buf << "--#{boundary}--\r\n"
+ flush_buffer(out, buf, chunked_p)
+ out << "0\r\n\r\n" if chunked_p
+ end
+
+ def quote_string(str, charset)
+ str = str.encode(charset, fallback:->(c){'&#%d;'%c.encode("UTF-8").ord}) if charset
+ str = str.gsub(/[\\"]/, '\\\\\&')
+ end
+
+ def flush_buffer(out, buf, chunked_p)
+ return unless buf
+ out << "%x\r\n"%buf.bytesize if chunked_p
+ out << buf
+ out << "\r\n" if chunked_p
+ buf.clear
+ end
+
def supply_default_content_type
return if content_type()
warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 2a6cfb4..a3ffa71 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -168,6 +168,8 @@ module Net # :nodoc:
}
end
+ alias << write
+
def writeline(str)
writing {
write0 str + "\r\n"
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index 76280ad..12c03a4 100644
--- a/test/net/http/test_http.rb
+++ b/test/net/http/test_http.rb
@@ -303,6 +303,102 @@ module TestNetHTTP_version_1_2_methods
assert_equal data.size, res.body.size
assert_equal data, res.body
end
+
+ def test_set_form
+ require 'tempfile'
+ file = Tempfile.new('ruby-test')
+ file << "\u{30c7}\u{30fc}\u{30bf}"
+ data = [
+ ['name', 'Gonbei Nanashi'],
+ ['name', "\u{540d}\u{7121}\u{3057}\u{306e}\u{6a29}\u{5175}\u{885b}"],
+ ['s"i\o', StringIO.new("\u{3042 3044 4e9c 925b}")],
+ ["file", file, filename: "ruby-test"]
+ ]
+ expected = <<"__EOM__".gsub(/\n/, "\r\n")
+--<boundary>
+Content-Disposition: form-data; name="name"
+
+Gonbei Nanashi
+--<boundary>
+Content-Disposition: form-data; name="name"
+
+\xE5\x90\x8D\xE7\x84\xA1\xE3\x81\x97\xE3\x81\xAE\xE6\xA8\xA9\xE5\x85\xB5\xE8\xA1\x9B
+--<boundary>
+Content-Disposition: form-data; name="s\\"i\\\\o"
+
+\xE3\x81\x82\xE3\x81\x84\xE4\xBA\x9C\xE9\x89\x9B
+--<boundary>
+Content-Disposition: form-data; name="file"; filename="ruby-test"
+Content-Type: application/octet-stream
+
+\xE3\x83\x87\xE3\x83\xBC\xE3\x82\xBF
+--<boundary>--
+__EOM__
+ start {|http|
+ _test_set_form_urlencoded(http, data.reject{|k,v|!v.is_a?(String)})
+ _test_set_form_multipart(http, false, data, expected)
+ _test_set_form_multipart(http, true, data, expected)
+ }
+ end
+
+ def _test_set_form_urlencoded(http, data)
+ req = Net::HTTP::Post.new('/')
+ req.set_form(data)
+ res = http.request req
+ assert_equal "name=Gonbei+Nanashi&name=%E5%90%8D%E7%84%A1%E3%81%97%E3%81%AE%E6%A8%A9%E5%85%B5%E8%A1%9B", res.body
+ end
+
+ def _test_set_form_multipart(http, chunked_p, data, expected)
+ data.each{|k,v|v.rewind rescue nil}
+ req = Net::HTTP::Post.new('/')
+ req.set_form(data, 'multipart/form-data')
+ req['Transfer-Encoding'] = 'chunked' if chunked_p
+ res = http.request req
+ body = res.body
+ assert_match(/\A--(?<boundary>\S+)/, body)
+ /\A--(?<boundary>\S+)/ =~ body
+ expected = expected.gsub(/<boundary>/, boundary)
+ assert_equal(expected, body)
+ end
+
+ def test_set_form_with_file
+ require 'tempfile'
+ file = Tempfile.new('ruby-test')
+ file << $test_net_http_data
+ filename = File.basename(file.to_path)
+ data = [['file', file]]
+ expected = <<"__EOM__".gsub(/\n/, "\r\n")
+--<boundary>
+Content-Disposition: form-data; name="file"; filename="<filename>"
+Content-Type: application/octet-stream
+
+<data>
+--<boundary>--
+__EOM__
+ expected.sub!(/<filename>/, filename)
+ expected.sub!(/<data>/, $test_net_http_data)
+ start {|http|
+ data.each{|k,v|v.rewind rescue nil}
+ req = Net::HTTP::Post.new('/')
+ req.set_form(data, 'multipart/form-data')
+ res = http.request req
+ body = res.body
+ header, _ = body.split(/\r\n\r\n/, 2)
+ assert_match(/\A--(?<boundary>\S+)/, body)
+ /\A--(?<boundary>\S+)/ =~ body
+ expected = expected.gsub(/<boundary>/, boundary)
+ assert_match(/^--(?<boundary>\S+)\r\n/, header)
+ assert_match(
+ /^Content-Disposition: form-data; name="file"; filename="#{filename}"\r\n/,
+ header)
+ assert_equal(expected, body)
+
+ data.each{|k,v|v.rewind rescue nil}
+ req['Transfer-Encoding'] = 'chunked'
+ res = http.request req
+ #assert_equal(expected, res.body)
+ }
+ end
end
class TestNetHTTP_version_1_1 < Test::Unit::TestCase
=end
--
http://redmine.ruby-lang.org