jekyll-assets 0.7.9 → 0.8.0

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 tags
+.sass-cache

data/HISTORY.md

@@ -1,5 +1,9 @@
 ### master (unreleased)
 
+* Explicitly require `sass`.
+* Fix `asset_*` helpers in imported SASS files.
+  See #83, #63. (Thanks @sentience)
+
 
 ### 0.7.9 (2014-05-25)
 

data/README.md

@@ -207,7 +207,7 @@ changed via configuration:
 
 ``` yaml
 assets:
-  baseurl: //my.super-cool-cdn.com/
+  baseurl: http://my.super-cool-cdn.com/assets
 ```
 
 [amazon-s3]: http://aws.amazon.com/s3

data/jekyll-assets.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll",    ">= 1.0.0", "< 3.0.0"
   spec.add_dependency "sprockets", "~> 2.10"
+  spec.add_dependency "sprockets-sass"
+  spec.add_dependency "sprockets-helpers"
   spec.add_dependency "sass"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/jekyll-assets/compass.rb

@@ -1,7 +1 @@
 require "compass"
-require "sprockets"
-
-Compass::Frameworks::ALL.each do |fw|
-  path = fw.stylesheets_directory
-  Sprockets.append_path path if path
-end

data/lib/jekyll/assets_plugin/environment.rb

@@ -2,7 +2,10 @@
 require "pathname"
 
 # 3rd-party
+require "sass"
 require "sprockets"
+require "sprockets-sass"
+require "sprockets-helpers"
 
 module Jekyll
   module AssetsPlugin

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.7.9"
+    VERSION = "0.8.0"
   end
 end

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

@@ -1,8 +1,8 @@
 require "spec_helper"
 require "jekyll-assets/bootstrap"
 
-describe "Bootstrap integration" do
-  it "should globally append bootstrap paths into Sprockets environment" do
-    @site.assets["bootstrap.css"].to_s.should =~ /bootstrap\//
+RSpec.describe "Bootstrap integration" do
+  it "globally appends bootstrap paths into Sprockets environment" do
+    expect(@site.assets["bootstrap.css"].to_s).to match(/bootstrap\//)
   end
 end

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

@@ -1,8 +1,9 @@
 require "spec_helper"
 require "jekyll-assets/bourbon"
 
-describe "Bourbon integration" do
-  it "should globally append bourbon paths into Sprockets environment" do
-    @site.assets["vendor/bourbon.css"].to_s.should =~ /linear-gradient/
+RSpec.describe "Bourbon integration" do
+  it "globally appends bourbon paths into Sprockets environment" do
+    expect(@site.assets["vendor/with_bourbon.css"].to_s)
+      .to match(/linear-gradient/)
   end
 end

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

@@ -1,8 +1,9 @@
 require "spec_helper"
 require "jekyll-assets/compass"
 
-describe "Compass integration" do
-  it "should globally append compass paths into Sprockets environment" do
-    @site.assets["vendor/compass.css"].to_s.should =~ /linear-gradient/
+RSpec.describe "Compass integration" do
+  it "globally appends compass paths into Sprockets environment" do
+    expect(@site.assets["vendor/with_compass.css"].to_s)
+      .to match(/linear-gradient/)
   end
 end

data/spec/lib/jekyll-assets/font-awesome_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 require "jekyll-assets/font-awesome"
 
-describe "Font Awesome integration" do
-  it "should globally append font awesome paths into Sprockets environment" do
-    @site.assets["font-awesome.css"].to_s.should =~ /fa-github/
+RSpec.describe "Font Awesome integration" do
+  it "globally appends font awesome paths into Sprockets environment" do
+    expect(@site.assets["font-awesome.css"].to_s).to match(/fa-github/)
   end
 end

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

@@ -1,8 +1,8 @@
 require "spec_helper"
 require "jekyll-assets/neat"
 
-describe "Neat integration" do
-  it "should globally append neat paths into Sprockets environment" do
-    @site.assets["vendor/neat.css"].to_s.should =~ /max-width/
+RSpec.describe "Neat integration" do
+  it "globally appends neat paths into Sprockets environment" do
+    expect(@site.assets["vendor/with_neat.css"].to_s).to match(/max-width/)
   end
 end

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

@@ -1,62 +1,62 @@
 require "spec_helper"
 
-describe Jekyll::AssetsPlugin::Configuration do
+RSpec.describe Jekyll::AssetsPlugin::Configuration do
   context "with defaults" do
     let(:config) { described_class.new }
 
     context "output assets dirname" do
       subject { config.dirname }
-      it { should == described_class::DEFAULTS[:dirname] }
+      it { is_expected.to eq described_class::DEFAULTS[:dirname] }
     end
 
     context "assets baseurl" do
       subject { config.baseurl }
-      it { should == "/" + described_class::DEFAULTS[:dirname] }
+      it { is_expected.to eq "/" + described_class::DEFAULTS[:dirname] }
     end
 
     context "sources list" do
       subject { config.sources }
-      it { should =~ described_class::DEFAULTS[:sources] }
+      it { is_expected.to match_array described_class::DEFAULTS[:sources] }
     end
 
     context "cachebust" do
       subject { config.cachebust }
-      it { should == :hard }
+      it { is_expected.to be :hard }
     end
 
     context "js compressor" do
       subject { config.js_compressor }
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context "css compressor" do
       subject { config.css_compressor }
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context "gzip" do
       subject { config.gzip }
-      it { should =~ %w[text/css application/javascript] }
+      it { is_expected.to match_array %w[text/css application/javascript] }
     end
 
     context "cache_assets?" do
       subject { config.cache_assets? }
-      it { should be_false }
+      it { is_expected.to eq false }
     end
 
     context "cache_path" do
       subject { config.cache_path }
-      it { should == ".jekyll-assets-cache" }
+      it { is_expected.to eq ".jekyll-assets-cache" }
     end
 
     context "debug" do
       subject { config.debug }
-      it { should be_false }
+      it { is_expected.to eq false }
     end
 
   end
 
-  it "should override specified options and leave defaults for missing" do
+  it "overrides specified options and leave defaults for missing" do
     config = described_class.new({
       :sources        => %w[abc],
       :css_compressor => "sass"
@@ -70,25 +70,25 @@ describe Jekyll::AssetsPlugin::Configuration do
 
   context "#cache" do
     context "when specified as String" do
-      it "should override default cache path" do
+      it "overrides default cache path" do
         config = described_class.new :cache => "/tmp/jekyll-assets"
-        config.cache_path.should == "/tmp/jekyll-assets"
+        expect(config.cache_path).to eq("/tmp/jekyll-assets")
       end
     end
   end
 
   context "#baseurl" do
-    it "should respect explicit overrides" do
-      described_class.new({
+    it "respects explicit overrides" do
+      expect(described_class.new({
         :dirname => "foo",
         :baseurl => "/bar/"
-      }).baseurl.should == "/bar"
+      }).baseurl).to eq("/bar")
     end
 
-    it "should be auto-guessed from dirname" do
-      described_class.new({
+    it "is auto-guessed from dirname" do
+      expect(described_class.new({
         :dirname => "foo"
-      }).baseurl.should == "/foo"
+      }).baseurl).to eq("/foo")
     end
   end
 
@@ -96,13 +96,13 @@ describe Jekyll::AssetsPlugin::Configuration 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 }
+      it { is_expected.to be :uglify }
     end
 
     context "otherwise" do
       let(:config) { described_class.new }
       subject { config.js_compressor }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
   end
 
@@ -110,13 +110,13 @@ describe Jekyll::AssetsPlugin::Configuration 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 }
+      it { is_expected.to be :sass }
     end
 
     context "otherwise" do
       let(:config) { described_class.new }
       subject { config.css_compressor }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
   end
 
@@ -124,7 +124,7 @@ describe Jekyll::AssetsPlugin::Configuration do
     context "when gzip is disabled" do
       let(:config) { described_class.new(:gzip => false) }
       subject { config.gzip }
-      it { should == [] }
+      it { is_expected.to eq [] }
     end
   end
 
@@ -133,14 +133,14 @@ describe Jekyll::AssetsPlugin::Configuration do
 
     context "when given as 123" do
       let(:version) { 123 }
-      it { should eq 123 }
-      it { should be_a Integer }
+      it { is_expected.to eq 123 }
+      it { is_expected.to be_a Integer }
     end
 
     context "when given as 'abc'" do
       let(:version) { "abc" }
-      it { should eq "abc" }
-      it { should be_a String }
+      it { is_expected.to eq "abc" }
+      it { is_expected.to be_a String }
     end
   end
 
@@ -152,15 +152,22 @@ describe Jekyll::AssetsPlugin::Configuration do
         { :compress => { :js => "uglify", :css => "sass" } }
       end
 
-      its(:js_compressor)   { should be :uglify }
-      its(:css_compressor)  { should be :sass }
+      describe "#js_compressor" do
+        subject { super().js_compressor }
+        it { is_expected.to be :uglify }
+      end
+
+      describe "#css_compressor" do
+        subject { super().css_compressor }
+        it { is_expected.to be :sass }
+      end
     end
 
     context "cache_assets" do
       let(:options) { { :cache_assets => true } }
 
-      it "should set `cache` value" do
-        config.cache_assets?.should be_true
+      it "sets `cache` value" do
+        expect(config.cache_assets?).to eq true
       end
     end
   end

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

@@ -1,22 +1,18 @@
 require "spec_helper"
 
-module Jekyll
-  module AssetsPlugin
-    describe Environment do
-      context "#asset_path of context" do
-        it "should properly handle query params" do
-          css = @site.assets["vapor.css"].to_s
-          css.should match(/fonts\/vapor-[a-f0-9]{32}\.eot\?#iefix/)
-          css.should match(/fonts\/vapor-[a-f0-9]{32}\.svg#iefix/)
-        end
+RSpec.describe Jekyll::AssetsPlugin::Environment do
+  context "#asset_path of context" do
+    it "properly handles query params" do
+      css = @site.assets["vapor.css"].to_s
+      expect(css).to match(/fonts\/vapor-[a-f0-9]{32}\.eot\?#iefix/)
+      expect(css).to match(/fonts\/vapor-[a-f0-9]{32}\.svg#iefix/)
+    end
 
-        it "should properly handle relative paths" do
-          css = @site.assets["lib/relative.css"].to_s
-          css.should =~ %r{/assets/fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
-          css.should =~ %r{/assets/fonts/vapor-[a-f0-9]{32}\.svg#iefix}
-          puts css
-        end
-      end
+    it "properly handles relative paths" do
+      css = @site.assets["lib/relative.css"].to_s
+      expect(css).to match(%r{/assets/fonts/vapor-[a-f0-9]{32}\.eot\?#iefix})
+      expect(css).to match(%r{/assets/fonts/vapor-[a-f0-9]{32}\.svg#iefix})
+      puts css
     end
   end
 end

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

@@ -1,12 +1,16 @@
 require "spec_helper"
 
-describe Jekyll::AssetsPlugin::Filters do
+RSpec.describe Jekyll::AssetsPlugin::Filters do
   let(:context) { { :registers => { :site => @site } } }
 
   def render(content)
     ::Liquid::Template.parse(content).render({}, context)
   end
 
+  def not_found_error(file)
+    "Liquid error: Couldn't find file '#{file}"
+  end
+
   context "{{ '<file>' | image }}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.png"
@@ -15,12 +19,12 @@ describe Jekyll::AssetsPlugin::Filters do
 
     context "when <file> exists" do
       subject { render("{{ 'noise.png' | image }}") }
-      it { should match tag_re("noise") }
+      it { is_expected.to match tag_re("noise") }
     end
 
     context "when <file> does not exists" do
       subject { render("{{ 'not-found.png' | image }}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.png'" }
+      it { is_expected.to match not_found_error "not-found.png" }
     end
   end
 
@@ -32,17 +36,17 @@ describe Jekyll::AssetsPlugin::Filters do
 
     context "when <file> exists" do
       subject { render("{{ 'app.css' | stylesheet }}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> extension is omited" do
       subject { render("{{ 'app' | stylesheet }}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> does not exists" do
       subject { render("{{ 'not-found.css' | stylesheet }}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.css'" }
+      it { is_expected.to match not_found_error "not-found.css" }
     end
   end
 
@@ -54,29 +58,29 @@ describe Jekyll::AssetsPlugin::Filters do
 
     context "when <file> exists" do
       subject { render("{{ 'app.js' | javascript }}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> extension omited" do
       subject { render("{{ 'app' | javascript }}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> does not exists" do
       subject { render("{{ 'not-found.js' | javascript }}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.js'" }
+      it { is_expected.to match not_found_error "not-found.js" }
     end
   end
 
   context "{{ '<file.ext>' | asset_path }}" do
     context "when <file> exists" do
       subject { render("{{ 'app.css' | asset_path }}") }
-      it { should match(%r{^/assets/app-[a-f0-9]{32}\.css$}) }
+      it { is_expected.to match(%r{^/assets/app-[a-f0-9]{32}\.css$}) }
     end
 
     context "when <file> does not exists" do
       subject { render("{{ 'not-found.css' | asset_path }}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.css'" }
+      it { is_expected.to match not_found_error "not-found.css" }
     end
 
     context "with baseurl given as /foobar/" do
@@ -85,19 +89,19 @@ describe Jekyll::AssetsPlugin::Filters do
       end
 
       subject { render("{{ 'app.css' | asset_path }}") }
-      it { should match(%r{^/foobar/app-[a-f0-9]{32}\.css$}) }
+      it { is_expected.to match(%r{^/foobar/app-[a-f0-9]{32}\.css$}) }
     end
   end
 
   context "{{ '<file.ext>' | asset }}" do
     context "when <file> exists" do
       subject { render("{{ 'app.css' | asset }}") }
-      it { should match(/body \{ background-image: url\(.+?\) \}/) }
+      it { is_expected.to match(/body \{ background-image: url\(.+?\) \}/) }
     end
 
     context "when <file> does not exists" do
       subject { render("{{ 'not-found.js' | asset }}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.js'" }
+      it { is_expected.to match not_found_error "not-found.js" }
     end
   end
 end

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

@@ -1,6 +1,8 @@
 require "spec_helper"
 
-describe Jekyll::AssetsPlugin::Patches::SitePatch do
+# rubocop:disable LineLength
+
+RSpec.describe Jekyll::AssetsPlugin::Patches::SitePatch do
   let(:site) do
     Jekyll::Site.new Jekyll.configuration({
       "source"  => fixtures_path.to_s,
@@ -13,13 +15,13 @@ describe Jekyll::AssetsPlugin::Patches::SitePatch do
 
   context "#assets" do
     subject { site.assets }
-    it { should be_a_kind_of ::Sprockets::Environment }
+    it { is_expected.to be_a_kind_of ::Sprockets::Environment }
 
     context "#cache_path" do
       let(:source_path) { Pathname.new site.source }
       subject           { site.assets.cache_path }
 
-      it { should eq source_path.join(".jekyll-assets-cache") }
+      it { is_expected.to eq source_path.join(".jekyll-assets-cache") }
     end
 
     context "calling #asset_path within assets" do
@@ -31,14 +33,14 @@ describe Jekyll::AssetsPlugin::Patches::SitePatch do
       end
 
       context "when requested file found" do
-        it "should have proper asset path" do
+        it "has proper asset path" do
           expect(site.assets["app.css"].to_s)
             .to match(%r{url\(/assets/noise-[a-f0-9]{32}\.png\)})
         end
       end
 
       context "when passed a blank path" do
-        it "should be blank" do
+        it "is blank" do
           expect(site.assets["should_be_blank.css"].to_s)
             .to match(/url\(\)/)
         end
@@ -51,22 +53,22 @@ describe Jekyll::AssetsPlugin::Patches::SitePatch do
 
     context "with none cachebust" do
       before { site.assets_config.cachebust = :none }
-      it { should match(%r{^/assets/app\.css$}) }
+      it { is_expected.to match(%r{^/assets/app\.css$}) }
     end
 
     context "with soft cachebust" do
       before { site.assets_config.cachebust = :soft }
-      it { should match(%r{^/assets/app\.css\?cb=[a-f0-9]{32}$}) }
+      it { is_expected.to match(%r{^/assets/app\.css\?cb=[a-f0-9]{32}$}) }
     end
 
     context "with hard cachebust" do
       before { site.assets_config.cachebust = :hard }
-      it { should match(%r{^/assets/app-[a-f0-9]{32}\.css$}) }
+      it { is_expected.to 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
+      it "raises error" do
         expect { site.asset_path "app.css" }.to raise_error
       end
     end
@@ -76,17 +78,17 @@ describe Jekyll::AssetsPlugin::Patches::SitePatch do
 
       context "and none cachebust" do
         before { site.assets_config.cachebust = :none }
-        it { should match(%r{^/assets/app\.css\?foo=bar$}) }
+        it { is_expected.to 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$} }
+        it { is_expected.to 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$}) }
+        it { is_expected.to match(%r{^/assets/app-[a-f0-9]{32}\.css\?foo=bar$}) }
       end
     end
 
@@ -95,35 +97,35 @@ describe Jekyll::AssetsPlugin::Patches::SitePatch do
 
       context "and none cachebust" do
         before { site.assets_config.cachebust = :none }
-        it { should match(%r{^/assets/app\.css#foobar$}) }
+        it { is_expected.to 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$}) }
+        it { is_expected.to 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$}) }
+        it { is_expected.to match(%r{^/assets/app-[a-f0-9]{32}\.css#foobar$}) }
       end
     end
   end
 
   context "#assets_config" do
     subject { site.assets_config }
-    it { should be_an_instance_of Jekyll::AssetsPlugin::Configuration }
+    it { is_expected.to be_an_instance_of Jekyll::AssetsPlugin::Configuration }
 
-    it "should been populated with `assets` section of config" do
-      site.assets_config.dirname.should_not eq "foobar"
-      site.assets_config.sources.should include "foobar"
+    it "populated with `assets` section of config" do
+      expect(site.assets_config.dirname).not_to eq "foobar"
+      expect(site.assets_config.sources).to include "foobar"
     end
   end
 
-  it "should regenerate assets upon multiple #process" do
+  it "regenerates assets upon multiple #process" do
     @site.assets_config.cachebust = :none
     2.times { @site.process }
-    @dest.join("assets", "app.css").exist?.should be_true
+    expect(@dest.join "assets", "app.css").to exist
   end
 
   context "with cache" do
@@ -139,30 +141,32 @@ describe Jekyll::AssetsPlugin::Patches::SitePatch do
       site.assets.cache_path.rmtree if site.assets.cache_path.exist?
     end
 
-    it "should regenerate static assets upon multiple #process" do
+    it "regenerates static assets upon multiple #process" do
       2.times { site.process }
-      @dest.join("assets", "noise.png").exist?.should be_true
+      expect(@dest.join "assets", "noise.png").to exist
     end
   end
 
   context "#gzip" do
     subject { site.assets_config }
 
-    it "should generate a static assets if gzip is enabled" do
+    it "generates a static assets if gzip is enabled" do
       @site.assets_config.gzip = true
       @site.process
-      @dest.join("assets", "app.css.gz").exist?.should be_true
+
+      expect(@dest.join "assets", "app.css.gz").to exist
     end
 
-    it "should not generate a static assets if gzip is enabled" do
+    it "does not generate a static assets if gzip is enabled" do
       @site.assets_config.gzip = false
       @site.process
-      @dest.join("assets", "app.css.gz").exist?.should be_false
+
+      expect(@dest.join "assets", "app.css.gz").to_not exist
     end
 
   end
 
-  it "should be included into Jekyll::Site" do
-    Jekyll::Site.included_modules.should include described_class
+  it "is included into Jekyll::Site" do
+    expect(Jekyll::Site.included_modules).to include described_class
   end
 end

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

@@ -3,7 +3,7 @@ require "ostruct"
 
 require "spec_helper"
 
-describe Jekyll::AssetsPlugin::Renderer do
+RSpec.describe Jekyll::AssetsPlugin::Renderer do
   let(:site) do
     Jekyll::Site.new Jekyll.configuration({
       "source"      => fixtures_path.to_s,
@@ -22,12 +22,12 @@ describe Jekyll::AssetsPlugin::Renderer do
 
     context "when debug mode enabled" do
       let(:assets_config) { Hash[:debug, true] }
-      it { should match(/^(\s*<script src="[^"]+"><\/script>\s*){3}$/) }
+      it { is_expected.to match(/^(\s*<script src="[^"]+"><\/script>\s*){3}$/) }
     end
 
     context "when debug mode disabled" do
       let(:assets_config) { Hash[:debug, false] }
-      it { should match(/^(\s*<script src="[^"]+"><\/script>\s*){1}$/) }
+      it { is_expected.to match(/^(\s*<script src="[^"]+"><\/script>\s*){1}$/) }
     end
   end
 
@@ -36,12 +36,12 @@ describe Jekyll::AssetsPlugin::Renderer do
 
     context "when debug mode enabled" do
       let(:assets_config) { Hash[:debug, true] }
-      it { should match(/^(\s*<link rel="stylesheet" [^>]+>\s*){3}$/) }
+      it { is_expected.to match(/^(\s*<link rel="stylesheet" [^>]+>\s*){3}$/) }
     end
 
     context "when debug mode disabled" do
       let(:assets_config) { Hash[:debug, false] }
-      it { should match(/^(\s*<link rel="stylesheet" [^>]+>\s*){1}$/) }
+      it { is_expected.to match(/^(\s*<link rel="stylesheet" [^>]+>\s*){1}$/) }
     end
   end
 

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

@@ -1,12 +1,16 @@
 require "spec_helper"
 
-describe Jekyll::AssetsPlugin::Tag do
+RSpec.describe Jekyll::AssetsPlugin::Tag do
   let(:context) { { :registers => { :site => @site } } }
 
   def render(content)
     ::Liquid::Template.parse(content).render({}, context)
   end
 
+  def not_found_error(file)
+    "Liquid error: Couldn't find file '#{file}'"
+  end
+
   context "{% image <file> %}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.png"
@@ -15,12 +19,12 @@ describe Jekyll::AssetsPlugin::Tag do
 
     context "when <file> exists" do
       subject { render("{% image noise.png %}") }
-      it { should match tag_re("noise") }
+      it { is_expected.to match tag_re("noise") }
     end
 
     context "when <file> does not exists" do
       subject { render("{% image not-found.png %}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.png'" }
+      it { is_expected.to match not_found_error "not-found.png" }
     end
   end
 
@@ -32,17 +36,17 @@ describe Jekyll::AssetsPlugin::Tag do
 
     context "when <file> exists" do
       subject { render("{% stylesheet app.css %}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> extension is omited" do
       subject { render("{% stylesheet app %}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> does not exists" do
       subject { render("{% stylesheet not-found.css %}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.css'" }
+      it { is_expected.to match not_found_error "not-found.css" }
     end
   end
 
@@ -54,29 +58,29 @@ describe Jekyll::AssetsPlugin::Tag do
 
     context "when <file> exists" do
       subject { render("{% javascript app.js %}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> extension omited" do
       subject { render("{% javascript app %}") }
-      it { should match tag_re("app") }
+      it { is_expected.to match tag_re("app") }
     end
 
     context "when <file> does not exists" do
       subject { render("{% javascript not-found.js %}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.js'" }
+      it { is_expected.to match not_found_error "not-found.js" }
     end
   end
 
   context "{% asset_path <file.ext> %}" do
     context "when <file> exists" do
       subject { render("{% asset_path app.css %}") }
-      it { should match(%r{^/assets/app-[a-f0-9]{32}\.css$}) }
+      it { is_expected.to match(%r{^/assets/app-[a-f0-9]{32}\.css$}) }
     end
 
     context "when <file> does not exists" do
       subject { render("{% asset_path not-found.js %}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.js'" }
+      it { is_expected.to match not_found_error "not-found.js" }
     end
 
     context "with baseurl given as /foobar/" do
@@ -85,19 +89,19 @@ describe Jekyll::AssetsPlugin::Tag do
       end
 
       subject { render("{% asset_path app.css %}") }
-      it { should match(%r{^/foobar/app-[a-f0-9]{32}\.css$}) }
+      it { is_expected.to match(%r{^/foobar/app-[a-f0-9]{32}\.css$}) }
     end
   end
 
   context "{% asset <file.ext> %}" do
     context "when <file> exists" do
       subject { render("{% asset app.css %}") }
-      it { should match(/body \{ background-image: url\(.+?\) \}/) }
+      it { is_expected.to match(/body \{ background-image: url\(.+?\) \}/) }
     end
 
     context "when <file> does not exists" do
       subject { render("{% asset_path not-found.js %}") }
-      it { should match "Liquid error: Couldn't find file 'not-found.js'" }
+      it { is_expected.to match not_found_error "not-found.js" }
     end
   end
 end

data/spec/spec_helper.rb

@@ -22,6 +22,8 @@ RSpec.configure do |config|
   config.include FixturesHelpers
   config.extend  FixturesHelpers
 
+  config.disable_monkey_patching!
+
   config.before(:all) do
     if Gem::Version.new("2") <= Gem::Version.new(Jekyll::VERSION)
       Jekyll.logger.log_level = :warn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -49,6 +49,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: sprockets-sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-helpers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -265,9 +297,9 @@ files:
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css.scss
 - spec/fixtures/_assets/vapor.js
-- spec/fixtures/_assets/vendor/bourbon.css.sass
-- spec/fixtures/_assets/vendor/compass.css.sass
-- spec/fixtures/_assets/vendor/neat.css.sass
+- spec/fixtures/_assets/vendor/with_bourbon.css.sass
+- spec/fixtures/_assets/vendor/with_compass.css.sass
+- spec/fixtures/_assets/vendor/with_neat.css.sass
 - spec/fixtures/_assets/wowscript.js
 - spec/fixtures/_assets/wowstyle.css
 - spec/fixtures/_config.yml
@@ -302,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3481509425775941281
+      hash: 483849259478873314
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -311,13 +343,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3481509425775941281
+      hash: 483849259478873314
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.7.9
+summary: jekyll-assets-0.8.0
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb
@@ -332,9 +364,9 @@ test_files:
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css.scss
 - spec/fixtures/_assets/vapor.js
-- spec/fixtures/_assets/vendor/bourbon.css.sass
-- spec/fixtures/_assets/vendor/compass.css.sass
-- spec/fixtures/_assets/vendor/neat.css.sass
+- spec/fixtures/_assets/vendor/with_bourbon.css.sass
+- spec/fixtures/_assets/vendor/with_compass.css.sass
+- spec/fixtures/_assets/vendor/with_neat.css.sass
 - spec/fixtures/_assets/wowscript.js
 - spec/fixtures/_assets/wowstyle.css
 - spec/fixtures/_config.yml