nanoc 4.0.0rc1 → 4.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b1a732cd792777b84fed953191470f0147e4ec
-  data.tar.gz: d2ac5a5275b3486c88e94dd68e353d8ac19d50e2
+  metadata.gz: ce4a238700e7502d74064d9e013beb617db329ec
+  data.tar.gz: 89e4fd37145ee9fad99eb7f3675cc2bba2205d81
 SHA512:
-  metadata.gz: b6a63f720e046d3385085ff1b25ea062776389208d1c29936df3647c85dd59a8a65b4b107dad415ddaba25d859d9ec97c41f44d2a49921c6cf8114ee1aba7a97
-  data.tar.gz: ccf810ffe22680e674c52b06605ac20ed2851727aca8c149c12ac8988788aee6f174f318b7ab7822ecb00116104fc60169a3f3cc87c1c3616080d61803fd4ed6
+  metadata.gz: 8d62477b536a1ebee8555c3e025eeed536a355bd11c2caa1b1fd7865696f899f0857c10eb2c12224f884541e3a16bb67e75e4d87f96f272ec68f18b2f1a6ae0b
+  data.tar.gz: 2d5e7a0dd2238702dd44df29e66fc5c81abed4a48f752066a55f03e300fecc702a877c4a4cbeb47e1bf59b0150a278842ce0cc617826237f8098f8749d311eaa

data/CONTRIBUTING.md

@@ -4,7 +4,7 @@ Contributing
 Reporting bugs
 --------------
 
-If you find a bug in nanoc, you should report it! Some information that you should include in your bug report is the nanoc version (`nanoc --version`) and, if relevant, the crash log (`crash.log`).
+If you find a bug in Nanoc, you should report it! Some information that you should include in your bug report is the Nanoc version (`nanoc --version`) and, if relevant, the crash log (`crash.log`).
 
 For details, check the [*bug reporting* section of the development guide](http://nanoc.ws/development/#reporting-bugs).
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.0.0rc1)
+    nanoc (4.0.0rc2)
       cri (~> 2.3)
 
 GEM
@@ -17,8 +17,6 @@ GEM
       parser (>= 2.2.0.pre.3, < 3.0)
     bluecloth (2.2.0)
     builder (3.2.2)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     chunky_png (1.3.4)
     coderay (1.1.0)
     coffee-script (2.4.1)
@@ -31,7 +29,7 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    coveralls (0.8.1)
+    coveralls (0.8.2)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
@@ -48,15 +46,15 @@ GEM
     erubis (2.7.0)
     excon (0.45.3)
     execjs (2.5.2)
-    ffi (1.9.8)
+    ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.31.0)
+    fog (1.32.0)
       fog-atmos
-      fog-aws (~> 0.0)
+      fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.30)
-      fog-ecloud
+      fog-core (~> 1.32)
+      fog-ecloud (= 0.1.1)
       fog-google (>= 0.0.2)
       fog-json
       fog-local
@@ -77,26 +75,26 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.5.0)
+    fog-aws (0.6.0)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.7.1)
+    fog-brightbox (0.7.2)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.31.1)
+    fog-core (1.32.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-    fog-ecloud (0.1.3)
+    fog-ecloud (0.1.1)
       fog-core
       fog-xml
-    fog-google (0.0.5)
+    fog-google (0.0.6)
       fog-core
       fog-json
       fog-xml
@@ -127,7 +125,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (0.4.6)
+    fog-softlayer (0.4.7)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -153,7 +151,6 @@ GEM
       handlebars-source (~> 3.0.0)
       therubyracer (~> 0.12.1)
     handlebars-source (3.0.3)
-    hitimes (1.2.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     inflecto (0.0.2)
@@ -162,9 +159,8 @@ GEM
     kramdown (1.7.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.7)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
+    libv8 (3.16.14.11)
+    listen (3.0.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     markaby (0.8.0)
@@ -178,7 +174,7 @@ GEM
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.1)
-    mustache (1.0.1)
+    mustache (1.0.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
@@ -186,7 +182,7 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pandoc-ruby (1.0.0)
-    parser (2.2.2.5)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
@@ -206,7 +202,7 @@ GEM
       ffi (>= 0.5.0)
     rdiscount (2.1.8)
     rdoc (4.2.0)
-    redcarpet (3.3.1)
+    redcarpet (3.3.2)
     ref (1.0.5)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -246,16 +242,14 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     temple (0.7.6)
-    term-ansicolor (1.3.1)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     tilt (2.0.1)
-    timers (4.0.1)
-      hitimes
-    tins (1.5.2)
+    tins (1.5.4)
     typogruby (1.0.18)
       rubypants
     uglifier (2.7.1)
@@ -328,4 +322,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.10.4
+   1.10.5

data/NEWS.md

@@ -1,4 +1,20 @@
-# nanoc news
+# Nanoc news
+
+## 4.0.0rc2 (2015-07-11)
+
+Fixes:
+
+* Fixed broken `shell` command (#672) [Jim Mendenhall]
+* Fixed absolute path check on Windows (#656)
+
+Enhancements:
+
+* Made Nanoc error when multiple items have the same output path (#665, #669)
+* Improved error message for non-hash frontmatter (#670, #673)
+
+Changes:
+
+* nanoc is now called Nanoc
 
 ## 4.0.0rc1 (2015-06-21)
 

data/README.md

@@ -3,13 +3,13 @@
 [![Code Climate](http://img.shields.io/codeclimate/github/nanoc/nanoc.svg)](https://codeclimate.com/github/nanoc/nanoc)
 [![Code Coverage](http://img.shields.io/coveralls/nanoc/nanoc.svg)](https://coveralls.io/r/nanoc/nanoc)
 
-![nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
+![Nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
 
-# nanoc
+# Nanoc
 
-nanoc is a flexible static-site generator written in Ruby. See the [nanoc web site](http://nanoc.ws) for more information.
+Nanoc is a flexible static-site generator written in Ruby. See the [Nanoc web site](http://nanoc.ws) for more information.
 
-**Please take a moment and [donate](http://pledgie.com/campaigns/9282) to nanoc. A lot of time has gone into developing nanoc, and I would like to keep it going. Your support will ensure that nanoc will continue to improve.**
+**Please take a moment and [donate](http://pledgie.com/campaigns/9282) to Nanoc. A lot of time has gone into developing Nanoc, and I would like to keep it going. Your support will ensure that Nanoc will continue to improve.**
 
 ## Contributing
 
@@ -17,6 +17,6 @@ Contributions are greatly appreciated! Consult the [Development guidelines](http
 
 ### Contributors
 
-Many thanks to everyone who has contributed to nanoc in one way or another:
+Many thanks to everyone who has contributed to Nanoc in one way or another:
 
-Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Peter Aronoff, Raphael von der Grün, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Xavier Shay, Zaiste de Grengolada, Šime Ramov
+Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Peter Aronoff, Raphael von der Grün, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Xavier Shay, Zaiste de Grengolada, Šime Ramov

data/bin/nanoc

@@ -3,7 +3,7 @@ require 'nanoc'
 require 'nanoc/cli'
 
 if File.file?('Gemfile') && !defined?(Bundler)
-  warn 'A Gemfile was detected, but Bundler is not loaded. This is probably not what you want. To run nanoc with Bundler, use `bundle exec nanoc`.'
+  warn 'A Gemfile was detected, but Bundler is not loaded. This is probably not what you want. To run Nanoc with Bundler, use `bundle exec nanoc`.'
 end
 
 Nanoc::CLI.run(ARGV)

data/lib/nanoc.rb

@@ -1,5 +1,5 @@
 module Nanoc
-  # @return [String] A string containing information about this nanoc version
+  # @return [String] A string containing information about this Nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).
   #
   # @api private
@@ -7,7 +7,7 @@ module Nanoc
     gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : 'without RubyGems'
     engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
     res = ''
-    res << "nanoc #{Nanoc::VERSION} © 2007-2015 Denis Defreyne.\n"
+    res << "Nanoc #{Nanoc::VERSION} © 2007-2015 Denis Defreyne.\n"
     res << "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}.\n"
     res
   end
@@ -34,7 +34,7 @@ require 'time'
 require 'yaml'
 require 'English'
 
-# Load nanoc
+# Load Nanoc
 require 'nanoc/version'
 require 'nanoc/base'
 require 'nanoc/extra'

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

@@ -40,6 +40,12 @@ module Nanoc::Int
   class Compiler
     extend Nanoc::Int::Memoization
 
+    class IdenticalRoutesError < ::Nanoc::Error
+      def initialize(output_path, rep_a, rep_b)
+        super("The item representations #{rep_a.inspect} and #{rep_b.inspect} are both routed to #{output_path}.")
+      end
+    end
+
     # @group Accessors
 
     # @return [Nanoc::Int::Site] The site this compiler belongs to
@@ -65,9 +71,9 @@ module Nanoc::Int
 
     # Compiles the site and writes out the compiled item representations.
     #
-    # Previous versions of nanoc (< 3.2) allowed passing items to compile, and
+    # Previous versions of Nanoc (< 3.2) allowed passing items to compile, and
     # had a “force” option to make the compiler recompile all pages, even
-    # when not outdated. These arguments and options are, as of nanoc 3.2, no
+    # when not outdated. These arguments and options are, as of Nanoc 3.2, no
     # longer used, and will simply be ignored when passed to {#run}.
     #
     # @overload run
@@ -215,6 +221,8 @@ module Nanoc::Int
     #
     # @api private
     def route_reps
+      paths_to_reps = {}
+
       reps.each do |rep|
         # Find matching rules
         rules = rules_collection.routing_rules_for(rep)
@@ -228,6 +236,13 @@ module Nanoc::Int
             raise "The path returned for the #{rep.inspect} item representation, “#{basic_path}”, does not start with a slash. Please ensure that all routing rules return a path that starts with a slash."
           end
 
+          # Check for duplicate paths
+          if paths_to_reps.key?(basic_path)
+            raise IdenticalRoutesError.new(basic_path, paths_to_reps[basic_path], rep)
+          else
+            paths_to_reps[basic_path] = rep
+          end
+
           # Get raw path by prepending output directory
           rep.raw_paths[snapshot] = @site.config[:output_dir] + basic_path
 

data/lib/nanoc/base/entities/content.rb

@@ -15,7 +15,7 @@ module Nanoc
 
       # @param [String, nil] filename
       def initialize(filename)
-        if filename && !filename.start_with?('/')
+        if filename && Pathname.new(filename).relative?
           raise ArgumentError, 'Content filename is not absolute'
         end
 

data/lib/nanoc/base/error.rb

@@ -1,5 +1,5 @@
 module Nanoc
-  # Generic error. Superclass for all nanoc-specific errors.
+  # Generic error. Superclass for all Nanoc-specific errors.
   class Error < ::StandardError
   end
 end

data/lib/nanoc/base/errors.rb

@@ -1,11 +1,11 @@
 module Nanoc::Int
-  # Module that contains all nanoc-specific errors.
+  # Module that contains all Nanoc-specific errors.
   #
   # @api private
   module Errors
     Generic = ::Nanoc::Error
 
-    # Generic trivial error. Superclass for all nanoc-specific errors that are
+    # Generic trivial error. Superclass for all Nanoc-specific errors that are
     # considered "trivial", i.e. errors that do not require a full crash report.
     class GenericTrivial < Generic
     end
@@ -66,7 +66,7 @@ module Nanoc::Int
     # working directory.
     class NoRulesFileFound < Generic
       def initialize
-        super('This site does not have a rules file, which is required for nanoc sites.')
+        super('This site does not have a rules file, which is required for Nanoc sites.')
       end
     end
 

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

@@ -1,5 +1,5 @@
 module Nanoc::Int
-  # Nanoc::Int::CodeSnippet represent a piece of custom code of a nanoc site.
+  # Nanoc::Int::CodeSnippet represent a piece of custom code of a Nanoc site.
   #
   # @api private
   class CodeSnippet
@@ -20,7 +20,7 @@ module Nanoc::Int
     #
     # @param [String] filename The filename corresponding to this code snippet
     #
-    # @param [Time, Hash] _params Extra parameters. Ignored by nanoc; it is
+    # @param [Time, Hash] _params Extra parameters. Ignored by Nanoc; it is
     #   only included for backwards compatibility.
     def initialize(data, filename, _params = nil)
       @data     = data

data/lib/nanoc/cli.rb

@@ -2,7 +2,7 @@ begin
   require 'cri'
 rescue LoadError => e
   $stderr.puts e
-  $stderr.puts "If you are using a Gemfile, make sure that the Gemfile contains nanoc ('gem \"nanoc\"')."
+  $stderr.puts "If you are using a Gemfile, make sure that the Gemfile contains Nanoc ('gem \"nanoc\"')."
   exit 1
 end
 
@@ -42,7 +42,7 @@ module Nanoc::CLI
     @debug = boolean
   end
 
-  # Invokes the nanoc command-line tool with the given arguments.
+  # Invokes the Nanoc command-line tool with the given arguments.
   #
   # @param [Array<String>] args An array of command-line arguments
   #

data/lib/nanoc/cli/command_runner.rb

@@ -1,5 +1,5 @@
 module Nanoc::CLI
-  # A command runner subclass for nanoc commands that adds nanoc-specific
+  # A command runner subclass for Nanoc commands that adds Nanoc-specific
   # convenience methods and error handling.
   #
   # @api private
@@ -34,7 +34,7 @@ module Nanoc::CLI
       @site = new_site
     end
 
-    # @return [Boolean] true if the current working directory is a nanoc site
+    # @return [Boolean] true if the current working directory is a Nanoc site
     #   directory, false otherwise
     def in_site_dir?
       Nanoc::Int::SiteLoader.cwd_is_nanoc_site?
@@ -48,7 +48,7 @@ module Nanoc::CLI
     # @return [void]
     def require_site
       if site.nil?
-        raise ::Nanoc::Int::Errors::GenericTrivial, 'The current working directory does not seem to be a nanoc site.'
+        raise ::Nanoc::Int::Errors::GenericTrivial, 'The current working directory does not seem to be a Nanoc site.'
       end
     end
 

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

@@ -18,10 +18,10 @@ module Nanoc::CLI::Commands
     DEFAULT_CONFIG = <<EOS unless defined? DEFAULT_CONFIG
 # The syntax to use for patterns in the Rules file. Can be either `"glob"`
 # (default) or `"legacy"`. The former will enable glob patterns, which behave
-# like Ruby’s File.fnmatch. The latter will enable nanoc 3.x-style patterns.
+# like Ruby’s File.fnmatch. The latter will enable Nanoc 3.x-style patterns.
 string_pattern_type: glob
 
-# A list of file extensions that nanoc will consider to be textual rather than
+# A list of file extensions that Nanoc will consider to be textual rather than
 # binary. If an item with an extension not in this list is found,  the file
 # will be considered as binary.
 text_extensions: #{array_to_yaml(Nanoc::Int::Configuration::DEFAULT_CONFIG[:text_extensions])}
@@ -34,7 +34,7 @@ output_dir: #{Nanoc::Int::Configuration::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.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.
+# such as “default.htm”. This list is used by Nanoc to generate pretty URLs.
 index_filenames: #{array_to_yaml(Nanoc::Int::Configuration::DEFAULT_CONFIG[:index_filenames])}
 
 # Whether or not to generate a diff of the compiled content when compiling a
@@ -43,7 +43,7 @@ index_filenames: #{array_to_yaml(Nanoc::Int::Configuration::DEFAULT_CONFIG[:inde
 enable_output_diff: false
 
 prune:
-  # Whether to automatically remove files not managed by nanoc from the output
+  # Whether to automatically remove files not managed by Nanoc from the output
   # directory.
   auto_prune: true
 
@@ -52,7 +52,7 @@ prune:
   # .git, .svn etc.
   exclude: [ '.git', '.hg', '.svn', 'CVS' ]
 
-# The data sources where nanoc loads its data from. This is an array of
+# The data sources where Nanoc loads its data from. This is an array of
 # hashes; each array element represents a single data source. By default,
 # there is only a single data source that reads data from the “content/” and
 # “layout/” directories in the site directory.
@@ -78,7 +78,7 @@ data_sources:
 
     # The kind of identifier to use for items and layouts. The default is
     # “full”, meaning that identifiers include file extensions. This can also
-    # be “legacy”, primarily used by older nanoc sites.
+    # be “legacy”, primarily used by older Nanoc sites.
     identifier_type: full
 
 # Configuration for the “check” command, which run unit tests on the site.
@@ -102,7 +102,7 @@ end
 
 # This is an example rule that matches Markdown (.md) files, and filters them
 # using the :kramdown filter. It is commented out by default, because kramdown
-# is not bundled with nanoc or Ruby.
+# is not bundled with Nanoc or Ruby.
 #
 #compile '/**/*.md' do
 #  filter :kramdown
@@ -132,16 +132,16 @@ EOS
 title: Home
 ---
 
-<h1>A Brand New nanoc Site</h1>
+<h1>A Brand New Nanoc Site</h1>
 
-<p>You’ve just created a new nanoc site. The page you are looking at right now is the home page for your site. To get started, consider replacing this default homepage with your own customized homepage. Some pointers on how to do so:</p>
+<p>You’ve just created a new Nanoc site. The page you are looking at right now is the home page for your site. To get started, consider replacing this default homepage with your own customized homepage. Some pointers on how to do so:</p>
 
 <ul>
   <li><p><strong>Change this page’s content</strong> by editing the “index.html” file in the “content” directory. This is the actual page content, and therefore doesn’t include the header, sidebar or style information (those are part of the layout).</p></li>
   <li><p><strong>Change the layout</strong>, which is the “default.html” file in the “layouts” directory, and create something unique (and hopefully less bland).</p></li>
 </ul>
 
-<p>If you need any help with customizing your nanoc web site, be sure to check out the documentation (see sidebar), and be sure to subscribe to the discussion group (also see sidebar). Enjoy!</p>
+<p>If you need any help with customizing your Nanoc web site, be sure to check out the documentation (see sidebar), and be sure to subscribe to the discussion group (also see sidebar). Enjoy!</p>
 EOS
 
     DEFAULT_STYLESHEET = <<EOS unless defined? DEFAULT_STYLESHEET
@@ -253,11 +253,11 @@ EOS
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>A Brand New nanoc Site - <%= @item[:title] %></title>
+    <title>A Brand New Nanoc Site - <%= @item[:title] %></title>
     <link rel="stylesheet" href="<%= @items['/stylesheet.*'].path %>">
 
     <!-- you don't need to keep this, but it's cool for stats! -->
-    <meta name="generator" content="nanoc <%= Nanoc::VERSION %>">
+    <meta name="generator" content="Nanoc <%= Nanoc::VERSION %>">
   </head>
   <body>
     <div id="main">

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

@@ -1,5 +1,5 @@
 usage 'nanoc command [options] [arguments]'
-summary 'nanoc, a static site compiler written in Ruby'
+summary 'Nanoc, a static site compiler written in Ruby'
 
 opt :l, :color, 'enable color' do
   $stdout.remove_stream_cleaner(Nanoc::CLI::StreamCleaners::ANSIColors)
@@ -20,7 +20,7 @@ opt :C, :'no-color', 'disable color' do
   $stderr.add_stream_cleaner(Nanoc::CLI::StreamCleaners::ANSIColors)
 end
 
-opt :V, :verbose, 'make nanoc output more detailed' do
+opt :V, :verbose, 'make output more detailed' do
   Nanoc::CLI::Logger.instance.level = :low
 end
 

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

@@ -1,12 +1,12 @@
 usage 'prune'
-summary 'remove files not managed by nanoc from the output directory'
+summary 'remove files not managed by Nanoc from the output directory'
 description <<-EOS
 Find all files in the output directory that do not correspond to an item
-managed by nanoc and remove them. Since this is a hazardous operation, an
+managed by Nanoc and remove them. Since this is a hazardous operation, an
 additional `--yes` flag is needed as confirmation.
 
 Also see the `auto_prune` configuration option in `nanoc.yaml` (`config.yaml`
-for older nanoc sites), which will automatically prune after compilation.
+for older Nanoc sites), which will automatically prune after compilation.
 EOS
 
 flag :y, :yes,       'confirm deletion'
@@ -25,7 +25,7 @@ module Nanoc::CLI::Commands
       else
         $stderr.puts 'WARNING: Since the prune command is a destructive command, it requires an additional --yes flag in order to work.'
         $stderr.puts
-        $stderr.puts 'Please ensure that the output directory does not contain any files (such as images or stylesheets) that are necessary but are not managed by nanoc. If you want to get a list of all files that would be removed, pass --dry-run.'
+        $stderr.puts 'Please ensure that the output directory does not contain any files (such as images or stylesheets) that are necessary but are not managed by Nanoc. If you want to get a list of all files that would be removed, pass --dry-run.'
         exit 1
       end
     end

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

@@ -1,5 +1,5 @@
 usage 'shell'
-summary 'open a shell on the nanoc environment'
+summary 'open a shell on the Nanoc environment'
 aliases 'console'
 description "
 Open an IRB shell on a context that contains @items, @layouts, and @config.
@@ -21,7 +21,7 @@ module Nanoc::CLI::Commands
       self.class.env_for_site(site)
     end
 
-    def self.env_for(site)
+    def self.env_for_site(site)
       {
         items: Nanoc::ItemCollectionView.new(site.items),
         layouts: Nanoc::LayoutCollectionView.new(site.layouts),

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -3,7 +3,7 @@ aliases :info
 usage 'show-plugins [options]'
 description <<-EOS
 Show a list of available plugins, including filters and data sources.
-If the current directory contains a nanoc web site, the plugins defined in this site will be shown as well.
+If the current directory contains a Nanoc web site, the plugins defined in this site will be shown as well.
 EOS
 
 module Nanoc::CLI::Commands

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

@@ -18,7 +18,6 @@ module Nanoc::CLI::Commands
       load_adsf
       require 'rack'
 
-      # Make sure we are in a nanoc site directory
       require_site
 
       # Set options

data/lib/nanoc/cli/error_handler.rb

@@ -297,7 +297,7 @@ module Nanoc::CLI
 
     def write_issue_link(stream, _params = {})
       stream.puts
-      stream.puts 'If you believe this is a bug in nanoc, please do report it at'
+      stream.puts 'If you believe this is a bug in Nanoc, please do report it at'
       stream.puts '-> https://github.com/nanoc/nanoc/issues/new <-'
       stream.puts
       stream.puts 'A detailed crash log has been written to ./crash.log.'

data/lib/nanoc/data_sources/filesystem.rb

@@ -219,6 +219,7 @@ module Nanoc::DataSources
         rescue Exception => e
           raise "Could not parse YAML for #{meta_filename}: #{e.message}"
         end
+        verify_meta(meta, meta_filename)
         return [meta, content]
       end
 
@@ -244,12 +245,25 @@ module Nanoc::DataSources
       rescue Exception => e
         raise "Could not parse YAML for #{content_filename}: #{e.message}"
       end
+      verify_meta(meta, content_filename)
       content = pieces[4]
 
       # Done
       [meta, content]
     end
 
+    class InvalidMetadataError < Nanoc::Error
+      def initialize(filename, klass)
+        super("The file #{filename} has invalid metadata (expected key-value pairs, found #{klass} instead)")
+      end
+    end
+
+    def verify_meta(meta, filename)
+      return if meta.is_a?(Hash)
+
+      raise InvalidMetadataError.new(filename, meta.class)
+    end
+
     # Reads the content of the file with the given name and returns a string
     # in UTF-8 encoding. The original encoding of the string is derived from
     # the default external encoding, but this can be overridden by the

data/lib/nanoc/data_sources/filesystem_unified.rb

@@ -44,7 +44,7 @@ module Nanoc::DataSources
   #     (`allow_periods_in_identifiers` set to false)
   #     foo.html.erb → /foo/
   #
-  # Note that each item must have an unique identifier. nanoc will display an
+  # Note that each item must have an unique identifier. Nanoc will display an
   # error if two items with the same identifier are found.
   #
   # Some more examples:

data/lib/nanoc/extra/checking/runner.rb

@@ -5,7 +5,7 @@ module Nanoc::Extra::Checking
   class Runner
     CHECKS_FILENAMES = ['Checks', 'Checks.rb', 'checks', 'checks.rb']
 
-    # @param [Nanoc::Int::Site] site The nanoc site this runner is for
+    # @param [Nanoc::Int::Site] site The Nanoc site this runner is for
     def initialize(site)
       @site = site
     end

data/lib/nanoc/extra/jruby_nokogiri_warner.rb

@@ -12,12 +12,12 @@ Note:
 The behavior of Pure Java Nokogiri differs from the Nokogiri used on the
 standard Ruby interpreter (MRI) due to differences in underlying libraries.
 
-These sometimes problematic behavioral differences can cause nanoc filters not
+These sometimes problematic behavioral differences can cause Nanoc filters not
 to function properly, if at all. If you need reliable (X)HTML and XML handling
 functionality, consider not using Nokogiri on JRuby for the time being.
 
-These issues are being worked on both from the Nokogiri and the nanoc side. Keep
-your Nokogiri and nanoc versions up to date!
+These issues are being worked on both from the Nokogiri and the Nanoc side. Keep
+your Nokogiri and Nanoc versions up to date!
 
 For details, see https://github.com/nanoc/nanoc/pull/422.
 --------------------------------------------------------------------------------

data/lib/nanoc/extra/pruner.rb

@@ -1,6 +1,6 @@
 module Nanoc::Extra
   # Responsible for finding and deleting files in the site’s output directory
-  # that are not managed by nanoc.
+  # that are not managed by Nanoc.
   #
   # @api private
   class Pruner
@@ -18,7 +18,7 @@ module Nanoc::Extra
       @exclude = params.fetch(:exclude) { [] }
     end
 
-    # Prunes all output files not managed by nanoc.
+    # Prunes all output files not managed by Nanoc.
     #
     # @return [void]
     def run

data/lib/nanoc/filters/erubis.rb

@@ -4,7 +4,7 @@ module Nanoc::Filters
     requires 'erubis'
 
     # The same as `::Erubis::Eruby` but adds `_erbout` as an alias for the
-    # `_buf` variable, making it compatible with nanoc’s helpers that rely
+    # `_buf` variable, making it compatible with Nanoc’s helpers that rely
     # on `_erbout`, such as {Nanoc::Helpers::Capturing}.
     class ErubisWithErbout < ::Erubis::Eruby
       include ::Erubis::ErboutEnhancer

data/lib/nanoc/filters/slim.rb

@@ -13,8 +13,8 @@ module Nanoc::Filters
     # @return [String] The filtered content
     def run(content, params = {})
       params = {
-        disable_capture: true,      # Capture managed by nanoc
-        buffer: '_erbout', # Force slim to output to the buffer used by nanoc
+        disable_capture: true,      # Capture managed by Nanoc
+        buffer: '_erbout', # Force slim to output to the buffer used by Nanoc
       }.merge params
 
       # Create context

data/lib/nanoc/helpers/capturing.rb

@@ -15,7 +15,7 @@ module Nanoc::Helpers
   # @example Capturing content for a summary
   #
   #   <% content_for :summary do %>
-  #     <p>On this item, nanoc is introduced, blah blah.</p>
+  #     <p>On this item, Nanoc is introduced, blah blah.</p>
   #   <% end %>
   #
   # @example Showing captured content in a sidebar

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
-  # The current nanoc version.
-  VERSION = '4.0.0rc1'
+  # The current Nanoc version.
+  VERSION = '4.0.0rc2'
 end

data/nanoc.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version     = Nanoc::VERSION
   s.homepage    = 'http://nanoc.ws/'
   s.summary     = 'A static-site generator with a focus on flexibility.'
-  s.description = 'nanoc is a static-site generator focused on flexibility. It transforms content from a format such as Markdown or AsciiDoc into another format, usually HTML, and lays out pages consistently to retain the site’s look and feel throughout. Static sites built with nanoc can be deployed to any web server.'
+  s.description = 'Nanoc is a static-site generator focused on flexibility. It transforms content from a format such as Markdown or AsciiDoc into another format, usually HTML, and lays out pages consistently to retain the site’s look and feel throughout. Static sites built with Nanoc can be deployed to any web server.'
 
   s.author  = 'Denis Defreyne'
   s.email   = 'denis.defreyne@stoneship.org'

data/test/base/test_compiler.rb

@@ -278,6 +278,33 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     end
   end
 
+  def test_disallow_duplicate_routes
+    # Create site
+    Nanoc::CLI.run %w( create_site bar)
+
+    FileUtils.cd('bar') do
+      # Create routes
+      File.open('Rules', 'w') do |io|
+        io.write "compile '/**/*' do\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '/**/*' do\n"
+        io.write "  '/index.html'\n"
+        io.write "end\n"
+      end
+
+      # Create files
+      File.write('content/foo.html', 'asdf')
+      File.write('content/bar.html', 'asdf')
+
+      # Create site
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      assert_raises(Nanoc::Int::Compiler::IdenticalRoutesError) do
+        site.compile
+      end
+    end
+  end
+
   def test_load_should_be_idempotent
     # Create site
     Nanoc::CLI.run %w( create_site bar)
@@ -325,7 +352,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
         io.write "end\n"
         io.write "\n"
         io.write "route '/**/*' do\n"
-        io.write "  '/index.html'\n"
+        io.write "  item.identifier.to_s\n"
         io.write "end\n"
         io.write "\n"
         io.write "layout '/**/*', :erb\n"
@@ -601,7 +628,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
         io.write "end\n"
         io.write "\n"
         io.write "route '/**/*' do\n"
-        io.write "  '/index.html'\n"
+        io.write "  item.identifier.to_s\n"
         io.write "end\n"
         io.write "\n"
         io.write "layout '/**/*', :erb\n"

data/test/data_sources/test_filesystem.rb

@@ -451,4 +451,31 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     assert_equal({ 'foo' => 'bar' }, result[0])
     assert_equal('blah blah',       result[1])
   end
+
+  def test_parse_internal_bad_metadata
+    content = \
+      "---\n" \
+      "Hello world!\n" \
+      "---\n" \
+      "blah blah\n"
+
+    File.open('test.html', 'w') { |io| io.write(content) }
+
+    data_source = Nanoc::DataSources::FilesystemUnified.new(nil, nil, nil, nil)
+
+    assert_raises(Nanoc::DataSources::Filesystem::InvalidMetadataError) do
+      data_source.instance_eval { parse('test.html', nil, 'foobar') }
+    end
+  end
+
+  def test_parse_external_bad_metadata
+    File.open('test.html', 'w') { |io| io.write('blah blah') }
+    File.open('test.yaml', 'w') { |io| io.write('Hello world!') }
+
+    data_source = Nanoc::DataSources::FilesystemUnified.new(nil, nil, nil, nil)
+
+    assert_raises(Nanoc::DataSources::Filesystem::InvalidMetadataError) do
+      data_source.instance_eval { parse('test.html', 'test.yaml', 'foobar') }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc1
+  version: 4.0.0rc2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -44,10 +44,10 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: nanoc is a static-site generator focused on flexibility. It transforms
+description: Nanoc is a static-site generator focused on flexibility. It transforms
   content from a format such as Markdown or AsciiDoc into another format, usually
   HTML, and lays out pages consistently to retain the site’s look and feel throughout.
-  Static sites built with nanoc can be deployed to any web server.
+  Static sites built with Nanoc can be deployed to any web server.
 email: denis.defreyne@stoneship.org
 executables:
 - nanoc
@@ -66,7 +66,6 @@ files:
 - NEWS.md
 - README.md
 - Rakefile
-- TODO.md
 - bin/nanoc
 - doc/yardoc_handlers/identifier.rb
 - doc/yardoc_templates/default/layout/html/footer.erb

data/TODO.md

@@ -1,14 +0,0 @@
-# To do
-
-## Ideas
-
-* binary snapshots could be possible
-* binary layotus could be possible
-
-## Removing `forget_progress`
-
-This means not storing compiled content inside item reps anymore.
-
-Compiler could store it, and `snapshot` could move temporary compiled content (like `:last`) and crystallize it in a more permanent store (even in-memory).
-
-CompiledContent class, which is basically snapshot -> Content.