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

* lib/uri/mailto.rb (URI::MailTo.build): follow Array#to_s change of

Browse Source 
Ruby 1.9; use Array#join. [Bug #5840]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-01-23 08:12:52 +00:00
parent aa5b65b2ed
commit 44d7233201
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jan 23 17:06:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/mailto.rb (URI::MailTo.build): follow Array#to_s change of
Ruby 1.9; use Array#join. [Bug #5840]
Mon Jan 23 16:42:28 2012 NARUSE, Yui <naruse@ruby-lang.org> Mon Jan 23 16:42:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (extract_binmode): raise an exception if binmode/textmode * io.c (extract_binmode): raise an exception if binmode/textmode

2
lib/uri/mailto.rb
View File

@ -103,7 +103,7 @@ module URI
if tmp[:headers].kind_of?(Array) if tmp[:headers].kind_of?(Array)
tmp[:opaque] << tmp[:headers].collect { |x| tmp[:opaque] << tmp[:headers].collect { |x|
if x.kind_of?(Array) if x.kind_of?(Array)
x[0] + '=' + x[1..-1].to_s x[0] + '=' + x[1..-1].join
else else
x.to_s x.to_s
end end

10
test/uri/test_mailto.rb
View File

@ -82,6 +82,16 @@ class TestMailTo < Test::Unit::TestCase
ok[-1] << {:to => "unlikely%3Faddress@example.com", ok[-1] << {:to => "unlikely%3Faddress@example.com",
:headers => ["blat=foop"]} :headers => ["blat=foop"]}
# mailto:john@example.com?Subject=Ruby&Cc=jack@example.com
ok << ["mailto:john@example.com?Subject=Ruby&Cc=jack@example.com"]
ok[-1] << ['john@example.com', [['Subject', 'Ruby'], ['Cc', 'jack@example.com']]]
ok[-1] << {:to=>"john@example.com", :headers=>[["Subject", "Ruby"], ["Cc", "jack@example.com"]]}
# mailto:listman@example.com?subject=subscribe
ok << ["mailto:listman@example.com?subject=subscribe"]
ok[-1] << {:to => 'listman@example.com', :headers => [['subject', 'subscribe']]}
ok[-1] << {:to => 'listman@example.com', :headers => [['subject', 'subscribe']]}
ok_all = ok.flatten.join("\0") ok_all = ok.flatten.join("\0")
# mailto:joe@example.com?cc=bob@example.com?body=hello ; WRONG! # mailto:joe@example.com?cc=bob@example.com?body=hello ; WRONG!