jekyll-asset-pipeline 0.0.5 → 0.1.0

data/README.md

@@ -2,8 +2,6 @@
 
 [Jekyll Asset Pipeline](http://www.matthodan.com/2012/11/22/jekyll-asset-pipeline.html) is a powerful asset pipeline that automatically collects, converts and compresses/minifies your site's JavaScript and CSS assets when you compile your Jekyll site.
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/matthodan/jekyll-asset-pipeline)
-
 ## Table of Contents
 
 - [Features](#features)
@@ -72,8 +70,10 @@ Jekyll Asset Pipeline is extremely easy to add to your Jekyll project and has no
 5. Run the `jekyll` command to compile your site.  You should see an output that includes the following Jekyll Asset Pipeline status messages.
 
   ``` bash
-  Asset Pipeline: Compiling bundle... compiled 'global-md5hash.css'.
-  Asset Pipeline: Compiling bundle... compiled 'global-md5hash.js'.
+  Asset Pipeline: Processing 'css_asset_tag' manifest 'global'
+  Asset Pipeline: Saved 'global-md5hash.css' to '_site/assets'
+  Asset Pipeline: Processing 'javascript_asset_tag' manifest 'global'
+  Asset Pipeline: Saved 'global-md5hash.js' to '_site/assets'
   ```
 
   > *If you do not see these messages, check that you have __not__ set Jekyll's "safe" option to "true" in your site's "_config.yml".  If the "safe" option is set to "true", Jekyll will not run plugins.*
@@ -94,11 +94,11 @@ In the following example, we will add a preprocessor that converts CoffeeScript
   module JekyllAssetPipeline
       class CoffeeScriptConverter < JekyllAssetPipeline::Converter
         require 'coffee-script'
-        
+
         def self.filetype
           '.coffee'
         end
-        
+
         def convert
           return CoffeeScript.compile(@content)
         end
@@ -139,9 +139,14 @@ module JekyllAssetPipeline
   end
 end
 ```
-
 > *Don't forget to install the "sass" gem before you run the `jekyll` command since the above SASS converter requires the "sass" library as a dependency.*
 
+### Successive Preprocessing
+
+If you would like to run an asset through multiple preprocessors successively, you can do so by naming your assets with nested file extensions.  Nest the extensions in the order (right to left) that the asset should be processed.  For example, `.css.scss.erb` would first be processed by an "erb" preprocessor then by a "scss" preprocessor before being rendered.  This convention is very similar to the convention used by the [Ruby on Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html#preprocessing).  
+
+> *Don't forget to define preprocessors for the extensions you use in your filenames, otherwise Jekyll Asset Pipeline will not process your asset.*
+
 ## Asset Compression
 
 Asset compression allows us to decrease the size of our assets and increase the speed of our site.  One of Jekyll Asset Pipeline's key strengths is that it works with __any__ compression library that has a ruby wrapper.  Adding asset compression is straightforward, but requires a small amount of additional code.
@@ -245,28 +250,39 @@ That is it!  Your asset pipeline used your template to generate an HTML "link" t
 
 ## Configuration
 
-Jekyll Asset Pipeline provides the following two configuration options that can be controlled by adding the following to the end of your project's "\_config.yml" file.
+Jekyll Asset Pipeline provides the following configuration options that can be controlled by adding the following to the end of your project's "\_config.yml" file.
 
 ``` yaml
 asset_pipeline:
+  bundle: true            # Default = true
   compress: true          # Default = true
   output_path: assets     # Default = assets
+  gzip: false             # Default = false
 ```
 
 > *If you don't have a "\_config.yml" file, consider reading the [configuration section](https://github.com/mojombo/jekyll/wiki/Configuration) of the Jekyll documentation.*
-
-> The "compress" setting tells Jekyll Asset Pipeline whether or not to compress the bundled assets.  It is useful to set this setting to "false" while you are debugging your site's JavaScript.  The "output\_path" setting defines where generated bundles should be saved within the "\_site" folder of your project.
+>
+> - The "bundle" setting controls whether Jekyll Asset Pipeline bundles the assets defined in each manifest.  If "bundle" is set to false, each asset will be saved individually and individual html tags pointing to each unbundled asset will be produced when you compile your site.  It is useful to set this to false while you are debugging your site.
+> - The "compress" setting tells Jekyll Asset Pipeline whether or not to compress the bundled assets.  It is useful to set this setting to "false" while you are debugging your site.
+> - The "output\_path" setting defines where generated bundles should be saved within the "\_site" folder of your project.
+> - The "gzip" setting controls whether Jekyll Asset Pipeline saves gzipped versions of your assets alongside un-gzipped versions.
 
 ## Contribute
 
 You can contribute to the Jekyll Asset Pipeline by submitting a pull request [via GitHub](https://github.com/matthodan/jekyll-asset-pipeline).  I have identified the following areas for improvement:
 
-- __Tests, tests, tests.__  I'm embarrassed to say that I didn't write a single test while building Jekyll Asset Pipeline.  This started as a hack for my blog and quickly grew into a library as I tweaked it to support my own needs.
-- __Handle remote assets.__ Right now, Jekyll Asset Pipeline does not provide any way to include remote assets in bundles unless you save them locally before generating your site.  Moshen's [Jekyll Asset Bundler](https://github.com/moshen/jekyll-asset_bundler) allows you to include remote assets, which I thought was pretty interesting.  That said, I think it is generally better to keep remote assets separate so that they load asynchronously.
-- __Successive preprocessing.__ Currently you can only preprocess a file once.  It would be better if you could run an asset through multiple preprocessors before it gets compressed and bundled.
+- __Tests, tests, tests.__  I'm embarrassed to say that I didn't write a single test while building Jekyll Asset Pipeline.  This started as a hack for my blog and quickly grew into a library as I tweaked it to support my own needs.  **This project is now fully tested.**
+- __Handle remote assets.__ Right now, Jekyll Asset Pipeline does not provide any way to include remote assets in bundles unless you save them locally before generating your site.  Moshen's [Jekyll Asset Bundler](https://github.com/moshen/jekyll-asset_bundler) allows you to include remote assets, which I thought was pretty interesting.  That said, I think it is generally better to keep remote assets separate so that they load asynchronously.  **After some thought, I've decided that this is not a priority.  If you disagree, let me know.**
+- __Successive preprocessing.__ Currently you can only preprocess a file once.  It would be better if you could run an asset through multiple preprocessors before it gets compressed and bundled.  **As of v0.1.0, Jekyll Asset Pipeline now supports successive preprocessing.**
 
 Feel free to message me on [Twitter](http://twitter.com/matthodan) or [Facebook](http://facebook.com/matthodan).
 
+## Code Status
+
+- [![Build Status](https://secure.travis-ci.org/matthodan/jekyll-asset-pipeline.png)](https://travis-ci.org/matthodan/jekyll-asset-pipeline)
+- [![Dependency Status](https://gemnasium.com/matthodan/jekyll-asset-pipeline.png)](https://gemnasium.com/matthodan/jekyll-asset-pipeline)
+- [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/matthodan/jekyll-asset-pipeline)
+
 ## Credits
 
 As I was building Jekyll Asset Pipeline, I came across a number of tools that I was able to draw inspiration and best practices from, but one stood out in particular...  I have to give credit to [Moshen](https://github.com/moshen/) for creating the [Jekyll Asset Bundler](https://github.com/moshen/jekyll-asset_bundler).

data/lib/jekyll_asset_pipeline.rb

@@ -3,31 +3,43 @@ require 'digest/md5'
 require 'fileutils'
 require 'time'
 require 'yaml'
+require 'zlib'
 
 # Third-party dependencies
 require 'jekyll'
 require 'liquid'
 
 # Jekyll extensions
+require 'jekyll_asset_pipeline/extensions/jekyll/static_file_extensions'
+require 'jekyll_asset_pipeline/extensions/jekyll/static_asset_file'
+
+# Liquid extensions
+require 'jekyll_asset_pipeline/extensions/liquid/liquid_block_extensions'
+require 'jekyll_asset_pipeline/extensions/liquid/asset_tag'
+require 'jekyll_asset_pipeline/extensions/liquid/asset_tags/css_asset_tag'
+require 'jekyll_asset_pipeline/extensions/liquid/asset_tags/javascript_asset_tag'
+
+# Ruby extensions
+require 'jekyll_asset_pipeline/extensions/ruby/subclass_tracking'
+
+# Jekyll Asset Pipeline
 require 'jekyll_asset_pipeline/version'
-require 'jekyll_asset_pipeline/extendable'
-require 'jekyll_asset_pipeline/asset_file'
-require 'jekyll_asset_pipeline/bundler'
-require 'jekyll_asset_pipeline/compressor'
+require 'jekyll_asset_pipeline/asset'
 require 'jekyll_asset_pipeline/converter'
+require 'jekyll_asset_pipeline/compressor'
 require 'jekyll_asset_pipeline/template'
 require 'jekyll_asset_pipeline/templates/javascript_tag_template'
 require 'jekyll_asset_pipeline/templates/css_tag_template'
-
-# Liquid extensions
-require 'jekyll_asset_pipeline/css_asset_tag'
-require 'jekyll_asset_pipeline/javascript_asset_tag'
+require 'jekyll_asset_pipeline/cache'
+require 'jekyll_asset_pipeline/pipeline'
 
 module JekyllAssetPipeline
   # Default configuration settings for Jekyll Asset Bundler
   # Strings used for keys to play nice when merging with _config.yml
   DEFAULTS = {
     'output_path'   => 'assets',    # Destination for bundle file (within the '_site' directory)
-    'compress'      => true         # true = Compress assets, false = Leave assets uncompressed
+    'bundle'        => true,        # true = Bundle assets, false = Leave assets unbundled
+    'compress'      => true,        # true = Minify assets, false = Leave assets unminified
+    'gzip'          => false        # true = Create gzip versions, false = Do not create gzip versions
   }
 end

data/lib/jekyll_asset_pipeline/asset.rb

@@ -0,0 +1,10 @@
+module JekyllAssetPipeline
+  class Asset
+    def initialize(content, filename)
+      @content = content
+      @filename = filename
+    end
+
+    attr_accessor :content, :filename, :output_path
+  end
+end

data/lib/jekyll_asset_pipeline/cache.rb

@@ -0,0 +1,17 @@
+module JekyllAssetPipeline
+  class Cache
+    @@cache = {}
+
+    def self.add(key, value)
+      @@cache[key] = value
+    end
+
+    def self.has_key?(key)
+      @@cache.has_key?(key)
+    end
+
+    def self.get(key)
+      @@cache[key]
+    end
+  end
+end

data/lib/jekyll_asset_pipeline/compressor.rb

@@ -1,5 +1,7 @@
 module JekyllAssetPipeline
-  class Compressor < JekyllAssetPipeline::Extendable
+  class Compressor
+    extend JekyllAssetPipeline::SubclassTracking
+
     def initialize(content)
       @content = content
       begin

data/lib/jekyll_asset_pipeline/converter.rb

@@ -1,13 +1,14 @@
 module JekyllAssetPipeline
-  class Converter < JekyllAssetPipeline::Extendable
-    def initialize(file)
-      @file = file
-      @content = file.read
-      @type = File.extname(@file).downcase
+  class Converter
+    extend JekyllAssetPipeline::SubclassTracking
+
+    def initialize(asset)
+      @content = asset.content
+      @type = File.extname(asset.filename).downcase
       begin
         @converted = self.convert
       rescue Exception => e
-        puts "Failed to convert asset '#{@file.path}'."
+        puts "Failed to convert asset '#{asset.filename}'."
         raise e
       end
     end

data/lib/jekyll_asset_pipeline/extensions/jekyll/static_asset_file.rb

@@ -0,0 +1,5 @@
+module JekyllAssetPipeline
+  class StaticAssetFile < ::Jekyll::StaticFile
+    include JekyllAssetPipeline::JekyllStaticFileExtensions
+  end
+end

data/lib/jekyll_asset_pipeline/{asset_file.rb → extensions/jekyll/static_file_extensions.rb}

@@ -1,5 +1,5 @@
 module JekyllAssetPipeline
-  class AssetFile < Jekyll::StaticFile
+  module JekyllStaticFileExtensions
     # Override #write method since the asset file is dynamically created
     def write(dest)
       true

data/lib/jekyll_asset_pipeline/extensions/liquid/asset_tag.rb

@@ -0,0 +1,6 @@
+module JekyllAssetPipeline
+  class AssetTag < ::Liquid::Block
+    extend JekyllAssetPipeline::LiquidBlockExtensions::ClassMethods
+    include JekyllAssetPipeline::LiquidBlockExtensions
+  end
+end

data/lib/jekyll_asset_pipeline/extensions/liquid/asset_tags/css_asset_tag.rb

@@ -0,0 +1,14 @@
+module JekyllAssetPipeline
+  class CssAssetTag < JekyllAssetPipeline::AssetTag
+    def self.tag_name
+      'css_asset_tag'
+    end
+
+    def self.output_type
+      '.css'
+    end
+  end
+
+  # Register CssAssetTag tag with Liquid
+  ::Liquid::Template.register_tag(JekyllAssetPipeline::CssAssetTag.tag_name, JekyllAssetPipeline::CssAssetTag)
+end

data/lib/jekyll_asset_pipeline/extensions/liquid/asset_tags/javascript_asset_tag.rb

@@ -0,0 +1,14 @@
+module JekyllAssetPipeline
+  class JavaScriptAssetTag < JekyllAssetPipeline::AssetTag
+    def self.tag_name
+      'javascript_asset_tag'
+    end
+
+    def self.output_type
+      '.js'
+    end
+  end
+
+  # Register JavaScriptAssetTag tag with Liquid
+  ::Liquid::Template.register_tag(JekyllAssetPipeline::JavaScriptAssetTag.tag_name, JekyllAssetPipeline::JavaScriptAssetTag)
+end

data/lib/jekyll_asset_pipeline/extensions/liquid/liquid_block_extensions.rb

@@ -0,0 +1,53 @@
+module JekyllAssetPipeline
+  module LiquidBlockExtensions
+    module ClassMethods
+      def output_type
+        ''
+      end
+
+      def tag_name
+        ''
+      end
+    end
+
+    def render(context)
+      # Get YAML manifest from Liquid block
+      manifest = @nodelist.first
+      prefix = @markup.lstrip.rstrip
+
+      # Get site instance from Jekyll
+      site = context.registers[:site]
+
+      # Initialize configuration hash
+      config = site.config['asset_pipeline'] || {}
+
+      # Generate hash based on asset last modified dates and config options
+      hash = JekyllAssetPipeline::Pipeline.hash(site.source, manifest, config)
+
+      # Fetch pipeline from cache if recently processed
+      if JekyllAssetPipeline::Cache.has_key?(hash)
+        pipeline = JekyllAssetPipeline::Cache.get(hash)
+
+        # Return HTML tags pointing to assets
+        return pipeline.html
+      else
+        # Create pipeline and process assets
+        puts "Asset Pipeline: Processing '#{self.class.tag_name}' manifest '#{prefix}'"
+        pipeline = JekyllAssetPipeline::Pipeline.new(manifest, prefix, site.source, site.dest, self.class.output_type, config)
+        pipeline.process
+
+        # Prevent Jekyll from cleaning up saved assets
+        pipeline.assets.each do |asset|
+          puts "Asset Pipeline: Saved '#{asset.filename}' to '_site/#{asset.output_path}'"
+          site.static_files << JekyllAssetPipeline::StaticAssetFile.new(site, site.dest, asset.output_path, asset.filename)
+        end
+
+        # Cache pipeline
+        JekyllAssetPipeline::Cache.add(hash, pipeline)
+
+        # Return HTML tags pointing to assets
+        return pipeline.html
+      end
+    end
+  end
+end

data/lib/jekyll_asset_pipeline/{extendable.rb → extensions/ruby/subclass_tracking.rb}

@@ -1,12 +1,12 @@
 module JekyllAssetPipeline
-  class Extendable
+  module SubclassTracking
     # Record subclasses of this class (this method is automatically called by ruby)
-    def self.inherited(base)
+    def inherited(base)
       subclasses << base
     end
 
     # Return an array of classes that are subclasses of this object
-    def self.subclasses
+    def subclasses
       @subclasses ||= []
     end
   end

data/lib/jekyll_asset_pipeline/pipeline.rb

@@ -0,0 +1,165 @@
+module JekyllAssetPipeline
+  class Pipeline
+    # Initialize new pipeline
+    def initialize(manifest, prefix, source, destination, type, options = {})
+      @manifest = manifest
+      @prefix = prefix
+      @source = source
+      @destination = destination
+      @type = type
+      @options = JekyllAssetPipeline::DEFAULTS.merge(options)
+    end
+
+    attr_reader :assets, :html
+
+    # Process the pipeline
+    def process
+      collect
+      convert
+      bundle if @options['bundle']
+      compress if @options['compress']
+      gzip if @options['gzip']
+      save
+      markup
+    end
+
+    # Generate hash based on manifest contents
+    def self.hash(source, manifest, options = {})
+      options = JekyllAssetPipeline::DEFAULTS.merge(options)
+      begin
+        Digest::MD5.hexdigest(YAML::load(manifest).map! do |path|
+          "#{path}#{File.mtime(File.join(source, path)).to_i}"
+        end.join.concat(options.to_s))
+      rescue Exception => e
+        puts "Asset Pipeline: Failed to generate hash from provided manifest."
+        raise e
+      end
+    end
+
+    private
+
+    # Collect assets based on manifest
+    def collect
+      begin
+        @assets = YAML::load(@manifest).map! do |path|
+          File.open(File.join(@source, path)) do |file|
+            JekyllAssetPipeline::Asset.new(file.read, File.basename(path))
+          end
+        end
+      rescue Exception => e
+        puts "Asset Pipeline: Failed to load assets from provided manifest."
+        raise e
+      end
+    end
+
+    # Convert assets based on the file extension if converter is defined
+    def convert
+      @assets.each do |asset|
+        # Convert asset multiple times if more than one converter is found
+        finished = false
+        while finished == false
+          # Find a converter to use
+          klass = JekyllAssetPipeline::Converter.subclasses.select do |c|
+            c.filetype == File.extname(asset.filename).downcase
+          end.last
+
+          # Convert asset if converter is found
+          unless klass.nil?
+            begin
+              # Convert asset content
+              converter = klass.new(asset)
+
+              # Replace asset content and filename
+              asset.content = converter.converted
+              asset.filename = File.basename(asset.filename, '.*')
+
+              # Add back the output extension if no extension left
+              asset.filename = "#{asset.filename}#{@type}" if File.extname(asset.filename) == ''
+            rescue Exception => e
+              puts "Asset Pipeline: Failed to convert '#{asset.filename}' with '#{klass.to_s}'."
+              raise e
+            end
+          else
+            finished = true
+          end
+        end
+      end
+    end
+
+    # Bundle multiple assets into a single asset
+    def bundle
+      content = @assets.map do |a|
+        a.content
+      end.join("\n")
+
+      hash = JekyllAssetPipeline::Pipeline.hash(@source, @manifest, @options)
+      @assets = [JekyllAssetPipeline::Asset.new(content, "#{@prefix}-#{hash}#{@type}")]
+    end
+
+    # Compress assets if compressor is defined
+    def compress
+      @assets.each do |asset|
+        # Find a compressor to use
+        klass = JekyllAssetPipeline::Compressor.subclasses.select do |c|
+          c.filetype == @type
+        end.last
+
+        unless klass.nil?
+          begin
+            asset.content = klass.new(asset.content).compressed
+          rescue Exception => e
+            puts "Asset Pipeline: Failed to compress '#{asset.filename}' with '#{klass.to_s}'."
+            raise e
+          end
+        end
+      end
+    end
+
+    # Create Gzip versions of assets
+    def gzip
+      @assets.map! do |asset|
+        gzip_content = Zlib::Deflate.deflate(asset.content)
+        [asset, JekyllAssetPipeline::Asset.new(gzip_content, "#{asset.filename}.gz")]
+      end.flatten!
+    end
+
+    # Save assets to file
+    def save
+      output_path = @options['output_path']
+
+      @assets.each do |asset|
+        # Create directories if necessary
+        directory = File.join(@destination, output_path)
+        FileUtils::mkpath(directory) unless File.directory?(directory)
+
+        begin
+          # Save file to disk
+          File.open(File.join(directory, asset.filename), 'w') do |file|
+            file.write(asset.content)
+          end
+        rescue Exception => e
+          puts "Asset Pipeline: Failed to save '#{asset.filename}' to disk."
+          raise e
+        end
+
+        # Store output path of saved file
+        asset.output_path = output_path
+      end
+    end
+
+    # Generate html markup pointing to assets
+    def markup
+      path = @options['output_path']
+
+      @html = @assets.map do |asset|
+        klass = JekyllAssetPipeline::Template.subclasses.select do |t|
+          t.filetype == File.extname(asset.filename).downcase
+        end.sort! { |x, y| y.priority <=> x.priority }.last
+
+        html = klass.new(path, asset.filename).html unless klass.nil?
+
+        html
+      end.join
+    end
+  end
+end

data/lib/jekyll_asset_pipeline/template.rb

@@ -1,5 +1,7 @@
 module JekyllAssetPipeline
-  class Template < JekyllAssetPipeline::Extendable
+  class Template
+    extend JekyllAssetPipeline::SubclassTracking
+
     def initialize(path, filename)
       @path = path
       @filename = filename

data/lib/jekyll_asset_pipeline/templates/css_tag_template.rb

@@ -5,12 +5,12 @@ module JekyllAssetPipeline
       '.css'
     end
 
-    def html
-      "<link href='/#{@path}/#{@filename}' rel='stylesheet' type='text/css' />\n"
+    def self.priority
+      -1
     end
 
-    def priority
-      -1
+    def html
+      "<link href='/#{@path}/#{@filename}' rel='stylesheet' type='text/css' />\n"
     end
   end
 end

data/lib/jekyll_asset_pipeline/templates/javascript_tag_template.rb

@@ -5,12 +5,12 @@ module JekyllAssetPipeline
       '.js'
     end
 
-    def html
-      "<script src='/#{@path}/#{@filename}' type='text/javascript'></script>\n"
+    def self.priority
+      -1
     end
 
-    def priority
-      -1
+    def html
+      "<script src='/#{@path}/#{@filename}' type='text/javascript'></script>\n"
     end
   end
 end

data/lib/jekyll_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module JekyllAssetPipeline
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -64,7 +64,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :development
@@ -72,25 +72,29 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.3'
-description: Jekyll Asset Pipeline adds asset preprocessing (CoffeeScript, Sass, Less,
-  ERB, etc.), asset compression/minification (Yahoo YUI Compressor, Google Closure
-  Compiler, etc.) to Jekyll.  Jekyll Asset Pipeline can be extended to support any
-  preprocessing or compression library.
+description: Adds asset preprocessing (CoffeeScript, Sass, Less, ERB, etc.), asset
+  compression/minification/gzip (Yahoo YUI Compressor, Google Closure Compiler, etc.)
+  to Jekyll.
 email: matthew.c.hodan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/jekyll_asset_pipeline/asset_file.rb
-- lib/jekyll_asset_pipeline/bundler.rb
+- lib/jekyll_asset_pipeline/asset.rb
+- lib/jekyll_asset_pipeline/cache.rb
 - lib/jekyll_asset_pipeline/compressor.rb
 - lib/jekyll_asset_pipeline/converter.rb
-- lib/jekyll_asset_pipeline/css_asset_tag.rb
-- lib/jekyll_asset_pipeline/extendable.rb
-- lib/jekyll_asset_pipeline/javascript_asset_tag.rb
+- lib/jekyll_asset_pipeline/extensions/jekyll/static_asset_file.rb
+- lib/jekyll_asset_pipeline/extensions/jekyll/static_file_extensions.rb
+- lib/jekyll_asset_pipeline/extensions/liquid/asset_tag.rb
+- lib/jekyll_asset_pipeline/extensions/liquid/asset_tags/css_asset_tag.rb
+- lib/jekyll_asset_pipeline/extensions/liquid/asset_tags/javascript_asset_tag.rb
+- lib/jekyll_asset_pipeline/extensions/liquid/liquid_block_extensions.rb
+- lib/jekyll_asset_pipeline/extensions/ruby/subclass_tracking.rb
+- lib/jekyll_asset_pipeline/pipeline.rb
 - lib/jekyll_asset_pipeline/template.rb
 - lib/jekyll_asset_pipeline/templates/css_tag_template.rb
 - lib/jekyll_asset_pipeline/templates/javascript_tag_template.rb

data/lib/jekyll_asset_pipeline/bundler.rb

@@ -1,150 +0,0 @@
-module JekyllAssetPipeline
-  class Bundler
-    def initialize(site, prefix, manifest, type)
-      @site = site
-      @prefix = prefix
-      @manifest = manifest
-      @type = type
-
-      # Initialize configuration hash
-      overrides = @site.config['asset_pipeline']
-      if overrides.is_a? Hash
-        @config = JekyllAssetPipeline::DEFAULTS.merge(overrides)
-      else
-        @config = JekyllAssetPipeline::DEFAULTS
-      end
-
-      self.process
-    end
-
-    # Bundle assets into new file or fetch previously bundled file from cache
-    def process
-      @@cache ||= {}
-
-      self.extract
-      self.collect
-      self.hashify
-
-      if @@cache.has_key?(@hash)
-        print "Asset Pipeline: Using cached bundle..."
-        @file = @@cache[@hash]
-
-        # Prevent Jekyll from cleaning up bundle file
-        @site.static_files << JekyllAssetPipeline::AssetFile.new(@site, @site.dest, @config['output_path'], filename)
-        puts " used '#{@prefix}-#{@hash[0, 6]}#{@type}'."
-      else
-        print "Asset Pipeline: Compiling bundle..."
-
-        # Create directories if necessary
-        path = "#{@site.dest}/#{@config['output_path']}"
-        FileUtils::mkpath(path) unless File.directory?(path)
-
-        # Create bundle file
-        self.convert
-        self.bundle
-        self.compress if @config['compress']
-
-        @file = File.new(File.join(@site.dest, @config['output_path'], filename), "w")
-        @file.write(@bundled)
-        @file.close
-
-        # Prevent Jekyll from cleaning up bundle file
-        @site.static_files << JekyllAssetPipeline::AssetFile.new(@site, @site.dest, @config['output_path'], filename)
-
-        # Save generated file to cache
-        @@cache[@hash] = @file
-
-        puts " compiled '#{@prefix}-#{@hash[0, 6]}#{@type}'."
-      end
-    end
-
-    # Extract asset paths from YAML manifest
-    def extract
-      begin
-        @assets = YAML::load(@manifest)
-      rescue Exception => e
-        puts "Asset Pipeline: Failed to read YAML manifest."
-        raise e
-      end
-    end
-
-    # Collect assets from various sources
-    def collect
-      @assets.map! do |path|
-        begin
-          file = File.open(File.join(@site.source, path))
-        rescue Exception => e
-          puts "Asset Pipeline: Failed to open asset file."
-          raise e
-        end
-        file
-      end
-    end
-
-    # Generate a hash id based on asset file paths and last modified dates
-    def hashify
-      payload = @assets.map do |file|
-        "#{file.path}-#{@config['compress'].to_s}-#{file.mtime.to_i.to_s}"
-      end
-      @hash = Digest::MD5.hexdigest(payload.join)
-    end
-
-    # Search for a Converter to use to convert a file based on the file extension
-    def convert
-      @assets.map! do |file|
-        converter_klass = JekyllAssetPipeline::Converter.subclasses.select do |c|
-          c.filetype == File.extname(file).downcase
-        end.last
-
-        converted = nil
-        unless converter_klass.nil?
-          converter = converter_klass.new(file)
-          converted = converter.converted
-        else
-          converted = file.read
-        end
-        converted
-      end
-    end
-
-    # Bundle all of the separate asset files into one big file
-    def bundle
-      @bundled = @assets.join("\n")
-    end
-
-    # Search for a Compressor to use to compress a file based on the output type
-    def compress
-      compressor_klass = JekyllAssetPipeline::Compressor.subclasses.select do |c|
-        c.filetype == @type
-      end.last
-
-      unless compressor_klass.nil?
-        compressor = compressor_klass.new(@bundled)
-        @bundled = compressor.compressed
-      end
-    end
-
-    # Return filename of bundle
-    def filename
-      "#{@prefix}-#{@hash}#{@type}"
-    end
-
-    # Return an HTML tag that points to the bundle file
-    def html_tag
-      path = @config['output_path']
-
-      template_klass = JekyllAssetPipeline::Template.subclasses.select do |t|
-        t.filetype == @type
-      end.sort! { |a, b| b.priority <=> a.priority }.last
-
-      template = nil
-      unless template_klass.nil?
-        template = template_klass.new(path, filename)
-        @html_tag = template.html
-      else
-        # Return link to file if no template exists
-        return "<a href='/#{path}/#{filename}'>AssetPipeline: No template available for '#{filename}'</a>"
-      end
-    end
-  end
-end

data/lib/jekyll_asset_pipeline/css_asset_tag.rb

@@ -1,19 +0,0 @@
-module JekyllAssetPipeline
-  class CssAssetTag < Liquid::Block
-    def render(context)
-      # Get YAML manifest from Liquid block
-      manifest = @nodelist.first
-      prefix = @markup.lstrip.rstrip
-
-      # Compile bundle based on manifest
-      site = context.registers[:site]
-      bundle = JekyllAssetPipeline::Bundler.new(site, prefix, manifest, '.css')
-
-      # Return HTML tag linked to bundle
-      return bundle.html_tag
-    end
-  end
-
-  # Register CssAssetTag tag with Liquid
-  Liquid::Template.register_tag('css_asset_tag', JekyllAssetPipeline::CssAssetTag)
-end

data/lib/jekyll_asset_pipeline/javascript_asset_tag.rb

@@ -1,19 +0,0 @@
-module JekyllAssetPipeline
-  class JavaScriptAssetTag < Liquid::Block
-    def render(context)
-      # Get YAML manifest from Liquid block
-      manifest = @nodelist.first
-      prefix = @markup.lstrip.rstrip
-
-      # Compile bundle based on manifest
-      site = context.registers[:site]
-      bundle = JekyllAssetPipeline::Bundler.new(site, prefix, manifest, '.js')
-
-      # Return HTML tag linked to bundle
-      return bundle.html_tag
-    end
-  end
-
-  # Register JavaScriptAssetTag tag with Liquid
-  Liquid::Template.register_tag('javascript_asset_tag', JekyllAssetPipeline::JavaScriptAssetTag)
-end