japr 0.2.3 → 0.2.4

data/README.md

@@ -1,6 +1,6 @@
 # JAPR (Jekyll Asset Pipeline Reborn)
 
-[![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)](https://coveralls.io/r/kitsched/japr) [![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)
+[![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.
 

data/lib/japr/asset.rb

@@ -1,10 +1,11 @@
 module JAPR
   class Asset
-    def initialize(content, filename)
+    def initialize(content, filename, dirname = '.')
       @content = content
       @filename = filename
+      @dirname = dirname
     end
 
-    attr_accessor :content, :filename, :output_path
+    attr_accessor :content, :filename, :dirname, :output_path
   end
 end

data/lib/japr/compressor.rb

@@ -4,7 +4,7 @@ module JAPR
 
     def initialize(content)
       @content = content
-      @compressed = self.compress
+      @compressed = compress
     end
 
     # Returns compressed content

data/lib/japr/converter.rb

@@ -5,7 +5,8 @@ module JAPR
     def initialize(asset)
       @content = asset.content
       @type = File.extname(asset.filename).downcase
-      @converted = self.convert
+      @converted = convert
+      @dirname = asset.dirname
     end
 
     def converted

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

@@ -8,7 +8,7 @@ module JAPR
         # Override Jekyll::Site#cleanup
         define_method(:cleanup) do
           # Run the Jekyll::Site#cleanup method
-          original_return_val = old_cleanup_method.bind(self).call()
+          original_return_val = old_cleanup_method.bind(self).call
 
           # Clear Jekyll Asset Pipeline cache
           Pipeline.clear_cache
@@ -22,11 +22,11 @@ module JAPR
         # Override Jekyll::Site#write
         define_method(:write) do
           # Run the Jekyll::Site#write method
-          original_return_value = old_write_method.bind(self).call()
+          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)
+          Pipeline.remove_staged_assets(source, config)
 
           original_return_value
         end

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

@@ -15,8 +15,10 @@ module JAPR
       config = site.config['asset_pipeline'] || {}
 
       # 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)
+      pipeline, cached = Pipeline.run(@nodelist.first, @markup.strip,
+                                      site.source, site.dest,
+                                      self.class.tag_name,
+                                      self.class.output_type, config)
 
       if pipeline.is_a?(Pipeline)
         # Prevent Jekyll from cleaning up saved assets if new pipeline
@@ -24,7 +26,8 @@ module JAPR
           config = JAPR::DEFAULTS.merge(config)
           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)
+                                                      asset.output_path,
+                                                      asset.filename)
         end unless cached
 
         # Return HTML tag pointing to asset

data/lib/japr/pipeline.rb

@@ -5,7 +5,7 @@ module JAPR
       def hash(source, manifest, options = {})
         options = DEFAULTS.merge(options)
         begin
-          Digest::MD5.hexdigest(YAML::load(manifest).map! do |path|
+          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
@@ -20,7 +20,7 @@ module JAPR
         hash = hash(source, manifest, config)
 
         # Check if pipeline has been cached
-        if cache.has_key?(hash)
+        if cache.key?(hash)
           # Return cached pipeline and cached status
           return cache[hash], true
         else
@@ -28,7 +28,7 @@ module JAPR
             puts "Processing '#{tag}' manifest '#{prefix}'"
 
             # Create and process new pipeline
-            pipeline = self.new(manifest, prefix, source, destination, type, config)
+            pipeline = new(manifest, prefix, source, destination, type, config)
             pipeline.assets.each do |asset|
               puts "Saved '#{asset.filename}' to '#{destination}/#{asset.output_path}'"
             end
@@ -60,16 +60,14 @@ module JAPR
 
       # 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)
+        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
@@ -107,16 +105,15 @@ module JAPR
 
     # Collect assets based on manifest
     def collect
-      begin
-        @assets = YAML::load(@manifest).map! do |path|
-          File.open(File.join(@source, path)) do |file|
-            JAPR::Asset.new(file.read, File.basename(path))
-          end
+      @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))
         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
@@ -186,7 +183,7 @@ 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, JAPR::Asset.new(gzip_content, "#{asset.filename}.gz", asset.dirname)]
       end.flatten!
     end
 
