library/uri: insure string-like arguments are accepted for URI.join,

URI#merge, URI#route_to, URI#route_from.

library/uri/join_spec.rb

@@ -14,6 +14,20 @@
     end
   end
 
+  ruby_bug "redmine:3506", "1.9.2" do
+    it "accepts string-like arguments with to_str" do
+      str = mock('string-like')
+      str.should_receive(:to_str).and_return("http://ruby-lang.org")
+      str2 = mock('string-like also')
+      str2.should_receive(:to_str).and_return("foo/bar")
+      URI.join(str, str2).should == URI.parse("http://ruby-lang.org/foo/bar")
+    end
+  end
+
+  it "raises an error if given no argument" do
+    lambda{ URI.join }.should raise_error
+  end
+
   it "doesn't create redundant '/'s" do
     URI.join("http://localhost/", "/main.rbx").should == URI.parse("http://localhost/main.rbx")
   end

library/uri/merge_spec.rb

@@ -11,4 +11,12 @@
   it "accepts URI objects as argument" do
     URI("http://localhost/").merge(URI("main.rbx")).should == URI.parse("http://localhost/main.rbx")
   end
+
+  ruby_bug "redmine:3506", "1.9.2" do
+    it "accepts a string-like argument" do
+      str = mock('string-like')
+      str.should_receive(:to_str).and_return("foo/bar")
+      URI("http://localhost/").merge(str).should == URI.parse("http://localhost/foo/bar")
+    end
+  end
 end

library/uri/route_from_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'uri'
+
+describe "URI#route_from" do
+
+  #this could be split out a good bit better
+  it "gives the minimal difference between the current URI and the target" do
+    URI("http://example.com/a.html").route_from('http://example.com/a.html').to_s.should == ""
+    URI("http://example.com/a.html").route_from('http://example.com/b.html').to_s.should == "a.html"
+    URI("http://example.com/a/").route_from('http://example.com/b/').to_s.should == "../a/"
+    URI("http://example.com/b/").route_from('http://example.com/a/c').to_s.should == "../b/"
+    URI("http://example.com/b/").route_from('http://example.com/a/b/').to_s.should == "../../b/"
+    URI("http://example.com/b/").route_from('http://EXAMPLE.cOm/a/b/').to_s.should == "../../b/"
+    URI("http://example.net/b/").route_from('http://example.com/a/b/').to_s.should == "//example.net/b/"
+    URI("mailto:foo@example.com#bar").route_from('mailto:foo@example.com').to_s.should == "#bar"
+  end
+
+  ruby_bug "redmine:3506", "1.9.2" do
+    it "accepts a string-like argument" do
+      str = mock('string-like')
+      str.should_receive(:to_str).and_return("http://example.com/b.html")
+      URI("http://example.com/a.html").route_from(str).to_s.should == "a.html"
+    end
+  end
+end

library/uri/route_to.rb → library/uri/route_to_spec.rb

@@ -11,11 +11,18 @@
     URI("http://example.com/a/c").route_to('http://example.com/b/').to_s.should == "../b/"
     URI("http://example.com/a/b/").route_to('http://example.com/b/').to_s.should == "../../b/"
     URI("http://example.com/a/b/").route_to('http://EXAMPLE.cOm/b/').to_s.should == "../../b/"
-    URI("http://example.com/a/b/").route_to('http://example.net/b/').to_s.should == "//example.net/b/"    
-    URI("mailto:foo@example.com").route_to('mailto:foo@example.com#bar').to_s.should == "#bar"    
-    
+    URI("http://example.com/a/b/").route_to('http://example.net/b/').to_s.should == "//example.net/b/"
+    URI("mailto:foo@example.com").route_to('mailto:foo@example.com#bar').to_s.should == "#bar"
+
     #this was a little surprising to me
-    URI("mailto:foo@example.com#bar").route_to('mailto:foo@example.com').to_s.should == ""    
+    URI("mailto:foo@example.com#bar").route_to('mailto:foo@example.com').to_s.should == ""
+  end
+
+  ruby_bug "redmine:3506", "1.9.2" do
+    it "accepts a string-like argument" do
+      str = mock('string-like')
+      str.should_receive(:to_str).and_return("http://example.com/b.html")
+      URI("http://example.com/a.html").route_to(str).to_s.should == "b.html"
+    end
   end
-
-end
+end

library/uri/uri_spec.rb

@@ -11,6 +11,12 @@
     Kernel::URI("http://ruby-lang.org").should == result
   end
 
+  it "converts its argument with to_str" do
+    str = mock('string-like')
+    str.should_receive(:to_str).and_return("http://ruby-lang.org")
+    URI(str).should == URI.parse("http://ruby-lang.org")
+  end
+
   ruby_bug "redmine:3505", "1.9.2" do
     it "returns the argument if it is a URI object" do
       result = URI.parse("http://ruby-lang.org")