From 39d56bc98834b09fc6939fd27bde8848efbb251d Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Thu, 21 Jul 2011 23:50:32 -0400
Subject: Finally a nice solution for mapping relative urls

---
 plugins/category_generator.rb |  2 +-
 plugins/custom_filters.rb     | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/category_generator.rb b/plugins/category_generator.rb
index c2e9a46e..e636781e 100644
--- a/plugins/category_generator.rb
+++ b/plugins/category_generator.rb
@@ -130,7 +130,7 @@ module Jekyll
     #
     def category_links(categories)
       dir = @context.registers[:site].config['category_dir']
-      root_url = @context.registers[:site].config['root']
+      root_url = @context.registers[:site].config['root'].sub(/\/$/, '')
       categories = categories.sort!.map do |item|
         "<a class='category' href='#{root_url}/#{dir}/#{item.gsub(/_|\W/, '-')}/'>#{item}</a>"
       end
diff --git a/plugins/custom_filters.rb b/plugins/custom_filters.rb
index 0a7604f7..5b49363b 100644
--- a/plugins/custom_filters.rb
+++ b/plugins/custom_filters.rb
@@ -20,15 +20,23 @@ module OctopressFilters
   end
 
   # Replaces relative urls with full urls
-  def full_urls(input, url='')
-    url ||= ''
+  def expand_urls(input, url='')
+    url ||= '/'
     input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\"'>]+)/ do
       $1+url+$3
     end
   end
 
-  # Returns a url without the http:// for use in as a search modifier eg. 'search terms site:website.com'
-  def search_url(input)
+  # Removes trailing forward slash from a string for easily appending url segments
+  def strip_slash(input)
+    if input =~ /(.+)\/$|^\/$/
+      input = $1
+    end
+    input
+  end
+
+  # Returns a url without the protocol (http://)
+  def shorthand_url(input)
     input.gsub /(https?:\/\/)(\S+)/ do
       $2
     end
-- 
cgit v1.2.1