octopress-filters 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c03a48072acdfaa98fc2e5df1a3762bcdf35e40
-  data.tar.gz: 5d4a041d2041a0d07fe96d63a63af55c9c0e6582
+  metadata.gz: 2002356620eb54fcc5b5ca13a69e33d42c72c0ee
+  data.tar.gz: b6b85128aee57ca486cace37c545952e562a8a83
 SHA512:
-  metadata.gz: 71dd711640a5c418a61b37693be4aa5b8c5799d79c1b1500dc1bc5c324337ad87de3d0585a62df87b08dd73f29485103226b4f776bdec440ab53accca5dc60a9
-  data.tar.gz: 93532fdce07a3ae9e072b7aa002b3dd6168468d6b95abdea56352e66db7845310b560610ff0d40a344454056cb830b0c6af67cc8e08a6130aa53334ca8640782
+  metadata.gz: 7de67e476e900952f27cdd7c7d640f85ffcd11e2e1b73c14b811145fc781b7f7cd1e5195ea30e28d491bba3820e21b09aa4a67a2c8ec48d562f09e1576d8a0e8
+  data.tar.gz: 2f2c54300ebdf183a7cab6a10963000b2bfc130815697c7994548bd9a450c9ac64403bacb3c7d4679081da12641930c4c54ff0d6d9ea2443b272551c97c24662

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.3 - 2015-01-23
+
+- Full urls will end with trailing slashes when appropriate
+
 ### 1.2.2 - 2015-01-23
 
 - Added support for baseurl

data/lib/octopress-filters.rb

@@ -62,8 +62,8 @@ module Octopress
       input.sub(/\s+(\S+)\s*$/, ' \1')
     end
 
-    # Convert url input into a standard canonical url
-    #
+    # Convert url input into a standard canonical url by expanding urls and
+    # removing url fragments ending with `index.[ext]`
     def canonical_url(input)
       full_url(input).downcase.sub(/index\.\w+$/i, '')
     end
@@ -99,20 +99,21 @@ module Octopress
     #
     def expand_url(input, url=nil)
       url ||= root
-      url = if input =~ /^#{url}/
+      url = if input.start_with?("http", url)
         input
       else
         File.join(url, input)
       end
 
-      # If url has a file.extension
-      if url =~ /\.\w+$/
-        url
-      else
-        # The url ends with a directory
+      # Ensure a trailing slash if a url:
+      # - is a site url, eg: http://site.com
+      # - or ends with a directory
+      if !(url =~ /\.\w+$/) || url =~ /:\/\/[^\/]+$/
         # Add trailing slash if necessary
-        File.join(url, '/')
+        url = File.join(url, '/')
       end
+
+      url
     end
 
     # Prepend all absolute urls with a url fragment
@@ -124,7 +125,7 @@ module Octopress
     #
     def expand_urls(input, url=nil)
       url ||= root
-      input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\/>]{1}[^\"'>]*)/ do
+      input.gsub /(\s+(href|src|poster)\s*=\s*["|']{1})(\/[^\/>]{1}[^\"'>]*)/ 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.2"
+    VERSION = "1.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-filters
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll