jekyll-assets 0.7.6 → 0.7.7

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

@@ -1,20 +1,16 @@
 # 3rd-party
 require "sprockets"
 
-
 module Jekyll
   module AssetsPlugin
     module Patches
       module BundledAssetPatch
-
         def jekyll_assets
           @processed_asset.jekyll_assets
         end
 
+        ::Sprockets::BundledAsset.send :include, self
       end
     end
   end
 end
-
-
-Sprockets::BundledAsset.send :include, Jekyll::AssetsPlugin::Patches::BundledAssetPatch

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

@@ -1,31 +1,26 @@
 # stdlib
 require "set"
 
-
 module Jekyll
   module AssetsPlugin
     module Patches
       module ContextPatch
-
         def site
           self.class.instance_variable_get :@site
         end
 
-
         def jekyll_assets
           @jekyll_assets ||= Set.new
         end
 
-
-        def asset_path pathname, *args
+        def asset_path(pathname, *args)
           return "" if pathname.to_s.strip.empty?
           asset = resolve(pathname.to_s[/^[^#?]+/]).to_s
           jekyll_assets << asset
-          (site.asset_path asset, *args) + (pathname.to_s[/[#?].+/] || '')
+          (site.asset_path asset, *args) + (pathname.to_s[/[#?].+/] || "")
         rescue Sprockets::FileNotFound
           raise Environment::AssetNotFound, pathname
         end
-
       end
     end
   end

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

@@ -1,30 +1,25 @@
 # 3rd-party
 require "sprockets"
 
-
 module Jekyll
   module AssetsPlugin
     module Patches
       module IndexPatch
-
-        def self.included base
+        def self.included(base)
           base.class_eval do
             alias_method :__orig_find_asset, :find_asset
             alias_method :find_asset, :__wrap_find_asset
           end
         end
 
-
-        def __wrap_find_asset path, options = {}
+        def __wrap_find_asset(path, options = {})
           __orig_find_asset(path, options).tap do |asset|
             asset.instance_variable_set :@site, @environment.site if asset
           end
         end
-
       end
     end
   end
 end
 
-
 Sprockets::Index.send :include, Jekyll::AssetsPlugin::Patches::IndexPatch

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

@@ -1,22 +1,22 @@
 # stdlib
 require "set"
 
-
 # 3rd-party
 require "sprockets"
 
-
 module Jekyll
   module AssetsPlugin
     module Patches
       module ProcessedAssetPatch
-
-        def self.included base
+        def self.included(base)
           base.class_eval do
             attr_reader :jekyll_assets
 
-            alias_method :__orig_build_dependency_paths, :build_dependency_paths
-            alias_method :build_dependency_paths, :__wrap_build_dependency_paths
+            alias_method :__orig_build_dependency_paths,
+                         :build_dependency_paths
+
+            alias_method :build_dependency_paths,
+                         :__wrap_build_dependency_paths
 
             alias_method :__orig_init_with, :init_with
             alias_method :init_with, :__wrap_init_with
@@ -26,34 +26,35 @@ module Jekyll
           end
         end
 
-
-        def __wrap_build_dependency_paths environment, context
+        def __wrap_build_dependency_paths(environment, context)
           @jekyll_assets = Set.new
 
           context.jekyll_assets.each do |path|
             @jekyll_assets << path
-            environment.find_asset(path).jekyll_assets.each{ |p| @jekyll_assets << p }
+            environment.find_asset(path)
+              .jekyll_assets.each { |p| @jekyll_assets << p }
           end
 
           __orig_build_dependency_paths environment, context
         end
 
-
-        def __wrap_init_with environment, coder
+        def __wrap_init_with(environment, coder)
           __orig_init_with environment, coder
-          @jekyll_assets = Set.new coder["jekyll_assets"].map{ |p| expand_root_path(p) }
-        end
 
+          @jekyll_assets = Set.new coder["jekyll_assets"]
+            .map { |p| expand_root_path(p) }
+        end
 
-        def __wrap_encode_with coder
+        def __wrap_encode_with(coder)
           __orig_encode_with coder
-          coder["jekyll_assets"] = jekyll_assets.map{ |p| relativize_root_path p }
+
+          coder["jekyll_assets"] = jekyll_assets.map do |path|
+            relativize_root_path path
+          end
         end
 
+        ::Sprockets::ProcessedAsset.send :include, self
       end
     end
   end
 end
-
-
-Sprockets::ProcessedAsset.send :include, Jekyll::AssetsPlugin::Patches::ProcessedAssetPatch

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

@@ -1,64 +1,55 @@
 # stdlib
 require "digest/md5"
 
-
 # 3rd-party
 require "jekyll"
 
-
 # internal
 require "jekyll/assets_plugin/configuration"
 require "jekyll/assets_plugin/environment"
 require "jekyll/assets_plugin/asset_path"
 
-
 module Jekyll
   module AssetsPlugin
     module Patches
       module SitePatch
-
-        def self.included base
+        def self.included(base)
           base.class_eval do
             alias_method :__orig_write, :write
             alias_method :write, :__wrap_write
           end
         end
 
-
         def assets_config
-          @assets_config ||= Configuration.new(self.config["assets"] || {})
+          @assets_config ||= Configuration.new(config["assets"] || {})
         end
 
-
         def assets
           @assets ||= Environment.new self
         end
 
-
         def asset_files
           @asset_files ||= []
         end
 
-
-        def asset_path pathname, *args
+        def asset_path(pathname, *args)
           pathname, _, anchor = pathname.rpartition "#" if pathname["#"]
           pathname, _, query  = pathname.rpartition "?" if pathname["?"]
 
-          AssetPath.new(assets[pathname, *args]).tap{ |ap|
-            ap.anchor = anchor
-            ap.query  = query
-          }.to_s
-        end
+          asset_path = AssetPath.new assets[pathname, *args]
+          asset_path.anchor = anchor
+          asset_path.query  = query
 
+          asset_path.to_s
+        end
 
-        def bundle_asset! asset
-          if not asset_files.include? asset
+        def bundle_asset!(asset)
+          unless asset_files.include? asset
             asset_files << asset
-            asset.jekyll_assets.each{ |path| bundle_asset! assets[path] }
+            asset.jekyll_assets.each { |path| bundle_asset! assets[path] }
           end
         end
 
-
         def __wrap_write
           static_files.push(*asset_files).uniq! do |asset|
             case hash = asset.hash
@@ -69,11 +60,9 @@ module Jekyll
 
           __orig_write
         end
-
       end
     end
   end
 end
 
-
 Jekyll::Site.send :include, Jekyll::AssetsPlugin::Patches::SitePatch

data/lib/jekyll/assets_plugin/renderer.rb

@@ -1,56 +1,47 @@
 module Jekyll
   module AssetsPlugin
     class Renderer
-
       STYLESHEET = '<link rel="stylesheet" href="%s">'
       JAVASCRIPT = '<script src="%s"></script>'
       IMAGE      = '<img src="%s">'
 
-
-      def initialize context, logical_path
+      def initialize(context, logical_path)
         @site = context.registers[:site]
         @path = logical_path.strip
       end
 
-
       def render_asset
         @site.assets[@path].to_s
       end
 
-
       def render_asset_path
         @site.asset_path @path
       end
 
-
       def render_javascript
         @path << ".js" if File.extname(@path).empty?
         render_tag JAVASCRIPT
       end
 
-
       def render_stylesheet
         @path << ".css" if File.extname(@path).empty?
         render_tag STYLESHEET
       end
 
-
       def render_image
         render_tag IMAGE
       end
 
-
       protected
 
-
-      def render_tag template
+      def render_tag(template)
         asset = @site.assets[@path]
-        (@site.assets_config.debug ? asset.to_a : [asset]).map{ |a|
-          template % AssetPath.new(a).to_s
-        }.join("\n")
-      end
+        tags  = (@site.assets_config.debug ? asset.to_a : [asset]).map do |a|
+          sprintf template, AssetPath.new(a).to_s
+        end
 
+        tags.join "\n"
+      end
     end
   end
 end
-

data/lib/jekyll/assets_plugin/tag.rb

@@ -1,24 +1,19 @@
 # 3rd-party
 require "liquid"
 
-
 # internal
 require "jekyll/assets_plugin/renderer"
 
-
 module Jekyll
   module AssetsPlugin
     class Tag < Liquid::Tag
-
-      def render context
+      def render(context)
         Renderer.new(context, @markup).send :"render_#{@tag_name}"
       end
-
     end
   end
 end
 
-
 %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.6"
+    VERSION = "0.7.7"
   end
 end

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

@@ -1,10 +1,10 @@
-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
-  end
-end
+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
+  end
+end

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 require "jekyll-assets/bourbon"
 
-
 module Jekyll::AssetsPlugin
   describe "Bourbon integration" do
     it "should globally append bourbon paths into Sprockets environment" do

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 require "jekyll-assets/compass"
 
-
 module Jekyll::AssetsPlugin
   describe "Compass integration" do
     it "should globally append compass paths into Sprockets environment" do

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

@@ -1,7 +1,6 @@
 require "spec_helper"
 require "jekyll-assets/neat"
 
-
 module Jekyll::AssetsPlugin
   describe "Neat integration" do
     it "should globally append neat paths into Sprockets environment" do

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

@@ -1,10 +1,9 @@
 require "spec_helper"
 
-
 module Jekyll::AssetsPlugin
   describe Configuration do
     context "with defaults" do
-      let(:config){ Configuration.new }
+      let(:config) { Configuration.new }
 
       context "output assets dirname" do
         subject { config.dirname }
@@ -64,10 +63,10 @@ module Jekyll::AssetsPlugin
         :css_compressor => "sass"
       })
 
-      config.dirname.should         ==  "assets"
-      config.sources.should         =~  %w{abc}
-      config.js_compressor.should       be_nil
-      config.css_compressor.should  ==  :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
@@ -96,13 +95,13 @@ module Jekyll::AssetsPlugin
 
     context "#js_compressor" do
       context "when js compressor is given as `uglify`" do
-        let(:config){ Configuration.new(:js_compressor => "uglify") }
+        let(:config) { Configuration.new(:js_compressor => "uglify") }
         subject { config.js_compressor }
         it { should be :uglify }
       end
 
       context "otherwise" do
-        let(:config){ Configuration.new }
+        let(:config) { Configuration.new }
         subject { config.js_compressor }
         it { should be_false }
       end
@@ -110,13 +109,13 @@ module Jekyll::AssetsPlugin
 
     context "#css_compressor" do
       context "when css compressor is given as `sass`" do
-        let(:config){ Configuration.new(:css_compressor => "sass") }
+        let(:config) { Configuration.new(:css_compressor => "sass") }
         subject { config.css_compressor }
         it { should be :sass }
       end
 
       context "otherwise" do
-        let(:config){ Configuration.new }
+        let(:config) { Configuration.new }
         subject { config.css_compressor }
         it { should be_false }
       end
@@ -124,26 +123,39 @@ module Jekyll::AssetsPlugin
 
     context "#gzip" do
       context "when gzip is disabled" do
-        let(:config){ Configuration.new(:gzip => false) }
+        let(:config) { Configuration.new(:gzip => false) }
         subject { config.gzip }
         it { should == [] }
       end
     end
 
+    context "#version" do
+      subject { Configuration.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 '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"} } }
+        let(:options) { { :compress => { :js => "uglify", :css => "sass" } } }
+        subject { Configuration.new options }
 
-        it "should set corresponding *_compressor value" do
-          config = Configuration.new options
-          config.js_compressor.should   == :uglify
-          config.css_compressor.should  == :sass
-        end
+        its(:js_compressor)   { should be :uglify }
+        its(:css_compressor)  { should be :sass }
       end
 
       context "cache_assets" do
-        let(:options){ { :cache_assets => true } }
+        let(:options) { { :cache_assets => true } }
 
         it "should set `cache` value" do
           config = Configuration.new options