octopress-filters 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2357cb37590cb64fbeaaecd05376b426165491d
-  data.tar.gz: 7c1ae0b31902592000b63670e4e6d1bac628e391
+  metadata.gz: 11cba7cb5a1ea7328d01334b1f6e9e17dced1c10
+  data.tar.gz: 7fbcb1e3b70bb1dd1cff8f510552921163611e44
 SHA512:
-  metadata.gz: 6bf6d18153c2c0033253f8615065cf292cdc463efcae779a3a32c9f87570d3cdef703996b59bb77a9d46c0eacb6aaf7e4680b305ae9331b631c7eed89db3b8f1
-  data.tar.gz: f7c237f990bb7c18c6e33443d5c848c2c97aed282476cfbb874864cfeb293cb71d8a9b869c182f0600751c9c1a9b317149f466b020cc9df30d71320199dc557e
+  metadata.gz: 7e649ed873418aafb09229b1336d5da8b618dee985e279be8ca49ad094ec77e1f062aff617cfe3c98625f66212ff3cccddf89aae54cd78c8fe1fe9080b5b5c78
+  data.tar.gz: 6c856e68115ed7ed6efe595876838f0a23e8d6c15f5e0f7369ee6a7af0ce28359d618e6a1af1a28755c4607725d9a0fa7cf0005a218d4be41a6a556cfe9793b7

data/CHANGELOG.md

@@ -1,12 +1,18 @@
 # Changelog
 
+### 1.2.5 - 2015-01-24
+
+- New: join_url filter, works like File.join.
+- New: smart_slash filter. Appends trailing slashes to URLs when appropriate.
+- Fix: Ensure a baseurl isn't added twice when expanding URLs.
+
 ### 1.2.4 - 2015-01-23
 
 - Simple domains won't end in trailing slashes (eg: http://example.com doesn't need a trailing slash).
 
 ### 1.2.3 - 2015-01-23
 
-- Full urls will end with trailing slashes when appropriate
+- Full URLs will end with trailing slashes when appropriate
 
 ### 1.2.2 - 2015-01-23
 

data/lib/octopress-filters.rb

@@ -10,13 +10,16 @@ require "titlecase"
 module Octopress
   module Filters
 
-    # Returns the site's config root or '/' if the config isn't set
+    # Returns the site's baseurl or '/' if the config isn't set
     #
     def root
-      baseurl = Octopress.site.config['baseurl'] || Octopress.site.config['root']
       baseurl.nil? ? '/' : File.join('/', baseurl)
     end
 
+    def baseurl
+      Octopress.site.config['baseurl'] || Octopress.site.config['root']
+    end
+
     def site_url
       @url ||= begin
         File.join(Octopress.site.config['url'], root)
@@ -52,6 +55,11 @@ module Octopress
       input.gsub(/\n{2,}/, "\n").gsub(/^ +\n/,"")
     end
 
+    # Join url fragments
+    def join_url(*input)
+      smart_slash(File.join(input))
+    end
+
     # Join newlines 
     def join_lines(input, separator='')
       compact_newlines(input).strip.gsub(/\s*\n\s*/, separator)
@@ -76,7 +84,17 @@ module Octopress
     # e.g. /images/awesome.gif => http://example.com/images/awesome.gif
     #
     def full_urls(input)
-      expand_urls(input, site_url)
+      expand_urls(strip_baseurls(input), site_url)
+    end
+
+    # If a baseurl has been manually added to a url,
+    # this ensures it isn't added twice
+    def strip_baseurls(input)
+      if baseurl
+        input.gsub /(\s+(href|src|poster)\s*=\s*["|'])(\/#{baseurl})/, '\1'
+      else
+        input
+      end
     end
     
     # Prepend a url with the full site url
@@ -99,18 +117,22 @@ module Octopress
     #
     def expand_url(input, url=nil)
       url ||= root
+
       url = if input.start_with?("http", url)
         input
       else
         File.join(url, input)
       end
 
-      # Ensure a trailing slash if a url ends with a directory
-      if !(url =~ /\.\w+$/)
-        url = File.join(url, '/')
-      end
+      smart_slash(url)
+    end
 
-      url
+    # Ensure a trailing slash if a url ends with a directory
+    def smart_slash(input)
+      if !(input =~ /\.\w+$/)
+        input = File.join(input, '/')
+      end
+      input
     end
 
     # Prepend all absolute urls with a url fragment
@@ -122,7 +144,7 @@ module Octopress
     #
     def expand_urls(input, url=nil)
       url ||= root
-      input.gsub /(\s+(href|src|poster)\s*=\s*["|']{1})(\/[^\/>]{1}[^\"'>]*)/ do
+      input.gsub /(\s+(href|src|poster)\s*=\s*["|'])(\/[^\/][^"'>]*)/ do
         $1 + expand_url($3, url)
       end
     end

data/lib/octopress-filters/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Filters
-    VERSION = "1.2.4"
+    VERSION = "1.2.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-filters
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Brandon Mathis