japr 0.3 → 0.3.1

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/japr.png)](http://badge.fury.io/rb/japr) [![Build Status](https://secure.travis-ci.org/kitsched/japr.png)](https://travis-ci.org/kitsched/japr) [![Coverage Status](https://coveralls.io/repos/kitsched/japr/badge.png?branch=master)](https://coveralls.io/r/kitsched/japr?branch=master) [![Dependency Status](https://gemnasium.com/kitsched/japr.png)](https://gemnasium.com/kitsched/japr) [![Code Climate](https://codeclimate.com/github/kitsched/japr.png)](https://codeclimate.com/github/kitsched/japr)
 
-JAPR 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.
+JAPR is a powerful asset pipeline that automatically collects, converts and compresses / minifies your site's JavaScript and CSS assets when you compile your [Jekyll](http://jekyllrb.com/) site.
 
 This project is a fork of [Jekyll Asset Pipeline](https://github.com/matthodan/jekyll-asset-pipeline) by [Matt Hodan](https://github.com/matthodan) which, unfortunately, was pretty much abandonware.
 
@@ -46,7 +46,7 @@ JAPR is extremely easy to add to your Jekyll project and has no incremental depe
 1. Install the "japr" gem via [Rubygems](http://rubygems.org/).
 
   ``` bash
-  $ gem install japr 
+  $ gem install japr
   ```
 
   > *If you are using [Bundler](http://gembundler.com/) to manage your project's gems, you can just add "japr" to your Gemfile and run `bundle install`.*
@@ -153,6 +153,28 @@ You probably get the gist of how converters work, but here's an example of a SAS
 
 > *Don't forget to install the "sass" gem or add it to your Gemfile and run `bundle install` before you run the `jekyll build` command since the above SASS converter requires the "sass" library as a dependency.*
 
+### LESS
+
+  ``` ruby
+  module JAPR
+    class LessConverter < JAPR::Converter
+      require 'less'
+
+      def self.filetype
+        '.less'
+      end
+
+      def convert
+        return Less::Parser.new.parse(@content).to_css
+      end
+    end
+  end
+  ```
+
+> *Don't forget to install the "less" gem or add it to your Gemfile and run
+`bundle install` before you run the `jekyll build` command since the above
+LESS converter requires the "less" 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).

data/lib/japr.rb

@@ -36,13 +36,13 @@ module JAPR
   # 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
-  #
+  # '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',
     'display_path'  => nil,

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

@@ -10,5 +10,6 @@ module JAPR
   end
 
   # Register JavaScriptAssetTag tag with Liquid
-  ::Liquid::Template.register_tag(JAPR::JavaScriptAssetTag.tag_name, JAPR::JavaScriptAssetTag)
+  ::Liquid::Template.register_tag(JAPR::JavaScriptAssetTag.tag_name,
+                                  JAPR::JavaScriptAssetTag)
 end

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

@@ -24,7 +24,8 @@ module JAPR
         # Prevent Jekyll from cleaning up saved assets if new pipeline
         pipeline.assets.each do |asset|
           config = JAPR::DEFAULTS.merge(config)
-          staging_path = File.expand_path(File.join(site.source, config['staging_path']))
+          staging_path = File.expand_path(File.join(site.source,
+                                                    config['staging_path']))
           site.static_files << Jekyll::StaticFile.new(site, staging_path,
                                                       asset.output_path,
                                                       asset.filename)

data/lib/japr/extensions/ruby/subclass_tracking.rb

@@ -1,6 +1,7 @@
 module JAPR
   module SubclassTracking
-    # Record subclasses of this class (this method is automatically called by ruby)
+    # Record subclasses of this class (this method is automatically called by
+    # ruby)
     def inherited(base)
       subclasses << base
     end

data/lib/japr/pipeline.rb

@@ -9,7 +9,7 @@ module JAPR
             "#{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."
+          puts "Failed to generate hash from provided manifest: #{e.message}"
           raise e
         end
       end
@@ -30,7 +30,8 @@ module JAPR
             # Create and process new pipeline
             pipeline = new(manifest, prefix, source, destination, type, config)
             pipeline.assets.each do |asset|
-              puts "Saved '#{asset.filename}' to '#{destination}/#{asset.output_path}'"
+              puts "Saved '#{asset.filename}' to " \
+                   "'#{destination}/#{asset.output_path}'"
             end
 
             # Add processed pipeline to cache
@@ -64,7 +65,7 @@ module JAPR
         staging_path = File.join(source, config['staging_path'])
         FileUtils.rm_rf(staging_path)
         rescue Exception => e
-          puts "Failed to remove staged assets."
+          puts "Failed to remove staged assets: #{e.message}"
 
           # Re-raise the exception
           raise e
@@ -108,11 +109,13 @@ module JAPR
       @assets = YAML.load(@manifest).map! do |path|
         full_path = File.join(@source, path)
         File.open(File.join(@source, path)) do |file|
-          JAPR::Asset.new(file.read, File.basename(path), File.dirname(full_path))
+          JAPR::Asset.new(file.read, File.basename(path),
+                          File.dirname(full_path))
         end
       end
       rescue Exception => e
-        puts "Asset Pipeline: Failed to load assets from provided manifest."
+        puts 'Asset Pipeline: Failed to load assets from provided ' \
+             "manifest: #{e.message}"
         raise e
     end
 
@@ -128,7 +131,9 @@ module JAPR
           end.last
 
           # Convert asset if converter is found
-          unless klass.nil?
+          if klass.nil?
+            finished = true
+          else
             begin
               # Convert asset content
               converter = klass.new(asset)
@@ -138,13 +143,14 @@ module JAPR
               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) == ''
+              if File.extname(asset.filename) == ''
+                asset.filename = "#{asset.filename}#{@type}"
+              end
             rescue Exception => e
-              puts "Asset Pipeline: Failed to convert '#{asset.filename}' with '#{klass.to_s}'."
+              puts "Asset Pipeline: Failed to convert '#{asset.filename}' " \
+                   "with '#{klass}': #{e.message}"
               raise e
             end
-          else
-            finished = true
           end
         end
       end
@@ -168,13 +174,14 @@ module JAPR
           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
+        return unless klass
+
+        begin
+          asset.content = klass.new(asset.content).compressed
+        rescue Exception => e
+          puts "Asset Pipeline: Failed to compress '#{asset.filename}' " \
+               "with '#{klass}': #{e.message}"
+          raise e
         end
       end
     end
@@ -183,7 +190,10 @@ module JAPR
     def gzip
       @assets.map! do |asset|
         gzip_content = Zlib::Deflate.deflate(asset.content)
-        [asset, JAPR::Asset.new(gzip_content, "#{asset.filename}.gz", asset.dirname)]
+        [
+          asset,
+          JAPR::Asset.new(gzip_content, "#{asset.filename}.gz", asset.dirname)
+        ]
       end.flatten!
     end
 
@@ -202,7 +212,8 @@ module JAPR
             file.write(asset.content)
           end
         rescue Exception => e
-          puts "Asset Pipeline: Failed to save '#{asset.filename}' to disk."
+          puts "Asset Pipeline: Failed to save '#{asset.filename}' to " \
+               "disk: #{e.message}"
           raise e
         end
 
@@ -217,10 +228,10 @@ module JAPR
       display_path = @options['display_path'] || @options['output_path']
 
       @html = @assets.map do |asset|
-        klass = JAPR::Template.subclasses.select do |t|
+        klasses = JAPR::Template.subclasses.select do |t|
           t.filetype == File.extname(asset.filename).downcase
-        end.sort! { |x, y| x.priority <=> y.priority }.last
-
+        end
+        klass = klasses.sort! { |x, y| x.priority <=> y.priority }.last
         html = klass.new(display_path, asset.filename).html unless klass.nil?
 
         html

data/lib/japr/version.rb

@@ -1,3 +1,3 @@
 module JAPR
-  VERSION = '0.3'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: japr
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -75,9 +75,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.2'
-description: Jekyll Asset Pipeline reborn adds asset preprocessing (CoffeeScript,
-  Sass, Less, ERB, etc.) and asset compression/minification/gzip (Yahoo YUI Compressor,
-  Google Closure Compiler, etc.) to Jekyll.
+description: ! "    Jekyll Asset Pipeline reborn adds asset preprocessing (CoffeeScript,
+  Sass,\n    Less, ERB, etc.) and asset compression / minification / gzip (Yahoo YUI\n
+  \   Compressor, Google Closure Compiler, etc.) to Jekyll.'\n"
 email: japr@clicktrackheart.com
 executables: []
 extensions: []