jekyll-assets 0.3.2 → 0.3.3

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.3.3 (2013-02-16)
+
+* Respect cachebust setting on assets output filenames. (Thanks @softcrumbs)
+
+
 ### 0.3.2 (2013-02-10)
 
 * Allow choose cachebusting strategy (hard/soft/none). See #11.

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/ixti/jekyll-assets.png)](http://travis-ci.org/ixti/jekyll-assets)
 [![Dependency Status](https://gemnasium.com/ixti/jekyll-assets.png)](https://gemnasium.com/ixti/jekyll-assets)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/ixti/jekyll-assets)
+[![Code Climate](https://codeclimate.com/github/ixti/jekyll-assets.png)](https://codeclimate.com/github/ixti/jekyll-assets)
 
 Jekyll plugin, that adds Rails-alike assets pipeline, that means that:
 

data/lib/jekyll/assets_plugin/asset_file.rb

@@ -14,7 +14,18 @@ module Jekyll
 
 
       def destination dest
-        File.join(dest, @site.assets_config.dirname, @asset.digest_path)
+        File.join dest, @site.assets_config.dirname, filename
+      end
+
+
+      def filename
+        cachebust = @site.assets_config.cachebust
+
+        case cachebust
+        when :none, :soft then asset.logical_path
+        when :hard        then asset.digest_path
+        else raise "Unknown cachebust strategy: #{cachebust.inspect}"
+        end
       end
 
 

data/lib/jekyll/assets_plugin/environment.rb

@@ -19,6 +19,7 @@ module Jekyll
 
 
       autoload :ContextPatch, "jekyll/assets_plugin/environment/context_patch"
+      autoload :IndexPatch,   "jekyll/assets_plugin/environment/index_patch"
 
 
       attr_reader :site
@@ -51,21 +52,7 @@ module Jekyll
 
 
       def index
-        super.tap do |index|
-          index.instance_eval do
-            def find_asset path, options = {}
-              site    = @environment.site
-              asset   = super
-              bundle  = options[:bundle]
-
-              if asset and bundle and not site.static_files.include? asset
-                site.static_files << AssetFile.new(site, asset)
-              end
-
-              asset
-            end
-          end
-        end
+        super.tap { |index| index.singleton_class.send :include, IndexPatch }
       end
 
     end

data/lib/jekyll/assets_plugin/environment/index_patch.rb

@@ -0,0 +1,21 @@
+module Jekyll
+  module AssetsPlugin
+    class Environment
+      module IndexPatch
+
+        def find_asset path, options = {}
+          site    = @environment.site
+          asset   = super
+          bundle  = options[:bundle]
+
+          if asset and bundle and not site.static_files.include? asset
+            site.static_files << AssetFile.new(site, asset)
+          end
+
+          asset
+        end
+
+      end
+    end
+  end
+end

data/lib/jekyll/assets_plugin/site_patch.rb

@@ -22,14 +22,15 @@ module Jekyll
 
 
       def asset_path *args
-        asset   = assets[*args]
-        baseurl = "#{assets_config.baseurl}/"
+        asset     = assets[*args]
+        baseurl   = "#{assets_config.baseurl}/"
+        cachebust = assets_config.cachebust
 
-        case assets_config.cachebust
+        case 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 cachebast strategy: #{assets_config.cachebust}"
+        else raise "Unknown cachebust strategy: #{cachebust.inspect}"
         end
       end
 

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/spec/fixtures/_assets/vendor/bourbon.css.sass

@@ -1,4 +1,4 @@
 @import "bourbon"
 
 .photo
-  @include box-shadow(0 0 5px 0px hsla(0, 0%, 0%, 0.65))
+  @include linear-gradient(#1e5799, #2989d8)

data/spec/fixtures/_assets/vendor/compass.css.sass

@@ -1,4 +1,4 @@
 @import "compass"
 
 .photo
-  @include single-box-shadow(#eee, 0px, 0px, 5px)
+  @include background-image(linear-gradient(#1e5799, #2989d8))

data/spec/lib/jekyll-assets/bourbon_spec.rb

@@ -5,10 +5,7 @@ require "jekyll-assets/bourbon"
 module Jekyll::AssetsPlugin
   describe "Bourbon integration" do
     it "should globally append bourbon paths into Sprockets environment" do
-      asset = @site.assets["vendor/bourbon.css"].to_s
-
-      asset.should =~ /-webkit-box-shadow/
-      asset.should =~ /box-shadow/
+      @site.assets["vendor/bourbon.css"].to_s.should =~ /linear-gradient/
     end
   end
 end

data/spec/lib/jekyll-assets/compass_spec.rb

@@ -5,11 +5,7 @@ require "jekyll-assets/compass"
 module Jekyll::AssetsPlugin
   describe "Compass integration" do
     it "should globally append compass paths into Sprockets environment" do
-      asset = @site.assets["vendor/compass.css"].to_s
-
-      asset.should =~ /-webkit-box-shadow/
-      asset.should =~ /-moz-box-shadow/
-      asset.should =~ /box-shadow/
+      @site.assets["vendor/compass.css"].to_s.should =~ /linear-gradient/
     end
   end
 end

data/spec/lib/jekyll/assets_plugin/asset_file_spec.rb

@@ -4,9 +4,31 @@ require "spec_helper"
 module Jekyll::AssetsPlugin
   describe AssetFile do
     context "#destination" do
-      let(:file) { AssetFile.new(@site, @site.assets["app.css"]) }
-      subject { file.destination @dest.to_s }
-      it { should match %r{/app-[0-9a-f]{32}\.css$} }
+      subject do
+        AssetFile.new(@site, @site.assets["app.css"]).destination @dest.to_s
+      end
+
+      context "with none cachebust" do
+        before { @site.assets_config.cachebust = :none }
+        it { should match(%r{/app\.css$}) }
+      end
+
+      context "with soft cachebust" do
+        before { @site.assets_config.cachebust = :soft }
+        it { should match(%r{/app\.css$}) }
+      end
+
+      context "with hard cachebust" do
+        before { @site.assets_config.cachebust = :hard }
+        it { should match %r{/app-[0-9a-f]{32}\.css$} }
+      end
+
+      context "with unknown cachebust" do
+        before { @site.assets_config.cachebust = :wtf }
+        it "should raise error" do
+          expect { @site.asset_path "app.css" }.to raise_error
+        end
+      end
     end
   end
 end

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

@@ -63,21 +63,20 @@ module Jekyll::AssetsPlugin
 
 
     context "#asset_path" do
+      subject { site.asset_path "app.css" }
+
       context "with none cachebust" do
         before { site.assets_config.cachebust = :none }
-        subject { site.asset_path "app.css" }
         it { should match(%r{^/assets/app\.css$}) }
       end
 
       context "with soft cachebust" do
         before { site.assets_config.cachebust = :soft }
-        subject { site.asset_path "app.css" }
         it { should match(%r{^/assets/app\.css\?cb=[a-f0-9]{32}$}) }
       end
 
       context "with hard cachebust" do
         before { site.assets_config.cachebust = :hard }
-        subject { site.asset_path "app.css" }
         it { should match(%r{^/assets/app-[a-f0-9]{32}\.css$}) }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -167,6 +167,7 @@ files:
 - lib/jekyll/assets_plugin/configuration.rb
 - lib/jekyll/assets_plugin/environment.rb
 - lib/jekyll/assets_plugin/environment/context_patch.rb
+- lib/jekyll/assets_plugin/environment/index_patch.rb
 - lib/jekyll/assets_plugin/filters.rb
 - lib/jekyll/assets_plugin/liquid_processor.rb
 - lib/jekyll/assets_plugin/renderer.rb
@@ -218,7 +219,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.3.2
+summary: jekyll-assets-0.3.3
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb