absolutize 0.0.2 → 0.0.3

data/README.textile

@@ -1,5 +1,5 @@
 
-h1. Absolutize v0.0.2
+h1. Absolutize v0.0.3
 
 h2. Intro 
 

data/lib/absolutize.rb

@@ -10,19 +10,20 @@ class Absolutize
     
     @options[:remove_anchors] = false
     @options[:force_escaping] = true
-    
+    @options[:output_debug] = false
   end
   
   def url(new_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]
+    new_url = new_url.gsub("//", "/") if @options[:force_escaping]
     new_url = URI.encode(new_url, " <>\{\}|\\\^\[\]`") if not new_url =~ /%/ and @options[:force_escaping]
     begin
       URI.join(@base_url, new_url).to_s
     rescue URI::InvalidURIError => urie
-      puts "Unable to use URI.join attempting manually"
+      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"
+        puts "base url starts with htt and new_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}"
@@ -35,8 +36,6 @@ class Absolutize
       else
         raise "Unable to absolutize #{base_url} and #{new_url}"
       end
-    end 
-    
-    ### remove double slashes
+    end
   end
 end

data/lib/absolutize.rb~

@@ -10,19 +10,20 @@ class Absolutize
     
     @options[:remove_anchors] = false
     @options[:force_escaping] = true
-    
+    @options[:output_debug] = false
   end
   
   def url(new_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]
+    new_url = new_url.gsub("//", "/") if @options[:force_escaping]
     new_url = URI.encode(new_url, " <>\{\}|\\\^\[\]`") if not new_url =~ /%/ and @options[:force_escaping]
     begin
       URI.join(@base_url, new_url).to_s
     rescue URI::InvalidURIError => urie
-      puts "Unable to use URI.join attempting manually"
+      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"
+        puts "base url starts with htt and new_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}"
@@ -36,7 +37,5 @@ class Absolutize
         raise "Unable to absolutize #{base_url} and #{new_url}"
       end
     end 
-    
-    ### remove double slashes
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: absolutize
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Stewart McKee