nanoc3 3.2.3 → 3.2.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2011 Denis Defreyne and contributors
+Copyright (c) 2007-2012 Denis Defreyne and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,13 @@
 # nanoc news
 
+## 3.2.4 (2012-01-09)
+
+* Fixed bug which would cause some reps not to be compiled when invoking nanoc programmatically
+* Made data source configuration location a bit more obvious
+* Fixed watch command under Windows
+* Made filesystem data source ignore UTF-8 BOM
+* Improved compatibility of colorize_syntax filter with older libxml versions
+
 ## 3.2.3 (2011-10-31)
 
 * Made syntax colorizer only strip trailing blank lines instead of all blanks
@@ -31,8 +39,7 @@ Base:
 * Added progress indicator for long-running filters
 * Made all source data, such as item attributes, frozen during compilation
 * Added --color option to force color on
-* Cleaned up internals, deprecating several parts and/or marking them as
-  private in the progress
+* Cleaned up internals, deprecating several parts and/or marking them as private in the progress
 * Allowed custom commands in commands/
 
 Extensions:
@@ -77,8 +84,7 @@ Extensions:
 * Improved metadata section check so that e.g. raw diffs are handled properly
 * Deprecated using `Nanoc3::Site#initialize` with a non-`"."` argument
 * Added Ruby engine to version string
-* Allowed the `created_at` and `updated_at` attributes used in the `Blogging`
-  helper to be `Date` instances
+* Allowed the `created_at` and `updated_at` attributes used in the `Blogging` helper to be `Date` instances
 
 ## 3.1.4 (2010-07-25)
 
@@ -93,15 +99,13 @@ Extensions:
 ## 3.1.3 (2010-04-25)
 
 * Removed annoying win32console warning [Eric Sunshine]
-* Removed color codes when not writing to a terminal, or when writing to
-  Windows’ console when win32console is not installed [Eric Sunshine]
+* Removed color codes when not writing to a terminal, or when writing to Windows’ console when win32console is not installed [Eric Sunshine]
 * Added .xhtml and .xml to list of text extensions
 * Improved support for relative Sass @imports [Chris Eppstein]
 
 ## 3.1.2 (2010-04-07)
 
-* Fixed bug which could cause incorrect output when compilation of an item is
-  delayed due to an unmet dependency
+* Fixed bug which could cause incorrect output when compilation of an item is delayed due to an unmet dependency
 
 ## 3.1.1 (2010-04-05)
 
@@ -119,16 +123,13 @@ New:
 * A `view` command that starts a web server in the output directory
 * A `debug` command that shows information about the items, reps and layouts
 * A `kramdown` filter ([kramdown site](http://kramdown.rubyforge.org/))
-* A diff between the previously compiled content and the last compiled content
-  is now written to `output.diff` if the `enable_output_diff` site
-  configuration attribute is true
+* A diff between the previously compiled content and the last compiled content is now written to `output.diff` if the `enable_output_diff` site configuration attribute is true
 * Assigns, such as `@items`, `@layouts`, `@item`, … are accessible without `@`
 * Support for binary items
 
 Changed:
 
-* New sites now come with a stylesheet item instead of a `style.css` file in
-  the output directory
+* New sites now come with a stylesheet item instead of a `style.css` file in the output directory
 * The `deploy:rsync` task now use sensible default options
 * The `deploy:rsync` task now accepts a config environment variable
 * The `deploy:rsync` task now uses a lowercase `dry_run` environment variable
@@ -136,10 +137,8 @@ Changed:
 * The `rainpress` filter now accepts parameters
 * The `filesystem` data source is now known as `filesystem_verbose`
 * Meta files and content files are now optional
-* The `filesystem_compact` and `filesystem_combined` data sources have been
-  merged into a new `filesystem_unified` data source
-* The metadata section in `filesystem_unified` is now optional [Christopher
-  Eppstein]
+* The `filesystem_compact` and `filesystem_combined` data sources have been merged into a new `filesystem_unified` data source
+* The metadata section in `filesystem_unified` is now optional [Christopher Eppstein]
 * The `--server` autocompile option is now known as `--handler`
 * Assigns in filters are now available as instance variables and methods
 * The `#breadcrumbs_trail` function now allows missing parents
@@ -149,13 +148,11 @@ Deprecated:
 
 * `Nanoc3::FileProxy`; use one of the filename attributes instead
 * `ItemRep#content_at_snapshot`; use `#compiled_content` instead
-* The `last_fm`, `delicious` and `twitter` data sources; fetch online content
-  into a cache by a rake task and load data from this cache instead
+* The `last_fm`, `delicious` and `twitter` data sources; fetch online content into a cache by a rake task and load data from this cache instead
 
 ## 3.0.9 (2010-02-24)
 
-* Fixed 1.8.x parsing bug due to lack of parens which could cause “undefined
-  method `to_iso8601_time` for #<String:0x…>” errors
+* Fixed 1.8.x parsing bug due to lack of parens which could cause “undefined method `to_iso8601_time` for #<String:0x…>” errors
 
 ## 3.0.8 (2010-02-24)
 
@@ -177,18 +174,11 @@ Deprecated:
 
 ## 3.0.5 (2010-01-12)
 
-* Restored pre-3.0.3 behaviour of periods in identifiers. By default, a file
-  can have multiple extensions (e.g. `content/foo.html.erb` will have the
-  identifier `/foo/`), but if `allow_periods_in_identifiers` in the site
-  configuration is true, a file can have only one extension (e.g.
-  `content/blog/stuff.entry.html` will have the identifier
-  `/blog/stuff.entry/`).
+* Restored pre-3.0.3 behaviour of periods in identifiers. By default, a file can have multiple extensions (e.g. `content/foo.html.erb` will have the identifier `/foo/`), but if `allow_periods_in_identifiers` in the site configuration is true, a file can have only one extension (e.g. `content/blog/stuff.entry.html` will have the identifier `/blog/stuff.entry/`).
 
 ## 3.0.4 (2010-01-07)
 
-* Fixed a bug which would cause the `filesystem_compact` data source to
-  incorrectly determine the content filename, leading to weird “Expected 1
-  content file but found 3” errors [Eric Sunshine]
+* Fixed a bug which would cause the `filesystem_compact` data source to incorrectly determine the content filename, leading to weird “Expected 1 content file but found 3” errors [Eric Sunshine]
 
 ## 3.0.3 (2010-01-06)
 
@@ -196,26 +186,22 @@ Deprecated:
 * The `relativize_paths` filter now only operates inside tags
 * The autocompiler now handles escaped paths
 * The `LinkTo` and `Tagging` helpers now output escaped HTML
-* Fixed `played_at` attribute assignment in the `LastFM` data source for
-  tracks playing now, and added a `now_playing` attribute [Nicky Peeters]
+* Fixed `played_at` attribute assignment in the `LastFM` data source for tracks playing now, and added a `now_playing` attribute [Nicky Peeters]
 * The `filesystem_*` data sources can now handle dots in identifiers
 * Required enumerator to make sure `#enum_with_index` always works
 * `Array#stringify_keys` now properly recurses
 
 ## 3.0.2 (2009-11-07)
 
-* Children-only identifier patterns no longer erroneously also match parent
-  (e.g.` /foo/*/` no longer matches `/foo/`)
+* Children-only identifier patterns no longer erroneously also match parent (e.g.` /foo/*/` no longer matches `/foo/`)
 * The `create_site` command no longer uses those ugly HTML entities
 * Install message now mentions the IRC channel
 
 ## 3.0.1 (2009-10-05)
 
-* The proper exception is now raised when no matching compilation rules can
-  be found
+* The proper exception is now raised when no matching compilation rules can be found
 * The autocompile command no longer has a duplicate `--port` option
-* The `#url_for` and `#feed_url` methods now check the presence of the
-  `base_url` site configuration attribute
+* The `#url_for` and `#feed_url` methods now check the presence of the `base_url` site configuration attribute
 * Several outdated URLs are now up-to-date
 * Error handling has been improved in general
 
@@ -246,18 +232,14 @@ Removed:
 
 ## 2.2.2 (2009-05-18)
 
-* Removed `relativize_paths` filter; use `relativize_paths_in_html` or
-  `relativize_paths_in_css` instead
-* Fixed bug which could cause nanoc to eat massive amounts of memory when an
-  exception occurs
-* Fixed bug which would cause nanoc to complain about the open file limit
-  being reached when using a large amount of assets
+* Removed `relativize_paths` filter; use `relativize_paths_in_html` or `relativize_paths_in_css` instead
+* Fixed bug which could cause nanoc to eat massive amounts of memory when an exception occurs
+* Fixed bug which would cause nanoc to complain about the open file limit being reached when using a large amount of assets
 
 ## 2.2.1 (2009-04-08)
 
 * Fixed bug which prevented `relative_path_to` from working
-* Split `relativize_paths` filter into two filter: `relativize_paths_in_html`
-  and `relativize_paths_in_css`
+* Split `relativize_paths` filter into two filter: `relativize_paths_in_html` and `relativize_paths_in_css`
 * Removed bundled mime-types library
 
 ## 2.2 (2009-04-06)
@@ -276,8 +258,7 @@ New:
 Changed:
 
 * The commandline option parser is now a lot more reliable
-* `#atom_feed` now takes optional `:content_proc`, `:excerpt_proc` and
-  `:articles` parameters
+* `#atom_feed` now takes optional `:content_proc`, `:excerpt_proc` and `:articles` parameters
 * The compile command show non-written items (those with `skip_output: true`)
 * The compile command compiles everything by default
 * Added `--only-outdated` option to compile only outdated pages
@@ -290,17 +271,14 @@ Removed:
 
 * The `filesystem_combined` data source now supports empty metadata sections
 * The `rdoc` filter now works for both RDoc 1.x and 2.x
-* The autocompiler now serves a 500 when an exception occurs outside
-  compilation
-* The autocompiler no longer serves index files when the request path does not
-  end with a slash
+* The autocompiler now serves a 500 when an exception occurs outside compilation
+* The autocompiler no longer serves index files when the request path does not end with a slash
 * The autocompiler now always serves asset content correctly
 
 ## 2.1.5 (2009-02-01)
 
 * Added Ruby 1.9 compatibility
-* The `filesystem` and `filesystem_combined` data sources now preserve custom
-  extensions
+* The `filesystem` and `filesystem_combined` data sources now preserve custom extensions
 
 ## 2.1.4 (2008-11-15)
 
@@ -357,14 +335,12 @@ Removed:
 ## 2.0.4 (2008-05-04)
 
 * Fixed `default.rb`’s `#html_escape`
-* Updated Haml filter and layout processor so that @page, @pages and @config
-  are now available as instance variables instead of local variables
+* Updated Haml filter and layout processor so that @page, @pages and @config are now available as instance variables instead of local variables
 
 ## 2.0.3 (2008-03-25)
 
 * The autocompiler now honors custom paths
-* The autocompiler now attempts to serve pages with the most appropriate MIME
-  type, instead of always serving everything as `text/html`
+* The autocompiler now attempts to serve pages with the most appropriate MIME type, instead of always serving everything as `text/html`
 
 ## 2.0.2 (2008-01-26)
 
@@ -406,8 +382,7 @@ Removed:
 ## 1.6 (2007-10-13)
 
 * Added support for post-layout filters
-* Added support for getting a File object for the page, so you can now e.g.
-  easily get the modification time for a given page (`@page.file.mtime`)
+* Added support for getting a File object for the page, so you can now e.g. easily get the modification time for a given page (`@page.file.mtime`)
 * Cleaned up the source code a lot
 * Removed deprecated asset-copying functionality
 
@@ -422,15 +397,12 @@ Removed:
 
 * nanoc now supports ERB (as well as Erubis); Erubis no longer is a dependency
 * `meta.yaml` can now have `haml_options` property, which is passed to Haml
-* Pages can now have a `filename` property, which defaults to `index` [Dennis
-  Sutch]
-* Pages now know in what order they should be compiled, eliminating the need
-  for custom page ordering [Dennis Sutch]
+* Pages can now have a `filename` property, which defaults to `index` [Dennis Sutch]
+* Pages now know in what order they should be compiled, eliminating the need for custom page ordering [Dennis Sutch]
 
 ## 1.3.1 (2007-06-30)
 
-* The contents of the `assets` directory are now copied into the output
-  directory specified in `config.yaml`
+* The contents of the `assets` directory are now copied into the output directory specified in `config.yaml`
 
 ## 1.3 (2007-06-24)
 
@@ -439,20 +411,16 @@ Removed:
 * Added new filters
 	* Textile/RedCloth
 	* Sass
-* nanoc now warns before overwriting in `create_site`, `create_page` and
-  `create_template` (but not in compile)
+* nanoc now warns before overwriting in `create_site`, `create_page` and `create_template` (but not in compile)
 
 ## 1.2 (2007-06-05)
 
-* Sites now have an `assets` directory, whose contents are copied to the
-  `output` directory when compiling [Soryu]
+* Sites now have an `assets` directory, whose contents are copied to the `output` directory when compiling [Soryu]
 * Added support for non-eRuby layouts (Markaby, Haml, Liquid, …)
 * Added more filters (Markaby, Haml, Liquid, RDoc [Dmitry Bilunov])
 * Improved error reporting
-* Accessing page attributes using instance variables, and not through `@page`,
-  is no longer possible
-* Page attributes can now be accessed using dot notation, i.e. `@page.title`
-  as well as `@page[:title]`
+* Accessing page attributes using instance variables, and not through `@page`, is no longer possible
+* Page attributes can now be accessed using dot notation, i.e. `@page.title` as well as `@page[:title]`
 
 ## 1.1.3 (2007-05-18)
 
@@ -468,14 +436,12 @@ Removed:
 * Added support for nested layouts
 * Added coloured logging
 * `@page` now hold the page that is currently being processed
-* Index files are now called “content” files and are now named after the
-  directory they are in [Colin Barrett]
+* Index files are now called “content” files and are now named after the directory they are in [Colin Barrett]
 * It is now possible to access `@page` in the page’s content file
 
 ## 1.0.1 (2007-05-05)
 
-* Fixed a bug which would cause a “no such template” error to be displayed
-  when the template existed but compiling it would raise an exception
+* Fixed a bug which would cause a “no such template” error to be displayed when the template existed but compiling it would raise an exception
 * Fixed bug which would cause pages not to be sorted by order before compiling
 
 ## 1.0 (2007-05-03)

data/README.md

@@ -73,6 +73,7 @@ may be interested in the development dependencies:
 
 * Ben Armston
 * Colin Barrett
+* Bil Bas
 * Dmitry Bilunov
 * Devon Luke Buchanan
 * Stefan Bühler

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

@@ -315,8 +315,7 @@ module Nanoc3
     #
     # @return [void]
     def compile_reps(reps)
-      outdated_reps = Set.new(reps.select { |rep| outdatedness_checker.outdated?(rep) })
-      content_dependency_graph = Nanoc3::DirectedGraph.new(outdated_reps)
+      content_dependency_graph = Nanoc3::DirectedGraph.new(reps)
 
       # Listen to processing start/stop
       Nanoc3::NotificationCenter.on(:processing_started, self) { |obj| @stack.push(obj) }

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Nanoc3
 
   # Keeps track of the rules in a site.

data/lib/nanoc3/base/directed_graph.rb

@@ -22,7 +22,7 @@ module Nanoc3
   #     # => %w( a b c )
   #   
   #   # Modify edges
-  #   graph.remove_edge('a', 'b')
+  #   graph.delete_edge('a', 'b')
   #   
   #   # Get (direct) predecessors again
   #   graph.direct_predecessors_of('d').sort

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

@@ -96,7 +96,7 @@ module Nanoc3
             self,
             data_source_hash[:items_root],
             data_source_hash[:layouts_root],
-            data_source_hash[:config] || {}
+            data_source_hash.merge(data_source_hash[:config] || {})
           )
         end
       end

data/lib/nanoc3/cli/commands/create_site.rb

@@ -41,7 +41,7 @@ output_dir: #{Nanoc3::Site::DEFAULT_CONFIG[:output_dir]}
 
 # A list of index filenames, i.e. names of files that will be served by a web
 # server when a directory is requested. Usually, index files are named
-# “index.hml”, but depending on the web server, this may be something else,
+# “index.html”, but depending on the web server, this may be something else,
 # such as “default.htm”. This list is used by nanoc to generate pretty URLs.
 index_filenames: #{array_to_yaml(Nanoc3::Site::DEFAULT_CONFIG[:index_filenames])}
 

data/lib/nanoc3/cli/commands/nanoc.rb

@@ -27,7 +27,7 @@ end
 opt :v, :version, 'show version information and quit' do
   gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : "without RubyGems"
   engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-  puts "nanoc #{Nanoc3::VERSION} (c) 2007-2011 Denis Defreyne."
+  puts "nanoc #{Nanoc3::VERSION} (c) 2007-2012 Denis Defreyne."
   puts "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}"
   exit 0
 end

data/lib/nanoc3/cli/commands/watch.rb

@@ -92,6 +92,9 @@ module Nanoc3::CLI::Commands
       # A list of commandline tool names that can be used to send notifications
       TOOLS = %w( growlnotify notify-send )
 
+      # The tool to use for discovering binaries' locations
+      FIND_BINARY_COMMAND = RUBY_PLATFORM =~ /mingw|mswin/ ? "where" : "which"
+
       # Send a notification. If no notifier is found, no notification will be
       # created.
       #
@@ -104,7 +107,7 @@ module Nanoc3::CLI::Commands
     private
 
       def tool
-        @tool ||= TOOLS.find { |t| !`which #{t}`.empty? }
+        @tool ||= TOOLS.find { |t| !`#{FIND_BINARY_COMMAND} #{t}`.empty? }
       end
 
       def growlnotify(message)

data/lib/nanoc3/data_sources/filesystem.rb

@@ -283,6 +283,9 @@ module Nanoc3::DataSources
         raise_encoding_error(filename, original_encoding) if !data.valid_encoding?
       end
 
+      # Remove UTF-8 BOM (ugly)
+      data.gsub!("\xEF\xBB\xBF", '')
+
       data
     end
 

data/lib/nanoc3/filters/colorize_syntax.rb

@@ -113,7 +113,7 @@ module Nanoc3::Filters
         # Highlight
         raw = strip(element.inner_text)
         highlighted_code = highlight(raw, language, params)
-        element.inner_html = strip(highlighted_code)
+        element.inner_html = Nokogiri::HTML.fragment(strip(highlighted_code), 'utf-8')
 
         # Add class
         unless has_class
@@ -191,6 +191,9 @@ module Nanoc3::Filters
       require 'systemu'
       check_availability('pygmentize', '-V')
 
+      params[:encoding] ||= 'utf-8'
+      params[:nowrap]   ||= 'True'
+
       # Build command
       cmd = [ 'pygmentize', '-l', language, '-f', 'html' ]
       cmd << '-O' << params.map { |k,v| "#{k}=#{v}" }.join(',') unless params.empty?
@@ -201,11 +204,7 @@ module Nanoc3::Filters
 
       # Get result
       stdout.rewind
-      highlighted_code = stdout.read
-
-      # Clean result
-      doc = Nokogiri::HTML.fragment(highlighted_code)
-      doc.xpath('./div[@class="highlight"]/pre').inner_html
+      stdout.read
     end
 
     SIMON_HIGHLIGHT_OPT_MAP = {

data/lib/nanoc3/filters/sass.rb

@@ -12,7 +12,7 @@ module Nanoc3::Filters
       attr_accessor :current
     end
 
-    # Essentially the {Sass::Importers::Filesystem} but registering each
+    # Essentially the `Sass::Importers::Filesystem` but registering each
     # import file path.
     class SassFilesystemImporter < ::Sass::Importers::Filesystem
 

data/lib/nanoc3/helpers/link_to.rb

@@ -63,9 +63,9 @@ module Nanoc3::Helpers
       "<a #{attributes}href=\"#{h path}\">#{text}</a>"
     end
 
-    # Creates a HTML link using link_to, except when the linked item is the
-    # current one. In this case, a span element with class “active” and with
-    # the given text will be returned. The HTML-escaping rules for
+    # Creates a HTML link using {#link_to}, except when the linked item is
+    # the current one. In this case, a span element with class “active” and
+    # with the given text will be returned. The HTML-escaping rules for
     # {#link_to} apply here as well.
     #
     # @param [String] text The visible link text

data/lib/nanoc3/helpers/rendering.rb

@@ -7,24 +7,33 @@ module Nanoc3::Helpers
 
     include Nanoc3::Helpers::Capturing
 
-    # Returns a string containing the rendered given layout. The given layout
-    # will first be run through the matching layout rule.
+    # Renders the given layout. The given layout will be run through the first
+    # matching layout rule.
     #
-    # The assigns (`@item`, `@config`, …) will not be available in the
-    # partial, but it is possible to pass custom assigns to the method. These
-    # assigns will be made available as instance variables inside the partial.
+    # When this method is invoked _without_ a block, the return value will be
+    # the rendered layout (a string)  and `_erbout` will not be modified.
     #
-    # The method can also take a block. In this case, the content of the block
-    # will be captured (using the {Nanoc3::Helpers::Capturing} helper) and
-    # this content will be made available with `yield`. In other words, a
-    # `yield` inside the partial will output the content of the block passed
-    # to the method.
+    # When this method is invoked _with_ a block, an empty string will be
+    # returned and the rendered content will be appended to `_erbout`. In this
+    # case, the content of the block will be captured (using the
+    # {Nanoc3::Helpers::Capturing} helper) and this content will be made
+    # available with `yield`. In other words, a `yield` inside the partial
+    # will output the content of the block passed to the method.
+    #
+    # (For the curious: the reason why {#render} with a block has this
+    # behaviour of returning an empty string and modifying `_erbout` is
+    # because ERB does not support combining the `<%= ... %>` form with a
+    # method call that takes a block.)
+    #
+    # The assigns (`@item`, `@config`, …) will be available in the partial. It
+    # is also possible to pass custom assigns to the method; these assigns
+    # will be made available as instance variables inside the partial.
     #
     # @param [String] identifier The identifier of the layout that should be
     #   rendered
     #
-    # @param [Hash] other_assigns A hash containing assigns that will be made
-    #   available as instance variables in the partial
+    # @param [Hash] other_assigns A hash containing extra assigns that will be
+    #   made available as instance variables in the partial
     #
     # @example Rendering a head and a foot partial around some text
     #
@@ -52,10 +61,22 @@ module Nanoc3::Helpers
     #     I'm boxy! Luvz!
     #   <% end %>
     #
+    #   # Result
+    #   <div class="box">
+    #     I'm boxy! Luvz!
+    #   </div>
+    #
     # @raise [Nanoc3::Errors::UnknownLayout] if the given layout does not
     #   exist
     #
-    # @return [String] The rendered partial
+    # @raise [Nanoc3::Errors::CannotDetermineFilter] if there is no layout
+    #   rule for the given layout
+    #
+    # @raise [Nanoc3::Errors::UnknownFilter] if the layout rule for the given
+    #   layout specifies an unknown filter
+    #
+    # @return [String, nil] The rendered partial, or nil if this method was
+    #   invoked with a block
     def render(identifier, other_assigns={}, &block)
       # Find layout
       layout = @site.layouts.find { |l| l.identifier == identifier.cleaned_identifier }

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.2.3'
+  VERSION = '3.2.4'
 
 end
 

data/tasks/doc.rake

@@ -5,10 +5,12 @@ require 'yard'
 YARD::Rake::YardocTask.new(:doc) do |yard|
   yard.files   = Dir['lib/**/*.rb']
   yard.options = [
-    '--markup',        'markdown',
-    '--readme',        'README.md',
-    '--files',         'NEWS.md,LICENSE',
-    '--output-dir',    'doc/yardoc',
-    '--template-path', 'doc/yardoc_templates'
+    '--markup',          'markdown',
+    '--markup-provider', 'kramdown',
+    '--charset',         'utf-8',
+    '--readme',          'README.md',
+    '--files',           'NEWS.md,LICENSE',
+    '--output-dir',      'doc/yardoc',
+    '--template-path',   'doc/yardoc_templates'
   ]
 end

data/test/base/test_compiler.rb

@@ -298,4 +298,19 @@ class Nanoc3::CompilerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_compile_should_recompile_all_reps
+    Nanoc3::CLI.run %w( create_site bar )
+
+    FileUtils.cd('bar') do
+      Nanoc3::CLI.run %w( compile )
+
+      site = Nanoc3::Site.new('.')
+      site.compile
+
+      # At this point, even the already compiled items in the previous pass
+      # should have their compiled content assigned, so this should work:
+      site.items[0].reps[0].compiled_content
+    end
+  end
+
 end

data/test/base/test_directed_graph.rb

@@ -81,14 +81,14 @@ class Nanoc3::DirectedGraphTest < MiniTest::Unit::TestCase
     assert graph.vertices.include?(3)
   end
 
-  def test_remove_edge
+  def test_delete_edge
     graph = Nanoc3::DirectedGraph.new([ 1, 2, 3 ])
     graph.add_edge(1,2)
 
     assert_equal [ 2 ], graph.successors_of(1)
     assert_equal [ 1 ], graph.predecessors_of(2)
 
-    graph.remove_edge(1, 2)
+    graph.delete_edge(1, 2)
 
     assert_equal [], graph.successors_of(1)
     assert_equal [], graph.predecessors_of(2)
@@ -246,37 +246,37 @@ class Nanoc3::DirectedGraphTest < MiniTest::Unit::TestCase
   def test_roots_after_removing_edge
     graph = Nanoc3::DirectedGraph.new([ 1, 2, 3 ])
     graph.add_edge(1, 2)
-    graph.remove_edge(1, 2)
+    graph.delete_edge(1, 2)
     assert_equal Set.new([ 1, 2, 3 ]), graph.roots
 
     graph = Nanoc3::DirectedGraph.new([ 1, 2, 3 ])
     graph.add_edge(1, 3)
     assert_equal Set.new([ 1, 2 ]), graph.roots
-    graph.remove_edge(1, 2) # no such edge
+    graph.delete_edge(1, 2) # no such edge
     assert_equal Set.new([ 1, 2 ]), graph.roots
 
     graph = Nanoc3::DirectedGraph.new([ 1, 2, 3 ])
     graph.add_edge(2, 1)
-    graph.remove_edge(2, 1)
+    graph.delete_edge(2, 1)
     assert_equal Set.new([ 1, 2, 3 ]), graph.roots
 
     graph = Nanoc3::DirectedGraph.new([ 1, 2, 3 ])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
-    graph.remove_edge(1, 2)
+    graph.delete_edge(1, 2)
     assert_equal Set.new([ 1, 2 ]), graph.roots
-    graph.remove_edge(2, 3)
+    graph.delete_edge(2, 3)
     assert_equal Set.new([ 1, 2, 3 ]), graph.roots
 
     graph = Nanoc3::DirectedGraph.new([ 1, 2, 3 ])
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
     graph.add_edge(3, 1)
-    graph.remove_edge(1, 2)
+    graph.delete_edge(1, 2)
     assert_equal Set.new([ 2 ]), graph.roots
-    graph.remove_edge(2, 3)
+    graph.delete_edge(2, 3)
     assert_equal Set.new([ 2, 3 ]), graph.roots
-    graph.remove_edge(3, 1)
+    graph.delete_edge(3, 1)
     assert_equal Set.new([ 1, 2, 3 ]), graph.roots
   end
 

data/test/base/test_site.rb

@@ -168,4 +168,23 @@ describe 'Nanoc3::Site#data_sources' do
     end.must_raise Nanoc3::Errors::UnknownDataSource
   end
 
+  it 'should also use the toplevel config for data sources' do
+    with_site do
+      File.open('config.yaml', 'w') do |io|
+        io.write "data_sources:\n"
+        io.write "  -\n"
+        io.write "    type: filesystem_unified\n"
+        io.write "    aaa: one\n"
+        io.write "    config:\n"
+        io.write "      bbb: two\n"
+      end
+
+      site = Nanoc3::Site.new('.')
+      data_sources = site.data_sources
+
+      assert data_sources.first.config[:aaa] = 'one'
+      assert data_sources.first.config[:bbb] = 'two'
+    end
+  end
+
 end

data/test/data_sources/test_filesystem.rb

@@ -365,6 +365,22 @@ class Nanoc3::DataSources::FilesystemTest < MiniTest::Unit::TestCase
     assert_equal('blah blah', result[1])
   end
 
+  def test_parse_utf8_bom
+    File.open('test.html', 'w') do |io|
+      io.write [ 0xEF, 0xBB, 0xBF ].map { |i| i.chr }.join
+      io.write "-----\n"
+      io.write "utf8bomawareness: high\n"
+      io.write "-----\n"
+      io.write "content goes here\n"
+    end
+
+    data_source = Nanoc3::DataSources::FilesystemCombined.new(nil, nil, nil, nil)
+
+    result = data_source.instance_eval { parse('test.html', nil, 'foobar') }
+    assert_equal({ 'utf8bomawareness' => 'high' }, result[0])
+    assert_equal('content goes here', result[1])
+  end
+
   def test_parse_embedded_no_meta
     content = "blah\n" \
       "blah blah blah\n" \

data/test/extra/test_auto_compiler.rb

@@ -32,7 +32,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         autocompiler.stubs(:site).returns(site)
 
         # Serve
-        status, headers, body = autocompiler.instance_eval { call('PATH_INFO' => '/foo/index.html') }
+        status, headers, body = autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/foo/index.html') }
 
         # Check response
         assert_equal(200, status)
@@ -59,7 +59,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         autocompiler.stubs(:site).returns(site)
 
         # Serve
-        status, headers, body = autocompiler.instance_eval { call('PATH_INFO' => '/afjwiagoawf.html') }
+        status, headers, body = autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/afjwiagoawf.html') }
 
         # Check response
         assert_equal(404, status)
@@ -94,7 +94,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       autocompiler.expects(:file_server).returns(file_server)
 
       # Run
-      autocompiler.instance_eval { call('PATH_INFO' => 'somefile.txt') }
+      autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => 'somefile.txt') }
 
       # Check
       assert_equal(file_server.expected_path_info, file_server.actual_path_info)
