nanoc 4.0.0b2 → 4.0.0b3

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class Identifier
     include Comparable

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::Int
   # Represents a compileable item in a site. It has content and attributes, as
   # well as an identifier (which starts and ends with a slash). It can also

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::Int
   # Represents a layout in a nanoc site. It has content, attributes, an
   # identifier and a modification time (to speed up compilation).

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::Int
   # The in-memory representation of a nanoc site. It holds references to the
   # following site data:
@@ -21,7 +19,7 @@ module Nanoc::Int
     # The default configuration for a data source. A data source's
     # configuration overrides these options.
     DEFAULT_DATA_SOURCE_CONFIG = {
-      type: 'filesystem_unified',
+      type: 'filesystem',
       items_root: '/',
       layouts_root: '/',
       config: {},

data/lib/nanoc/base/store.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::Int
   # An abstract superclass for classes that need to store data to the
   # filesystem, such as checksums, cached compiled content and dependency

data/lib/nanoc/base/temp_filename_factory.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'tmpdir'
 
 module Nanoc::Int

data/lib/nanoc/base/views/config.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class ConfigView
     # @api private

data/lib/nanoc/base/views/identifiable_collection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class IdentifiableCollectionView
     include Enumerable

data/lib/nanoc/base/views/item.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class ItemView
     # @api private
@@ -107,7 +105,7 @@ module Nanoc
     #
     # @return [nil] if the item has no parent
     def parent
-      Nanoc::ItemView.new(@item.parent)
+      @item.parent && Nanoc::ItemView.new(@item.parent)
     end
 
     # @return [Boolean] True if the item is binary, false otherwise
@@ -127,9 +125,9 @@ module Nanoc
 
     # Returns the representations of this item.
     #
-    # @return [Enumerable<Nanoc::ItemRepView>]
+    # @return [Nanoc::ItemRepCollectionView]
     def reps
-      @item.reps.map { |r| Nanoc::ItemRepView.new(r) }
+      Nanoc::ItemRepCollectionView.new(@item.reps)
     end
 
     # @api private

data/lib/nanoc/base/views/item_collection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class ItemCollectionView < ::Nanoc::IdentifiableCollectionView
     # @api private

data/lib/nanoc/base/views/item_rep.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class ItemRepView
     # @api private

data/lib/nanoc/base/views/item_rep_collection.rb

@@ -0,0 +1,48 @@
+module Nanoc
+  class ItemRepCollectionView
+    include Enumerable
+
+    # @api private
+    def initialize(item_reps)
+      @item_reps = item_reps
+    end
+
+    # @api private
+    def unwrap
+      @item_reps
+    end
+
+    def to_ary
+      @item_reps.map { |ir| Nanoc::ItemRepView.new(ir) }
+    end
+
+    # Calls the given block once for each item rep, passing that item rep as a parameter.
+    #
+    # @yieldparam [Nanoc::ItemRepView] item rep
+    #
+    # @yieldreturn [void]
+    #
+    # @return [self]
+    def each
+      @item_reps.each { |ir| yield Nanoc::ItemRepView.new(ir) }
+      self
+    end
+
+    # @return [Integer]
+    def size
+      @item_reps.size
+    end
+
+    # Return the item rep with the given name, or nil if no item rep exists.
+    #
+    # @param [Symbol] rep_name
+    #
+    # @return [nil] if no item rep with the given name was found
+    #
+    # @return [Nanoc::ItemRepView] if an item rep with the given name was found
+    def [](rep_name)
+      res = @item_reps.find { |ir| ir.name == rep_name }
+      res && Nanoc::ItemRepView.new(res)
+    end
+  end
+end

data/lib/nanoc/base/views/layout.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class LayoutView
     # @api private

data/lib/nanoc/base/views/layout_collection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class LayoutCollectionView < ::Nanoc::IdentifiableCollectionView
     # @api private

data/lib/nanoc/base/views/mutable_config.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class MutableConfigView < Nanoc::ConfigView
     # Sets the value for the given attribute.

data/lib/nanoc/base/views/mutable_identifiable_collection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class MutableIdentifiableCollectionView < Nanoc::IdentifiableCollectionView
     # Deletes every object for which the block evaluates to true.

data/lib/nanoc/base/views/mutable_item.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class MutableItemView < Nanoc::ItemView
     # Sets the value for the given attribute.

data/lib/nanoc/base/views/mutable_item_collection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class MutableItemCollectionView < Nanoc::MutableIdentifiableCollectionView
     # @api private

data/lib/nanoc/base/views/mutable_layout.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class MutableLayoutView < Nanoc::LayoutView
     # Sets the value for the given attribute.

data/lib/nanoc/base/views/mutable_layout_collection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class MutableLayoutCollectionView < Nanoc::MutableIdentifiableCollectionView
     # @api private

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc
   class SiteView
     # @api private

data/lib/nanoc/cli.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 begin
   require 'cri'
 rescue LoadError => e

data/lib/nanoc/cli/ansi_string_colorizer.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI
   # A simple ANSI colorizer for strings. When given a string and a list of
   # attributes, it returns a colorized string.

data/lib/nanoc/cli/cleaning_stream.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI
   # An output stream that passes output through stream cleaners. This can be
   # used to strip ANSI color sequences, for instance.

data/lib/nanoc/cli/command_runner.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI
   # A command runner subclass for nanoc commands that adds nanoc-specific
   # convenience methods and error handling.

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'check [options] [names]'
 summary 'run issue checks'
 description "

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'compile [options]'
 summary 'compile items of this site'
 description <<-EOS

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

@@ -1,11 +1,7 @@
-# encoding: utf-8
-
 usage 'create-site [options] path'
 aliases :create_site, :cs
 summary 'create a site'
-description "
-Create a new site at the given path. The site will use the `filesystem_unified` data source by default, but this can be changed using the `--datasource` command-line option.
-"
+description "Create a new site at the given path. The site will use the `filesystem` data source."
 flag nil, :force, "Force creation of new site. Disregards previous existence of site in destination"
 
 module Nanoc::CLI::Commands
@@ -62,8 +58,7 @@ prune:
 # “layout/” directories in the site directory.
 data_sources:
   -
-    # The type is the identifier of the data source. By default, this will be
-    # `filesystem_unified`.
+    # The type is the identifier of the data source.
     type: #{Nanoc::Int::Site::DEFAULT_DATA_SOURCE_CONFIG[:type]}
 
     # The path where items should be mounted (comparable to mount points in
@@ -77,18 +72,13 @@ data_sources:
     # same as the items root, but applies to layouts rather than items.
     layouts_root: #{Nanoc::Int::Site::DEFAULT_DATA_SOURCE_CONFIG[:layouts_root]}
 
-    # Whether to allow periods in identifiers. When turned off, everything
-    # past the first period is considered to be the extension, and when
-    # turned on, only the characters past the last period are considered to
-    # be the extension. For example,  a file named “content/about.html.erb”
-    # will have the identifier “/about/” when turned off, but when turned on
-    # it will become “/about.html/” instead.
-    allow_periods_in_identifiers: false
-
     # 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
 
+    # 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.
     identifier_type: full
 
 # Configuration for the “check” command, which run unit tests on the site.
@@ -291,14 +281,11 @@ EOS
 EOS
 
     def run
-      # Check arguments
+      # Extract arguments
       if arguments.length != 1
         raise Nanoc::Int::Errors::GenericTrivial, "usage: #{command.usage}"
       end
-
-      # Extract arguments and options
-      path        = arguments[0]
-      data_source = options[:datasource] || 'filesystem_unified'
+      path = arguments[0]
 
       # Check whether site exists
       if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - %w{ . .. }).empty?) && !options[:force]
@@ -307,11 +294,6 @@ EOS
           "Re-run the command using --force to create the site anyway."
       end
 
-      # Check whether data source exists
-      if Nanoc::DataSource.named(data_source).nil?
-        raise Nanoc::Int::Errors::GenericTrivial, "Unrecognised data source: #{data_source}"
-      end
-
       # Setup notifications
       Nanoc::Int::NotificationCenter.on(:file_created) do |file_path|
         Nanoc::CLI::Logger.instance.file(:high, :create, file_path)

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'deploy [options]'
 summary 'deploy the compiled site'
 description "

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'nanoc command [options] [arguments]'
 summary 'nanoc, a static site compiler written in Ruby'
 

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'prune'
 summary 'remove files not managed by nanoc from the output directory'
 description <<-EOS

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'shell'
 summary 'open a shell on the nanoc environment'
 aliases 'console'

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'show-data'
 aliases :debug
 summary 'show data in this site'

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 summary 'show all available plugins'
 aliases :info
 usage 'show-plugins [options]'

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'show-rules [thing]'
 aliases :explain
 summary 'describe the rules for each item'

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 usage 'view [options]'
 summary 'start the web server that serves static files'
 description <<-EOS

data/lib/nanoc/cli/error_handler.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI
   # Catches errors and prints nice diagnostic messages, then exits.
   #

data/lib/nanoc/cli/logger.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'singleton'
 
 module Nanoc::CLI

data/lib/nanoc/cli/stream_cleaners.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI
   # @api private
   module StreamCleaners

data/lib/nanoc/cli/stream_cleaners/abstract.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI::StreamCleaners
   # Superclass for all stream cleaners. Stream cleaners have a single method,
   # {#clean}, that takes a string and returns a cleaned string. Stream cleaners

data/lib/nanoc/cli/stream_cleaners/ansi_colors.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI::StreamCleaners
   # Removes ANSI color escape sequences.
   #

data/lib/nanoc/cli/stream_cleaners/utf8.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::CLI::StreamCleaners
   # Simplifies output by replacing UTF-8 characters with their ASCII decompositions.
   #

data/lib/nanoc/data_sources.rb

@@ -1,12 +1,8 @@
-# encoding: utf-8
-
 # @api private
 module Nanoc::DataSources
   autoload 'Filesystem',         'nanoc/data_sources/filesystem'
   autoload 'FilesystemUnified',  'nanoc/data_sources/filesystem_unified'
-  autoload 'FilesystemVerbose',  'nanoc/data_sources/filesystem_verbose'
 
-  Nanoc::DataSource.register '::Nanoc::DataSources::FilesystemVerbose',  :filesystem_verbose
   Nanoc::DataSource.register '::Nanoc::DataSources::FilesystemUnified',  :filesystem_unified
-  Nanoc::DataSource.register '::Nanoc::DataSources::Static',             :static
+  Nanoc::DataSource.register '::Nanoc::DataSources::FilesystemUnified',  :filesystem
 end

data/lib/nanoc/data_sources/filesystem.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Nanoc::DataSources
   # Provides functionality common across all filesystem data sources.
   #
@@ -47,6 +45,8 @@ module Nanoc::DataSources
     def load_objects(dir_name, kind, klass)
       res = []
 
+     return [] if dir_name.nil?
+
       all_split_files_in(dir_name).each do |base_filename, (meta_ext, content_exts)|
         content_exts.each do |content_ext|
           # Get filenames