nanoc 3.6.11 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a730bbd1983d87218d076f836977767199ef701
-  data.tar.gz: 7bb2110b44c0d6d2e9819b00a903d5e7de9f8234
+  metadata.gz: e05fb6e57e3ddbb81bd5170426bfcc2ce3430f31
+  data.tar.gz: 9c19214f41958e9dd43fdc7f5b1c0db914edde74
 SHA512:
-  metadata.gz: bbc3e89e3c6d901a0c7482d8f52db5574d08f6a2e5e9655cc94dcc83085b56dc18825546af3e5c66bb03b219414dab87dc289ac4954edae25a5f53b6ee8b6ae7
-  data.tar.gz: 2878543090973ca8832c17352d360edcb966d1d701307df6846735a529de0ea65493702d1c7ddb666a55fa9973fae80d58d8ba6b29f2a1c466920d44193bdafd
+  metadata.gz: 0bc2ef4f92b9db37fb96ef5359f6b75df606c682db3269910c35044889275f43dd92ae2f13d8d11af4afbcd762a7f73823db7ad633ccacf0cef0c46ab4b88197
+  data.tar.gz: f8dac777eb295e619fa854cdad8dcf5dbfb57b671b7561697b16a52234b5c561cf87bea85eba92aa0819e3da7ce29069f2ad8839ab5d0029c756833909e3a92e

data/Gemfile

@@ -13,6 +13,7 @@ gem 'builder'
 gem 'coderay'
 gem 'compass'
 gem 'coffee-script'
+gem 'coveralls', :require => false
 gem 'erubis'
 gem 'fog', :platforms => ruby_19_plus
 gem 'haml'
@@ -37,6 +38,7 @@ gem 'rdiscount', :platforms => [:ruby, :mswin]
 gem 'rdoc'
 gem 'redcarpet', :platforms => ruby_19_plus_without_jruby + [:mswin]
 gem 'RedCloth'
+gem 'rouge'
 gem 'rubocop', :platforms => ruby_19_plus
 gem 'rubypants'
 gem 'sass', '~> 3.2.2'

data/Gemfile.lock

@@ -1,26 +1,21 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.11)
+    nanoc (3.7.0)
       cri (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    RedCloth (4.2.9-java)
     addressable (2.3.6)
     adsf (1.2.0)
       rack (>= 1.0.0)
-    allison (2.0.3)
     ast (2.0.0)
     bluecloth (2.2.0)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
     chunky_png (1.3.1)
     coderay (1.1.0)
     coffee-script (2.2.0)
@@ -33,24 +28,26 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    cri (2.6.0)
+    cri (2.6.1)
       colored (~> 1.2)
-    echoe (4.6.5)
-      allison (>= 2.0.3)
-      rake (>= 0.9.2)
-      rdoc (>= 2.5.11)
-      rubyforge (>= 2.0.4)
+    docile (1.1.3)
     erubis (2.7.0)
-    excon (0.33.0)
-    execjs (2.0.2)
+    excon (0.36.0)
+    execjs (2.2.0)
     ffi (1.9.3)
-    ffi (1.9.3-java)
-    fog (1.22.0)
+    fog (1.22.1)
       fog-brightbox
-      fog-core (~> 1.21, >= 1.21.1)
+      fog-core (~> 1.22)
       fog-json
+      ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
     fog-brightbox (0.0.2)
       fog-core
@@ -64,7 +61,7 @@ GEM
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    formatador (0.2.4)
+    formatador (0.2.5)
     fssm (0.2.10)
     haml (4.0.5)
       tilt
@@ -72,39 +69,33 @@ GEM
       handlebars-source (~> 1.3.0)
       therubyracer (~> 0.12.0)
     handlebars-source (1.3.0)
+    ipaddress (0.8.0)
     json (1.8.1)
-    json (1.8.1-java)
-    json_pure (1.8.1)
     kramdown (1.3.3)
-    less (2.5.0)
+    less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.3)
-    listen (2.7.4)
+    listen (2.7.7)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     markaby (0.8.0)
       builder
-    maruku (0.7.1)
+    maruku (0.7.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.2)
-    mini_portile (0.5.3)
+    mime-types (2.3)
+    mini_portile (0.6.0)
     minitest (4.7.5)
-    mocha (1.0.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     mustache (0.99.5)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.0)
-    nio4r (1.0.0)
-    nio4r (1.0.0-java)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nokogiri (1.6.1-java)
-      mini_portile (~> 0.5.0)
+    net-ssh (2.9.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     pandoc-ruby (0.7.5)
     parser (2.1.9)
       ast (>= 1.1, < 3.0)
@@ -115,69 +106,70 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.12.6-java)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
     pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rainbow (2.0.0)
     rainpress (1.0)
-      echoe
-    rake (10.3.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.7.1)
     rdoc (4.1.1)
       json (~> 1.4)
-    redcarpet (3.1.1)
+    redcarpet (3.1.2)
     ref (1.0.5)
-    rubocop (0.21.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rouge (1.4.0)
+    rubocop (0.23.0)
       json (>= 1.7.7, < 2)
       parser (~> 2.1.9)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.4.2)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
+    ruby-progressbar (1.5.1)
     rubypants (0.2.0)
     safe_yaml (1.0.3)
     sass (3.2.19)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
     slop (3.5.0)
-    spoon (0.0.4)
-      ffi
     temple (0.6.7)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
+    thor (0.19.1)
     tilt (2.0.1)
     timers (1.1.0)
+    tins (1.3.0)
     typogruby (1.0.16)
       rubypants
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    vcr (2.9.0)
+    vcr (2.9.2)
     w3c_validators (1.2)
       json
       nokogiri
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
     yajl-ruby (1.1.0)
     yard (0.8.7.4)
     yuicompressor (1.3.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -189,6 +181,7 @@ DEPENDENCIES
   coderay
   coffee-script
   compass
+  coveralls
   erubis
   fog
   haml
@@ -213,6 +206,7 @@ DEPENDENCIES
   rdiscount
   rdoc
   redcarpet
+  rouge
   rubocop
   rubypants
   sass (~> 3.2.2)

data/NEWS.md

@@ -1,5 +1,26 @@
 # nanoc news
 
+## 3.7.0 (2014-06-08)
+
+New features:
+
+* Allowed excluding links from the internal links check (`@config[:checks][:internal_links][:exclude]`) (#242) [Remko Tronçon]
+* Added Rouge syntax coloring filter (#398) [Guilherme Garnier]
+* Backported `after_setup` from nanoc 4 to make it easier to create CLI plugins (#407) [Rémi Barraquand]
+* Make lib dirs configurable using `lib_dirs` config attribute (#424) [Gregory Pakosz]
+* Added support for setting parent config dir using `parent_config_file` config attribute (#419) [Gregory Pakosz]
+
+Enhancements:
+
+* Added `:with_toc` support to RedCarpet (#222, #232)
+* Added `slim` to the list of text extensions (#316)
+* Made `content/` and `layouts/` dirs configurable (#412) [Gregory Pakosz]
+* Allowed included rules files to have their own preprocess block (#420) [Gregory Pakosz]
+
+Fixes:
+
+* Fixed bug which caused temporary directories not to be removed (#440, #444)
+
 ## 3.6.11 (2014-05-09)
 
 Identical to 3.6.10 but published with corrected release notes.

data/bin/nanoc

@@ -4,6 +4,7 @@
 # Try loading bundler if it's possible
 begin
   require 'bundler/setup'
+  Bundler.require(:default)
 rescue LoadError
   # no problem
 end

data/lib/nanoc/base/compilation/compiler.rb

@@ -191,12 +191,13 @@ module Nanoc
     end
     memoize :dependency_tracker
 
-    # Runs the preprocessor.
+    # Runs the preprocessors.
     #
     # @api private
     def preprocess
-      return if rules_collection.preprocessor.nil?
-      preprocessor_context.instance_eval(&rules_collection.preprocessor)
+      rules_collection.preprocessors.each_value do |preprocessor|
+        preprocessor_context.instance_eval(&preprocessor)
+      end
     end
 
     # Returns all objects managed by the site (items, layouts, code snippets,

data/lib/nanoc/base/compilation/compiler_dsl.rb

@@ -5,6 +5,11 @@ module Nanoc
   # Contains methods that will be executed by the site’s `Rules` file.
   class CompilerDSL
 
+    # The current rules filename.
+    #
+    # @return [String] The current rules filename.
+    attr_accessor :rules_filename
+
     # Creates a new compiler DSL for the given collection of rules.
     #
     # @api private
@@ -25,12 +30,11 @@ module Nanoc
     #
     # @return [void]
     def preprocess(&block)
-      if @rules_collection.preprocessor
+      if @rules_collection.preprocessors[rules_filename]
         warn 'WARNING: A preprocess block is already defined. Defining ' \
           'another preprocess block overrides the previously one.'
       end
-
-      @rules_collection.preprocessor = block
+      @rules_collection.preprocessors[rules_filename] = block
     end
 
     # Creates a compilation rule for all items whose identifier match the
@@ -246,7 +250,7 @@ module Nanoc
       filename = [ "#{name}", "#{name}.rb", "./#{name}", "./#{name}.rb" ].find { |f| File.file?(f) }
       raise Nanoc::Errors::NoRulesFileFound.new if filename.nil?
 
-      instance_eval(File.read(filename), filename)
+      @rules_collection.parse(filename)
     end
 
   private

data/lib/nanoc/base/compilation/rules_collection.rb

@@ -28,17 +28,21 @@ module Nanoc
     # @return [Hash] The layout-to-filter mapping rules
     attr_reader :layout_filter_mapping
 
-    # @return [Proc] The code block that will be executed after all data is
-    #   loaded but before the site is compiled
-    attr_accessor :preprocessor
+    # The hash containing preprocessor code blocks that will be executed after
+    #   all data is loaded but before the site is compiled.
+    #
+    # @return [Hash] The hash containing the preprocessor code blocks that will
+    #   be executed after all data is loaded but before the site is compiled
+    attr_accessor :preprocessors
 
     # @param [Nanoc::Compiler] compiler The site’s compiler
     def initialize(compiler)
       @compiler = compiler
 
-      @item_compilation_rules  = []
-      @item_routing_rules      = []
-      @layout_filter_mapping   = OrderedHash.new
+      @item_compilation_rules = []
+      @item_routing_rules     = []
+      @layout_filter_mapping  = OrderedHash.new
+      @preprocessors          = OrderedHash.new
     end
 
     # Add the given rule to the list of item compilation rules.
@@ -76,20 +80,29 @@ module Nanoc
       rules_filename = rules_filenames.find { |f| File.file?(f) }
       raise Nanoc::Errors::NoRulesFileFound.new if rules_filename.nil?
 
+      parse(rules_filename)
+    end
+
+    def parse(rules_filename)
+      rules_filename = File.absolute_path(rules_filename)
+
       # Get rule data
       @data = File.read(rules_filename)
 
-      # Load DSL
-      dsl.instance_eval(@data, "./#{rules_filename}")
+      old_rules_filename = dsl.rules_filename
+      dsl.rules_filename = rules_filename
+      dsl.instance_eval(@data, rules_filename)
+      dsl.rules_filename = old_rules_filename
     end
 
     # Unloads this site’s rules.
     #
     # @return [void]
     def unload
-      @item_compilation_rules  = []
-      @item_routing_rules      = []
-      @layout_filter_mapping   = OrderedHash.new
+      @item_compilation_rules = []
+      @item_routing_rules     = []
+      @layout_filter_mapping  = OrderedHash.new
+      @preprocessors          = OrderedHash.new
     end
 
     # Finds the first matching compilation rule for the given item

data/lib/nanoc/base/source_data/data_source.rb

@@ -58,7 +58,7 @@ module Nanoc
       @site         = site
       @items_root   = items_root
       @layouts_root = layouts_root
-      @config       = config
+      @config       = config || {}
 
       @references = 0
     end

data/lib/nanoc/base/source_data/site.rb

@@ -32,7 +32,8 @@ module Nanoc
     # that lacks some options, the default value will be taken from
     # `DEFAULT_CONFIG`.
     DEFAULT_CONFIG = {
-      :text_extensions    => %w( css erb haml htm html js less markdown md php rb sass scss txt xhtml xml coffee hb handlebars mustache ms ).sort,
+      :text_extensions    => %w( css erb haml htm html js less markdown md php rb sass scss txt xhtml xml coffee hb handlebars mustache ms slim ).sort,
+      :lib_dirs           => %w( lib ),
       :output_dir         => 'output',
       :data_sources       => [ {} ],
       :index_filenames    => [ 'index.html' ],
@@ -305,11 +306,15 @@ module Nanoc
       @code_snippets_loaded = true
 
       # Get code snippets
-      @code_snippets = Dir['lib/**/*.rb'].sort.map do |filename|
-        Nanoc::CodeSnippet.new(
-          File.read(filename),
-          filename
-        )
+      @code_snippets = []
+      config[:lib_dirs].each do |lib|
+        code_snippets = Dir["#{lib}/**/*.rb"].sort.map do |filename|
+          Nanoc::CodeSnippet.new(
+            File.read(filename),
+            filename
+          )
+        end
+        @code_snippets.concat(code_snippets)
       end
 
       # Execute code snippets
@@ -350,6 +355,29 @@ module Nanoc
       end
     end
 
+    # Loads a configuration file.
+    def load_config(config_path)
+      YAML.load_file(config_path).symbolize_keys_recursively
+    end
+
+    def apply_parent_config(config, config_paths = [])
+      parent_config_file = config[:parent_config_file]
+      if parent_config_file
+        config.delete(:parent_config_file)
+        config_path = File.absolute_path(parent_config_file, File.dirname(config_paths.last))
+        if !File.file?(config_path)
+          raise Nanoc::Errors::GenericTrivial, "Could not find parent configuration file '#{parent_config_file}'"
+        end
+        if config_paths.include?(config_path)
+          raise Nanoc::Errors::GenericTrivial, "Cycle detected. Could not use parent configuration file '#{parent_config_file}'"
+        end
+        parent_config = load_config(config_path)
+        apply_parent_config(parent_config, config_paths + [config_path]).merge(config)
+      else
+        config
+      end
+    end
+
     def ensure_identifier_uniqueness(objects, type)
       seen = Set.new
       objects.each do |obj|
@@ -375,22 +403,24 @@ module Nanoc
           if filename.nil?
             raise Nanoc::Errors::GenericTrivial, 'Could not find nanoc.yaml or config.yaml in the current working directory'
           end
-          File.join(dir_or_config_hash, filename)
+          File.absolute_path(filename, dir_or_config_hash)
         end
-        @config = DEFAULT_CONFIG.merge(YAML.load_file(config_path).symbolize_keys_recursively)
-        @config[:data_sources].map! { |ds| ds.symbolize_keys_recursively }
+
+        @config = apply_parent_config(load_config(config_path), [config_path])
       else
         # Use passed config hash
-        @config = DEFAULT_CONFIG.merge(dir_or_config_hash)
+        @config = apply_parent_config(dir_or_config_hash.symbolize_keys_recursively)
       end
 
+      # Merge config with default config
+      @config = DEFAULT_CONFIG.merge(@config)
+
       # Merge data sources with default data source config
       @config[:data_sources] = @config[:data_sources].map { |ds| DEFAULT_DATA_SOURCE_CONFIG.merge(ds) }
 
       # Convert to proper configuration
       @config = Nanoc::Configuration.new(@config)
     end
-
   end
 
 end

data/lib/nanoc/base/temp_filename_factory.rb

@@ -46,6 +46,10 @@ module Nanoc
       end
 
       @counts.delete(prefix)
+
+      if @counts.empty? && File.directory?(@root_dir)
+        FileUtils.remove_entry_secure(@root_dir)
+      end
     end
 
   end

data/lib/nanoc/cli.rb

@@ -74,6 +74,14 @@ module Nanoc::CLI
     root_command.add_command(cmd)
   end
 
+  # Schedules the given block to be executed after the CLI has been set up.
+  #
+  # @return [void]
+  def self.after_setup(&block)
+    # TODO decide what should happen if the CLI is already set up
+    self.add_after_setup_proc(block)
+  end
+
 protected
 
   # Makes the commandline interface ready for use.
@@ -83,6 +91,7 @@ protected
     setup_cleaning_streams
     setup_commands
     load_custom_commands
+    after_setup_procs.each { |b| b.call }
   end
 
   # Sets up the root command and base subcommands.
@@ -207,4 +216,13 @@ protected
     true
   end
 
+  def self.after_setup_procs
+    @after_setup_procs || []
+  end
+
+  def self.add_after_setup_proc(proc)
+    @after_setup_procs ||= []
+    @after_setup_procs << proc
+  end
+
 end

data/lib/nanoc/cli/commands/create-site.rb

@@ -85,8 +85,20 @@ data_sources:
     # it will become “/about.html/” instead.
     allow_periods_in_identifiers: false
 
-    # The default encoding for all files in `content/` and `layouts/`.
+    # The encoding to use for input files. If your input files are not in
+    # UTF-8 (which they should be!), change this.
     encoding: utf-8
+
+# Configuration for the “check” command, which run unit tests on the site.
+checks:
+  # Configuration for the “internal_links” checker, which checks whether all
+  # internal links are valid.
+  internal_links:
+    # A list of patterns, specified as regular expressions, to exclude from the check.
+    # If an internal link matches this pattern, the validity check will be skipped.
+    # E.g.:
+    #   exclude: ['^/server_status']
+    exclude: []
 EOS
 
     DEFAULT_RULES = <<EOS unless defined? DEFAULT_RULES

data/lib/nanoc/data_sources/filesystem.rb

@@ -23,10 +23,18 @@ module Nanoc::DataSources
     def down
     end
 
+    def content_dir_name
+      config.fetch(:content_dir, 'content')
+    end
+
+    def layouts_dir_name
+      config.fetch(:layouts_dir, 'layouts')
+    end
+
     # See {Nanoc::DataSource#setup}.
     def setup
       # Create directories
-      %w( content layouts ).each do |dir|
+      [ content_dir_name, layouts_dir_name ].each do |dir|
         FileUtils.mkdir_p(dir)
         vcs.add(dir)
       end
@@ -34,22 +42,22 @@ module Nanoc::DataSources
 
     # See {Nanoc::DataSource#items}.
     def items
-      load_objects('content', 'item', Nanoc::Item)
+      load_objects(content_dir_name, 'item', Nanoc::Item)
     end
 
     # See {Nanoc::DataSource#layouts}.
     def layouts
-      load_objects('layouts', 'layout', Nanoc::Layout)
+      load_objects(layouts_dir_name, 'layout', Nanoc::Layout)
     end
 
     # See {Nanoc::DataSource#create_item}.
     def create_item(content, attributes, identifier, params = {})
-      create_object('content', content, attributes, identifier, params)
+      create_object(content_dir_name, content, attributes, identifier, params)
     end
 
     # See {Nanoc::DataSource#create_layout}.
     def create_layout(content, attributes, identifier, params = {})
-      create_object('layouts', content, attributes, identifier, params)
+      create_object(layouts_dir_name, content, attributes, identifier, params)
     end
 
   protected

data/lib/nanoc/data_sources/filesystem_unified.rb

@@ -5,8 +5,15 @@ module Nanoc::DataSources
   # The filesystem_unified data source stores its items and layouts in nested
   # directories. Items and layouts are represented by one or two files; if it
   # is represented using one file, the metadata can be contained in this file.
-  # The root directory for items is the `content` directory; for layouts, this
-  # is the `layouts` directory.
+  #
+  # The default root directory for items is the `content` directory; for
+  # layouts, this is the `layouts` directory. This can be overridden
+  # in the data source configuration:
+  #
+  #     data_sources:
+  #       - type:         filesystem_unified
+  #         content_dir:  items
+  #         layouts_dir:  layouts
   #
   # The metadata for items and layouts can be stored in a separate file with
   # the same base name but with the `.yaml` extension. If such a file is

data/lib/nanoc/data_sources/static.rb

@@ -17,9 +17,9 @@ module Nanoc::DataSources
   # The default data source directory is `static/`, but this can be overridden
   # in the data source configuration:
   #
-  #    data_sources:
-  #      - type:   static
-  #        prefix: assets
+  #     data_sources:
+  #       - type:   static
+  #         prefix: assets
   #
   # Unless the `hide_items` configuration attribute is false, items from static
   # data sources will have the :is_hidden attribute set by default, which will

data/lib/nanoc/extra/checking/checks/internal_links.rb

@@ -9,6 +9,9 @@ module Nanoc::Extra::Checking::Checks
 
     # Starts the validator. The results will be printed to stdout.
     #
+    # Internal links that match a regexp pattern in `@config[:checks][:internal_links][:exclude]` will
+    # be skipped.
+    #
     # @return [void]
     def run
       # TODO de-duplicate this (duplicated in external links check)
@@ -32,6 +35,9 @@ module Nanoc::Extra::Checking::Checks
       # FIXME this is ugly and won’t always be correct
       return true if href == '.'
 
+      # Skip hrefs that are specified in the exclude configuration
+      return true if self.excluded?(href)
+
       # Remove target
       path = href.sub(/#.*$/, '')
       return true if path.empty?
@@ -60,6 +66,11 @@ module Nanoc::Extra::Checking::Checks
       false
     end
 
+    def excluded?(href)
+      excludes =  @site.config.fetch(:checks, {}).fetch(:internal_links, {}).fetch(:exclude, [])
+      excludes.any? { |pattern| Regexp.new(pattern).match(href) }
+    end
+
   end
 
 end

data/lib/nanoc/extra/deployers/rsync.rb

@@ -23,7 +23,15 @@ module Nanoc::Extra::Deployers
 
     # Default rsync options
     DEFAULT_OPTIONS = [
-      '-glpPrtvz',
+      '--group',
+      '--links',
+      '--perms',
+      '--partial',
+      '--progress',
+      '--recursive',
+      '--times',
+      '--verbose',
+      '--compress',
       '--exclude=".hg"',
       '--exclude=".svn"',
       '--exclude=".git"'

data/lib/nanoc/filters/colorize_syntax.rb

@@ -34,6 +34,7 @@ module Nanoc::Filters
     # * `:pygmentsrb` for [pygments.rb](https://github.com/tmm1/pygments.rb),
     #   a Ruby interface for [Pygments](http://pygments.org/)
     # * `:simon_highlight` for [Highlight](http://www.andre-simon.de/doku/highlight/en/highlight.html)
+    # * `:rouge` for [Rouge](https://github.com/jayferd/rouge/)
     #
     # Additional colorizer implementations are welcome!
     #
@@ -315,9 +316,50 @@ module Nanoc::Filters
       element.swap div_outer
     end
 
+    # Runs the content through [Rouge](https://github.com/jayferd/rouge/.
+    #
+    # @api private
+    #
+    # @param [String] code The code to colorize
+    #
+    # @param [String] language The language the code is written in
+    #
+    # @return [String] The colorized output
+    def rouge(code, language, params = {})
+      require 'rouge'
+
+      formatter_options = {
+        :css_class => params.fetch(:css_class, 'highlight'),
+      }
+      formatter = Rouge::Formatters::HTML.new(formatter_options)
+      lexer = Rouge::Lexer.find_fancy(language, code) || Rouge::Lexers::PlainText
+      formatter.format(lexer.lex(code))
+    end
+
+    # Removes the double wrapping.
+    #
+    # Before:
+    #
+    #   <pre><code class="language-ruby"><pre><code class="highlight">
+    #
+    # After:
+    #
+    #   <pre><code class="language-ruby highlight">
+    def rouge_postprocess(language, element)
+      return if element.name != 'pre'
+
+      code1 = element.xpath('code').first
+      return if code1.nil?
+      code2 = code1.xpath('pre/code').first
+      return if code2.nil?
+
+      code1.inner_html = code2.inner_html
+      code1['class'] = [ code1['class'], code2['class'] ].compact.join(' ')
+    end
+
   protected
 
-    KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight ]
+    KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight, :rouge ]
 
     # Removes the first blank lines and any whitespace at the end.
     def strip(s)

data/lib/nanoc/filters/redcarpet.rb

@@ -38,26 +38,47 @@ module Nanoc::Filters
     #   @option params [Hash] :renderer_options ({}) A list of options to pass
     #     on to the Redcarpet renderer
     #
+    #   @option params [Boolean] :with_toc (false) A boolean to request a table
+    #     of contents
+
     #   @return [String] The filtered content
     def run(content, params = {})
       if ::Redcarpet::VERSION > '2'
-        options          = params[:options]          || {}
-        renderer_class   = params[:renderer]         || ::Redcarpet::Render::HTML
-        renderer_options = params[:renderer_options] || {}
+        options          = params.fetch(:options,          {})
+        renderer_class   = params.fetch(:renderer,         ::Redcarpet::Render::HTML)
+        renderer_options = params.fetch(:renderer_options, {})
+        with_toc         = params.fetch(:with_toc,         false)
 
         if options.is_a?(Array)
           warn 'WARNING: You are passing an array of options to the :redcarpet filter, but Redcarpet 2.x expects a hash instead. This will likely fail.'
         end
 
+        # Setup TOC
+        if with_toc
+          unless renderer_class <= ::Redcarpet::Render::HTML
+            raise "Unexpected renderer: #{renderer_class}"
+          end
+
+          # `with_toc` implies `with_toc_data` for the HTML renderer
+          renderer_options[:with_toc_data] = true
+        end
+
+        # Create renderer
         if renderer_class == ::Redcarpet::Render::HTML_TOC
           renderer = renderer_class.new
         else
           renderer = renderer_class.new(renderer_options)
         end
-        ::Redcarpet::Markdown.new(renderer, options).render(content)
-      else
-        options = params[:options] || []
-        ::Redcarpet.new(content, *options).to_html
+
+        # Render
+        if with_toc
+          renderer_toc = ::Redcarpet::Render::HTML_TOC.new
+          toc  = ::Redcarpet::Markdown.new(renderer_toc, options).render(content)
+          body = ::Redcarpet::Markdown.new(renderer,     options).render(content)
+          toc + body
+        else
+          ::Redcarpet::Markdown.new(renderer, options).render(content)
+        end
       end
     end
 

data/lib/nanoc/helpers/blogging.rb

@@ -28,7 +28,12 @@ module Nanoc::Helpers
     #
     # @return [Array] An array containing all articles
     def articles
-      @items.select { |item| item[:kind] == 'article' }
+      blk = lambda { @items.select { |item| item[:kind] == 'article' } }
+      if @items.frozen?
+        @article_items ||= blk.call
+      else
+        blk.call
+      end
     end
 
     # Returns a sorted list of articles, i.e. items where the `kind`
@@ -37,9 +42,15 @@ module Nanoc::Helpers
     #
     # @return [Array] A sorted array containing all articles
     def sorted_articles
-      articles.sort_by do |a|
-        attribute_to_time(a[:created_at])
-      end.reverse
+      blk = lambda do
+        articles.sort_by { |a| attribute_to_time(a[:created_at]) }.reverse
+      end
+
+      if @items.frozen?
+        @sorted_article_items ||= blk.call
+      else
+        blk.call
+      end
     end
 
     class AtomFeedBuilder

data/lib/nanoc/version.rb

@@ -3,6 +3,6 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.6.11'
+  VERSION = '3.7.0'
 
 end

data/nanoc.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 $LOAD_PATH.unshift(File.expand_path('../lib/', __FILE__))
-require 'nanoc'
+require 'nanoc/version'
 
 Gem::Specification.new do |s|
   s.name        = 'nanoc'

data/tasks/rubocop.rake

@@ -1,9 +1,9 @@
 begin
   require 'rubocop/rake_task'
 
-  Rubocop::RakeTask.new(:rubocop) do |task|
+  RuboCop::RakeTask.new(:rubocop) do |task|
     task.patterns = ['lib/**/*.rb']
   end
 rescue LoadError
-  warn "Could not load Rubocop. Rubocop rake tasks will be unavailable."
+  warn "Could not load RuboCop. RuboCop rake tasks will be unavailable."
 end

data/test/base/temp_filename_factory_spec.rb

@@ -53,6 +53,14 @@ describe Nanoc::TempFilenameFactory do
       File.file?(path_a).wont_equal(true)
     end
 
+    it 'should eventually delete the root directory' do
+      subject.create(prefix)
+      File.directory?(subject.root_dir).must_equal(true)
+
+      subject.cleanup(prefix)
+      File.directory?(subject.root_dir).wont_equal(true)
+    end
+
   end
 
   describe 'other instance' do

data/test/base/test_compiler_dsl.rb

@@ -33,6 +33,40 @@ class Nanoc::CompilerDSLTest < Nanoc::TestCase
     assert_match(/WARNING: A preprocess block is already defined./, io[:stderr])
   end
 
+  def test_per_rules_file_preprocessor
+    # Create site
+    Nanoc::CLI.run %w( create_site per-rules-file-preprocessor )
+    FileUtils.cd('per-rules-file-preprocessor') do
+      # Create rep
+      item = Nanoc::Item.new('foo', { :extension => 'bar' }, '/foo/')
+
+      # Create a bonus rules file
+      File.open('more_rules.rb', 'w') { |io| io.write "preprocess { @items['/foo/'][:preprocessed] = true }" }
+
+      # Create other necessary stuff
+      site = Nanoc::Site.new('.')
+      site.items << item
+      dsl = site.compiler.rules_collection.dsl
+      io = capturing_stdio do
+        dsl.preprocess {}
+      end
+      assert_empty io[:stdout]
+      assert_empty io[:stderr]
+
+      # Include rules
+      dsl.include_rules 'more_rules'
+
+      # Check that the two preprocess blocks have been added
+      assert_equal 2, site.compiler.rules_collection.preprocessors.size
+      refute_nil site.compiler.rules_collection.preprocessors.first
+      refute_nil site.compiler.rules_collection.preprocessors.last
+
+      # Apply preprocess blocks
+      site.compiler.preprocess
+      assert item[:preprocessed]
+    end
+  end
+
   def test_include_rules
     # Create site
     Nanoc::CLI.run %w( create_site with_bonus_rules )

data/test/base/test_site.rb

@@ -33,14 +33,89 @@ class Nanoc::SiteTest < Nanoc::TestCase
     assert_equal({},      site.config[:data_sources][0][:config])
   end
 
+  def test_initialize_with_existing_parent_config_file
+    File.open('nanoc.yaml', 'w') do |io|
+      io.write <<-EOF
+output_dir: public_html
+parent_config_file: foo/foo.yaml
+EOF
+    end
+    FileUtils.mkdir_p('foo')
+    FileUtils.cd('foo') do
+      File.open('foo.yaml', 'w') do |io|
+        io.write <<-EOF
+parent_config_file: ../bar/bar.yaml
+EOF
+      end
+    end
+    FileUtils.mkdir_p('bar')
+    FileUtils.cd('bar') do
+      File.open('bar.yaml', 'w') do |io|
+        io.write <<-EOF
+enable_output_diff: true
+foo: bar
+output_dir: output
+EOF
+      end
+    end
+
+    site = Nanoc::Site.new('.')
+    assert_nil site.config[:parent_config_file]
+    assert site.config[:enable_output_diff]
+    assert_equal 'bar', site.config[:foo]
+    assert_equal 'public_html', site.config[:output_dir]
+  end
+
+  def test_initialize_with_missing_parent_config_file
+    File.open('nanoc.yaml', 'w') do |io|
+      io.write <<-EOF
+parent_config_file: foo/foo.yaml
+EOF
+    end
+
+    error = assert_raises(Nanoc::Errors::GenericTrivial) do
+      site = Nanoc::Site.new('.')
+    end
+    assert_equal(
+      "Could not find parent configuration file 'foo/foo.yaml'",
+      error.message
+    )
+  end
+
+  def test_initialize_with_parent_config_file_cycle
+    File.open('nanoc.yaml', 'w') do |io|
+      io.write <<-EOF
+parent_config_file: foo/foo.yaml
+EOF
+    end
+    FileUtils.mkdir_p('foo')
+    FileUtils.cd('foo') do
+      File.open('foo.yaml', 'w') do |io|
+        io.write <<-EOF
+parent_config_file: ../nanoc.yaml
+EOF
+      end
+    end
+
+    error = assert_raises(Nanoc::Errors::GenericTrivial) do
+      site = Nanoc::Site.new('.')
+    end
+    assert_equal(
+      "Cycle detected. Could not use parent configuration file '../nanoc.yaml'",
+      error.message
+    )
+  end
+
   def test_load_rules_with_existing_rules_file
     # Mock DSL
     dsl = mock
+    dsl.stubs(:rules_filename)
+    dsl.stubs(:rules_filename=)
     dsl.expects(:compile).with('*')
 
     # Create site
     site = Nanoc::Site.new({})
-    site.compiler.rules_collection.expects(:dsl).returns(dsl)
+    site.compiler.rules_collection.stubs(:dsl).returns(dsl)
 
     # Create rules file
     File.open('Rules', 'w') do |io|

data/test/cli/commands/test_create_site.rb

@@ -19,6 +19,37 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     end
   end
 
+  def test_default_encoding
+    if !defined?(Encoding)
+      skip 'No Encoding class'
+      return
+    end
+
+    original_encoding = Encoding.default_external
+    Encoding.default_external = 'ISO-8859-1' # ew!
+
+    Nanoc::CLI.run %w( create_site foo )
+
+    FileUtils.cd('foo') do
+
+      # Try with encoding = default encoding = utf-8
+      File.open('content/index.html', 'w') { |io| io.write("Hello <\xD6>!\n") }
+      site = Nanoc::Site.new('.')
+      exception = assert_raises(RuntimeError) do
+        site.compile
+      end
+      assert_equal "Could not read content/index.html because the file is not valid UTF-8.", exception.message
+
+      # Try with encoding = specific
+      File.open('nanoc.yaml', 'w') { |io| io.write("meh: true\n") }
+      site = Nanoc::Site.new('.')
+      site.compile
+    end
+    FileUtils
+  ensure
+    Encoding.default_external = original_encoding
+  end
+
   def test_new_site_has_correct_stylesheets
     Nanoc::CLI.run %w( create_site foo )
     FileUtils.cd('foo') do

data/test/cli/test_cli.rb

@@ -102,6 +102,15 @@ EOS
     end
   end
 
+  def test_after_setup
+    $after_setup_success = false
+    Nanoc::CLI.after_setup do
+      $after_setup_success = true
+    end
+    Nanoc::CLI.setup
+    assert $after_setup_success
+  end
+
   def test_enable_utf8_only_on_tty
     new_env_diff = {
       'LC_ALL'   => 'en_US.ISO-8859-1',

data/test/extra/checking/checks/test_internal_links.rb

@@ -53,6 +53,19 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
     end
   end
 
+  def test_exclude
+    with_site do |site|
+      # Create check
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+      site.config.update({ :checks => { :internal_links => { :exclude => ['^/excluded\d+'] } } })
+
+      # Test
+      assert check.send(:valid?, '/excluded1', 'output/origin')
+      assert check.send(:valid?, '/excluded2', 'output/origin')
+      assert !check.send(:valid?, '/excluded_not', 'output/origin')
+    end
+  end
+
   def test_unescape_url
     with_site do |site|
       FileUtils.mkdir_p('output/stuff')
@@ -64,4 +77,5 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
       refute check.send(:valid?, 'stuff/wrong%20foo', 'output/origin')
     end
   end
+
 end

data/test/filters/test_colorize_syntax.rb

@@ -385,4 +385,58 @@ EOS
     end
   end
 
+  def test_rouge
+    if_have 'rouge', 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = <<EOS
+before
+<pre><code class="language-ruby">
+  def foo
+  end
+</code></pre>
+after
+EOS
+      expected_output = <<EOS
+before
+<pre><code class=\"language-ruby highlight\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
+  <span class=\"k\">end</span></code></pre>
+after
+EOS
+
+      # Run filter
+      actual_output = filter.setup_and_run(input, :default_colorizer => :rouge)
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
+  def test_rouge_with_css_class
+    if_have 'rouge', 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = <<EOS
+before
+<pre><code class="language-ruby">
+  def foo
+  end
+</code></pre>
+after
+EOS
+      expected_output = <<EOS
+before
+<pre><code class=\"language-ruby my-class\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
+  <span class=\"k\">end</span></code></pre>
+after
+EOS
+
+      # Run filter
+      actual_output = filter.setup_and_run(input, :default_colorizer => :rouge, :rouge => { :css_class => 'my-class' })
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
 end

data/test/filters/test_redcarpet.rb

@@ -79,7 +79,31 @@ class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
 
       # Run filter
       input = "# Heading 1\n## Heading 2\n"
-      filter.run(input, :renderer => Redcarpet::Render::HTML_TOC)
+      output_actual = filter.run(input, :renderer => Redcarpet::Render::HTML_TOC)
+
+      # Test
+      output_expected = %r{<ul>\n<li>\n<a href=\"#heading-1\">Heading 1</a>\n<ul>\n<li>\n<a href=\"#heading-2\">Heading 2</a>\n</li>\n</ul>\n</li>\n</ul>}
+      assert_match(output_expected, output_actual)
+    end
+  end
+
+  def test_toc_if_requested
+    if_have 'redcarpet' do
+      # Create filter
+      filter = ::Nanoc::Filters::Redcarpet.new
+
+      # Run filter
+      input = "A Title\n======"
+      if ::Redcarpet::VERSION > '2'
+        output_expected = %r{<ul>\n<li>\n<a href="#a-title">A Title</a>\n</li>\n</ul>\n<h1 id="a-title">A Title</h1>\n}
+        output_actual   = filter.setup_and_run(input, :with_toc => true)
+      else
+        output_expected = %r{<h1>A Title</h1>\n}
+        output_actual   = filter.setup_and_run(input)
+      end
+
+      # Test
+      assert_match(output_expected, output_actual)
     end
   end
 

data/test/helper.rb

@@ -10,6 +10,10 @@ require 'minitest/mock'
 require 'mocha/setup'
 require 'vcr'
 
+# Setup coverage
+require 'coveralls'
+Coveralls.wear!
+
 # Load nanoc
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'nanoc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.6.11
+  version: 3.7.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri