jekyll-assets 0.7.6 → 0.7.7

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

@@ -1,13 +1,12 @@
 require "spec_helper"
 
-
 module Jekyll::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 =~ %r{fonts/vapor-[a-f0-9]{32}\.eot\?#iefix}
-        css.should =~ %r{fonts/vapor-[a-f0-9]{32}\.svg#iefix}
+        css.should match(/fonts\/vapor-[a-f0-9]{32}\.eot\?#iefix/)
+        css.should match(/fonts\/vapor-[a-f0-9]{32}\.svg#iefix/)
       end
 
       it "should properly handle relative paths" do

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

@@ -1,16 +1,15 @@
 require "spec_helper"
 
-
 module Jekyll::AssetsPlugin
   describe Filters do
     let(:context) { { :registers => { :site => @site } } }
 
-    def render content
+    def render(content)
       Liquid::Template.parse(content).render({}, context)
     end
 
     context "{{ '<file>' | image }}" do
-      def tag_re name
+      def tag_re(name)
         file = "/assets/#{name}-[a-f0-9]{32}\.png"
         Regexp.new "^#{Renderer::IMAGE % file}$"
       end
@@ -27,7 +26,7 @@ module Jekyll::AssetsPlugin
     end
 
     context "{{ '<file>' | stylesheet }}" do
-      def tag_re name
+      def tag_re(name)
         file = "/assets/#{name}-[a-f0-9]{32}\.css"
         Regexp.new "^#{Renderer::STYLESHEET % file}$"
       end
@@ -49,7 +48,7 @@ module Jekyll::AssetsPlugin
     end
 
     context "{{ '<file>' | javascript }}" do
-      def tag_re name
+      def tag_re(name)
         file = "/assets/#{name}-[a-f0-9]{32}\.js"
         Regexp.new "^#{Renderer::JAVASCRIPT % file}$"
       end
@@ -82,7 +81,10 @@ module Jekyll::AssetsPlugin
       end
 
       context "with baseurl given as /foobar/" do
-        before { context[:registers][:site].assets_config.baseurl = "/foobar/" }
+        before do
+          context[:registers][:site].assets_config.baseurl = "/foobar/"
+        end
+
         subject { render("{{ 'app.css' | asset_path }}") }
         it { should match(%r{^/foobar/app-[a-f0-9]{32}\.css$}) }
       end

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

@@ -1,6 +1,5 @@
 require "spec_helper"
 
-
 module Jekyll::AssetsPlugin
   module Patches
     describe SitePatch do
@@ -9,7 +8,7 @@ module Jekyll::AssetsPlugin
           "source"  => RSpecHelpers.fixtures_path.to_s,
           "dirname" => "foobar",
           "assets"  => {
-            "sources" => [ "foobar", "_assets" ]
+            "sources" => %w{ foobar _assets }
           }
         })
       end
@@ -22,35 +21,33 @@ module Jekyll::AssetsPlugin
           let(:source_path) { Pathname.new site.source }
           subject           { site.assets.cache_path }
 
-          it { should == source_path.join(".jekyll-assets-cache") }
+          it { should eq source_path.join(".jekyll-assets-cache") }
         end
 
         context "calling #asset_path within assets" do
           context "when requested file not found" do
-            it "should raise a NotFound error" do
-              Proc.new do
-                site.assets["should_fail.css"]
-              end.should raise_error(Environment::AssetNotFound)
+            it "raises a NotFound error" do
+              expect { site.assets["should_fail.css"] }
+                .to raise_error Environment::AssetNotFound
             end
           end
 
           context "when requested file found" do
             it "should have proper asset path" do
-              noise_img_re = %r{url\(/assets/noise-[a-f0-9]{32}\.png\)}
-              site.assets["app.css"].to_s.should match(noise_img_re)
+              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
-              css = site.assets["should_be_blank.css"].to_s
-              css.should =~ /url\(\)/
+              expect(site.assets["should_be_blank.css"].to_s)
+                .to match(/url\(\)/)
             end
           end
         end
       end
 
-
       context "#asset_path" do
         subject { site.asset_path "app.css" }
 
@@ -76,7 +73,6 @@ module Jekyll::AssetsPlugin
           end
         end
 
-
         context "with query part in requested filename" do
           subject { site.asset_path "app.css?foo=bar" }
 
@@ -87,7 +83,7 @@ module Jekyll::AssetsPlugin
 
           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 { should match %r{^/assets/app\.css\?cb=[a-f0-9]{32}&foo=bar$} }
           end
 
           context "and hard cachebust" do
@@ -96,7 +92,6 @@ module Jekyll::AssetsPlugin
           end
         end
 
-
         context "with anchor part in requested filename" do
           subject { site.asset_path "app.css#foobar" }
 
@@ -117,25 +112,22 @@ module Jekyll::AssetsPlugin
         end
       end
 
-
       context "#assets_config" do
         subject { site.assets_config }
         it { should be_an_instance_of Configuration }
 
         it "should been populated with `assets` section of config" do
-          site.assets_config.dirname.should_not == "foobar"
+          site.assets_config.dirname.should_not eq "foobar"
           site.assets_config.sources.should include "foobar"
         end
       end
 
-
       it "should regenerate assets upon multiple #process" do
         @site.assets_config.cachebust = :none
-        2.times{ @site.process }
+        2.times { @site.process }
         @dest.join("assets", "app.css").exist?.should be_true
       end
 
-
       context "with cache" do
         def site
           Jekyll::Site.new(Jekyll.configuration({
@@ -150,12 +142,11 @@ module Jekyll::AssetsPlugin
         end
 
         it "should regenerate static assets upon multiple #process" do
-          2.times{ site.process }
+          2.times { site.process }
           @dest.join("assets", "noise.png").exist?.should be_true
         end
       end
 
-
       context "#gzip" do
         subject { site.assets_config }
 

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

@@ -1,10 +1,8 @@
 # stdlib
 require "ostruct"
 
-
 require "spec_helper"
 
-
 module Jekyll::AssetsPlugin
   describe Renderer do
 
@@ -16,39 +14,36 @@ module Jekyll::AssetsPlugin
       })
     end
 
-
     let(:renderer) do
       context = OpenStruct.new(:registers => { :site => site })
       Renderer.new context, "app"
     end
 
-
     describe "#render_javascript" do
       subject { renderer.render_javascript }
 
       context "when debug mode enabled" do
-        let(:assets_config){ Hash[:debug, true] }
-        it { should match %r{^(\s*<script src="[^"]+"></script>\s*){3}$} }
+        let(:assets_config) { Hash[:debug, true] }
+        it { should match(/^(\s*<script src="[^"]+"><\/script>\s*){3}$/) }
       end
 
       context "when debug mode disabled" do
-        let(:assets_config){ Hash[:debug, false] }
-        it { should match %r{^(\s*<script src="[^"]+"></script>\s*){1}$} }
+        let(:assets_config) { Hash[:debug, false] }
+        it { should match(/^(\s*<script src="[^"]+"><\/script>\s*){1}$/) }
       end
     end
 
-
     describe "#render_stylesheet" do
       subject { renderer.render_stylesheet }
 
       context "when debug mode enabled" do
-        let(:assets_config){ Hash[:debug, true] }
-        it { should match %r{^(\s*<link rel="stylesheet" href="[^"]+">\s*){3}$} }
+        let(:assets_config) { Hash[:debug, true] }
+        it { should match(/^(\s*<link rel="stylesheet" [^>]+>\s*){3}$/) }
       end
 
       context "when debug mode disabled" do
-        let(:assets_config){ Hash[:debug, false] }
-        it { should match %r{^(\s*<link rel="stylesheet" href="[^"]+">\s*){1}$} }
+        let(:assets_config) { Hash[:debug, false] }
+        it { should match(/^(\s*<link rel="stylesheet" [^>]+>\s*){1}$/) }
       end
     end
 

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

@@ -1,16 +1,15 @@
 require "spec_helper"
 
-
 module Jekyll::AssetsPlugin
   describe Tag do
     let(:context) { { :registers => { :site => @site } } }
 
-    def render content
+    def render(content)
       Liquid::Template.parse(content).render({}, context)
     end
 
     context "{% image <file> %}" do
-      def tag_re name
+      def tag_re(name)
         file = "/assets/#{name}-[a-f0-9]{32}\.png"
         Regexp.new "^#{Renderer::IMAGE % file}$"
       end
@@ -27,7 +26,7 @@ module Jekyll::AssetsPlugin
     end
 
     context "{% stylesheet <file> %}" do
-      def tag_re name
+      def tag_re(name)
         file = "/assets/#{name}-[a-f0-9]{32}\.css"
         Regexp.new "^#{Renderer::STYLESHEET % file}$"
       end
@@ -49,7 +48,7 @@ module Jekyll::AssetsPlugin
     end
 
     context "{% javascript <file> %}" do
-      def tag_re name
+      def tag_re(name)
         file = "/assets/#{name}-[a-f0-9]{32}\.js"
         Regexp.new "^#{Renderer::JAVASCRIPT % file}$"
       end
@@ -82,7 +81,10 @@ module Jekyll::AssetsPlugin
       end
 
       context "with baseurl given as /foobar/" do
-        before { context[:registers][:site].assets_config.baseurl = "/foobar/" }
+        before do
+          context[:registers][:site].assets_config.baseurl = "/foobar/"
+        end
+
         subject { render("{% asset_path app.css %}") }
         it { should match(%r{^/foobar/app-[a-f0-9]{32}\.css$}) }
       end

data/spec/spec_helper.rb

@@ -1,26 +1,22 @@
 require "rubygems"
 
-
-require 'simplecov'
+require "simplecov"
 require "coveralls"
 
-
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start
 
-
 require "jekyll"
 require "liquid"
 require "sprockets"
 
-
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path("../support", __FILE__) + "/**/*.rb"].each {|f| require f}
-
+Dir[File.expand_path("../support", __FILE__) + "/**/*.rb"]
+  .each { |f| require f }
 
 RSpec.configure do |config|
   config.include Jekyll::AssetsPlugin::RSpecHelpers

data/spec/support/fixtures_path.rb

@@ -1,12 +1,11 @@
 require "pathname"
 
-
 module Jekyll::AssetsPlugin
   module RSpecHelpers
-    extend self
-
     def fixtures_path
       @fixtures_path ||= Pathname.new(__FILE__).parent.parent.join("fixtures")
     end
+
+    module_function :fixtures_path
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -162,6 +162,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -248,7 +249,7 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: jekyll-assets-0.7.6
+summary: jekyll-assets-0.7.7
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb