nutils 0.10.0 → 0.11.0

data/README.md

@@ -6,7 +6,7 @@ A set of utilities for nanoc 3.
 
 * **beautify** Retabs HTML code. Tested in Mac OS X 10.6, Ruby 1.8.7 and Nanoc 3.1.6, 3.2.1.
 * **crop** Extracts the specified rectangle from the image.. Tested in Mac OS X 10.6, Ruby 1.8.7 and Nanoc 3.1.6, 3.2.1.
-* **sprockets** Runs the content through [Sprockets](http://getsprockets.org). Tested in Mac OS X 10.6, Ruby 1.8.7, Nanoc 3.1.6, 3.2.1 and Sprockets 1.
+* **sprockets** Runs the content through [Sprockets](http://getsprockets.org). Tested in Mac OS X 10.6, Ruby 1.8.7, 1.9.2, Nanoc 3.2.2 and Sprockets.
 * **svg_to_png** Converts an SVG to PNG. Tested in Mac OS X 10.6, Ruby 1.8.7, Nanoc 3.1.6, 3.2.1 and Batik 1.7.
 * **yuicompressor** Compress the content with [YUI Compressor](http://developer.yahoo.com/yui/compressor/). Tested in Mac OS X 10.6, Ruby 1.8.7, Nanoc 3.1.6, 3.2.1 and yui-compressor 0.9.1.
 * **zass** Deprecated. You **should** use the **sass** filter from nanoc 3.1.9+
@@ -17,5 +17,9 @@ A set of utilities for nanoc 3.
 ## Helpers
 * **load_rules** Allows to use multiple files with Nanoc rules. It works with nanoc 3.1 and 3.2.
 
+## Collaborators
+
+* [Ximus](https://github.com/ximus)
+
 ## Contact
 You can reach me at <arnau.siches@gmail.com>.

data/lib/nutils/filters/sprockets.rb

@@ -1,43 +1,88 @@
 module Nutils
   module Filters
-
     # @author Arnau Siches
     #
-    # @version 1.0.0
+    # @version 2.0.0
     #
     # @note Requires «sprockets»
     class SprocketWheel < Nanoc3::Filter
-
       identifier :sprockets
       type :text
-
-      # Concatenate the Javascript content through [Sprockets](http://getsprockets.org).
+      # Concatenate the Javascript, CoffeeScript or Sass content through [Sprockets](http://getsprockets.org).
       # This method takes no options.
       #
       # @param [String] content The content to filter.
       #
+      # @todo Use the content to build a Sprocket Asset instead of just get the
+      #   `@item[:content_filename]`.
+      #
       # @return [String] The filtered content.
       def run(content, params={})
-        require "sprockets"
-        require "tempfile"
-
-        tmp_file = Tempfile.new("sprockets.tmp", File.dirname(@item[:filename]))
-
-        tmp_file.puts content
-        tmp_file.open
-        
-        source_files = tmp_file.path
-        load_path = params[:load_path] || File.dirname(@item[:filename])
-
+        require 'sprockets'
+        Gem.loaded_specs['sprockets'].version < Gem::Version.create('2.0') ? backwards(content, params) : default(content, params)
+      end
+      
+      private
+      
+      def default(content, params)
+        filename  = Pathname.new(@item[:content_filename])
+        
+        # Create a temp file with the content received to give the desired
+        # content to Sprockets on the same context.
+        tmp_filename = filename.dirname + ('tmp_' + filename.basename.to_s)
+        tmp_filename.open('w') { |io| io.puts content }
+        
+        load_path = params[:load_path] || []
+        load_path << tmp_filename.dirname.realpath
+        
+        env = ::Sprockets::Environment.new(tmp_filename.dirname.realpath)
+        
+        # Assign load paths to Sprockets
+        load_path.each do |path|
+          env.append_path(File.expand_path(path))
+        end
+        
+        # Get the Sprockets BundledAsset object for the content
+        main_asset = env.find_asset(tmp_filename.realpath)
+        
+        # Get Nanoc::Item equivalent for each dependence managed by Sprockets
+        dependencies = main_asset.dependencies.inject([]) do |dep, asset|
+          item = @items.find { |i| asset.pathname == Pathname.new(i[:content_filename]).realpath }
+          dep << item unless item.nil?
+          dep
+        end
+        # Register Nanoc dependencies
+        depend_on(dependencies) unless dependencies.nil?
+        
+        # Output compiled asset
+        main_asset.to_s
+      ensure
+        tmp_filename.delete if tmp_filename.exist?
+      end
+      
+      def backwards(content, params)
+        puts "You are using Sprockets 1.0.0. It's strongly recommended you upgrade to Sprockets >= 2.0.0"
+        puts "Nutils 1.0.0 will *not* support Sprockets 1.0.0"
+        
+        filename = Pathname.new(@item[:content_filename])
+        
+        # Create a temp file with the content received to give the desired
+        # content to Sprockets on the same context.
+        tmp_filename = filename.dirname + ('tmp_' + filename.basename.to_s)
+        tmp_filename.open('w') { |io| io.puts content }
+        
+        load_path = params[:load_path] || []
+        load_path << tmp_filename.dirname.realpath.to_s
         params.merge!({
           :load_path => load_path,
-          :source_files => [source_files]
+          :source_files => [tmp_filename.realpath.to_s]
         })
-
+        
         secretary = ::Sprockets::Secretary.new(params)
         secretary.install_assets if params[:asset_root]
-        secretary.concatenation
-
+        secretary.concatenation.to_s
+      ensure
+        tmp_filename.delete if tmp_filename.exist?
       end
     end
   end

data/lib/nutils.rb

@@ -3,7 +3,7 @@
 module Nutils
 
   # The current nutils version.
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nutils
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: 
   segments: 
   - 0
-  - 10
+  - 11
   - 0
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Arnau Siches
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 -04:00
+date: 2011-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency