jekyll-assets 0.3.0 → 0.3.1

data/.yardopts

@@ -0,0 +1 @@
+lib/**/*.rb - README.md HISTORY.md LICENSE

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.3.1 (2013-02-02)
+
+* Preprocess CSS/JS assets with Liquid processor.
+
+
 ### 0.3.0 (2013-01-08)
 
 * Add complimentary filters (same names as tags).

data/README.md

@@ -35,6 +35,13 @@ information about amazing features it gives you.
 [sprockets]:    https://github.com/sstephenson/sprockets#readme
 [extjs]:        https://github.com/sstephenson/execjs#readme
 
+For a quick start check out [jekyll-assets introduction][jekyll-assets-intro]
+that shows how to use it step by step. Also you might want to take a look on 
+[my blog sources][ixti-blog-src] as a real-world example as well.
+
+[jekyll-assets-intro]:  http://ixti.net/software/2012/12/30/unleash-mr-hyde-introduction-of-jekyll-assets.html
+[ixti-blog-src]:        https://github.com/ixti/ixti.github.com
+
 
 ## Installation
 

data/lib/jekyll-assets.rb

@@ -1 +1 @@
-require 'jekyll/assets_plugin'
+require "jekyll/assets_plugin"

data/lib/jekyll/assets_plugin.rb

@@ -1,20 +1,4 @@
-require 'jekyll'
-require 'liquid'
-
-
-require 'jekyll/assets_plugin/site_patch'
-require 'jekyll/assets_plugin/filters'
-require 'jekyll/assets_plugin/tag'
-require 'jekyll/assets_plugin/version'
-
-
-Jekyll::Site.send :include, Jekyll::AssetsPlugin::SitePatch
-
-
-Liquid::Template.register_filter Jekyll::AssetsPlugin::Filters
-
-
-Liquid::Template.register_tag 'javascript', Jekyll::AssetsPlugin::Tag
-Liquid::Template.register_tag 'stylesheet', Jekyll::AssetsPlugin::Tag
-Liquid::Template.register_tag 'asset_path', Jekyll::AssetsPlugin::Tag
-Liquid::Template.register_tag 'asset',      Jekyll::AssetsPlugin::Tag
+require "jekyll/assets_plugin/site_patch"
+require "jekyll/assets_plugin/filters"
+require "jekyll/assets_plugin/tag"
+require "jekyll/assets_plugin/version"

data/lib/jekyll/assets_plugin/asset_file.rb

@@ -1,38 +1,38 @@
-# stdlib
-require 'set'
-
-
 module Jekyll
   module AssetsPlugin
-    # Represents single asset that can be used as StaticFile for Site
-    #
     class AssetFile
-      class NotFound < StandardError; end
 
       @@mtimes = Hash.new
 
+
       attr_reader :asset
 
+
       def initialize site, asset
         @site, @asset = site, asset
       end
 
+
       def destination dest
         File.join(dest, @site.assets_config.dirname, @asset.digest_path)
       end
 
+
       def path
         @asset.pathname.to_s
       end
 
+
       def mtime
         @asset.mtime.to_i
       end
 
+
       def modified?
         @@mtimes[path] != mtime
       end
 
+
       def write dest
         dest_path = destination dest
 
@@ -43,6 +43,7 @@ module Jekyll
         true
       end
 
+
       def == other
         case other
         when AssetFile        then same_asset? other.asset
@@ -51,15 +52,19 @@ module Jekyll
         end
       end
 
+
       def to_s
         "#<Jekyll::AssetsPlugin::AssetFile:#{asset.logical_path}>"
       end
 
+
       protected
 
+
       def same_asset? other
         other.pathname.cleanpath == asset.pathname.cleanpath
       end
+
     end
   end
 end

data/lib/jekyll/assets_plugin/configuration.rb

@@ -1,72 +1,46 @@
 # stdlib
-require 'ostruct'
+require "ostruct"
 
 
 module Jekyll
   module AssetsPlugin
-    # Plugin configuration class.
-    #
-    #
-    # ##### sources
-    #
-    # Pathnames where to find assets relative to the root of the site.
-    #
-    # Default: ['_assets/javascripts', '_assets/stylesheets', '_assets/images']
-    #
-    #
-    # ##### compress
-    #
-    # Sets compressors for the specific types of file: `js`, or `css`.
-    #
-    # Possible variants:
-    #
-    #     css  => 'yui', 'sass', nil
-    #     js   => 'yui', 'uglifier', nil
-    #
-    # Default: { 'css' => nil, 'js' => nil } (no compression at all)
-    #
-    #
-    # ##### dirname
-    #
-    # Destination pathname of processed assets relative to the compiled site
-    # root (which is `_site` by default).
-    #
-    # Default: 'assets'
-    #
-    #
-    # ##### baseurl
-    #
-    # Base URL for assets paths. By default equals dirname surrunded with
-    # slashes. You ight want to change it if your blog has baseurl configuration
-    # and served not from the root of the server, or if you want to keep your
-    # assets on CDN.
-    #
-    class Configuration < OpenStruct
-      @@defaults = {
-        :dirname  => 'assets',
+    class Configuration
+      DEFAULTS = {
+        :dirname  => "assets",
         :sources  => %w{_assets/javascripts _assets/stylesheets _assets/images},
         :compress => { :css => nil, :js => nil }
-      }
+      }.freeze
+
 
       def initialize config = {}
-        super @@defaults.merge(config)
+        @data = OpenStruct.new DEFAULTS.merge(config)
 
-        self.sources  = [ self.sources ] if self.sources.is_a? String
-        self.compress = OpenStruct.new(self.compress)
-        self.dirname  = self.dirname.gsub(/^\/+|\/+$/, '')
+        @data.sources  = [ @data.sources ] if @data.sources.is_a? String
+        @data.compress = OpenStruct.new @data.compress
+        @data.dirname  = @data.dirname.gsub(/^\/+|\/+$/, "")
 
         # if baseurl not given - autoguess base on dirname
-        self.baseurl ||= "/#{self.dirname}/".squeeze '/'
+        @data.baseurl ||= "/#{@data.dirname}/".squeeze '/'
       end
 
+
+      def baseurl
+        @data.baseurl.chomp "/"
+      end
+
+
       def js_compressor
-        return compress.js.to_sym if compress.js
-        false
+        @data.compress.js ? @data.compress.js.to_sym : false
       end
 
+
       def css_compressor
-        return compress.css.to_sym if compress.css
-        false
+        @data.compress.css ? @data.compress.css.to_sym : false
+      end
+
+
+      def method_missing name, *args, &block
+        @data.send name, *args, &block
       end
     end
   end

data/lib/jekyll/assets_plugin/environment.rb

@@ -0,0 +1,73 @@
+# 3rd-party
+require "sprockets"
+
+
+# internal
+require "jekyll/assets_plugin/asset_file"
+require "jekyll/assets_plugin/liquid_processor"
+
+
+module Jekyll
+  module AssetsPlugin
+    class Environment < Sprockets::Environment
+
+      class AssetNotFound < StandardError
+        def initialize path
+          super "Couldn't find file '#{path}'"
+        end
+      end
+
+
+      autoload :ContextPatch, "jekyll/assets_plugin/environment/context_patch"
+
+
+      attr_reader :site
+
+
+      def initialize site
+        super site.source
+
+        @site = site
+
+        # append asset paths
+        @site.assets_config.sources.each { |p| append_path p }
+
+        self.js_compressor   = @site.assets_config.js_compressor
+        self.css_compressor  = @site.assets_config.css_compressor
+
+        register_preprocessor "text/css",               LiquidProcessor
+        register_preprocessor "application/javascript", LiquidProcessor
+
+        # bind jekyll and Sprockets context together
+        context_class.instance_variable_set :@site, @site
+
+        context_class.send :include, ContextPatch
+      end
+
+
+      def find_asset path, *args
+        super or raise AssetNotFound, path
+      end
+
+
+      def index
+        super.tap do |index|
+          index.instance_eval do
+            def find_asset path, options = {}
+              site    = @environment.site
+              asset   = super
+              bundle  = options[:bundle]
+
+              if asset and bundle and not site.static_files.include? asset
+                site.static_files << AssetFile.new(site, asset)
+              end
+
+              asset
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Jekyll
+  module AssetsPlugin
+    class Environment
+      module ContextPatch
+
+        def site
+          self.class.instance_variable_get :@site
+        end
+
+
+        def asset_path *args
+          "#{site.assets_config.baseurl}/#{site.assets[*args].digest_path}"
+        end
+
+      end
+    end
+  end
+end

data/lib/jekyll/assets_plugin/filters.rb

@@ -5,6 +5,7 @@ require 'jekyll/assets_plugin/renderer'
 module Jekyll
   module AssetsPlugin
     module Filters
+
       %w{ asset asset_path javascript stylesheet }.each do |name|
         module_eval <<-RUBY, __FILE__, __LINE__
         def #{name} path                    # def stylesheet logical_path
@@ -13,6 +14,10 @@ module Jekyll
         end                                 # end
         RUBY
       end
+
     end
   end
 end
+
+
+Liquid::Template.register_filter Jekyll::AssetsPlugin::Filters

data/lib/jekyll/assets_plugin/liquid_processor.rb

@@ -0,0 +1,18 @@
+# 3rd-party
+require 'tilt'
+
+
+module Jekyll
+  module AssetsPlugin
+    class LiquidProcessor < Tilt::LiquidTemplate
+      def evaluate context, locals, &block
+        @engine.render locals, {
+          :filters   => [Jekyll::Filters],
+          :registers => {
+            :site => context.site
+          }
+        }
+      end
+    end
+  end
+end

data/lib/jekyll/assets_plugin/renderer.rb

@@ -1,47 +1,40 @@
 module Jekyll
   module AssetsPlugin
     class Renderer
+
       STYLESHEET = '<link rel="stylesheet" type="text/css" href="%s">'
       JAVASCRIPT = '<script type="text/javascript" src="%s"></script>'
 
+
       def initialize context, logical_path
         @site = context.registers[:site]
         @path = logical_path.strip
       end
 
+
       def render_asset
-        asset.to_s
+        @site.assets[@path].to_s
       end
 
-      def render_asset_path
-        unless @site.static_files.include? asset
-          @site.static_files << AssetFile.new(@site, asset)
-        end
 
-        return "#{@site.assets_config.baseurl.chomp '/'}/#{asset.digest_path}"
+      def render_asset_path
+        "#{@site.assets_config.baseurl}/#{@site.assets[@path].digest_path}"
       end
 
+
       def render_javascript
-        @path << '.js' if File.extname(@path).empty?
+        @path << ".js" if File.extname(@path).empty?
 
         JAVASCRIPT % render_asset_path
       end
 
+
       def render_stylesheet
-        @path << '.css' if File.extname(@path).empty?
+        @path << ".css" if File.extname(@path).empty?
 
         STYLESHEET % render_asset_path
       end
 
-      protected
-
-      def asset
-        unless @asset ||= @site.assets[@path]
-          raise AssetFile::NotFound, "couldn't find file '#{@path}'"
-        end
-
-        @asset
-      end
     end
   end
 end

data/lib/jekyll/assets_plugin/site_patch.rb

@@ -1,58 +1,28 @@
 # 3rd-party
-require 'sprockets'
+require "jekyll"
 
 
 # internal
-require 'jekyll/assets_plugin/asset_file'
-require 'jekyll/assets_plugin/configuration'
+require "jekyll/assets_plugin/configuration"
+require "jekyll/assets_plugin/environment"
 
 
 module Jekyll
   module AssetsPlugin
-    # Patch that provides #assets and #assets_config to Site
-    #
     module SitePatch
+
       def assets_config
-        @assets_config ||= Configuration.new(self.config['assets'] || {})
+        @assets_config ||= Configuration.new(self.config["assets"] || {})
       end
 
-      def assets
-        unless @assets
-          @assets = Sprockets::Environment.new(self.source)
-
-          assets_config.sources.each(&@assets.method(:append_path))
-
-          @assets.js_compressor   = assets_config.js_compressor
-          @assets.css_compressor  = assets_config.css_compressor
-
-          # bind jekyll and Sprockets context together
-          @assets.context_class.instance_variable_set :@site, self
-
-          @assets.context_class.class_eval do
-            def site
-              self.class.instance_variable_get :@site
-            end
-
-            def asset_baseurl
-              site.assets_config.baseurl.chomp "/"
-            end
 
-            def asset_path(path, options = {})
-              unless (asset = environment.find_asset path, options)
-                raise AssetFile::NotFound, "couldn't find file '#{path}'"
-              end
-
-              unless site.static_files.include? asset
-                site.static_files << AssetFile.new(site, asset)
-              end
-
-              "#{asset_baseurl}/#{asset.digest_path}".squeeze "/"
-            end
-          end
-        end
-
-        @assets
+      def assets
+        @assets ||= Environment.new self
       end
+
     end
   end
 end
+
+
+Jekyll::Site.send :include, Jekyll::AssetsPlugin::SitePatch

data/lib/jekyll/assets_plugin/tag.rb

@@ -1,55 +1,24 @@
 # 3rd-party
-require 'liquid'
+require "liquid"
 
 
 # internal
-require 'jekyll/assets_plugin/renderer'
+require "jekyll/assets_plugin/renderer"
 
 
 module Jekyll
   module AssetsPlugin
-    # Class that implements some useful liquid tags:
-    #
-    #
-    # ##### stylesheet
-    #
-    # Renders `<link>` tag for a logical path:
-    #
-    #     {% stylesheet foo.css %}
-    #     # => '<link type="text/css" rel="stylesheet"
-    #           href="/assets/foo-b39e528efc3afe2def4bbc39de17f2b82cd8bd0d.css">
-    #
-    # You may omit extension so the following will give same result as above:
-    #
-    #     {% stylesheet foo %}
-    #
-    #
-    # ##### javascript
-    #
-    # Renders `<script>` tag for a logical path:
-    #
-    #     {% javascript foo.js %}
-    #     # => '<script type="text/javascript"
-    #           src="/assets/foo-b39e528efc3afe2def4bbc39de17f2b82cd8bd0d.js">
-    #           </script>
-    #
-    # You may omit extension so the following will give same result as above:
-    #
-    #     {% javascript foo %}
-    #
-    #
-    # ##### asset_path
-    #
-    # Renders asset path for an asset (useful for images):
-    #
-    #     {% asset_path foo.jpg %}
-    #     # => '/assets/foo-b39e528efc3afe2def4bbc39de17f2b82cd8bd0d.jpg"
-    #
-    #
     class Tag < Liquid::Tag
+
       def render context
         Renderer.new(context, @markup).send :"render_#{@tag_name}"
       end
+
     end
   end
 end
+
+
+%w{ javascript stylesheet asset asset_path }.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.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/fixtures/_assets/app.js

@@ -1 +1,3 @@
 //= require vapor
+
+var noise = '{% asset_path noise.png %}';

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

@@ -1,11 +1,11 @@
-require 'spec_helper'
-require 'jekyll-assets/bourbon'
+require "spec_helper"
+require "jekyll-assets/bourbon"
 
 
 module Jekyll::AssetsPlugin
-  describe 'Bourbon integration' do
+  describe "Bourbon integration" do
     it "should globally append bourbon paths into Sprockets environment" do
-      asset = @site.assets['vendor/bourbon.css'].to_s
+      asset = @site.assets["vendor/bourbon.css"].to_s
 
       asset.should =~ /-webkit-box-shadow/
       asset.should =~ /box-shadow/

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

@@ -1,11 +1,11 @@
-require 'spec_helper'
-require 'jekyll-assets/compass'
+require "spec_helper"
+require "jekyll-assets/compass"
 
 
 module Jekyll::AssetsPlugin
-  describe 'Compass integration' do
+  describe "Compass integration" do
     it "should globally append compass paths into Sprockets environment" do
-      asset = @site.assets['vendor/compass.css'].to_s
+      asset = @site.assets["vendor/compass.css"].to_s
 
       asset.should =~ /-webkit-box-shadow/
       asset.should =~ /-moz-box-shadow/

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

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require "spec_helper"
 
 
 module Jekyll::AssetsPlugin
   describe AssetFile do
-    context '#destination' do
-      let(:file) { AssetFile.new(@site, @site.assets['app.css']) }
+    context "#destination" do
+      let(:file) { AssetFile.new(@site, @site.assets["app.css"]) }
       subject { file.destination @dest.to_s }
       it { should match %r{/app-[0-9a-f]{32}\.css$} }
     end

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

@@ -1,98 +1,86 @@
-require 'spec_helper'
+require "spec_helper"
 
 
 module Jekyll::AssetsPlugin
   describe Configuration do
-    let(:defaults) do
-      {
-        :dirname  => 'assets',
-        :baseurl  => '/assets/',
-        :sources  => %w{_assets/javascripts _assets/stylesheets _assets/images}
-      }
-    end
-
-    context 'with defaults' do
+    context "with defaults" do
       let(:config){ Configuration.new }
 
-      context 'output assets dirname' do
+      context "output assets dirname" do
         subject { config.dirname }
-        it { should == defaults[:dirname] }
+        it { should == Configuration::DEFAULTS[:dirname] }
       end
 
-      context 'assets baseurl' do
+      context "assets baseurl" do
         subject { config.baseurl }
-        it { should == defaults[:baseurl] }
+        it { should == "/" + Configuration::DEFAULTS[:dirname] }
       end
 
-      context 'sources list' do
+      context "sources list" do
         subject { config.sources }
-        it { should =~ defaults[:sources] }
+        it { should =~ Configuration::DEFAULTS[:sources] }
       end
 
-      context 'js compressor' do
+      context "js compressor" do
         subject { config.compress.js }
         it { should be_nil }
       end
 
-      context 'css compressor' do
+      context "css compressor" do
         subject { config.compress.css }
         it { should be_nil }
       end
     end
 
-    it 'should override specified options and leave defaults for missing' do
+    it "should override specified options and leave defaults for missing" do
       config = Configuration.new({
         :sources  => %w{abc},
-        :compress => { :css => 'sass' }
+        :compress => { :css => "sass" }
       })
 
-      config.dirname.should == 'assets'
-      config.sources.should =~ %w{abc}
-      config.compress.js.should be_nil
-      config.compress.css.should == 'sass'
+      config.dirname.should       ==  "assets"
+      config.sources.should       =~  %w{abc}
+      config.compress.js.should       be_nil
+      config.compress.css.should  ==  "sass"
     end
 
-    context '#baseurl' do
-      it 'should respect explicit overrides' do
-        config = Configuration.new({
-          :dirname => 'foo',
-          :baseurl => '/bar/'
-        })
-
-        config.baseurl.should == '/bar/'
+    context "#baseurl" do
+      it "should respect explicit overrides" do
+        Configuration.new({
+          :dirname => "foo",
+          :baseurl => "/bar/"
+        }).baseurl.should == "/bar"
       end
 
-      it 'should be auto-guessed from dirname' do
-        config = Configuration.new({
-          :dirname => 'foo'
-        })
-
-        config.baseurl.should == '/foo/'
+      it "should be auto-guessed from dirname" do
+        Configuration.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(:compress => {:js => 'uglify'}) }
+    context "#js_compressor" do
+      context "when js compressor is given as `uglify`" do
+        let(:config){ Configuration.new(:compress => {:js => "uglify"}) }
         subject { config.js_compressor }
         it { should be :uglify }
       end
 
-      context 'otherwise' do
+      context "otherwise" do
         let(:config){ Configuration.new }
         subject { config.js_compressor }
         it { should be_false }
       end
     end
 
-    context '#css_compressor' do
-      context 'when js compressor is given as "sass"' do
-        let(:config){ Configuration.new(:compress => {:css => 'sass'}) }
+    context "#css_compressor" do
+      context "when css compressor is given as `sass`" do
+        let(:config){ Configuration.new(:compress => {:css => "sass"}) }
         subject { config.css_compressor }
         it { should be :sass }
       end
 
-      context 'otherwise' do
+      context "otherwise" do
         let(:config){ Configuration.new }
         subject { config.css_compressor }
         it { should be_false }

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

@@ -27,7 +27,7 @@ module Jekyll::AssetsPlugin
 
       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 { should match "Liquid error: Couldn't find file 'not-found.css'" }
       end
     end
 
@@ -49,7 +49,7 @@ module Jekyll::AssetsPlugin
 
       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 { should match "Liquid error: Couldn't find file 'not-found.js'" }
       end
     end
 
@@ -61,7 +61,7 @@ module Jekyll::AssetsPlugin
 
       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 { should match "Liquid error: Couldn't find file 'not-found.css'" }
       end
 
       context "with baseurl given as /foobar/" do
@@ -79,7 +79,7 @@ module Jekyll::AssetsPlugin
 
       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 { should match "Liquid error: Couldn't find file 'not-found.js'" }
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 
 module Jekyll::AssetsPlugin
@@ -13,9 +13,9 @@ module Jekyll::AssetsPlugin
 
         def config
           @config ||= {
-            'dirname' => 'foobar',
-            'assets'  => {
-              'sources' => [ 'foobar', '_assets' ]
+            "dirname" => "foobar",
+            "assets"  => {
+              "sources" => [ "foobar", "_assets" ]
             }
           }
         end
@@ -26,26 +26,26 @@ module Jekyll::AssetsPlugin
       end.new
     end
 
-    context '#assets' do
+    context "#assets" do
       subject { site.assets }
-      it { should be_an_instance_of Sprockets::Environment }
+      it { should be_a_kind_of Sprockets::Environment }
 
-      context 'calling #asset_path within assets' do
-        context 'when requested file not found' do
-          it 'should raise a NotFound error' do
+      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(AssetFile::NotFound)
+            end.should raise_error(Environment::AssetNotFound)
           end
         end
 
-        context 'when requested file found' do
-          it 'should have proper asset path' do
+        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)
           end
 
-          it 'should be appended to the static files list' do
+          it "should be appended to the static files list" do
             asset = site.assets["app.css"] # make sure main asset was compiled
             asset = site.assets["noise.png"]
 
@@ -53,19 +53,25 @@ module Jekyll::AssetsPlugin
           end
         end
       end
+
+      context "with Liquid markup within assets" do
+        it "should be rendered" do
+          site.assets["app.js"].to_s.should match(/noise-[a-f0-9]{32}\.png/)
+        end
+      end
     end
 
-    context '#assets_config' do
+    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.sources.should include 'foobar'
+      it "should been populated with `assets` section of config" do
+        site.assets_config.dirname.should_not == "foobar"
+        site.assets_config.sources.should include "foobar"
       end
     end
 
-    it 'should be included into Jekyll::Site' do
+    it "should be included into Jekyll::Site" do
       Jekyll::Site.included_modules.should include SitePatch
     end
   end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 
 module Jekyll::AssetsPlugin
@@ -9,77 +9,77 @@ module Jekyll::AssetsPlugin
       Liquid::Template.parse(content).render({}, context)
     end
 
-    context '{% stylesheet <file> %}' do
+    context "{% stylesheet <file> %}" do
       def tag_re name
         file = "/assets/#{name}-[a-f0-9]{32}\.css"
         Regexp.new "^#{Renderer::STYLESHEET % file}$"
       end
 
