jekyll-assets 0.7.7 → 0.7.8

data/.rubocop.yml

@@ -23,12 +23,30 @@ BlockNesting:
 HashSyntax:
   EnforcedStyle: hash_rockets
 
-Encoding:
-  Enabled: false
-
 StringLiterals:
   EnforcedStyle: double_quotes
 
+AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+IndentHash:
+  EnforcedStyle: consistent
+
+PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%':  ()
+    '%i': ()
+    '%q': ()
+    '%Q': ()
+    '%r': '{}'
+    '%s': ()
+    '%w': '[]'
+    '%W': '[]'
+    '%x': ()
+
+Encoding:
+  Enabled: false
+
 BracesAroundHashParameters:
   Enabled: false
 
@@ -43,6 +61,14 @@ TrivialAccessors:
 Lambda:
   Enabled: false
 
+# Ridiculous (and IMHO useless) restriction, that makes impossible aligning
+# code like this:
+#
+#   redis.hset    :k1, now
+#   redis.hincrby :k2, 123
+SingleSpaceBeforeFirstArg:
+  Enabled: false
+
 AllCops:
-  Includes:
+  Include:
     - Gemfile

data/.travis.yml

@@ -1,2 +1,9 @@
 language: ruby
-rvm: [ 1.9.3, 2.0.0 ]
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - Gemfile
+  - Gemfile.jekyll-1.0

data/Gemfile

@@ -7,5 +7,9 @@ group :test do
   gem "simplecov", :require => false
 end
 
+group :development do
+  gem "guard-rspec"
+end
+
 # Specify your gem's dependencies in jekyll-assets.gemspec
 gemspec

data/Gemfile.jekyll-1.0

@@ -0,0 +1,2 @@
+eval_gemfile "Gemfile"
+gem "jekyll", "~> 1.0"

data/HISTORY.md

@@ -1,3 +1,23 @@
+### 0.7.8 (2014-05-08)
+
+* Support jekyll `~> 2.0`.
+
+
+### 0.7.7 (2014-03-12)
+
+* Allow purge cache by bumping assest config version.
+
+
+### 0.7.6 (2014-02-22)
+
+* Add `bootstrap-sass` support. See #75. (Thanks @adilsoncarvalho)
+
+
+### 0.7.5 (2014-02-11)
+
+* Fix `asset_path` error against empty srting. See #72. (Thanks @yaegashi)
+
+
 ### 0.7.4 (2013-10-25)
 
 * Fix relative paths requires. See #59. (Thanks @wadetandy)

data/README.md

@@ -505,6 +505,11 @@ assets:
   # Default: false
   #
   debug: false
+  #
+  # Configuration version. Used to force cache invalidation.
+  # Default: 1
+  #
+  version: 1
 ```
 
 

data/jekyll-assets.gemspec

@@ -23,15 +23,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jekyll",    "~> 1.0"
+  spec.add_dependency "jekyll",    ">= 1.0.0", "< 3.0.0"
   spec.add_dependency "sprockets", "~> 2.10"
+  spec.add_dependency "sass"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "compass"
   spec.add_development_dependency "bourbon"
   spec.add_development_dependency "neat"
   spec.add_development_dependency "bootstrap-sass"
+
+  # compass fails with SASS than 3.3+
+  # https://github.com/chriseppstein/compass/issues/1513
+  spec.add_development_dependency "sass", "~> 3.2.13"
 end

data/lib/jekyll-assets.rb

@@ -1 +1,2 @@
+# rubocop: disable FileName
 require "jekyll/assets_plugin"

data/lib/jekyll-assets/bootstrap.rb

@@ -1,6 +1,6 @@
 require "sprockets"
 
 bootstrap = Gem::Specification.find_by_name("bootstrap-sass").gem_dir
-%w(fonts javascripts stylesheets).each do |asset|
+%w[fonts javascripts stylesheets].each do |asset|
   Sprockets.append_path File.join(bootstrap, "vendor", "assets", asset)
 end

data/lib/jekyll/assets_plugin/asset_path.rb

@@ -20,9 +20,11 @@ module Jekyll
         query = []
 
         query << "cb=#{@asset.digest}" if :soft == cachebust
-        query << @query               if @query
+        query << @query                if @query
 
-        "?#{query.join '&'}" unless query.empty?
+        return if query.empty?
+
+        "?" << query.join("&")
       end
 
       def anchor

data/lib/jekyll/assets_plugin/configuration.rb

@@ -6,14 +6,14 @@ module Jekyll
     class Configuration
       DEFAULTS = {
         :dirname        => "assets",
-        :sources        => %w{ _assets/javascripts
-                               _assets/stylesheets
-                               _assets/images },
+        :sources        => %w[_assets/javascripts
+                              _assets/stylesheets
+                              _assets/images],
         :js_compressor  => nil,
         :css_compressor => nil,
         :cachebust      => :hard,
         :cache          => false,
-        :gzip           => %w{ text/css application/javascript },
+        :gzip           => %w[text/css application/javascript],
         :debug          => false,
         :version        => 1
       }.freeze
@@ -53,7 +53,7 @@ module Jekyll
       end
 
       def cache_assets?
-        !!@data.cache
+        @data.cache ? true : false
       end
 
       def cache_path

data/lib/jekyll/assets_plugin/filters.rb

@@ -4,7 +4,7 @@ require "jekyll/assets_plugin/renderer"
 module Jekyll
   module AssetsPlugin
     module Filters
-      %w{ asset asset_path image javascript stylesheet }.each do |name|
+      %w[asset asset_path image javascript stylesheet].each do |name|
         module_eval <<-RUBY, __FILE__, __LINE__
         def #{name} path                    # def stylesheet logical_path
           r = Renderer.new @context, path   #   r = Renderer.new @context, path

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

@@ -13,10 +13,10 @@ module Jekyll
             attr_reader :jekyll_assets
 
             alias_method :__orig_build_dependency_paths,
-                         :build_dependency_paths
+              :build_dependency_paths
 
             alias_method :build_dependency_paths,
-                         :__wrap_build_dependency_paths
+              :__wrap_build_dependency_paths
 
             alias_method :__orig_init_with, :init_with
             alias_method :init_with, :__wrap_init_with

data/lib/jekyll/assets_plugin/renderer.rb

@@ -37,7 +37,7 @@ module Jekyll
       def render_tag(template)
         asset = @site.assets[@path]
         tags  = (@site.assets_config.debug ? asset.to_a : [asset]).map do |a|
-          sprintf template, AssetPath.new(a).to_s
+          format template, AssetPath.new(a).to_s
         end
 
         tags.join "\n"

data/lib/jekyll/assets_plugin/tag.rb

@@ -14,6 +14,6 @@ module Jekyll
   end
 end
 
-%w{ asset asset_path image javascript stylesheet }.each do |tag|
+%w[asset asset_path image javascript stylesheet].each do |tag|
   Liquid::Template.register_tag tag, Jekyll::AssetsPlugin::Tag
 end

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.7.7"
+    VERSION = "0.7.8"
   end
 end

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

@@ -1,10 +1,8 @@
 require "spec_helper"
 require "jekyll-assets/bootstrap"
 
-module Jekyll::AssetsPlugin
-  describe "Bootstrap integration" do
-    it "should globally append bootstrap paths into Sprockets environment" do
-      @site.assets["bootstrap.css"].to_s.should =~ /bootstrap\//
-    end
+describe "Bootstrap integration" do
+  it "should globally append bootstrap paths into Sprockets environment" do
+    @site.assets["bootstrap.css"].to_s.should =~ /bootstrap\//
   end
 end

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

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

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

@@ -1,10 +1,8 @@
 require "spec_helper"
 require "jekyll-assets/compass"
 
-module Jekyll::AssetsPlugin
-  describe "Compass integration" do
-    it "should globally append compass paths into Sprockets environment" do
-      @site.assets["vendor/compass.css"].to_s.should =~ /linear-gradient/
-    end
+describe "Compass integration" do
+  it "should globally append compass paths into Sprockets environment" do
+    @site.assets["vendor/compass.css"].to_s.should =~ /linear-gradient/
   end
 end

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

@@ -1,10 +1,8 @@
 require "spec_helper"
 require "jekyll-assets/neat"
 
-module Jekyll::AssetsPlugin
-  describe "Neat integration" do
-    it "should globally append neat paths into Sprockets environment" do
-      @site.assets["vendor/neat.css"].to_s.should =~ /max-width/
-    end
+describe "Neat integration" do
+  it "should globally append neat paths into Sprockets environment" do
+    @site.assets["vendor/neat.css"].to_s.should =~ /max-width/
   end
 end

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

@@ -1,166 +1,166 @@
 require "spec_helper"
 
-module Jekyll::AssetsPlugin
-  describe Configuration do
-    context "with defaults" do
-      let(:config) { Configuration.new }
-
-      context "output assets dirname" do
-        subject { config.dirname }
-        it { should == Configuration::DEFAULTS[:dirname] }
-      end
+describe Jekyll::AssetsPlugin::Configuration do
+  context "with defaults" do
+    let(:config) { described_class.new }
 
-      context "assets baseurl" do
-        subject { config.baseurl }
-        it { should == "/" + Configuration::DEFAULTS[:dirname] }
-      end
+    context "output assets dirname" do
+      subject { config.dirname }
+      it { should == described_class::DEFAULTS[:dirname] }
+    end
 
-      context "sources list" do
-        subject { config.sources }
-        it { should =~ Configuration::DEFAULTS[:sources] }
-      end
+    context "assets baseurl" do
+      subject { config.baseurl }
+      it { should == "/" + described_class::DEFAULTS[:dirname] }
+    end
 
-      context "cachebust" do
-        subject { config.cachebust }
-        it { should == :hard }
-      end
+    context "sources list" do
+      subject { config.sources }
+      it { should =~ described_class::DEFAULTS[:sources] }
+    end
 
-      context "js compressor" do
-        subject { config.js_compressor }
-        it { should be_nil }
-      end
+    context "cachebust" do
+      subject { config.cachebust }
+      it { should == :hard }
+    end
 
-      context "css compressor" do
-        subject { config.css_compressor }
-        it { should be_nil }
-      end
+    context "js compressor" do
+      subject { config.js_compressor }
+      it { should be_nil }
+    end
 
-      context "gzip" do
-        subject { config.gzip }
-        it { should =~ %w{ text/css application/javascript } }
-      end
+    context "css compressor" do
+      subject { config.css_compressor }
+      it { should be_nil }
+    end
 
-      context "cache_assets?" do
-        subject { config.cache_assets? }
-        it { should be_false }
-      end
+    context "gzip" do
+      subject { config.gzip }
+      it { should =~ %w[text/css application/javascript] }
+    end
 
-      context "cache_path" do
-        subject { config.cache_path }
-        it { should == ".jekyll-assets-cache" }
-      end
+    context "cache_assets?" do
+      subject { config.cache_assets? }
+      it { should be_false }
+    end
 
-      context "debug" do
-        subject { config.debug }
-        it { should be_false }
-      end
+    context "cache_path" do
+      subject { config.cache_path }
+      it { should == ".jekyll-assets-cache" }
+    end
 
+    context "debug" do
+      subject { config.debug }
+      it { should be_false }
     end
 
-    it "should override specified options and leave defaults for missing" do
-      config = Configuration.new({
-        :sources        => %w{abc},
-        :css_compressor => "sass"
-      })
+  end
 
-      expect(config.dirname).to eq "assets"
-      expect(config.sources).to eq %w{abc}
-      expect(config.js_compressor).to be_nil
-      expect(config.css_compressor).to be  :sass
-    end
+  it "should override specified options and leave defaults for missing" do
+    config = described_class.new({
+      :sources        => %w[abc],
+      :css_compressor => "sass"
+    })
+
+    expect(config.dirname).to eq "assets"
+    expect(config.sources).to eq %w[abc]
+    expect(config.js_compressor).to be_nil
+    expect(config.css_compressor).to be  :sass
+  end
 
-    context "#cache" do
-      context "when specified as String" do
-        it "should override default cache path" do
-          config = Configuration.new :cache => "/tmp/jekyll-assets"
-          config.cache_path.should == "/tmp/jekyll-assets"
-        end
+  context "#cache" do
+    context "when specified as String" do
+      it "should override default cache path" do
+        config = described_class.new :cache => "/tmp/jekyll-assets"
+        config.cache_path.should == "/tmp/jekyll-assets"
       end
     end
+  end
 
-    context "#baseurl" do
-      it "should respect explicit overrides" do
-        Configuration.new({
-          :dirname => "foo",
-          :baseurl => "/bar/"
-        }).baseurl.should == "/bar"
-      end
+  context "#baseurl" do
+    it "should respect explicit overrides" do
+      described_class.new({
+        :dirname => "foo",
+        :baseurl => "/bar/"
+      }).baseurl.should == "/bar"
+    end
 
-      it "should be auto-guessed from dirname" do
-        Configuration.new({
-          :dirname => "foo"
-        }).baseurl.should == "/foo"
-      end
+    it "should be auto-guessed from dirname" do
+      described_class.new({
+        :dirname => "foo"
+      }).baseurl.should == "/foo"
     end
+  end
 
-    context "#js_compressor" do
-      context "when js compressor is given as `uglify`" do
-        let(:config) { Configuration.new(:js_compressor => "uglify") }
-        subject { config.js_compressor }
-        it { should be :uglify }
-      end
+  context "#js_compressor" do
+    context "when js compressor is given as `uglify`" do
+      let(:config) { described_class.new(:js_compressor => "uglify") }
+      subject { config.js_compressor }
+      it { should be :uglify }
+    end
 
-      context "otherwise" do
-        let(:config) { Configuration.new }
-        subject { config.js_compressor }
-        it { should be_false }
-      end
+    context "otherwise" do
+      let(:config) { described_class.new }
+      subject { config.js_compressor }
+      it { should be_false }
     end
+  end
 
-    context "#css_compressor" do
-      context "when css compressor is given as `sass`" do
-        let(:config) { Configuration.new(:css_compressor => "sass") }
-        subject { config.css_compressor }
-        it { should be :sass }
-      end
+  context "#css_compressor" do
+    context "when css compressor is given as `sass`" do
+      let(:config) { described_class.new(:css_compressor => "sass") }
+      subject { config.css_compressor }
+      it { should be :sass }
+    end
 
-      context "otherwise" do
-        let(:config) { Configuration.new }
-        subject { config.css_compressor }
-        it { should be_false }
-      end
+    context "otherwise" do
+      let(:config) { described_class.new }
+      subject { config.css_compressor }
+      it { should be_false }
     end
+  end
 
-    context "#gzip" do
-      context "when gzip is disabled" do
-        let(:config) { Configuration.new(:gzip => false) }
-        subject { config.gzip }
-        it { should == [] }
-      end
+  context "#gzip" do
+    context "when gzip is disabled" do
+      let(:config) { described_class.new(:gzip => false) }
+      subject { config.gzip }
+      it { should == [] }
     end
+  end
 
-    context "#version" do
-      subject { Configuration.new(:version => version).version }
+  context "#version" do
+    subject { described_class.new(:version => version).version }
 
-      context "when given as 123" do
-        let(:version) { 123 }
-        it { should eq 123 }
-        it { should be_a Integer }
-      end
+    context "when given as 123" do
+      let(:version) { 123 }
+      it { should eq 123 }
+      it { should be_a Integer }
+    end
 
-      context "when given as 'abc'" do
-        let(:version) { "abc" }
-        it { should eq "abc" }
-        it { should be_a String }
-      end
+    context "when given as 'abc'" do
+      let(:version) { "abc" }
+      it { should eq "abc" }
+      it { should be_a String }
     end
+  end
 
-    context "Deprecated options" do
-      context "compress" do
-        let(:options) { { :compress => { :js => "uglify", :css => "sass" } } }
-        subject { Configuration.new options }
+  context "Deprecated options" do
+    subject(:config) { described_class.new options }
 
-        its(:js_compressor)   { should be :uglify }
-        its(:css_compressor)  { should be :sass }
+    context "compress" do
+      let :options do
+        { :compress => { :js => "uglify", :css => "sass" } }
       end
 
-      context "cache_assets" do
-        let(:options) { { :cache_assets => true } }
+      its(:js_compressor)   { should be :uglify }
+      its(:css_compressor)  { should be :sass }
+    end
+
+    context "cache_assets" do
+      let(:options) { { :cache_assets => true } }
 
-        it "should set `cache` value" do
-          config = Configuration.new options
-          config.cache_assets?.should be_true
-        end
+      it "should set `cache` value" do
+        config.cache_assets?.should be_true
       end
     end
   end