jekyll-assets 0.3.5 → 0.3.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 832045a15d6f254fb11848378bf00c5b94894515
+  data.tar.gz: 2985a2194b2393f21199d8faf70a22d33e6f133a
+SHA512:
+  metadata.gz: 217c2da729697c4e7cc95aa0e7c424ae234423ce8b94ac0ee27e8d1a47069316bd1342f189d0c2a54fa52ac8ac3eab1bbdac59d4c2610e9349f9a7c7af0cebce
+  data.tar.gz: 118175635e6306e85929ff95549a927b695600416417f549310d6333e3ab1d0adb4778623165aa1bb6846a3350bea4902f205d5b147678e1ee42cff899811d06

data/.travis.yml

@@ -1,2 +1,2 @@
 language: ruby
-rvm: [ 1.9.3 ]
+rvm: [ 1.9.3, 2.0.0 ]

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
+
+group :test do
+  gem 'coveralls', :require => false
+  gem 'simplecov', :require => false
+end
+
+
 # Specify your gem's dependencies in jekyll-assets.gemspec
 gemspec

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.3.6 (2013-04-28)
+
+* Ruby 2.0.0 support. See #16.
+
+
 ### 0.3.5 (2013-03-03)
 
 * Add buil-tim neat support as `require "jekyll-assets/neat"`. See #18.

data/README.md

@@ -1,8 +1,10 @@
 # Jekyll::AssetsPlugin
 
+[![Gem Version](https://badge.fury.io/rb/jekyll-assets.png)](http://badge.fury.io/rb/jekyll-assets)
 [![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/github/ixti/jekyll-assets.png)](https://codeclimate.com/github/ixti/jekyll-assets)
+[![Coverage Status](https://coveralls.io/repos/ixti/jekyll-assets/badge.png)](https://coveralls.io/r/ixti/jekyll-assets)
 
 Jekyll plugin, that adds Rails-alike assets pipeline, that means that:
 

data/lib/jekyll/assets_plugin.rb

@@ -1,4 +1,4 @@
-require "jekyll/assets_plugin/site_patch"
+require "jekyll/assets_plugin/patches"
 require "jekyll/assets_plugin/filters"
 require "jekyll/assets_plugin/tag"
 require "jekyll/assets_plugin/version"

data/lib/jekyll/assets_plugin/environment.rb

@@ -18,10 +18,6 @@ module Jekyll
       end
 
 
-      autoload :ContextPatch, "jekyll/assets_plugin/environment/context_patch"
-      autoload :IndexPatch,   "jekyll/assets_plugin/environment/index_patch"
-
-
       attr_reader :site
 
 
@@ -42,7 +38,7 @@ module Jekyll
         # bind jekyll and Sprockets context together
         context_class.instance_variable_set :@site, @site
 
-        context_class.send :include, ContextPatch
+        context_class.send :include, Patches::ContextPatch
       end
 
 
@@ -50,11 +46,6 @@ module Jekyll
         super or raise AssetNotFound, path
       end
 
-
-      def index
-        super.tap { |index| index.singleton_class.send :include, IndexPatch }
-      end
-
     end
   end
 end

data/lib/jekyll/assets_plugin/patches.rb

@@ -0,0 +1 @@
+Dir[File.join File.dirname(__FILE__), "patches/**/*.rb"].each { |f| require f }

data/lib/jekyll/assets_plugin/{environment → patches}/context_patch.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AssetsPlugin
-    class Environment
+    module Patches
       module ContextPatch
 
         def site

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

@@ -0,0 +1,30 @@
+# 3rd-party
+require "sprockets"
+
+
+module Jekyll
+  module AssetsPlugin
+    module Patches
+      module IndexPatch
+
+        def self.included base
+          base.class_eval do
+            alias_method :find_asset_without_jekyll, :find_asset
+            alias_method :find_asset, :find_asset_with_jekyll
+          end
+        end
+
+
+        def find_asset_with_jekyll path, options = {}
+          asset = find_asset_without_jekyll path, options
+          @environment.site.bundle_asset! asset if asset and options[:bundle]
+          asset
+        end
+
+      end
+    end
+  end
+end
+
+
+Sprockets::Index.send :include, Jekyll::AssetsPlugin::Patches::IndexPatch

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

@@ -0,0 +1,73 @@
+# 3rd-party
+require "jekyll"
+
+
+# internal
+require "jekyll/assets_plugin/configuration"
+require "jekyll/assets_plugin/environment"
+
+
+module Jekyll
+  module AssetsPlugin
+    module Patches
+      module SitePatch
+
+        def self.included base
+          base.class_eval do
+            alias_method :write_without_assets, :write
+            alias_method :write, :write_with_assets
+          end
+        end
+
+
+        def assets_config
+          @assets_config ||= Configuration.new(self.config["assets"] || {})
+        end
+
+
+        def assets
+          @assets ||= Environment.new self
+        end
+
+
+        def asset_files
+          @asset_files ||= []
+        end
+
+
+        def asset_path *args
+          asset     = assets[*args]
+          baseurl   = "#{assets_config.baseurl}/"
+          cachebust = assets_config.cachebust
+
+          case cachebust
+          when :none then baseurl << asset.logical_path
+          when :soft then baseurl << asset.logical_path << "?cb=#{asset.digest}"
+          when :hard then baseurl << asset.digest_path
+          else raise "Unknown cachebust strategy: #{cachebust.inspect}"
+          end
+        end
+
+
+        def bundle_asset! asset
+          if not asset_files.include? asset
+            file = AssetFile.new self, asset
+
+            asset_files   << file
+            static_files  << file
+          end
+        end
+
+
+        def write_with_assets
+          static_files.push(*asset_files).uniq!
+          write_without_assets
+        end
+
+      end
+    end
+  end
+end
+
+
+Jekyll::Site.send :include, Jekyll::AssetsPlugin::Patches::SitePatch

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

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

@@ -0,0 +1,133 @@
+require "spec_helper"
+
+
+module Jekyll::AssetsPlugin
+  module Patches
+    describe SitePatch do
+      let(:site) do
+        Class.new(Jekyll::Site) do
+          include SitePatch
+
+          def initialize
+            self.reset
+          end
+
+          def config
+            @config ||= {
+              "dirname" => "foobar",
+              "assets"  => {
+                "sources" => [ "foobar", "_assets" ]
+              }
+            }
+          end
+
+          def source
+            @source ||= RSpecHelpers.fixtures_path.to_s
+          end
+        end.new
+      end
+
+      context "#assets" do
+        subject { site.assets }
+        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
+              Proc.new do
+                site.assets["should_fail.css"]
+              end.should 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)
+            end
+
+            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"]
+
+              site.static_files.include?(asset).should be_true
+            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 "#asset_path" do
+        subject { site.asset_path "app.css" }
+
+        context "with none cachebust" do
+          before { site.assets_config.cachebust = :none }
+          it { should 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}$}) }
+        end
+
+        context "with hard cachebust" do
+          before { site.assets_config.cachebust = :hard }
+          it { should 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
+            expect { site.asset_path "app.css" }.to raise_error
+          end
+        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.sources.should include "foobar"
+        end
+      end
+
+
+      it "should regenerate assets upon multiple #process" do
+        @site.assets_config.cachebust = :none
+        2.times { @site.process }
+
+        @dest.join("assets", "app.css").exist?.should be_true
+      end
+
+      context "#gzip" do
+        subject { site.assets_config }
+
+        it "should generate 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
+        end
+
+        it "should 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
+        end
+
+      end
+
+      it "should be included into Jekyll::Site" do
+        Jekyll::Site.included_modules.should include SitePatch
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,17 @@
 require "rubygems"
 
 
+require 'simplecov'
+require "coveralls"
+
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
+
 require "jekyll"
 require "liquid"
 require "sprockets"

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.3.5
-  prerelease: 
+  version: 0.3.6
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   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
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,118 +41,105 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: neat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "  Jekyll plugin, that allows you to write javascript/css assets in\n
-  \ other languages such as CoffeeScript, Sass, Less and ERB, concatenate\n  them,
-  respecting dependencies, minify and many more.\n"
+description: |2
+    Jekyll plugin, that allows you to write javascript/css assets in
+    other languages such as CoffeeScript, Sass, Less and ERB, concatenate
+    them, respecting dependencies, minify and many more.
 email:
 - ixti@member.fsf.org
 executables: []
@@ -183,12 +165,13 @@ files:
 - 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/environment/index_patch.rb
 - lib/jekyll/assets_plugin/filters.rb
 - lib/jekyll/assets_plugin/liquid_processor.rb
+- lib/jekyll/assets_plugin/patches.rb
+- lib/jekyll/assets_plugin/patches/context_patch.rb
+- lib/jekyll/assets_plugin/patches/index_patch.rb
+- lib/jekyll/assets_plugin/patches/site_patch.rb
 - lib/jekyll/assets_plugin/renderer.rb
-- lib/jekyll/assets_plugin/site_patch.rb
 - lib/jekyll/assets_plugin/tag.rb
 - lib/jekyll/assets_plugin/version.rb
 - spec/fixtures/.gitignore
@@ -211,41 +194,34 @@ files:
 - spec/lib/jekyll/assets_plugin/asset_file_spec.rb
 - spec/lib/jekyll/assets_plugin/configuration_spec.rb
 - spec/lib/jekyll/assets_plugin/filters_spec.rb
-- spec/lib/jekyll/assets_plugin/site_patch_spec.rb
+- spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb
 - spec/lib/jekyll/assets_plugin/tag_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures_path.rb
 homepage: http://ixti.github.com/jekyll-assets
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3616688251786802351
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3616688251786802351
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: jekyll-assets-0.3.5
+specification_version: 4
+summary: jekyll-assets-0.3.6
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb
@@ -267,7 +243,7 @@ test_files:
 - spec/lib/jekyll/assets_plugin/asset_file_spec.rb
 - spec/lib/jekyll/assets_plugin/configuration_spec.rb
 - spec/lib/jekyll/assets_plugin/filters_spec.rb
-- spec/lib/jekyll/assets_plugin/site_patch_spec.rb
+- spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb
 - spec/lib/jekyll/assets_plugin/tag_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures_path.rb

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

@@ -1,15 +0,0 @@
-module Jekyll
-  module AssetsPlugin
-    class Environment
-      module IndexPatch
-
-        def find_asset path, options = {}
-          asset = super
-          @environment.site.bundle_asset! asset if asset and options[:bundle]
-          asset
-        end
-
-      end
-    end
-  end
-end

data/lib/jekyll/assets_plugin/site_patch.rb

@@ -1,71 +0,0 @@
-# 3rd-party
-require "jekyll"
-
-
-# internal
-require "jekyll/assets_plugin/configuration"
-require "jekyll/assets_plugin/environment"
-
-
-module Jekyll
-  module AssetsPlugin
-    module SitePatch
-
-      def self.included base
-        base.class_eval do
-          alias_method :write_without_assets, :write
-          alias_method :write, :write_with_assets
-        end
-      end
-
-
-      def assets_config
-        @assets_config ||= Configuration.new(self.config["assets"] || {})
-      end
-
-
-      def assets
-        @assets ||= Environment.new self
-      end
-
-
-      def asset_files
-        @asset_files ||= []
-      end
-
-
-      def asset_path *args
-        asset     = assets[*args]
-        baseurl   = "#{assets_config.baseurl}/"
-        cachebust = assets_config.cachebust
-
-        case cachebust
-        when :none then baseurl << asset.logical_path
-        when :soft then baseurl << asset.logical_path << "?cb=#{asset.digest}"
-        when :hard then baseurl << asset.digest_path
-        else raise "Unknown cachebust strategy: #{cachebust.inspect}"
-        end
-      end
-
-
-      def bundle_asset! asset
-        if not asset_files.include? asset
-          file = AssetFile.new self, asset
-
-          asset_files   << file
-          static_files  << file
-        end
-      end
-
-
-      def write_with_assets
-        static_files.push(*asset_files).uniq!
-        write_without_assets
-      end
-
-    end
-  end
-end
-
-
-Jekyll::Site.send :include, Jekyll::AssetsPlugin::SitePatch

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

@@ -1,131 +0,0 @@
-require "spec_helper"
-
-
-module Jekyll::AssetsPlugin
-  describe SitePatch do
-    let(:site) do
-      Class.new(Jekyll::Site) do
-        include SitePatch
-
-        def initialize
-          self.reset
-        end
-
-        def config
-          @config ||= {
-            "dirname" => "foobar",
-            "assets"  => {
-              "sources" => [ "foobar", "_assets" ]
-            }
-          }
-        end
-
-        def source
-          @source ||= RSpecHelpers.fixtures_path.to_s
-        end
-      end.new
-    end
-
-    context "#assets" do
-      subject { site.assets }
-      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
-            Proc.new do
-              site.assets["should_fail.css"]
-            end.should 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)
-          end
-
-          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"]
-
-            site.static_files.include?(asset).should be_true
-          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 "#asset_path" do
-      subject { site.asset_path "app.css" }
-
-      context "with none cachebust" do
-        before { site.assets_config.cachebust = :none }
-        it { should 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}$}) }
-      end
-
-      context "with hard cachebust" do
-        before { site.assets_config.cachebust = :hard }
-        it { should 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
-          expect { site.asset_path "app.css" }.to raise_error
-        end
-      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.sources.should include "foobar"
-      end
-    end
-
-
-    it "should regenerate assets upon multiple #process" do
-      @site.assets_config.cachebust = :none
-      2.times { @site.process }
-
-      @dest.join("assets", "app.css").exist?.should be_true
-    end
-
-    context "#gzip" do
-      subject { site.assets_config }
-
-      it "should generate 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
-      end
-
-      it "should 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
-      end
-
-    end
-
-    it "should be included into Jekyll::Site" do
-      Jekyll::Site.included_modules.should include SitePatch
-    end
-  end
-end