-      context 'when <file> exists' do
-        subject { render('{% stylesheet app.css %}') }
+      context "when <file> exists" do
+        subject { render("{% stylesheet app.css %}") }
         it { should match tag_re("app") }
       end
 
-      context 'when <file> extension is omited' do
-        subject { render('{% stylesheet app %}') }
+      context "when <file> extension is omited" do
+        subject { render("{% stylesheet app %}") }
         it { should 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'" }
+      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'" }
       end
     end
 
-    context '{% javascript <file> %}' do
+    context "{% javascript <file> %}" do
       def tag_re name
         file = "/assets/#{name}-[a-f0-9]{32}\.js"
         Regexp.new "^#{Renderer::JAVASCRIPT % file}$"
       end
 
-      context 'when <file> exists' do
-        subject { render('{% javascript app.js %}') }
+      context "when <file> exists" do
+        subject { render("{% javascript app.js %}") }
         it { should match tag_re("app") }
       end
 
-      context 'when <file> extension omited' do
-        subject { render('{% javascript app %}') }
+      context "when <file> extension omited" do
+        subject { render("{% javascript app %}") }
         it { should 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'" }
+      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'" }
       end
     end
 
-    context '{% asset_path <file.ext> %}' do
-      context 'when <file> exists' do
-        subject { render('{% asset_path app.css %}') }
+    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$}) }
       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'" }
+      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'" }
       end
 
-      context 'with baseurl given as /foobar/' do
-        before { context[:registers][:site].assets_config.baseurl = '/foobar/' }
-        subject { render('{% asset_path app.css %}') }
+      context "with baseurl given as /foobar/" do
+        before { context[:registers][:site].assets_config.baseurl = "/foobar/" }
+        subject { render("{% asset_path app.css %}") }
         it { should 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 %}') }
+    context "{% asset <file.ext> %}" do
+      context "when <file> exists" do
+        subject { render("{% asset app.css %}") }
         it { should 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'" }
+      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'" }
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,24 +1,24 @@
-require 'rubygems'
+require "rubygems"
 
 
-require 'jekyll'
-require 'liquid'
-require 'sprockets'
+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
 
   config.before(:all) do
-    @dest = fixtures_path.join('_site')
+    @dest = fixtures_path.join("_site")
     @site = Jekyll::Site.new(Jekyll.configuration({
-      'source'      => fixtures_path.to_s,
-      'destination' => @dest.to_s
+      "source"      => fixtures_path.to_s,
+      "destination" => @dest.to_s
     }))
 
     @dest.rmtree if @dest.exist?

data/spec/support/fixtures_path.rb

@@ -1,4 +1,4 @@
-require 'pathname'
+require "pathname"
 
 
 module Jekyll::AssetsPlugin
@@ -6,7 +6,7 @@ module Jekyll::AssetsPlugin
     extend self
 
     def fixtures_path
-      @fixtures_path ||= Pathname.new(__FILE__).parent.parent.join('fixtures')
+      @fixtures_path ||= Pathname.new(__FILE__).parent.parent.join("fixtures")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -151,6 +151,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- .yardopts
 - Gemfile
 - Guardfile
 - HISTORY.md
@@ -164,7 +165,10 @@ files:
 - lib/jekyll/assets_plugin.rb
 - lib/jekyll/assets_plugin/asset_file.rb
 - lib/jekyll/assets_plugin/configuration.rb
+- lib/jekyll/assets_plugin/environment.rb
+- lib/jekyll/assets_plugin/environment/context_patch.rb
 - lib/jekyll/assets_plugin/filters.rb
+- lib/jekyll/assets_plugin/liquid_processor.rb
 - lib/jekyll/assets_plugin/renderer.rb
 - lib/jekyll/assets_plugin/site_patch.rb
 - lib/jekyll/assets_plugin/tag.rb
@@ -214,7 +218,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.3.0
+summary: jekyll-assets-0.3.1
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb