absolutize 0.0.1 → 0.0.2

data/README.textile

@@ -1,9 +1,9 @@
 
-h1. Absolutize v0.0.1
+h1. Absolutize v0.0.2
 
-h2. Intro
+h2. Intro 
 
-I know, I know, i should just fix URI.join, tough i haven't!
+Absolutize is essentially a replication of the URI.join or URI.merge methods, however, these strictly adhere to html standards, unfortunately the rest of the world doesn't.  The absolutize gem attempts to replicate url parsing that browsers use, ignoring the encoding issues etc.
 
 h2. Installation
 
@@ -13,10 +13,47 @@ bq. gem install absolutize
 
 h2. Usage
 
-absol = Absolutize.new(base_url)
-uri = absol.url(relative_url)
+h4. new(base_url, options)
 
-h3. Methods
+Creates a new absolutize object based on a base_url
 
-new - creates a new absolutize object based on a base_url
-url - absolutizes the relative_url based on the base_url
+  * base_url - This is the base url for the absolutize method, it should either be the url of the current page or if a base tag is supplied it should be the href attribute of the base tag
+
+  * options - Options are passed in as a hash,
+    ** :remove_anchors - removes any anchor tags (false)
+    ** :force_escaping - forces escaping of urls if it hasn't been done already (true)
+    
+bq. absolutizer = Absolutize.new("http://www.vamosa.com/mainfolder/", :remove_anchors => true)  
+
+h4. url(rel_url)
+
+Absolutizes the url that is passed in based on the options that have already been configured
+
+  * rel_url - The url to absolutize, this is the url that is used on the page and should be absolutized in relation to the base url.  
+
+bq. absolutizer.url("subfolder/index.html")
+
+
+h2. License
+
+h3. The MIT License
+
+Copyright (c) 2010 Vamosa Limited
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/absolutize.rb

@@ -4,13 +4,19 @@ require File.expand_path(File.dirname(__FILE__) + '/absolutize')
 
 class Absolutize
 
-  def initialize(base_url)
+  def initialize(base_url, options = {})
     @base_url = base_url
+    @options = options
+    
+    @options[:remove_anchors] = false
+    @options[:force_escaping] = true
+    
   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 = URI.encode(new_url, " <>\{\}|\\\^\[\]`") if not new_url =~ /%/
+    new_url = new_url.split("#").first if new_url.include?"#" and @options[:remove_anchors]
+    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
@@ -24,11 +30,13 @@ class Absolutize
           "#{uri.scheme}://#{uri.host}#{new_url}"
         end
       elsif new_url =~ /\Ahttp/
-        # new url is absolute anyway
+        #new url is absolute anyway
         new_url
       else
         raise "Unable to absolutize #{base_url} and #{new_url}"
       end
     end 
+    
+    ### remove double slashes
   end
 end

data/lib/absolutize.rb~

@@ -1,15 +1,22 @@
 require 'rubygems'
+require 'uri'
 require File.expand_path(File.dirname(__FILE__) + '/absolutize')
 
 class Absolutize
 
-  def initialize(base_url)
+  def initialize(base_url, options = {})
     @base_url = base_url
+    @options = options
+    
+    @options[:remove_anchors] = false
+    @options[:force_escaping] = true
+    
   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 = URI.encode(new_url, " <>\{\}|\\\^\[\]`") if not new_url =~ /%/
+    new_url = new_url.split("#").first if new_url.include?"#" and @options[:remove_anchors]
+    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
@@ -23,11 +30,13 @@ class Absolutize
           "#{uri.scheme}://#{uri.host}#{new_url}"
         end
       elsif new_url =~ /\Ahttp/
-        # new url is absolute anyway
+        #new url is absolute anyway
         new_url
       else
         raise "Unable to absolutize #{base_url} and #{new_url}"
       end
     end 
+    
+    ### remove double slashes
   end
 end

data/spec/absolutize/absolutize_spec.rb~

@@ -15,9 +15,9 @@ describe Absolutize do
     @absolutize.url("http://www.bbc.co.uk/").to_s.should == "http://www.bbc.co.uk/" 
   end
   it "should return the absolute url for a relative to root url" do
-    @absolutize.url("/asdf.html").to_s.should == "http://www.bbc.co.uk/asdf.html" 
+    @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.bbc.co.uk/asdf.html" 
+    @absolutize.url("asdf.html").to_s.should == "http://www.baseurl.com/asdf.html" 
   end  
 end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: absolutize
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Stewart McKee
@@ -37,7 +37,7 @@ files:
 - lib/absolutize.rb~
 - README.textile
 has_rdoc: false
-homepage: http://www.vamosa.com/
+homepage: http://github.com/vamosa/absolutize
 licenses: []
 
 post_install_message: