@@ -218,12 +218,15 @@ module Addressable path = path.to_str.strip path.gsub!(/^file:\/?\/?/, "") if path =~ /^file:\/?\/?/ - path = "/" + path if path =~ /^([a-zA-Z])(\||:)/ + path = "/" + path if path =~ /^([a-zA-Z])[\|:]/ uri = self.parse(path) + puts uri.path.inspect if uri.scheme == nil # Adjust windows-style uris - uri.path.gsub!(/^\/?([a-zA-Z])\|(\\|\/)/, "/\\1:/") + uri.path.gsub!(/^\/?([a-zA-Z])[\|:][\\\/]/) do + "/#{$1.downcase}:/" + end uri.path.gsub!(/\\/, "/") if File.exists?(uri.path) && File.stat(uri.path).directory? lib/addressable/uri.rb @@ -3343,25 +3343,25 @@ describe Addressable::URI, "when converting a bogus path" do end end -describe Addressable::URI, "when given the root directory" do +describe Addressable::URI, "when given a UNIX root directory" do before do - if RUBY_PLATFORM =~ /mswin/ - @path = "C:\\" - else - @path = "/" - end + @path = "/" end - if RUBY_PLATFORM =~ /mswin/ - it "should convert to \'file:///c:/\'" do - @uri = Addressable::URI.convert_path(@path) - @uri.to_str.should == "file:///c:/" - end - else - it "should convert to \'file:///\'" do - @uri = Addressable::URI.convert_path(@path) - @uri.to_str.should == "file:///" - end + it "should convert to \'file:///\'" do + @uri = Addressable::URI.convert_path(@path) + @uri.to_str.should == "file:///" + end +end + +describe Addressable::URI, "when given a Windows root directory" do + before do + @path = "C:\\" + end + + it "should convert to \'file:///c:/\'" do + @uri = Addressable::URI.convert_path(@path) + @uri.to_str.should == "file:///c:/" end end spec/addressable/uri_spec.rb b5fb3f34bf3a4ec60bb57e538aece5876fab4702 Bob Aman bob@sporkmonger.com http://github.com/sporkmonger/addressable/commit/23e475086046964413936a2e4ecdb7285ce6b5c6 23e475086046964413936a2e4ecdb7285ce6b5c6 2009-11-01T14:22:42-08:00 2009-11-01T14:22:42-08:00 Fixed issue with spec failures in Windows. 1df9eca9b40670e1b4c80641904f2f31b12510d9 Bob Aman bob@sporkmonger.com