absolutize 0.0.4 → 0.0.5

data/README.textile

@@ -1,5 +1,5 @@
 
-h1. Absolutize v0.0.4
+h1. Absolutize v0.0.5
 
 h2. Intro 
 

data/lib/absolutize.rb

@@ -13,29 +13,35 @@ class Absolutize
     @options[:output_debug] = false
   end
   
-  def url(new_url)
+  def url(relative_url)
     # encode the url if the new url contains spaces but doesn't contain %, i.e isn't already encoded
-    new_url = new_url.split("#").first if new_url.include?"#" and @options[:remove_anchors]
+    relative_url = relative_url.split("#").first if relative_url.include?"#" and @options[:remove_anchors]
+    relative_url = URI.encode(relative_url, " <>\{\}|\\\^\[\]`") if @options[:force_escaping]
     
-    new_url = URI.encode(new_url, " <>\{\}|\\\^\[\]`") if not new_url =~ /%/ and @options[:force_escaping]
+    absolute_url = nil
     begin
-      URI.join(@base_url, new_url).to_s
+      absolute_url = URI.join(@base_url, relative_url)
     rescue URI::InvalidURIError => urie
       puts "Unable to use URI.join attempting manually" if @options[:output_debug]
-      if @base_url =~ /\Ahttp/ and new_url =~ /\A\//
-        puts "base url starts with htt and new_url is relative to root" if @options[:output_debug]
+      if @base_url =~ /\Ahttp/ and relative_url =~ /\A\//
+        puts "base url starts with http and relative_url is relative to root" if @options[:output_debug]
         uri = URI.parse(@base_url)
         if uri.port
-          "#{uri.scheme}://#{uri.host}:#{uri.port}#{new_url}"
+          absolute_url = URI.parse("#{uri.scheme}://#{uri.host}:#{uri.port}#{relative_url}")
         else
-          "#{uri.scheme}://#{uri.host}#{new_url}"
+          absolute_url = URI.parse("#{uri.scheme}://#{uri.host}#{relative_url}")
         end
-      elsif new_url =~ /\Ahttp/
+      elsif relative_url =~ /\Ahttp/
         #new url is absolute anyway
-        new_url
+        absolute_url = URI.parse(relative_url)
       else
-        raise "Unable to absolutize #{base_url} and #{new_url}"
+        raise "Unable to absolutize #{base_url} and #{relative_url}"
       end
     end
+    
+    # remove any double slashes in the path
+    absolute_url.path = absolute_url.path.gsub("//", "/")
+    
+    absolute_url
   end
 end

data/lib/absolutize.rb~

@@ -13,29 +13,35 @@ class Absolutize
     @options[:output_debug] = false
   end
   
-  def url(new_url)
+  def url(relative_url)
     # encode the url if the new url contains spaces but doesn't contain %, i.e isn't already encoded
-    new_url = new_url.split("#").first if new_url.include?"#" and @options[:remove_anchors]
+    relative_url = relative_url.split("#").first if relative_url.include?"#" and @options[:remove_anchors]
+    relative_url = URI.encode(relative_url, " <>\{\}|\\\^\[\]`") if @options[:force_escaping]
     
-    new_url = URI.encode(new_url, " <>\{\}|\\\^\[\]`") if not new_url =~ /%/ and @options[:force_escaping]
+    absolute_url = nil
     begin
-      URI.join(@base_url, new_url).to_s
+      absolute_url = URI.join(@base_url, relative_url)
     rescue URI::InvalidURIError => urie
       puts "Unable to use URI.join attempting manually" if @options[:output_debug]
-      if @base_url =~ /\Ahttp/ and new_url =~ /\A\//
-        puts "base url starts with htt and new_url is relative to root" if @options[:output_debug]
+      if @base_url =~ /\Ahttp/ and relative_url =~ /\A\//
+        puts "base url starts with http and relative_url is relative to root" if @options[:output_debug]
         uri = URI.parse(@base_url)
         if uri.port
-          "#{uri.scheme}://#{uri.host}:#{uri.port}#{new_url}"
+          absolute_url = URI.parse("#{uri.scheme}://#{uri.host}:#{uri.port}#{relative_url}")
         else
-          "#{uri.scheme}://#{uri.host}#{new_url}"
+          absolute_url = URI.parse("#{uri.scheme}://#{uri.host}#{relative_url}")
         end
-      elsif new_url =~ /\Ahttp/
+      elsif relative_url =~ /\Ahttp/
         #new url is absolute anyway
-        new_url
+        absolute_url = URI.parse(relative_url)
       else
-        raise "Unable to absolutize #{base_url} and #{new_url}"
+        raise "Unable to absolutize #{base_url} and #{relative_url}"
       end
     end
+    
+    # remove any double slashes in the path
+    absolute_url.path = absolute_url.path.gsub("//", "/")
+    
+    absolute_url
   end
 end

data/spec/absolutize/absolutize_spec.rb

@@ -14,10 +14,25 @@ describe Absolutize do
   it "should return the same url for an absolute url" do
     @absolutize.url("http://www.bbc.co.uk/").to_s.should == "http://www.bbc.co.uk/" 
   end
+  it "should return the same url for an absolute url" do
+    @absolutize.url("http://www.bbc.co.uk//asdf/asdf.html").to_s.should == "http://www.bbc.co.uk/asdf/asdf.html" 
+  end
   it "should return the absolute url for a relative to root url" do
     @absolutize.url("/asdf.html").to_s.should == "http://www.baseurl.com/asdf.html" 
   end
   it "should return the absolute url for a relative to folder url" do
     @absolutize.url("asdf.html").to_s.should == "http://www.baseurl.com/asdf.html" 
   end  
+  it "should handle urls with spaces" do
+    @absolutize.url("/root folder/asdf.html").to_s.should == "http://www.baseurl.com/root%20folder/asdf.html"     
+  end
+  it "should handle urls with ['s" do
+    @absolutize.url("/folder/asdf.html?id=[asdf]").to_s.should == "http://www.baseurl.com/folder/asdf.html?id=%5Basdf%5D"         
+  end
+  it "should not encode urls with %'s" do
+    @absolutize.url("/root%20folder/asdf.html?id=asdf").to_s.should == "http://www.baseurl.com/root%20folder/asdf.html?id=asdf"         
+  end
+  it "should not encode existing encoded characters" do
+    @absolutize.url("/root%20folder/asdf.html?id=[asdf]").to_s.should == "http://www.baseurl.com/root%20folder/asdf.html?id=%5Basdf%5D"         
+  end
 end 

data/spec/absolutize/absolutize_spec.rb~

@@ -14,10 +14,23 @@ describe Absolutize do
   it "should return the same url for an absolute url" do
     @absolutize.url("http://www.bbc.co.uk/").to_s.should == "http://www.bbc.co.uk/" 
   end
+  it "should return the same url for an absolute url" do
+    @absolutize.url("http://www.bbc.co.uk//asdf/asdf.html").to_s.should == "http://www.bbc.co.uk/asdf/asdf.html" 
+  end
   it "should return the absolute url for a relative to root url" do
     @absolutize.url("/asdf.html").to_s.should == "http://www.baseurl.com/asdf.html" 
   end
   it "should return the absolute url for a relative to folder url" do
     @absolutize.url("asdf.html").to_s.should == "http://www.baseurl.com/asdf.html" 
   end  
+  it "should handle urls with spaces" do
+    @absolutize.url("/root folder/asdf.html").to_s.should == "http://www.baseurl.com/root%20folder/asdf.html"     
+  end
+  it "should handle urls with ['s" do
+    @absolutize.url("/folder/asdf.html?id=[asdf]").to_s.should == "http://www.baseurl.com/folder/asdf.html?id=%5Basdf%5D"         
+  end
+  it "should not encode urls with %'s" do
+    @absolutize.url("/root%20folder/asdf.html?id=asdf").to_s.should == "http://www.baseurl.com/root%20folder/asdf.html?id=asdf"         
+  end
+
 end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: absolutize
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Stewart McKee