@@ -197,7 +194,7 @@ module JAPR
 
       @assets.each do |asset|
         directory = File.join(@source, staging_path, output_path)
-        FileUtils::mkpath(directory) unless File.directory?(directory)
+        FileUtils.mkpath(directory) unless File.directory?(directory)
 
         begin
           # Save file to disk

data/lib/japr/templates/css_tag_template.rb

@@ -10,7 +10,7 @@ module JAPR
     end
 
     def html
-      "<link href='/#{@path}/#{@filename}' rel='stylesheet' type='text/css' />\n"
+      "<link href='/#{@path}/#{@filename}' rel='stylesheet' type='text/css' />"
     end
   end
 end

data/lib/japr/templates/javascript_tag_template.rb

@@ -10,7 +10,7 @@ module JAPR
     end
 
     def html
-      "<script src='/#{@path}/#{@filename}' type='text/javascript'></script>\n"
+      "<script src='/#{@path}/#{@filename}' type='text/javascript'></script>"
     end
   end
 end

data/lib/japr/version.rb

@@ -1,3 +1,3 @@
 module JAPR
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: japr
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
+  prerelease: 
 platform: ruby
 authors:
 - Matt Hodan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,11 +70,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.2'
-description: JAPR (Jekyll Asset Pipeline Reborn) adds asset preprocessing (CoffeeScript,
+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.
 email: japr@clicktrackheart.com
@@ -74,47 +83,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- lib/japr.rb
-- lib/japr/asset.rb
 - lib/japr/compressor.rb
 - lib/japr/converter.rb
-- lib/japr/extensions/jekyll/site.rb
-- lib/japr/extensions/jekyll/site_extensions.rb
-- lib/japr/extensions/liquid/asset_tag.rb
-- lib/japr/extensions/liquid/asset_tags/css_asset_tag.rb
+- lib/japr/templates/javascript_tag_template.rb
+- lib/japr/templates/css_tag_template.rb
+- lib/japr/version.rb
+- lib/japr/template.rb
 - lib/japr/extensions/liquid/asset_tags/javascript_asset_tag.rb
+- lib/japr/extensions/liquid/asset_tags/css_asset_tag.rb
+- lib/japr/extensions/liquid/asset_tag.rb
 - lib/japr/extensions/liquid/liquid_block_extensions.rb
+- lib/japr/extensions/jekyll/site_extensions.rb
+- lib/japr/extensions/jekyll/site.rb
 - lib/japr/extensions/ruby/subclass_tracking.rb
 - lib/japr/pipeline.rb
-- lib/japr/template.rb
-- lib/japr/templates/css_tag_template.rb
-- lib/japr/templates/javascript_tag_template.rb
-- lib/japr/version.rb
+- lib/japr/asset.rb
+- lib/japr.rb
+- LICENSE
+- README.md
 homepage: https://github.com/kitsched/japr
 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: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A powerful asset pipeline for Jekyll that bundles, converts, and minifies
   CSS and JavaScript assets.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjRiOTE0NjFhNzVmZWUwMzBjYWIyYTVjNWQwZmI4ZjY1YzZmN2JiMQ==
-  data.tar.gz: !binary |-
-    OTVlYTQ1MTI0MTA4YTRmNTg0MWI2MmZiNGFiNGZlOWFlOTlhZTllMQ==
-SHA512:
-  metadata.gz: !binary |-
-    YmFkZmY2ODZmODNkNDJkOWExMzg1NTM3Y2FkZDZmYWI3Yjc4ZDk3MTM3MzU4
-    MTM1Y2Y3MTIwMTBhNWE2NWE3YTNjNTM5YmI3M2QzMDU2NmNiMTIyNzA2MjY4
-    OWMxODljYmZiZmIzOTk3ZTg3M2U4OTMwZTJiY2QwZGVhNjYzYjk=
-  data.tar.gz: !binary |-
-    NGFlYTU2ZTEyN2JhYjY5Y2M3ZDMwZThhOWVmODgyNjMwYmYzNTE5MDA1ZDUw
-    YjczOTAwMzliMTVkZGJkZWU4Zjk0MDc0ODI0MzdjNDM2YmNkOTZlYTUzMWM5
-    ZGM3MWM1YTMzNDU4NzVhYzQ4Mjc3MTlhMjA1NWU1ZTBiNTAzMjM=