@@ -128,7 +128,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       autocompiler.expects(:file_server).returns(file_server)
 
       # Run
-      autocompiler.instance_eval { call('PATH_INFO' => '/foo/bar/') }
+      autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/foo/bar/') }
 
       # Check
       assert_equal(file_server.expected_path_info, file_server.actual_path_info)
@@ -162,7 +162,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       autocompiler.expects(:file_server).returns(file_server)
 
       # Run
-      autocompiler.instance_eval { call('PATH_INFO' => 'foo/bar/') }
+      autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => 'foo/bar/') }
 
       # Check
       assert_equal(file_server.expected_path_info, file_server.actual_path_info)
@@ -196,7 +196,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       autocompiler.expects(:file_server).returns(file_server)
 
       # Run
-      autocompiler.instance_eval { call('PATH_INFO' => 'foo/bar') }
+      autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => 'foo/bar') }
 
       # Check
       assert_equal(file_server.expected_path_info, file_server.actual_path_info)
@@ -230,7 +230,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       autocompiler.expects(:file_server).returns(file_server)
 
       # Run
-      autocompiler.instance_eval { call('PATH_INFO' => 'foo/bar') }
+      autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => 'foo/bar') }
 
       # Check
       assert_equal(file_server.expected_path_info, file_server.actual_path_info)
@@ -260,7 +260,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       autocompiler.expects(:file_server).returns(file_server)
 
       # Run
-      autocompiler.instance_eval { call('PATH_INFO' => 'four-oh-four.txt') }
+      autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => 'four-oh-four.txt') }
 
       # Check
       assert_equal(file_server.expected_path_info, file_server.actual_path_info)
@@ -314,7 +314,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         autocompiler.stubs(:site).returns(site)
 
         # Serve
-        status, headers, body = autocompiler.instance_eval { call('PATH_INFO' => '/') }
+        status, headers, body = autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/') }
 
         # Check response
         assert_equal(200, status)
@@ -348,7 +348,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
 
         # Serve
         assert_raises(RuntimeError) do
-          autocompiler.instance_eval { call('PATH_INFO' => '/whatever/') }
+          autocompiler.instance_eval { call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/whatever/') }
         end
       end
     end
@@ -375,7 +375,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         File.utime(Time.now+5, Time.now+5, 'config.yaml')
 
         # Check
-        status, headers, body = autocompiler.call('PATH_INFO' => '/')
+        status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
         body.each do |b|
           assert_match /The Grand Value of Configuration is Foo!/, b
         end
@@ -387,7 +387,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
         File.utime(Time.now+5, Time.now+5, 'config.yaml')
 
         # Check
-        status, headers, body = autocompiler.call('PATH_INFO' => '/')
+        status, headers, body = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/')
         body.each do |b|
           assert_match /The Grand Value of Configuration is Bar!/, b
         end
@@ -408,7 +408,7 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
       autocompiler.stubs(:site).returns(site)
 
       # Test
-      result = autocompiler.call('PATH_INFO' => '/%73oftware')
+      result = autocompiler.call('REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/%73oftware')
       assert_equal 404, result[0]
       assert_match "File not found: /software\n", result[2][0]
     end

data/test/filters/test_rdoc.rb

@@ -11,7 +11,7 @@ class Nanoc3::Filters::RDocTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.run("= Foo")
-      assert_match(%r{<h1>Foo</h1>\Z}, result)
+      assert_match(%r{<h1( id="label-Foo")?>Foo</h1>\Z}, result)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc3
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &70345936282400 !ruby/object:Gem::Requirement
+  requirement: &70158392072000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345936282400
+  version_requirements: *70158392072000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70345936281900 !ruby/object:Gem::Requirement
+  requirement: &70158392070860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345936281900
+  version_requirements: *70158392070860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70345936281040 !ruby/object:Gem::Requirement
+  requirement: &70158392069520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345936281040
+  version_requirements: *70158392069520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70345936280540 !ruby/object:Gem::Requirement
+  requirement: &70158392065560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345936280540
+  version_requirements: *70158392065560
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70345936279920 !ruby/object:Gem::Requirement
+  requirement: &70158392058260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345936279920
+  version_requirements: *70158392058260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70345936279240 !ruby/object:Gem::Requirement
+  requirement: &70158392056380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345936279240
+  version_requirements: *70158392056380
 description: nanoc is a simple but very flexible static site generator written in
   Ruby. It operates on local files, and therefore does not run on the server. nanoc
   “compiles” the local source files into HTML (usually), by evaluating eRuby, Markdown,