nutils 0.7.0 → 0.8.1

data/README.md

@@ -9,6 +9,7 @@ A set of utilities for Nanoc3.
 * **sprockets** Runs the content through [Sprockets](http://getsprockets.org)
 * **svg_to_png** Converts an SVG to PNG. Tested in Mac OS X 10.6, Ruby 1.8.7, Nanoc 3.1.6 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 and yui-compressor 0.9.1.
+* **zass** Compiles the content using [Sass](http://sass-lang.com/) 3.1. Tested in Mac OS X 10.6.7, Ruby 1.8.7, Nanoc 3.1.6 and sass 3.1.
 
 ## Data Sources
 * **filesystem_customizable** Allows an array for source directories and for layout directories.

data/lib/nutils/filters/sass.rb

@@ -1,8 +1,11 @@
 # encoding: utf-8
 
+require 'sass'
+
 module Nutils
   module Filters
     class Sass < Nanoc3::Filters::Sass
+      FILES = []
       identifier :zass
       type :text
 
@@ -13,70 +16,62 @@ module Nutils
       #
       # @return [String] The filtered content
       def run(content, params={})
-        require 'sass'
-
-        # Add imported_filename read accessor to ImportNode
-        # … but… but… nex3 said I could monkey patch it! :(
-        methods = ::Sass::Tree::ImportNode.instance_methods
-        if !methods.include?(:import_filename) && !methods.include?('import_filename')
-          ::Sass::Tree::ImportNode.send(:attr_reader, :imported_filename)
-        end
-
         # Get options
         options = params.dup
         sass_filename = options[:filename] || (@item && @item[:content_filename])
         options[:filename] ||= sass_filename
-
+        options[:filesystem_importer] ||= Nutils::Importers::Nanoc
+        
         # Build engine
         engine = ::Sass::Engine.new(content, options)
-
-        # Get import nodes
-        require 'set'
-        imported_nodes = []
-        unprocessed_nodes = Set.new([ engine.to_tree ])
-        until unprocessed_nodes.empty?
-          # Get an unprocessed node
-          node = unprocessed_nodes.each { |n| break n }
-          unprocessed_nodes.delete(node)
-
-          # Add to list of import nodes if necessary
-          imported_nodes << node if node.is_a?(::Sass::Tree::ImportNode)
-
-          # Mark children of this node for processing
-          node.children.each { |c| unprocessed_nodes << c }
+        output = engine.render
+        
+        until Nutils::Filters::Sass::FILES.empty?
+          filename = Nutils::Filters::Sass::FILES.pop
+          notify(filename)
         end
+        
+        return output
+      end
 
-        # Get import paths
-        import_paths = (options[:load_paths] || []).dup
-        import_paths.unshift(File.dirname(sass_filename)) if sass_filename
-        # Get imported filenames
-        imported_filenames = imported_nodes.map do |node|
-          ::Sass::Files.find_file_to_import(node.imported_filename, import_paths)
-        end
+      def notify(filename)
+        pathname = Pathname.new(filename)
+        item = @items.find { |i| i[:content_filename] && Pathname.new(i[:content_filename]).realpath == pathname.realpath }
+        
+        # Notify
+        ::Nanoc3::NotificationCenter.post(:visit_started, item)
+        ::Nanoc3::NotificationCenter.post(:visit_ended,   item)
+        
+        # Raise unmet dependency error if item is not yet compiled
+        any_uncompiled_rep = item.reps.find { |r| !r.compiled? }
+        raise ::Nanoc3::Errors::UnmetDependency.new(any_uncompiled_rep) if any_uncompiled_rep
+      end
 
-        # Convert to items
-        imported_items = imported_filenames.map do |filename|
-          pathname = Pathname.new(filename)
-          next unless pathname.file?
-          normalized_filename = pathname.realpath
-          @items.find { |i| i[:content_filename] && Pathname.new(i[:content_filename]).realpath == normalized_filename }
-        end.compact
+    end
+  end
 
-        # Require compilation of each item
-        imported_items.each do |item|
-          # Notify
-          Nanoc3::NotificationCenter.post(:visit_started, item)
-          Nanoc3::NotificationCenter.post(:visit_ended,   item)
 
-          # Raise unmet dependency error if item is not yet compiled
-          any_uncompiled_rep = item.reps.find { |r| !r.compiled? }
-          raise Nanoc3::Errors::UnmetDependency.new(any_uncompiled_rep) if any_uncompiled_rep
-        end
+  module Importers
 
-        # Done
-        engine.render
+    ##
+    # Essentially the {Sass::Importers::Filesystem} but registering each import
+    # file path.
+    class Nanoc < ::Sass::Importers::Filesystem
+      
+      private
+      
+      def _find(dir, name, options)
+        full_filename, syntax = find_real_file(dir, name)
+        return unless full_filename && File.readable?(full_filename)
+        
+        Nutils::Filters::Sass::FILES << full_filename
+        
+        options[:syntax] = syntax
+        options[:filename] = full_filename
+        options[:importer] = self
+        ::Sass::Engine.new(File.read(full_filename), options)
       end
-
     end
   end
+
 end

data/lib/nutils/filters.rb

@@ -1,15 +1,17 @@
 module Nutils
   module Filters
-    autoload "Beautify", "nutils/filters/beautify"
-    autoload "Crop", "nutils/filters/crop"
-    autoload "SprocketWheel", "nutils/filters/sprockets"
-    autoload "SvgToPng", "nutils/filters/svg2png"
-    autoload "YuiCompressor", "nutils/filters/yuicompressor"
+    autoload 'Beautify', 'nutils/filters/beautify'
+    autoload 'Crop', 'nutils/filters/crop'
+    autoload 'SprocketWheel', 'nutils/filters/sprockets'
+    autoload 'SvgToPng', 'nutils/filters/svg2png'
+    autoload 'YuiCompressor', 'nutils/filters/yuicompressor'
+    autoload 'Sass', 'nutils/filters/sass'
 
-    ::Nanoc3::Filter.register "::Nutils::Filters::Beautify", :beautify
-    ::Nanoc3::Filter.register "::Nutils::Filters::Crop", :crop
-    ::Nanoc3::Filter.register "::Nutils::Filters::SprocketWheel", :sprockets
-    ::Nanoc3::Filter.register "::Nutils::Filters::SvgToPng", :svg_to_png
-    ::Nanoc3::Filter.register "::Nutils::Filters::YuiCompressor", :yuicompressor
+    ::Nanoc3::Filter.register '::Nutils::Filters::Beautify', :beautify
+    ::Nanoc3::Filter.register '::Nutils::Filters::Crop', :crop
+    ::Nanoc3::Filter.register '::Nutils::Filters::SprocketWheel', :sprockets
+    ::Nanoc3::Filter.register '::Nutils::Filters::SvgToPng', :svg_to_png
+    ::Nanoc3::Filter.register '::Nutils::Filters::YuiCompressor', :yuicompressor
+    ::Nanoc3::Filter.register '::Nutils::Filters::Sass', :zass
   end
 end

data/lib/nutils.rb

@@ -3,15 +3,15 @@
 module Nutils
 
   # The current nutils version.
-  VERSION = "0.7.0"
+  VERSION = '0.8.1'
 
 end
 
 # Load requirements
-require "nanoc3"
+require 'nanoc3'
 
 # Load nutils
-require "nutils/base"
-require "nutils/data_sources"
-require "nutils/filters"
-require "nutils/helpers"
+require 'nutils/base'
+require 'nutils/data_sources'
+require 'nutils/filters'
+require 'nutils/helpers'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nutils
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 61
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 0
-  version: 0.7.0
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Arnau Siches
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 -05:00
+date: 2011-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency