jekyll-assets 0.3.7 → 0.3.8

data/HISTORY.md

@@ -1,3 +1,9 @@
+### 0.3.8 (2013-04-29)
+
+* Play nice with query strings and anchors in pathnames of requested assets.
+  See #20.
+
+
 ### 0.3.7 (2013-04-29)
 
 * Refactor AssetFile to avoid stale assets caching. See #23.

data/lib/jekyll/assets_plugin/patches/site_patch.rb

@@ -36,17 +36,24 @@ module Jekyll
         end
 
 
-        def asset_path *args
-          asset     = assets[*args]
+        def asset_path pathname, *args
+          pathname, _, anchor = pathname.rpartition "#" if pathname["#"]
+          pathname, _, query  = pathname.rpartition "?" if pathname["?"]
+
+          asset     = assets[pathname, *args]
           baseurl   = "#{assets_config.baseurl}/"
-          cachebust = assets_config.cachebust
 
-          case cachebust
+          case cachebust = assets_config.cachebust
           when :none then baseurl << asset.logical_path
           when :soft then baseurl << asset.logical_path << "?cb=#{asset.digest}"
           when :hard then baseurl << asset.digest_path
           else raise "Unknown cachebust strategy: #{cachebust.inspect}"
           end
+
+          baseurl << (:soft == cachebust ? "&" : "?") << query if query
+          baseurl << "#" << anchor if anchor
+
+          baseurl
         end
 
 

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end

data/spec/fixtures/_assets/vapor.css

@@ -1 +1,11 @@
 /* vapor css framework */
+
+@font-face {
+  font-family: 'Vapor';
+  src: url(font-path('fonts/vapor.eot'));
+  src: url(font-path('fonts/vapor.eot')#iefix) format("embedded-opentype"),
+       url(font-path('fonts/vapor.woff')) format("woff"),
+       url(font-path('fonts/vapor.ttf')) format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}

data/spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb

@@ -87,6 +87,46 @@ module Jekyll::AssetsPlugin
             expect { site.asset_path "app.css" }.to raise_error
           end
         end
+
+
+        context "with query part in requested filename" do
+          subject { site.asset_path "app.css?foo=bar" }
+
+          context "and none cachebust" do
+            before { site.assets_config.cachebust = :none }
+            it { should match(%r{^/assets/app\.css\?foo=bar$}) }
+          end
+
+          context "and soft cachebust" do
+            before { site.assets_config.cachebust = :soft }
+            it { should match(%r{^/assets/app\.css\?cb=[a-f0-9]{32}&foo=bar$}) }
+          end
+
+          context "and hard cachebust" do
+            before { site.assets_config.cachebust = :hard }
+            it { should match(%r{^/assets/app-[a-f0-9]{32}\.css\?foo=bar$}) }
+          end
+        end
+
+
+        context "with anchor part in requested filename" do
+          subject { site.asset_path "app.css#foobar" }
+
+          context "and none cachebust" do
+            before { site.assets_config.cachebust = :none }
+            it { should match(%r{^/assets/app\.css#foobar$}) }
+          end
+
+          context "and soft cachebust" do
+            before { site.assets_config.cachebust = :soft }
+            it { should match(%r{^/assets/app\.css\?cb=[a-f0-9]{32}#foobar$}) }
+          end
+
+          context "and hard cachebust" do
+            before { site.assets_config.cachebust = :hard }
+            it { should match(%r{^/assets/app-[a-f0-9]{32}\.css#foobar$}) }
+          end
+        end
       end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -195,6 +195,9 @@ files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb
 - spec/fixtures/_assets/app.js
+- spec/fixtures/_assets/fonts/vapor.eot
+- spec/fixtures/_assets/fonts/vapor.ttf
+- spec/fixtures/_assets/fonts/vapor.woff
 - spec/fixtures/_assets/noise.png
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css
@@ -231,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2575730464667574048
+      hash: -1911320826109447063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -240,17 +243,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2575730464667574048
+      hash: -1911320826109447063
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.3.7
+summary: jekyll-assets-0.3.8
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb
 - spec/fixtures/_assets/app.js
+- spec/fixtures/_assets/fonts/vapor.eot
+- spec/fixtures/_assets/fonts/vapor.ttf
+- spec/fixtures/_assets/fonts/vapor.woff
 - spec/fixtures/_assets/noise.png
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css