jekyll-assets 0.3.1 → 0.3.2

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.3.2 (2013-02-10)
+
+* Allow choose cachebusting strategy (hard/soft/none). See #11.
+
+
 ### 0.3.1 (2013-02-02)
 
 * Preprocess CSS/JS assets with Liquid processor.

data/README.md

@@ -204,14 +204,6 @@ assets:
 [amazon-s3]: http://aws.amazon.com/s3
 
 
-That's all. Feel free to ask questions if any on [twitter][twitter],
-[jabber][jabber] or [e-mail][e-mail].
-
-[twitter]:  https://twitter.com/zapparov
-[jabber]:   xmpp://zapparov@jabber.ru
-[e-mail]:   mailto://ixti@member.fsf.org
-
-
 ## Custom Vendors
 
 Sometimes you would like to have some 3rd-party vendors. For this purposes,
@@ -402,13 +394,6 @@ You can fine-tune configuration by editing your `_config.yml`:
         css:  ~
 
 
-## "Ben, I need help!" (c) Brother 2
-
-Feel free to send me any comments, recommendations, suggestions. Improve this
-README, as I really suck in documenting things (thanks @imathis for pointing
-this out).
-
-
 ## Contributing
 
 1. Fork it
@@ -418,6 +403,16 @@ this out).
 5. Create new Pull Request
 
 
+## "Th-th-th-that's all folks!"
+
+Feel free to follow me on [twitter][twitter], chat via [jabber][jabber] or
+write an [e-mail][e-mail]. :D
+
+[twitter]:  https://twitter.com/zapparov
+[jabber]:   xmpp://zapparov@jabber.ru
+[e-mail]:   mailto://ixti@member.fsf.org
+
+
 ## License
 
 Copyright (C) 2012 Aleksey V Zapparov (http://ixti.net/)

data/lib/jekyll/assets_plugin/configuration.rb

@@ -6,9 +6,10 @@ module Jekyll
   module AssetsPlugin
     class Configuration
       DEFAULTS = {
-        :dirname  => "assets",
-        :sources  => %w{_assets/javascripts _assets/stylesheets _assets/images},
-        :compress => { :css => nil, :js => nil }
+        :dirname    => "assets",
+        :sources    => %w{_assets/javascripts _assets/stylesheets _assets/images},
+        :compress   => { :css => nil, :js => nil },
+        :cachebust  => :hard
       }.freeze
 
 
@@ -30,18 +31,36 @@ module Jekyll
 
 
       def js_compressor
-        @data.compress.js ? @data.compress.js.to_sym : false
+        compressor @data.compress.js
       end
 
 
       def css_compressor
-        @data.compress.css ? @data.compress.css.to_sym : false
+        compressor @data.compress.css
+      end
+
+
+      def cachebust
+        none?(@data.cachebust) ? :none : @data.cachebust.to_sym
       end
 
 
       def method_missing name, *args, &block
         @data.send name, *args, &block
       end
+
+
+      protected
+
+
+      def none? val
+        val.nil? || val.empty? || "none" == val.to_s.downcase
+      end
+
+
+      def compressor val
+        none?(val) ? nil : val.to_sym
+      end
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Jekyll
 
 
         def asset_path *args
-          "#{site.assets_config.baseurl}/#{site.assets[*args].digest_path}"
+          site.asset_path(*args)
         end
 
       end

data/lib/jekyll/assets_plugin/renderer.rb

@@ -18,7 +18,7 @@ module Jekyll
 
 
       def render_asset_path
-        "#{@site.assets_config.baseurl}/#{@site.assets[@path].digest_path}"
+        @site.asset_path @path
       end
 
 

data/lib/jekyll/assets_plugin/site_patch.rb

@@ -20,6 +20,19 @@ module Jekyll
         @assets ||= Environment.new self
       end
 
+
+      def asset_path *args
+        asset   = assets[*args]
+        baseurl = "#{assets_config.baseurl}/"
+
+        case 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 cachebast strategy: #{assets_config.cachebust}"
+        end
+      end
+
     end
   end
 end

data/lib/jekyll/assets_plugin/version.rb

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

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

@@ -21,6 +21,11 @@ module Jekyll::AssetsPlugin
         it { should =~ Configuration::DEFAULTS[:sources] }
       end
 
+      context "cachebust" do
+        subject { config.cachebust }
+        it { should == :hard }
+      end
+
       context "js compressor" do
         subject { config.compress.js }
         it { should be_nil }

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

@@ -61,6 +61,34 @@ module Jekyll::AssetsPlugin
       end
     end
 
+
+    context "#asset_path" do
+      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
+
+      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
+
     context "#assets_config" do
       subject { site.assets_config }
       it { should be_an_instance_of Configuration }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -218,7 +218,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.3.1
+summary: jekyll-assets-0.3.2
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb