jekyll-assets 0.1.0 → 0.1.1

data/README.md

@@ -1,5 +1,9 @@
 # Jekyll::AssetsPlugin
 
+[![Build Status](https://secure.travis-ci.org/ixti/jekyll-assets.png)](http://travis-ci.org/ixti/jekyll-assets)
+[![Dependency Status](https://gemnasium.com/ixti/jekyll-assets.png)](https://gemnasium.com/ixti/jekyll-assets)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/ixti/jekyll-assets)
+
 Jekyll plugin, that adds Rails-alike assets pipelines.
 
 

data/lib/jekyll/assets_plugin.rb

@@ -14,3 +14,4 @@ Jekyll::Site.send :include, Jekyll::AssetsPlugin::SitePatch
 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)

data/lib/jekyll/assets_plugin/configuration.rb

@@ -58,8 +58,8 @@ module Jekyll
 
         self.sources  = [ self.sources ] if self.sources.is_a? String
         self.bundles  = [ self.bundles ] if self.bundles.is_a? String
-
         self.compress = OpenStruct.new(self.compress)
+        self.dirname  = self.dirname.gsub(/^\/+|\/+$/, '')
       end
 
       # Returns bundles array with pattern strings converted to RegExps

data/lib/jekyll/assets_plugin/site_patch.rb

@@ -22,13 +22,8 @@ module Jekyll
 
           assets_config.sources.each(&@assets.method(:append_path))
 
-          if js_compressor = assets_config.js_compressor
-            @assets.js_compressor = js_compressor
-          end
-
-          if css_compressor = assets_config.css_compressor
-            @assets.css_compressor = css_compressor
-          end
+          @assets.js_compressor   = assets_config.js_compressor
+          @assets.css_compressor  = assets_config.css_compressor
 
           @assets.context_class.class_eval <<-RUBY, __FILE__, __LINE__
             def asset_path(path, options = {})

data/lib/jekyll/assets_plugin/tag.rb

@@ -68,6 +68,12 @@ module Jekyll
         @logical_path << default_extension if File.extname(@logical_path).empty?
       end
 
+      def render context
+        send :"render_#{@tag_name}", context
+      end
+
+      protected
+
       def default_extension
         EXTENSIONS[@tag_name].to_s
       end
@@ -84,19 +90,37 @@ module Jekyll
         end
       end
 
-      def render context
+      def with_asset context, &block
         site    = context.registers[:site]
         asset   = site.assets[@logical_path]
 
         return asset_not_found unless asset
-        return asset_not_bundled unless site.has_bundled_asset? asset
 
-        url = "/#{site.assets_config.dirname}/#{asset.digest_path}".squeeze "/"
+        yield asset, site
+      end
+
+      def render_asset context
+        with_asset context do |asset|
+          return asset.to_s
+        end
+      end
+
+      def render_asset_path context
+        with_asset context do |asset, site|
+          return asset_not_bundled unless site.has_bundled_asset? asset
+          return "/#{site.assets_config.dirname}/#{asset.digest_path}"
+        end
+      end
+
+      def render_javascript context
+        if url = render_asset_path(context)
+          return JAVASCRIPT % [url]
+        end
+      end
 
-        case @tag_name
-        when 'stylesheet' then STYLESHEET % [url]
-        when 'javascript' then JAVASCRIPT % [url]
-        else url
+      def render_stylesheet context
+        if url = render_asset_path(context)
+          return STYLESHEET % [url]
         end
       end
     end

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

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

@@ -77,5 +77,17 @@ module Jekyll::AssetsPlugin
         it { should be_empty }
       end
     end
+
+    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> is not found' do
+        subject { render('{% asset_path not-found.js %}') }
+        it { should be_empty }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -929384781
+      hash: 346987987
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,13 +175,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -929384781
+      hash: 346987987
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.1.0
+summary: jekyll-assets-0.1.1
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb