Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lib/uri/generic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,7 @@ def query=(v)
return @query = nil unless v
raise InvalidURIError, "query conflicts with opaque" if @opaque

x = v.to_str
v = x.dup if x.equal? v
v = v.to_str.dup
v.encode!(Encoding::UTF_8) rescue nil
v.delete!("\t\r\n")
v.force_encoding(Encoding::ASCII_8BIT)
Expand Down Expand Up @@ -944,8 +943,7 @@ def opaque=(v)
def fragment=(v)
return @fragment = nil unless v

x = v.to_str
v = x.dup if x.equal? v
v = v.to_str.dup
v.encode!(Encoding::UTF_8) rescue nil
v.delete!("\t\r\n")
v.force_encoding(Encoding::ASCII_8BIT)
Expand Down
14 changes: 14 additions & 0 deletions test/uri/test_generic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@ def uri_to_ary(uri)
uri.class.component.collect {|c| uri.send(c)}
end


def test_query_and_fragment_use_to_str_result
converted = "a b".freeze
value = Object.new
value.define_singleton_method(:to_str) { converted }
uri = URI("https://example.test/path")

uri.query = value
uri.fragment = value

assert_equal("https://example.test/path?a%20b#a%20b", uri.to_s)
assert_equal("a b", converted)
end

def test_to_s
exp = 'http://example.com/'.freeze
str = URI(exp).to_s
Expand Down