jekyll-asset-pipeline 0.1.2 → 0.1.3

data/lib/jekyll_asset_pipeline.rb

@@ -32,7 +32,6 @@ 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'
-require 'jekyll_asset_pipeline/cache'
 require 'jekyll_asset_pipeline/pipeline'
 
 module JekyllAssetPipeline

data/lib/jekyll_asset_pipeline/compressor.rb

@@ -4,12 +4,7 @@ module JekyllAssetPipeline
 
     def initialize(content)
       @content = content
-      begin
-        @compressed = self.compress
-      rescue Exception => e
-        puts "Failed to compress asset with '#{self.class.to_s}'."
-        raise e
-      end
+      @compressed = self.compress
     end
 
     # Returns compressed content

data/lib/jekyll_asset_pipeline/converter.rb

@@ -5,12 +5,7 @@ module JekyllAssetPipeline
     def initialize(asset)
       @content = asset.content
       @type = File.extname(asset.filename).downcase
-      begin
-        @converted = self.convert
-      rescue Exception => e
-        puts "Failed to convert asset '#{asset.filename}'."
-        raise e
-      end
+      @converted = self.convert
     end
 
     def converted

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

@@ -11,7 +11,7 @@ module JekyllAssetPipeline
           original_return_val = old_cleanup_method.bind(self).call()
 
           # Clear Jekyll Asset Pipeline cache
-          JekyllAssetPipeline::Cache.clear
+          Pipeline.clear_cache
 
           original_return_val
         end

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

@@ -11,42 +11,25 @@ module JekyllAssetPipeline
     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
+      # Run Jekyll Asset Pipeline
+      pipeline, cached = Pipeline.run(@nodelist.first, @markup.strip, site.source,
+        site.dest, self.class.tag_name, self.class.output_type, config)
 
-        # Prevent Jekyll from cleaning up saved assets
+      if pipeline.is_a?(Pipeline)
+        # Prevent Jekyll from cleaning up saved assets if new pipeline
         pipeline.assets.each do |asset|
-          puts "Asset Pipeline: Saved '#{asset.filename}' to '#{site.dest}/#{asset.output_path}'"
-          site.static_files << JekyllAssetPipeline::StaticAssetFile.new(site, site.dest, asset.output_path, asset.filename)
-        end
+          site.static_files << StaticAssetFile.new(site, site.dest,
+            asset.output_path, asset.filename)
+        end unless cached
 
-        # Cache pipeline
-        JekyllAssetPipeline::Cache.add(hash, pipeline)
-
-        # Return HTML tags pointing to assets
+        # Return HTML tag pointing to asset
         return pipeline.html
+      else
+        # Return nothing
+        return nil
       end
     end
   end

data/lib/jekyll_asset_pipeline/pipeline.rb

@@ -1,5 +1,69 @@
 module JekyllAssetPipeline
   class Pipeline
+    class << self
+      # Generate hash based on manifest
+      def hash(source, manifest, options = {})
+        options = 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 "Failed to generate hash from provided manifest."
+          raise e
+        end
+      end
+
+      # Run pipeline
+      def run(manifest, prefix, source, destination, tag, type, config)
+        # Get hash for pipeline
+        hash = hash(source, manifest, config)
+
+        # Check if pipeline has been cached
+        if cache.has_key?(hash)
+          # Return cached pipeline and cached status
+          return cache[hash], true
+        else
+          begin
+            puts "Processing '#{tag}' manifest '#{prefix}'"
+
+            # Create and process new pipeline
+            pipeline = self.new(manifest, prefix, source, destination, type, config)
+            pipeline.assets.each do |asset|
+              puts "Saved '#{asset.filename}' to '#{destination}/#{asset.output_path}'"
+            end
+
+            # Add processed pipeline to cache
+            cache[hash] = pipeline
+
+            # Return newly processed pipeline and cached status
+            return pipeline, false
+          rescue Exception => e
+            # Add exception to cache
+            cache[hash] = e
+
+            # Re-raise the exception
+            raise e
+          end
+        end
+      end
+
+      # Cache processed pipelines
+      def cache
+        @cache ||= {}
+      end
+
+      # Empty cache
+      def clear_cache
+        @cache = {}
+      end
+
+      # Add prefix to output
+      def puts(message)
+        $stdout.puts("Asset Pipeline: #{message}")
+      end
+    end
+
     # Initialize new pipeline
     def initialize(manifest, prefix, source, destination, type, options = {})
       @manifest = manifest
@@ -8,10 +72,14 @@ module JekyllAssetPipeline
       @destination = destination
       @type = type
       @options = JekyllAssetPipeline::DEFAULTS.merge(options)
+
+      process
     end
 
     attr_reader :assets, :html
 
+    private
+
     # Process the pipeline
     def process
       collect
@@ -23,21 +91,6 @@ module JekyllAssetPipeline
       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
@@ -154,7 +207,7 @@ module JekyllAssetPipeline
       @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
+        end.sort! { |x, y| x.priority <=> y.priority }.last
 
         html = klass.new(path, asset.filename).html unless klass.nil?
 

data/lib/jekyll_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module JekyllAssetPipeline
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-31 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.10.0
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :development
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
 description: Adds asset preprocessing (CoffeeScript, Sass, Less, ERB, etc.) and asset
@@ -84,7 +84,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - 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/extensions/jekyll/site.rb

data/lib/jekyll_asset_pipeline/cache.rb

@@ -1,21 +0,0 @@
-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
-
-    def self.clear
-      @cache = {}
-    end
-  end
-end