absolutize 0.0.9 → 0.0.10

data/lib/absolutize.rb

@@ -16,12 +16,15 @@ class Absolutize
   def url(relative_url)
     # encode the url if the new url contains spaces but doesn't contain %, i.e isn't already encoded
     relative_url = relative_url.split("#").first if relative_url.include?"#" and @options[:remove_anchors]
-    relative_url = URI.encode(relative_url, " <>\{\}|\\\^\[\]|`") if @options[:force_escaping]
+    if @options[:force_escaping]
+      relative_url = URI.decode(relative_url)#force the decode of the URL
+      relative_url = URI.encode(relative_url, " <>\{\}|\\\^\[\]|`")
+    end
     
     absolute_url = nil
     begin
       absolute_url = URI.join(@base_url, relative_url)
-    rescue URI::InvalidURIError => urie
+    rescue URI::InvalidURIError => uri
       puts "Unable to use URI.join attempting manually" 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]
@@ -35,7 +38,7 @@ class Absolutize
         #new url is absolute anyway
         absolute_url = URI.parse(relative_url)
       else
-        raise "Unable to absolutize #{base_url} and #{relative_url}"
+        raise "Unable to absolutize #{@base_url} and #{relative_url}"
       end
     end
     

data/spec/absolutize/absolutize_spec.rb

@@ -19,8 +19,15 @@ describe Absolutize 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" 
+      @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 correct absolute URL when the url is already encoded" do
+      ab = Absolutize.new("http://www.baseurl.com/top_folder/index.html")
+      ab.url("%2ftop_folder%2fsub_folder%2findex.html").to_s.should == "http://www.baseurl.com/top_folder/sub_folder/index.html"
+      ab.url("/top_folder/sub_folder/index.html").to_s.should == "http://www.baseurl.com/top_folder/sub_folder/index.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
@@ -58,7 +65,15 @@ describe Absolutize do
       @absolutize = Absolutize.new(@base_url, :force_escaping => false)
     end
     it "should not escape invalid characters" do
-      lambda { @absolutize.url("/root folder/asdf.html#anchor")}.should raise_error     
+      lambda { @absolutize.url("/root folder/asdf.html#anchor")}.should raise_error
+
+      ab = Absolutize.new("http://www.baseurl.com/top_folder/index.html", :force_escaping => false)
+      #this is actually wrong, but we have not forced escaping
+      ab.url("%2ftop_folder%2fsub_folder%2findex.html").to_s.should == "http://www.baseurl.com/top_folder/%2ftop_folder%2fsub_folder%2findex.html"
+      #should work fine
+      ab.url("/top_folder/sub_folder/index.html").to_s.should == "http://www.baseurl.com/top_folder/sub_folder/index.html"
+
     end
+
   end
 end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: absolutize
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Stewart McKee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 +01:00
+date: 2010-08-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +34,6 @@ files:
 - spec/absolutize/absolutize_spec.rb
 - spec/absolutize/absolutize_spec.rb~
 - lib/absolutize.rb
-- lib/absolutize.rb~
 - README.textile
 has_rdoc: false
 homepage: http://github.com/vamosa/absolutize

data/lib/absolutize.rb~

@@ -1,47 +0,0 @@
-require 'rubygems'
-require 'uri'
-require File.expand_path(File.dirname(__FILE__) + '/absolutize')
-
-class Absolutize
-
-  def initialize(base_url, options = {})
-    @base_url = base_url
-    @options = options
-    
-    @options[:remove_anchors] = false if @options[:remove_anchors].nil? 
-    @options[:force_escaping] = true if @options[:force_escaping].nil?
-    @options[:output_debug] = false if @options[:output_debug].nil?
-  end
-  
-  def url(relative_url)
-    # encode the url if the new url contains spaces but doesn't contain %, i.e isn't already encoded
-    relative_url = relative_url.split("#").first if relative_url.include?"#" and @options[:remove_anchors]
-    relative_url = URI.encode(relative_url, " <>\{\}|\\\^\[\]|`") if @options[:force_escaping]
-    
-    absolute_url = nil
-    begin
-      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 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
-          absolute_url = URI.parse("#{uri.scheme}://#{uri.host}:#{uri.port}#{relative_url}")
-        else
-          absolute_url = URI.parse("#{uri.scheme}://#{uri.host}#{relative_url}")
-        end
-      elsif relative_url =~ /\Ahttp/
-        #new url is absolute anyway
-        absolute_url = URI.parse(relative_url)
-      else
-        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("//", "/") unless absolute_url.path.nil?
-    
-    absolute_url
-  end
-end