nutils 0.11.3 → 1.1.0

data/README.md

@@ -1,24 +1,25 @@
 # Nutils Readme
 
-A set of utilities for nanoc 3.
+A set of utilities for nanoc 3. Tested in Mac OS X 10.6, Ruby 1.8.7, 1.92 and nanoc 3.3.
 
 ## Filters
 
-* **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, 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+
+* **beautify** Retabs HTML code. htmlbeautifier 0.0.6.
+* **crop** Extracts the specified rectangle from the image. RMagick 2.13.1.
+* **sprockets** Runs the content through [Sprockets](http://getsprockets.org). Sprockets 2.
+* **svg_to_png** Converts an SVG to PNG. Batik 1.7.
+* **yuicompressor** Compress the content with [YUI Compressor](http://developer.yahoo.com/yui/compressor/). yui-compressor 0.9.1.
+* **sass** Importer `Nutils::SassImporters::NanocItem` which deals with `@import /nanoc/identifier/` instead of real filenames.
 
 ## Data Sources
 * **filesystem_customizable** Allows an array for source directories and for layout directories.
 
 ## Helpers
-* **load_rules** Allows to use multiple files with Nanoc rules. It works with nanoc 3.1 and 3.2.
+* **load_rules** Allows to use multiple files with Nanoc rules.
 
 ## Collaborators
 
+* [Choan](https://github.com/choan)
 * [Ximus](https://github.com/ximus)
 
 ## Contact

data/lib/nutils/base/errors.rb

@@ -3,7 +3,7 @@ module Nutils
     
     # Error that is raised when no partial rules file can be found in any
     # directory provided.
-    class NoRulesFileFound < ::Nanoc3::Errors::NoRulesFileFound
+    class NoRulesFileFound < ::Nanoc::Errors::NoRulesFileFound
 
       # @param [String] filename The file name not found.
       def initialize(filename)
@@ -13,4 +13,4 @@ module Nutils
     end
     
   end
-end
+end

data/lib/nutils/data_sources/filesystem_customizable.rb

@@ -16,8 +16,8 @@ module Nutils
     #         source_dir: ["src"]
     #         layout_dir: ["layouts", "other_layouts"]
     #
-    # @see Nanoc3::DataSources::FilesystemUnified
-    class FilesystemCustomizable < Nanoc3::DataSources::FilesystemUnified
+    # @see Nanoc::DataSources::FilesystemUnified
+    class FilesystemCustomizable < Nanoc::DataSources::FilesystemUnified
       identifier :filesystem_customizable
 
       def setup
@@ -26,12 +26,12 @@ module Nutils
       end
       def items
         @sources.map do |dir|
-          load_objects(dir, 'item', Nanoc3::Item)
+          load_objects(dir, 'item', Nanoc::Item)
         end.flatten
       end
       def layouts
         @layouts.map do |dir|
-          load_objects(dir, 'layout', Nanoc3::Layout)
+          load_objects(dir, 'layout', Nanoc::Layout)
         end.flatten
       end
 
@@ -48,4 +48,4 @@ module Nutils
 
     end
   end
-end
+end

data/lib/nutils/data_sources.rb

@@ -2,6 +2,6 @@ module Nutils
   module DataSources
     autoload "FilesystemCustomizable", "nutils/data_sources/filesystem_customizable"
 
-    ::Nanoc3::DataSource.register "::Nutils::DataSources::FilesystemCustomizable",  :filesystem_customizable
+    ::Nanoc::DataSource.register "::Nutils::DataSources::FilesystemCustomizable",  :filesystem_customizable
   end
-end
+end

data/lib/nutils/filters/beautify.rb

@@ -9,7 +9,7 @@ module Nutils
     # @note Requires htmlbeautifer
     #
     # @todo Pass parameters to the HtmlBeautifer engine.
-    class Beautify < Nanoc3::Filter
+    class Beautify < Nanoc::Filter
 
       identifier :beautify
       type :text
@@ -30,4 +30,4 @@ module Nutils
     end
 
   end
-end
+end

data/lib/nutils/filters/crop.rb

@@ -6,7 +6,7 @@ module Nutils
     # @version 0.1.1
     #
     # @note Requires «RMagick»
-    class Crop < Nanoc3::Filter
+    class Crop < Nanoc::Filter
       
       identifier :crop
       type :binary
@@ -48,4 +48,4 @@ module Nutils
 
     end
   end
-end
+end

data/lib/nutils/filters/sprockets.rb

@@ -2,11 +2,10 @@ module Nutils
   module Filters
     # @author Arnau Siches
     #
-    # @version 2.0.2
+    # @version 3.0.0
     #
     # @note Requires «sprockets»
-    class SprocketWheel < Nanoc3::Filter
-      require 'pathname'
+    class SprocketWheel < Nanoc::Filter
       identifier :sprockets
       type :text
       # Concatenate the Javascript, CoffeeScript or Sass content through [Sprockets](http://getsprockets.org).
@@ -17,13 +16,9 @@ module Nutils
       # @return [String] The filtered content.
       def run(content, params={})
         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])
+        raise "Sprockets should be 2.0.0 or higher" if Gem.loaded_specs['sprockets'].version < Gem::Version.create('2.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.
@@ -31,9 +26,9 @@ module Nutils
         tmp_filename.open('w') { |io| io.puts content }
         
         load_path = params[:load_path] || []
-        load_path << filename.dirname.realpath
+        load_path << tmp_filename.dirname.realpath
         
-        env = ::Sprockets::Environment.new(filename.dirname.realpath)
+        env = ::Sprockets::Environment.new(tmp_filename.dirname.realpath)
         
         # Assign load paths to Sprockets
         load_path.each do |path|
@@ -45,16 +40,16 @@ module Nutils
         
         # Select just the possible items that can be dependencies
         possible_items = @items.reject { |i| i[:content_filename].nil? }.select do |i|
-          load_path.find { |p| ::Pathname.new(p).realpath.to_s == ::Pathname.new(i[:content_filename]).dirname.realpath.to_s }
+          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 = possible_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
@@ -62,31 +57,6 @@ module Nutils
       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 => [tmp_filename.realpath.to_s]
-        })
-        
-        secretary = ::Sprockets::Secretary.new(params)
-        secretary.install_assets if params[:asset_root]
-        secretary.concatenation.to_s
-      ensure
-        tmp_filename.delete if tmp_filename.exist?
-      end
     end
   end
 end

data/lib/nutils/filters/svg2png.rb

@@ -7,7 +7,7 @@ module Nutils
     # @version 0.3.1
     #
     # @note Requires «rjb» and «batik»
-    class SvgToPng < Nanoc3::Filter
+    class SvgToPng < Nanoc::Filter
       require 'rjb'
       require 'tempfile'
       require 'fileutils'
@@ -74,7 +74,8 @@ module Nutils
 
         t.addTranscodingHint(@pngTranscoder.KEY_WIDTH, @float.new(opts[:width])) if opts[:width]
         t.addTranscodingHint(@pngTranscoder.KEY_HEIGHT, @float.new(opts[:height])) if opts[:height]
-        t.addTranscodingHint(@pngTranscoder.KEY_PIXEL_TO_MM, @float.new(254 / opts[:dpi])) if opts[:dpi]
+        #t.addTranscodingHint(@pngTranscoder.KEY_PIXEL_TO_MM, @float.new(254 / opts[:dpi])) if opts[:dpi]
+        t.addTranscodingHint(@pngTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER, @float.new(254 / opts[:dpi])) if opts[:dpi]
         t.addTranscodingHint(@pngTranscoder.KEY_BACKGROUND_COLOR, @color.new(hex2int(opts[:background_color]))) if opts[:background_color] and opts[:background_color] != 'transparent'
         # t.addTranscodingHint(@pngTranscoder.KEY_BACKGROUND_COLOR, @color.decode('#FC0'))
 
@@ -112,4 +113,4 @@ module Nutils
 
     end
   end
-end
+end

data/lib/nutils/filters/yuicompressor.rb

@@ -3,10 +3,10 @@ module Nutils
 
     # @author Arnau Siches
     #
-    # @version 1.2.1
+    # @version 1.2.0
     #
     # @note Requires «yui-compressor»
-    class YuiCompressor < Nanoc3::Filter
+    class YuiCompressor < Nanoc::Filter
       
       identifier :yuicompressor
       type :text
@@ -24,12 +24,12 @@ module Nutils
         require "yui/compressor"
         if (params[:type] == :css)
           compressor = ::YUI::CssCompressor.new
-        else
-          puts "Remember to add a params[:type] to your filter declaration to ensure straight compatibility with YUICompressor" unless params.has_key?(:type)
-          # elsif (params[:type] == :js)
+        elsif (params[:type] == :js)
           # It fallbacks to `:type => :js` because backwards compatibility w/
           # prior versions of the filter.
           compressor = ::YUI::JavaScriptCompressor.new
+        else
+          raise "You should define a params[:type] either :js or :css"
         end
 
         compressor.compress(content)
@@ -37,4 +37,4 @@ module Nutils
       
     end
   end
-end
+end

data/lib/nutils/filters.rb

@@ -5,13 +5,11 @@ module Nutils
     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::Sass', :zass
+    ::Nanoc::Filter.register '::Nutils::Filters::Beautify', :beautify
+    ::Nanoc::Filter.register '::Nutils::Filters::Crop', :crop
+    ::Nanoc::Filter.register '::Nutils::Filters::SprocketWheel', :sprockets
+    ::Nanoc::Filter.register '::Nutils::Filters::SvgToPng', :svg_to_png
+    ::Nanoc::Filter.register '::Nutils::Filters::YuiCompressor', :yuicompressor
   end
-end
+end

data/lib/nutils/helpers/rules.rb

@@ -25,15 +25,13 @@ module Nutils
       # 
       # @return [Proc]
       def load_rules(filepath)
-        raise "You should upgrade to nanoc 3.2.1 to run the load_rules helper properly" if Gem.loaded_specs["nanoc3"].version == Gem::Version.create('3.2')
+        raise "You should upgrade to nanoc 3.3 to run the load_rules helper properly" if Gem.loaded_specs["nanoc"].version == Gem::Version.create('3.3')
 
-        rules_dir = if Gem.loaded_specs["nanoc3"].version >= Gem::Version.create('3.1') and Gem.loaded_specs["nanoc3"].version < Gem::Version.create('3.2')
+        rules_dir = if Gem.loaded_specs["nanoc"].version >= Gem::Version.create('3.1') and Gem.loaded_specs["nanoc"].version < Gem::Version.create('3.3')
           (@site.config[:rules_dir] || ['.']) 
         else
           @config[:rules_dir] || ['.']
         end
-        
-
 
         path = rules_dir.map do |dir|
           Dir[File.join(dir, filepath)].each { |filename| filename }

data/lib/nutils.rb

@@ -3,12 +3,11 @@
 module Nutils
 
   # The current nutils version.
-  VERSION = '0.11.3'
-
+  VERSION = '1.1.0'
 end
 
 # Load requirements
-require 'nanoc3'
+require 'nanoc'
 
 # Load nutils
 require 'nutils/base'

metadata

@@ -3,10 +3,10 @@ name: nutils
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
+  - 1
   - 0
-  - 11
-  - 3
-  version: 0.11.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Arnau Siches
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 +01:00
+date: 2012-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nanoc3
+  name: nanoc
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,12 +26,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 3
+        - 3
         - 1
-        - 2
-        version: 3.1.2
+        version: 3.3.1
   type: :runtime
   version_requirements: *id001
-description: Nutils is a set of utilities like filters, data_sources and helpers for Nanoc3.
+description: Nutils is a set of utilities like filters, data_sources and helpers for Nanoc.
 email: arnau.siches@gmail.com
 executables: []
 
@@ -47,7 +47,6 @@ files:
 - lib/nutils/data_sources.rb
 - lib/nutils/filters/beautify.rb
 - lib/nutils/filters/crop.rb
-- lib/nutils/filters/sass.rb
 - lib/nutils/filters/sprockets.rb
 - lib/nutils/filters/svg2png.rb
 - lib/nutils/filters/yuicompressor.rb

data/lib/nutils/filters/sass.rb

@@ -1,82 +0,0 @@
-# encoding: utf-8
-
-require 'sass'
-
-module Nutils
-  module Filters
-    class Sass < Nanoc3::Filters::Sass
-      FILES = []
-      identifier :zass
-      type :text
-
-      # Runs the content through [Sass](http://sass-lang.com/).
-      # Parameters passed to this filter will be passed on to Sass.
-      #
-      # @param [String] content The content to filter
-      #
-      # @return [String] The filtered content
-      def run(content, params={})
-
-        puts "You should use the Sass filter from nanoc 3.1.9 or later. This Sass filter (:zass) is deprecated."
-
-        # 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)
-        output = engine.render
-        
-        until Nutils::Filters::Sass::FILES.empty?
-          filename = Nutils::Filters::Sass::FILES.pop
-          notify(filename)
-        end
-        
-        return output
-      end
-
-      def notify(filename)
-        pathname = Pathname.new(filename)
-        item = @items.find { |i| i[:content_filename] && Pathname.new(i[:content_filename]).realpath == pathname.realpath }
-        
-        unless item.nil?
-          # 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
-      end
-
-    end
-  end
-
-
-  module Importers
-
-    ##
-    # 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