nutils 1.1.0 → 1.2.0

data/README.md

@@ -6,10 +6,8 @@ A set of utilities for nanoc 3. Tested in Mac OS X 10.6, Ruby 1.8.7, 1.92 and na
 
 * **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.

data/lib/nutils.rb

@@ -3,7 +3,7 @@
 module Nutils
 
   # The current nutils version.
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end
 
 # Load requirements

data/lib/nutils/base.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
 module Nutils
   
   autoload "Errors", "nutils/base/errors"
   
-end
+end

data/lib/nutils/base/errors.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Nutils
   module Errors
     
@@ -7,7 +8,7 @@ module Nutils
 
       # @param [String] filename The file name not found.
       def initialize(filename)
-        super("No file found in any directory provided for “#{filename}”".make_compatible_with_env)
+        super("No file found in any directory provided for #{filename}".make_compatible_with_env)
       end
 
     end

data/lib/nutils/data_sources.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Nutils
   module DataSources
     autoload "FilesystemCustomizable", "nutils/data_sources/filesystem_customizable"

data/lib/nutils/data_sources/filesystem_customizable.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Nutils
   module DataSources
 
@@ -45,7 +46,6 @@ module Nutils
         puts "Data Loaded in #{format('%.2f', @dtend - @dtstart)}s."
       end
 
-
     end
   end
 end

data/lib/nutils/filters.rb

@@ -1,14 +1,13 @@
+# encoding: utf-8
 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'
 
     ::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

data/lib/nutils/filters/beautify.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Nutils
   module Filters
 

data/lib/nutils/filters/crop.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Nutils
   module Filters
 

data/lib/nutils/filters/svg2png.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Nutils
   module Filters
 

data/lib/nutils/filters/yuicompressor.rb

@@ -1,9 +1,10 @@
+# encoding: utf-8
 module Nutils
   module Filters
 
     # @author Arnau Siches
     #
-    # @version 1.2.0
+    # @version 1.2.1
     #
     # @note Requires «yui-compressor»
     class YuiCompressor < Nanoc::Filter
@@ -24,12 +25,12 @@ module Nutils
         require "yui/compressor"
         if (params[:type] == :css)
           compressor = ::YUI::CssCompressor.new
-        elsif (params[:type] == :js)
+        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)
           # 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)

data/lib/nutils/helpers/rules.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Nutils
   module Helpers
 

metadata

@@ -1,53 +1,42 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nutils
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Arnau Siches
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-18 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nanoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 3
-        - 1
+  requirement: &70365351652660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.3.1
   type: :runtime
-  version_requirements: *id001
-description: Nutils is a set of utilities like filters, data_sources and helpers for Nanoc.
+  prerelease: false
+  version_requirements: *70365351652660
+description: Nutils is a set of utilities like filters, data_sources and helpers for
+  Nanoc.
 email: arnau.siches@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - lib/nutils/base/errors.rb
 - lib/nutils/base.rb
 - lib/nutils/data_sources/filesystem_customizable.rb
 - lib/nutils/data_sources.rb
 - lib/nutils/filters/beautify.rb
 - lib/nutils/filters/crop.rb
-- lib/nutils/filters/sprockets.rb
 - lib/nutils/filters/svg2png.rb
 - lib/nutils/filters/yuicompressor.rb
 - lib/nutils/filters.rb
@@ -56,38 +45,30 @@ files:
 - lib/nutils.rb
 - README.md
 - LICENSE
-has_rdoc: yard
 homepage: http://github.com/arnau/Nutils/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A set of utilities for Nanoc3.
 test_files: []
-

data/lib/nutils/filters/sprockets.rb

@@ -1,62 +0,0 @@
-module Nutils
-  module Filters
-    # @author Arnau Siches
-    #
-    # @version 3.0.0
-    #
-    # @note Requires «sprockets»
-    class SprocketWheel < Nanoc::Filter
-      identifier :sprockets
-      type :text
-      # Concatenate the Javascript, CoffeeScript or Sass content through [Sprockets](http://getsprockets.org).
-      # This method takes no options.
-      #
-      # @param [String] content The content to filter.
-      #
-      # @return [String] The filtered content.
-      def run(content, params={})
-        require 'sprockets'
-        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.
-        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)
-        
-        # 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 }
-        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 }
-          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
-    end
-  end
-end