nutils 0.11.0 → 0.11.1

data/lib/nutils/filters/sprockets.rb

@@ -13,9 +13,6 @@ module Nutils
       #
       # @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'
@@ -33,9 +30,9 @@ module Nutils
         tmp_filename.open('w') { |io| io.puts content }
         
         load_path = params[:load_path] || []
-        load_path << tmp_filename.dirname.realpath
+        load_path << filename.dirname.realpath
         
-        env = ::Sprockets::Environment.new(tmp_filename.dirname.realpath)
+        env = ::Sprockets::Environment.new(filename.dirname.realpath)
         
         # Assign load paths to Sprockets
         load_path.each do |path|
@@ -45,13 +42,18 @@ module Nutils
         # Get the Sprockets BundledAsset object for the content
         main_asset = env.find_asset(tmp_filename.realpath)
         
+        # Select just the possible items that can be dependencies
+        possible_items = @items.select do |i|
+          load_path.find { |p| Pathname.new(p).realpath.to_s == Pathname.new(i[:content_filename]).dirname.realpath.to_s }
+        end
+        
         # 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 }
+          item = possible_items.find { |i| asset.pathname == Pathname.new(i[:content_filename]).realpath }
           dep << item unless item.nil?
           dep
         end
-        # Register Nanoc dependencies
+        # # Register Nanoc dependencies
         depend_on(dependencies) unless dependencies.nil?
         
         # Output compiled asset

data/lib/nutils.rb

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

metadata

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