jekyll-asset-pipeline 0.1.4 → 0.1.5

data/lib/jekyll_asset_pipeline.rb

@@ -10,8 +10,6 @@ require 'jekyll'
 require 'liquid'
 
 # Jekyll extensions
-require 'jekyll_asset_pipeline/extensions/jekyll/static_file_extensions'
-require 'jekyll_asset_pipeline/extensions/jekyll/static_asset_file'
 require 'jekyll_asset_pipeline/extensions/jekyll/site_extensions'
 require 'jekyll_asset_pipeline/extensions/jekyll/site'
 
@@ -37,11 +35,20 @@ require 'jekyll_asset_pipeline/pipeline'
 module JekyllAssetPipeline
   # Default configuration settings for Jekyll Asset Pipeline
   # Strings used for keys to play nice when merging with _config.yml
+  #
+  # 'output_path'       Destination for bundle file (within the '_site' directory)
+  # 'display_path'      Optional.  Override path to assets for output HTML refs
+  # 'staging_path'      Destination for staged assets (within project root directory)
+  # 'bundle'            true = Bundle assets, false = Leave assets unbundled
+  # 'compress'          true = Minify assets, false = Leave assets unminified
+  # 'gzip'              true = Create gzip versions, false = Do not create gzip versions
+  #
   DEFAULTS = {
-    'output_path'   => 'assets',    # Destination for bundle file (within the '_site' directory)
-    'display_path'  => nil,         # Optional.  Override path to assets for output HTML refs
-    '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
+    'output_path'   => 'assets',
+    'display_path'  => nil,
+    'staging_path'  => '.asset_pipeline',
+    'bundle'        => true,
+    'compress'      => true,
+    'gzip'          => false
   }
 end

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

@@ -15,6 +15,21 @@ module JekyllAssetPipeline
 
           original_return_val
         end
+
+        # Store the original Jekyll::Site#write method
+        old_write_method = instance_method(:write)
+
+        # Override Jekyll::Site#write
+        define_method(:write) do
+          # Run the Jekyll::Site#write method
+          original_return_value = old_write_method.bind(self).call()
+
+          # Clear Jekyll Asset Pipeline staged assets
+          config = self.config['asset_pipeline'] || {}
+          Pipeline.remove_staged_assets(self.source, config)
+
+          original_return_value
+        end
       end
     end
   end

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

@@ -21,7 +21,8 @@ module JekyllAssetPipeline
       if pipeline.is_a?(Pipeline)
         # Prevent Jekyll from cleaning up saved assets if new pipeline
         pipeline.assets.each do |asset|
-          site.static_files << StaticAssetFile.new(site, site.dest,
+          config = JekyllAssetPipeline::DEFAULTS.merge(config)
+          site.static_files << Jekyll::StaticFile.new(site, config['staging_path'],
             asset.output_path, asset.filename)
         end unless cached
 

data/lib/jekyll_asset_pipeline/pipeline.rb

@@ -58,6 +58,20 @@ module JekyllAssetPipeline
         @cache = {}
       end
 
+      # Remove staged assets
+      def remove_staged_assets(source, config)
+        begin
+          config = DEFAULTS.merge(config)
+          staging_path = File.join(source, config['staging_path'])
+          FileUtils.rm_rf(staging_path)
+        rescue Exception => e
+          puts "Failed to remove staged assets."
+
+          # Re-raise the exception
+          raise e
+        end
+      end
+
       # Add prefix to output
       def puts(message)
         $stdout.puts("Asset Pipeline: #{message}")
@@ -179,10 +193,10 @@ module JekyllAssetPipeline
     # Save assets to file
     def save
       output_path = @options['output_path']
+      staging_path = @options['staging_path']
 
       @assets.each do |asset|
-        # Create directories if necessary
-        directory = File.join(@destination, output_path)
+        directory = File.join(@source, staging_path, output_path)
         FileUtils::mkpath(directory) unless File.directory?(directory)
 
         begin

data/lib/jekyll_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module JekyllAssetPipeline
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -88,8 +88,6 @@ files:
 - lib/jekyll_asset_pipeline/converter.rb
 - lib/jekyll_asset_pipeline/extensions/jekyll/site.rb
 - lib/jekyll_asset_pipeline/extensions/jekyll/site_extensions.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

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

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

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

@@ -1,8 +0,0 @@
-module JekyllAssetPipeline
-  module JekyllStaticFileExtensions
-    # Override #write method since the asset file is dynamically created
-    def write(dest)
-      true
-    end
-  end
-end