nanoc3 3.2.0a4 → 3.2.0b1

data/lib/nanoc3/extra/auto_compiler.rb

@@ -20,6 +20,7 @@ module Nanoc3::Extra
       @site_path = site_path
 
       # Create mutex to prevent parallel requests
+      require 'thread'
       @mutex = Mutex.new
     end
 

data/lib/nanoc3/extra/file_proxy.rb

@@ -14,7 +14,6 @@ module Nanoc3::Extra
     end
 
     def freeze
-      super
     end
 
     def respond_to?(meth)

data/lib/nanoc3/filters.rb

@@ -24,6 +24,7 @@ module Nanoc3::Filters
   autoload 'Sass',            'nanoc3/filters/sass'
   autoload 'Slim',            'nanoc3/filters/slim'
   autoload 'Typogruby',       'nanoc3/filters/typogruby'
+  autoload 'UglifyJS',        'nanoc3/filters/uglify_js'
 
   Nanoc3::Filter.register '::Nanoc3::Filters::AsciiDoc',        :asciidoc
   Nanoc3::Filter.register '::Nanoc3::Filters::BlueCloth',       :bluecloth
@@ -47,5 +48,6 @@ module Nanoc3::Filters
   Nanoc3::Filter.register '::Nanoc3::Filters::Sass',            :sass
   Nanoc3::Filter.register '::Nanoc3::Filters::Slim',            :slim
   Nanoc3::Filter.register '::Nanoc3::Filters::Typogruby',       :typogruby
+  Nanoc3::Filter.register '::Nanoc3::Filters::UglifyJS',        :uglify_js
 
 end

data/lib/nanoc3/filters/asciidoc.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'systemu'
+
 module Nanoc3::Filters
 
   # @since 3.2.0
@@ -12,45 +14,23 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'escape'
-      require 'tempfile'
-
-      # Run filter
-      output = ''
-      errors = ''
-      success = true
-      Tempfile.open('nanoc-asciidoc-in') do |cmd_in|
-        cmd_out = Tempfile.open('nanoc-asciidoc-out')
-        cmd_err = Tempfile.open('nanoc-asciidoc-err')
-        cmd_out.close
-        cmd_err.close
-
-        # Write input
-        cmd_in.write(content)
-        cmd_in.close
-
-        # Run
-        # TODO allow customizable options
-        fns = {
-          :in  => Escape.shell_single_word(cmd_in.path),
-          :out => Escape.shell_single_word(cmd_out.path),
-          :err => Escape.shell_single_word(cmd_err.path),
-        }
-        command = "asciidoc -o #{fns[:out]} #{fns[:in]} 2>#{fns[:err]}"
-        system(command)
-        success = $?.success?
-
-        # Done
-        output = File.read(cmd_out.path)
-        errors = File.read(cmd_err.path)
-      end
+      # Run command
+      stdout = ''
+      stderr = ''
+      status = systemu(
+        [ 'asciidoc', '-o', '-', '-' ],
+        'stdin'  => content,
+        'stdout' => stdout,
+        'stderr' => stderr)
 
       # Show errors
-      puts errors
-      raise RuntimeError, errors if !success
+      unless status.success?
+        $stderr.puts stderr
+        raise RuntimeError, "AsciiDoc filter failed with status #{status}"
+      end
 
-      # Done
-      output
+      # Get result
+      stdout
     end
 
   end

data/lib/nanoc3/filters/bluecloth.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'bluecloth'
+
 module Nanoc3::Filters
   class BlueCloth < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'bluecloth'
-
       ::BlueCloth.new(content).to_html
     end
 

data/lib/nanoc3/filters/coderay.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
+require 'coderay'
+
 module Nanoc3::Filters
   class CodeRay < Nanoc3::Filter
 
     # @deprecated Use the `:colorize_syntax` filter instead.
     def run(content, params={})
-      require 'coderay'
-
       # Warn
       warn 'The :coderay filter is deprecated; consider using the :colorize_syntax filter instead.'
 

data/lib/nanoc3/filters/colorize_syntax.rb

@@ -1,5 +1,9 @@
 # encoding: utf-8
 
+require 'nokogiri'
+require 'stringio'
+require 'open3'
+
 module Nanoc3::Filters
   class ColorizeSyntax < Nanoc3::Filter
 
@@ -55,18 +59,19 @@ module Nanoc3::Filters
     #
     # @param [String] content The content to filter
     #
-    # @option params [symbol] :default_colorizer (DEFAULT_COLORIZER) The
+    # @option params [Symbol] :default_colorizer (DEFAULT_COLORIZER) The
     #   default colorizer, i.e. the colorizer that will be used when the
     #   colorizer is not overriden for a specific language.
     #
+    # @option params [Symbol] :syntax (:html) The syntax to use, which can be
+    #   `:html`, `:xml` or `:xhtml`, the latter two being the same.
+    #
     # @option params [Hash] :colorizers ({}) A hash containing
     #   a mapping of programming languages (symbols, not strings) onto
     #   colorizers (symbols).
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'nokogiri'
-
       # Take colorizers from parameters
       @colorizers = Hash.new(params[:default_colorizer] || DEFAULT_COLORIZER)
       (params[:colorizers] || {}).each_pair do |language, colorizer|
@@ -177,8 +182,8 @@ module Nanoc3::Filters
     #
     # @return [String] The colorized output
     def pygmentize(code, language, params={})
-      require 'stringio'
       require 'systemu'
+      check_availability('pygmentize --V')
 
       # Build command
       cmd = [ 'pygmentize', '-l', language, '-f', 'html' ]
@@ -215,9 +220,10 @@ module Nanoc3::Filters
     #
     # @since 3.2.0
     def simon_highlight(code, language, params={})
-      require 'stringio'
       require 'systemu'
 
+      check_availability('highlight --version')
+
       # Build command
       cmd = [ 'highlight', '--syntax', language, '--fragment' ]
       params.each do |key, value|
@@ -240,5 +246,12 @@ module Nanoc3::Filters
       stdout.rewind
       stdout.read
     end
+
+    def check_availability(cmd)
+      Open3.popen3(*cmd) do |stdin, stdout, stderr, thread|
+        raise "Could not spawn #{cmd.join(' ')}" if thread.nil?
+      end
+    end
+
   end
 end

data/lib/nanoc3/filters/erb.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8                                                                                                           
 
+require 'erb'
+
 module Nanoc3::Filters
   class ERB < Nanoc3::Filter
 
@@ -14,8 +16,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'erb'
-
       # Create context
       context = ::Nanoc3::Context.new(assigns)
 

data/lib/nanoc3/filters/erubis.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'erubis'
+
 module Nanoc3::Filters
   class Erubis < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'erubis'
-
       # Create context
       context = ::Nanoc3::Context.new(assigns)
 

data/lib/nanoc3/filters/haml.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'haml'
+
 module Nanoc3::Filters
   class Haml < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'haml'
-
       # Get options
       options = params.merge(:filename => filename)
 

data/lib/nanoc3/filters/kramdown.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'kramdown'
+
 module Nanoc3::Filters
   class Kramdown < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'kramdown'
-
       # Get result
       ::Kramdown::Document.new(content, params).to_html
     end

data/lib/nanoc3/filters/less.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'less'
+
 module Nanoc3::Filters
   class Less < Nanoc3::Filter
 
@@ -10,7 +12,36 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'less'
+      # Find imports (hacky)
+      imports = []
+      imports.concat(content.scan(/^@import\s+(["'])([^\1]+?)\1;/))
+      imports.concat(content.scan(/^@import\s+url\((["']?)([^)]+?)\1\);/))
+      imported_filenames = imports.map do |i|
+        i[1].match(/\.(less|css)$/) ? i[1] : i[1] + '.less'
+      end
+
+      # Convert to items
+      imported_items = imported_filenames.map do |filename|
+        # Find directory for this item
+        current_dir_pathname = Pathname.new(@item[:content_filename]).dirname.realpath
+
+        # Find absolute pathname for imported item
+        imported_pathname    = Pathname.new(filename)
+        if imported_pathname.relative?
+          imported_pathname = current_dir_pathname + imported_pathname
+        end
+        next if !imported_pathname.exist?
+        imported_filename = imported_pathname.realpath
+
+        # Find matching item
+        @items.find do |i|
+          next if i[:content_filename].nil?
+          Pathname.new(i[:content_filename]).realpath == imported_filename
+        end
+      end.compact
+
+      # Create dependencies
+      depend_on(imported_items)
 
       # Add filename to load path
       paths = [ File.dirname(@item[:content_filename]) ]

data/lib/nanoc3/filters/markaby.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'markaby'
+
 module Nanoc3::Filters
   class Markaby < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'markaby'
-
       # Get result
       ::Markaby::Builder.new(assigns).instance_eval(content).to_s
     end

data/lib/nanoc3/filters/maruku.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'maruku'
+
 module Nanoc3::Filters
   class Maruku < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'maruku'
-
       # Get result
       ::Maruku.new(content, params).to_html
     end

data/lib/nanoc3/filters/mustache.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'mustache'
+
 module Nanoc3::Filters
 
   # @since 3.2.0
@@ -13,8 +15,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'mustache'
-
       # Get result
       ::Mustache.render(content, item.attributes)
     end

data/lib/nanoc3/filters/rainpress.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'rainpress'
+
 module Nanoc3::Filters
   class Rainpress < Nanoc3::Filter
 
@@ -10,8 +12,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'rainpress'
-
       ::Rainpress.compress(content, params)
     end
 

data/lib/nanoc3/filters/rdiscount.rb

@@ -1,17 +1,18 @@
 # encoding: utf-8
 
+require 'rdiscount'
+
 module Nanoc3::Filters
   class RDiscount < Nanoc3::Filter
 
     # Runs the content through [RDiscount](http://github.com/rtomayko/rdiscount).
-    # This method takes no options.
+    #
+    # @option params [Array] symbol ([]) A list of RDiscount extensions
     #
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'rdiscount'
-
       extensions = params[:extensions] || []
 
       ::RDiscount.new(content, *extensions).to_html

data/lib/nanoc3/filters/rdoc.rb

@@ -1,5 +1,15 @@
 # encoding: utf-8
 
+begin
+  # new RDoc
+  require 'rdoc/markup'
+  require 'rdoc/markup/to_html'
+rescue LoadError
+  # old RDoc
+  require 'rdoc/markup/simple_markup'
+  require 'rdoc/markup/simple_markup/to_html'
+end
+
 module Nanoc3::Filters
   class RDoc < Nanoc3::Filter
 
@@ -12,15 +22,9 @@ module Nanoc3::Filters
     def run(content, params={})
       begin
         # new RDoc
-        require 'rdoc/markup'
-        require 'rdoc/markup/to_html'
-        
         ::RDoc::Markup.new.convert(content, ::RDoc::Markup::ToHtml.new)
       rescue LoadError
         # old RDoc
-        require 'rdoc/markup/simple_markup'
-        require 'rdoc/markup/simple_markup/to_html'
-
         ::SM::SimpleMarkup.new.convert(content, ::SM::ToHtml.new)
       end
     end

data/lib/nanoc3/filters/redcarpet.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'redcarpet'
+
 module Nanoc3::Filters
 
   # @since 3.2.0
@@ -15,8 +17,6 @@ module Nanoc3::Filters
     #
     # @return [String] The filtered content
     def run(content, params={})
-      require 'redcarpet'
-
       options = params[:options] || []
 
       ::Redcarpet.new(content, *options).to_html