nanoc-core 4.14.6 → 4.14.8

data/lib/nanoc/core/errors.rb

@@ -20,7 +20,10 @@ module Nanoc
         def initialize(item_rep, snapshot)
           @item_rep = item_rep
           @snapshot = snapshot
-          super("The “#{item_rep.inspect}” item rep does not have a snapshot “#{snapshot.inspect}”")
+
+          super(
+            "The “#{item_rep.inspect}” item rep does not have a snapshot “#{snapshot.inspect}”"
+          )
         end
       end
 
@@ -30,6 +33,8 @@ module Nanoc
         attr_reader :item_rep
 
         def initialize(wrapped, item_rep)
+          super(wrapped.message)
+
           @wrapped = wrapped
           @item_rep = item_rep
         end
@@ -45,7 +50,9 @@ module Nanoc
         # @param [String] data_source_name The data source name for which no
         #   data source could be found
         def initialize(data_source_name)
-          super("The data source specified in the site’s configuration file, “#{data_source_name}”, does not exist.")
+          super(
+            'The data source specified in the site’s configuration file, ' \
+            "“#{data_source_name}”, does not exist.")
         end
       end
 
@@ -65,7 +72,10 @@ module Nanoc
           @rep = rep
           @snapshot_name = snapshot_name
 
-          super("The current item cannot be compiled yet because of an unmet dependency on the “#{rep.item.identifier}” item (rep “#{rep.name}”, snapshot “#{snapshot_name}”).")
+          super(
+            'The current item cannot be compiled yet because of an ' \
+            "unmet dependency on the “#{rep.item.identifier}” item " \
+            "(rep “#{rep.name}”, snapshot “#{snapshot_name}”).")
         end
       end
 
@@ -79,9 +89,9 @@ module Nanoc
           cycle.each.with_index do |r, i|
             msg_bits << "    (#{i + 1}) item #{r.item.identifier}, rep #{r.name.inspect}, uses compiled content of"
           end
-          msg_bits << (msg_bits.pop + ' (1)')
+          msg_bits << "#{msg_bits.pop} (1)"
 
-          super(msg_bits.map { |x| x + "\n" }.join)
+          super(msg_bits.map { |x| "#{x}\n" }.join)
         end
       end
 
@@ -92,22 +102,31 @@ module Nanoc
         # @param [String] layout_identifier The identifier of the layout for
         #   which the filter could not be determined
         def initialize(layout_identifier)
-          super("The filter to be used for the “#{layout_identifier}” layout could not be determined. Make sure the layout does have a filter.")
+          super(
+            "The filter to be used for the “#{layout_identifier}” layout " \
+            'could not be determined. Make sure the layout does have a filter.')
         end
       end
 
       # Error that is raised when the compiled content of a binary item is attempted to be accessed.
       class CannotGetCompiledContentOfBinaryItem < ::Nanoc::Core::Error
-        # @param [Nanoc::Core::ItemRep] rep The binary item representation whose compiled content was attempted to be accessed
+        # @param [Nanoc::Core::ItemRep] rep The binary item representation
+        #   whose compiled content was attempted to be accessed
         def initialize(rep)
-          super("You cannot access the compiled content of a binary item representation (but you can access the path). The offending item rep is #{rep}.")
+          super(
+            'You cannot access the compiled content of a binary item ' \
+            "representation (but you can access the path). The offending item rep is #{rep}.")
         end
       end
 
       # Error that is raised when attempting to call #parent or #children on an item with a legacy identifier.
       class CannotGetParentOrChildrenOfNonLegacyItem < ::Nanoc::Core::Error
         def initialize(identifier)
-          super("You cannot get the parent or children of an item that has a “full” identifier (#{identifier}). Getting the parent or children of an item is only possible for items that have a legacy identifier.")
+          super(
+            'You cannot get the parent or children of an item that has a ' \
+            "“full” identifier (#{identifier}). Getting the parent or " \
+            'children of an item is only possible for items that have a ' \
+            'legacy identifier.')
         end
       end
 
@@ -126,7 +145,12 @@ module Nanoc
         # @param [Nanoc::Core::ItemRep] rep The item representation that was attempted
         #   to be laid out
         def initialize(rep)
-          super("The “#{rep.item.identifier}” item (rep “#{rep.name}”) cannot be laid out because it is a binary item. If you are getting this error for an item that should be textual instead of binary, make sure that its extension is included in the text_extensions array in the site configuration.")
+          super(
+            "The “#{rep.item.identifier}” item (rep “#{rep.name}”) cannot " \
+            'be laid out because it is a binary item. If you are getting ' \
+            'this error for an item that should be textual instead of ' \
+            'binary, make sure that its extension is included in the ' \
+            'text_extensions array in the site configuration.')
         end
       end
 
@@ -138,7 +162,10 @@ module Nanoc
         #
         # @param [Class] filter_class The filter class that was used
         def initialize(rep, filter_class)
-          super("The “#{filter_class.inspect}” filter cannot be used to filter the “#{rep.item.identifier}” item (rep “#{rep.name}”), because textual filters cannot be used on binary items.")
+          super(
+            "The “#{filter_class.inspect}” filter cannot be used to filter " \
+            "the “#{rep.item.identifier}” item (rep “#{rep.name}”), because " \
+            'textual filters cannot be used on binary items.')
         end
       end
 
@@ -150,7 +177,13 @@ module Nanoc
         #
         # @param [Class] filter_class The filter class that was used
         def initialize(rep, filter_class)
-          super("The “#{filter_class.inspect}” filter cannot be used to filter the “#{rep.item.identifier}” item (rep “#{rep.name}”), because binary filters cannot be used on textual items. If you are getting this error for an item that should be textual instead of binary, make sure that its extension is included in the text_extensions array in the site configuration.")
+          super(
+            "The “#{filter_class.inspect}” filter cannot be used to filter " \
+            "the “#{rep.item.identifier}” item (rep “#{rep.name}”), because " \
+            'binary filters cannot be used on textual items. If you are ' \
+            'getting this error for an item that should be textual instead ' \
+            'of binary, make sure that its extension is included in the ' \
+            'text_extensions array in the site configuration.')
         end
       end
 

data/lib/nanoc/core/executor.rb

@@ -13,7 +13,9 @@ module Nanoc
         filter = filter_for_filtering(filter_name)
 
         begin
-          Nanoc::Core::NotificationCenter.post(:filtering_started, @rep, filter_name)
+          Nanoc::Core::NotificationCenter.post(
+            :filtering_started, @rep, filter_name
+          )
 
           # Run filter
           last = @compilation_context.compiled_content_repo.get_current(@rep)
@@ -30,16 +32,20 @@ module Nanoc
           # Store
           @compilation_context.compiled_content_repo.set_current(@rep, last)
         ensure
-          Nanoc::Core::NotificationCenter.post(:filtering_ended, @rep, filter_name)
+          Nanoc::Core::NotificationCenter.post(
+            :filtering_ended, @rep, filter_name
+          )
         end
       end
 
       def layout(layout_identifier, extra_filter_args = nil)
         layout = find_layout(layout_identifier)
-        filter_name_and_args = @compilation_context.filter_name_and_args_for_layout(layout)
+        filter_name_and_args =
+          @compilation_context.filter_name_and_args_for_layout(layout)
         filter_name = filter_name_and_args.name
         if filter_name.nil?
-          raise Nanoc::Core::Errors::CannotDetermineFilter.new(layout_identifier)
+          raise Nanoc::Core::Errors::CannotDetermineFilter
+            .new(layout_identifier)
         end
 
         filter_args = filter_name_and_args.args
@@ -48,7 +54,9 @@ module Nanoc
 
         # Check whether item can be laid out
         last = @compilation_context.compiled_content_repo.get_current(@rep)
-        raise Nanoc::Core::Errors::CannotLayoutBinaryItem.new(@rep) if last.binary?
+        if last.binary?
+          raise Nanoc::Core::Errors::CannotLayoutBinaryItem.new(@rep)
+        end
 
         # Create filter
         klass = Nanoc::Core::Filter.named!(filter_name)
@@ -59,7 +67,9 @@ module Nanoc
         @dependency_tracker.bounce(layout, raw_content: true)
 
         begin
-          Nanoc::Core::NotificationCenter.post(:filtering_started, @rep, filter_name)
+          Nanoc::Core::NotificationCenter.post(
+            :filtering_started, @rep, filter_name
+          )
 
           # Layout
           content = layout.content
@@ -70,14 +80,21 @@ module Nanoc
           last = Nanoc::Core::TextualContent.new(res).tap(&:freeze)
           @compilation_context.compiled_content_repo.set_current(@rep, last)
         ensure
-          Nanoc::Core::NotificationCenter.post(:filtering_ended, @rep, filter_name)
+          Nanoc::Core::NotificationCenter.post(
+            :filtering_ended, @rep, filter_name
+          )
         end
       end
 
       def snapshot(snapshot_name)
         last = @compilation_context.compiled_content_repo.get_current(@rep)
-        @compilation_context.compiled_content_repo.set(@rep, snapshot_name, last)
-        Nanoc::Core::NotificationCenter.post(:snapshot_created, @rep, snapshot_name)
+        @compilation_context.compiled_content_repo.set(
+          @rep, snapshot_name,
+          last
+        )
+        Nanoc::Core::NotificationCenter.post(
+          :snapshot_created, @rep, snapshot_name
+        )
       end
 
       def assigns

data/lib/nanoc/core/feature.rb

@@ -70,7 +70,8 @@ module Nanoc
 
       # @api private
       def self.enabled_features
-        @_enabled_features ||= Set.new(ENV.fetch('NANOC_FEATURES', '').split(','))
+        @_enabled_features ||=
+          Set.new(ENV.fetch('NANOC_FEATURES', '').split(','))
       end
 
       # @api private

data/lib/nanoc/core/filter.rb

@@ -2,8 +2,8 @@
 
 module Nanoc
   module Core
-    # Nanoc::Core::Filter is responsible for filtering items. It is the superclass
-    # for all textual filters.
+    # Nanoc::Core::Filter is responsible for filtering items. It is the
+    # superclass for all textual filters.
     #
     # A filter instance should only be used once. Filters should not be reused
     # since they store state.
@@ -48,7 +48,10 @@ module Nanoc
 
         contract C::Or[String, Symbol], String => self
         def initialize(filter_name, output_filename)
-          super("The #{filter_name.inspect} filter did not write anything to the required output file, #{output_filename}.")
+          super(
+            "The #{filter_name.inspect} filter did not write anything to " \
+            "the required output file, #{output_filename}.",
+          )
         end
       end
 
@@ -57,7 +60,10 @@ module Nanoc
 
         contract C::Or[String, Symbol] => self
         def initialize(filter_name)
-          super("The #{filter_name.inspect} filter returned nil, but is required to return a String.")
+          super(
+            "The #{filter_name.inspect} filter returned nil, but is " \
+            'required to return a String.',
+          )
         end
       end
 
@@ -130,8 +136,8 @@ module Nanoc
           @always_outdated || false
         end
 
-        # Marks this filter as always causing the item rep to be outdated. This is useful for filters
-        # that cannot do dependency tracking properly.
+        # Marks this filter as always causing the item rep to be outdated. This
+        # is useful for filters that cannot do dependency tracking properly.
         #
         # @return [void]
         def always_outdated
@@ -140,11 +146,14 @@ module Nanoc
 
         # @overload requires(*requires)
         #   Sets the required libraries for this filter.
-        #   @param [Array<String>] requires A list of library names that are required
+        #   @param [Array<String>] requires A list of library names that are
+        #     required
         #   @return [void]
+        #
         # @overload requires
         #   Returns the required libraries for this filter.
-        #   @return [Enumerable<String>] This filter’s list of library names that are required
+        #   @return [Enumerable<String>] This filter’s list of library names
+        #     that are required
         def requires(*requires)
           if requires.empty?
             @requires || []
@@ -203,17 +212,24 @@ module Nanoc
       #   value is undefined; if the filter outputs textual content, the return
       #   value will be the filtered content.
       def run(content_or_filename, params = {}) # rubocop:disable Lint/UnusedMethodArgument
-        raise NotImplementedError.new('Nanoc::Core::Filter subclasses must implement #run')
+        raise NotImplementedError.new(
+          'Nanoc::Core::Filter subclasses must implement #run',
+        )
       end
 
       def verify(res)
         if self.class.to_binary?
           unless File.file?(output_filename)
-            raise Nanoc::Core::Filter::OutputNotWrittenError.new(self.class.identifier, output_filename)
+            raise Nanoc::Core::Filter::OutputNotWrittenError.new(
+              self.class.identifier,
+              output_filename,
+            )
           end
         elsif self.class.to_text?
           unless res
-            raise Nanoc::Core::Filter::FilterReturnedNilError.new(self.class.identifier)
+            raise Nanoc::Core::Filter::FilterReturnedNilError.new(
+              self.class.identifier,
+            )
           end
         end
       end

data/lib/nanoc/core/identifiable_collection.rb

@@ -17,7 +17,8 @@ module Nanoc
         raise 'IdentifiableCollection is abstract and cannot be instantiated'
       end
 
-      # contract C::Or[Hash, C::Named['Nanoc::Core::Configuration']], C::IterOf[C::RespondTo[:identifier]], C::Maybe[String] => C::Any
+      # contract C::Or[Hash, C::Named['Nanoc::Core::Configuration']],
+      #   C::IterOf[C::RespondTo[:identifier]], C::Maybe[String] => C::Any
       def initialize_basic(config, objects = [], name = nil)
         @config = config
         @objects = Immutable::Vector.new(objects)

data/lib/nanoc/core/identifier.rb

@@ -8,37 +8,48 @@ module Nanoc
 
       class InvalidIdentifierError < ::Nanoc::Core::Error
         def initialize(string)
-          super("Invalid identifier (does not start with a slash): #{string.inspect}")
+          super(
+            'Invalid identifier (does not start with a slash): ' \
+            "#{string.inspect}")
         end
       end
 
       class InvalidFullIdentifierError < ::Nanoc::Core::Error
         def initialize(string)
-          super("Invalid full identifier (ends with a slash): #{string.inspect}")
+          super(
+            'Invalid full identifier (ends with a slash): ' \
+            "#{string.inspect}")
         end
       end
 
       class InvalidTypeError < ::Nanoc::Core::Error
         def initialize(type)
-          super("Invalid type for identifier: #{type.inspect} (can be :full or :legacy)")
+          super(
+            "Invalid type for identifier: #{type.inspect} " \
+            '(can be :full or :legacy)')
         end
       end
 
       class InvalidPrefixError < ::Nanoc::Core::Error
         def initialize(string)
-          super("Invalid prefix (does not start with a slash): #{string.inspect}")
+          super(
+            'Invalid prefix (does not start with a slash): ' \
+            "#{string.inspect}")
         end
       end
 
       class UnsupportedLegacyOperationError < ::Nanoc::Core::Error
         def initialize
-          super('Cannot use this method on legacy identifiers')
+          super(
+            'Cannot use this method on legacy identifiers')
         end
       end
 
       class NonCoercibleObjectError < ::Nanoc::Core::Error
         def initialize(obj)
-          super("#{obj.inspect} cannot be converted into a Nanoc::Core::Identifier")
+          super(
+            "#{obj.inspect} cannot be converted into a " \
+            'Nanoc::Core::Identifier')
         end
       end
 
@@ -113,7 +124,8 @@ module Nanoc
       end
 
       contract C::None => C::Bool
-      # Whether or not this is a legacy identifier (i.e. does not include the extension).
+      # Whether or not this is a legacy identifier (i.e. does not include the
+      # extension).
       def legacy?
         @type == :legacy
       end
@@ -137,7 +149,10 @@ module Nanoc
           raise InvalidPrefixError.new(string)
         end
 
-        Nanoc::Core::Identifier.new(string.sub(%r{/+\z}, '') + @string, type: @type)
+        Nanoc::Core::Identifier.new(
+          string.sub(%r{/+\z}, '') + @string,
+          type: @type,
+        )
       end
 
       contract C::None => String

data/lib/nanoc/core/in_memory_data_source.rb

@@ -8,7 +8,9 @@ module Nanoc
       attr_reader :items
       attr_reader :layouts
 
-      contract Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection, C::Maybe[Nanoc::Core::DataSource] => C::Any
+      contract Nanoc::Core::ItemCollection,
+               Nanoc::Core::LayoutCollection,
+               C::Maybe[Nanoc::Core::DataSource] => C::Any
       def initialize(items, layouts, orig_data_source = nil)
         super({}, '/', '/', {})
 

data/lib/nanoc/core/item.rb

@@ -4,7 +4,7 @@ module Nanoc
   module Core
     class Item < ::Nanoc::Core::Document
       def reference
-        @_reference ||= "item:#{identifier}"
+        @_reference ||= :"item:#{identifier}"
       end
 
       def identifier=(new_identifier)

data/lib/nanoc/core/item_collection.rb

@@ -2,7 +2,7 @@
 
 module Nanoc
   module Core
-    class ItemCollection < IdentifiableCollection
+    class ItemCollection < Nanoc::Core::IdentifiableCollection
       prepend MemoWise
 
       def initialize(config, objects = [])
@@ -10,7 +10,7 @@ module Nanoc
       end
 
       def reference
-        'items'
+        :items
       end
     end
   end

data/lib/nanoc/core/item_rep.rb

@@ -95,7 +95,7 @@ module Nanoc
 
       # Returns an object that can be used for uniquely identifying objects.
       def reference
-        "item_rep:#{item.identifier}:#{name}"
+        :"item_rep:#{item.identifier}:#{name}"
       end
 
       def to_s

data/lib/nanoc/core/item_rep_builder.rb

@@ -6,7 +6,9 @@ module Nanoc
     class ItemRepBuilder
       include Nanoc::Core::ContractsSupport
 
-      contract Nanoc::Core::ActionSequence, Nanoc::Core::ItemRep => C::ArrayOf[Nanoc::Core::SnapshotDef]
+      contract Nanoc::Core::ActionSequence,
+               Nanoc::Core::ItemRep =>
+               C::ArrayOf[Nanoc::Core::SnapshotDef]
       def self.snapshot_defs_for(action_sequence, rep)
         is_binary = rep.item.content.binary?
         snapshot_defs = []
@@ -15,7 +17,8 @@ module Nanoc
           case action
           when Nanoc::Core::ProcessingActions::Snapshot
             action.snapshot_names.each do |snapshot_name|
-              snapshot_defs << Nanoc::Core::SnapshotDef.new(snapshot_name, binary: is_binary)
+              snapshot_defs <<
+                Nanoc::Core::SnapshotDef.new(snapshot_name, binary: is_binary)
             end
           when Nanoc::Core::ProcessingActions::Filter
             is_binary = Nanoc::Core::Filter.named!(action.filter_name).to_binary?
@@ -27,7 +30,9 @@ module Nanoc
 
       attr_reader :reps
 
-      contract Nanoc::Core::Site, Nanoc::Core::ActionProvider, Nanoc::Core::ItemRepRepo => C::Any
+      contract Nanoc::Core::Site,
+               Nanoc::Core::ActionProvider,
+               Nanoc::Core::ItemRepRepo => C::Any
       def initialize(site, action_provider, reps)
         @site = site
         @action_provider = action_provider
@@ -41,10 +46,14 @@ module Nanoc
           end
         end
 
-        action_sequences = Nanoc::Core::ItemRepRouter.new(@reps, @action_provider, @site).run
+        action_sequences = Nanoc::Core::ItemRepRouter.new(
+          @reps, @action_provider, @site
+        ).run
 
         @reps.each do |rep|
-          rep.snapshot_defs = self.class.snapshot_defs_for(action_sequences[rep], rep)
+          rep.snapshot_defs = self.class.snapshot_defs_for(
+            action_sequences[rep], rep
+          )
         end
 
         action_sequences

data/lib/nanoc/core/item_rep_router.rb

@@ -10,17 +10,22 @@ module Nanoc
 
       class IdenticalRoutesError < ::Nanoc::Core::Error
         def initialize(output_path, rep_a, rep_b)
-          super("The item representations #{rep_a} and #{rep_b} are both routed to #{output_path}.")
+          super(
+            "The item representations #{rep_a} and #{rep_b} are both " \
+            "routed to #{output_path}.")
         end
       end
 
       class RouteWithoutSlashError < ::Nanoc::Core::Error
         def initialize(output_path, rep)
-          super("The item representation #{rep} is routed to #{output_path}, which does not start with a slash, as required.")
+          super(
+            "The item representation #{rep} is routed to #{output_path}, " \
+            'which does not start with a slash, as required.')
         end
       end
 
-      contract Nanoc::Core::ItemRepRepo, Nanoc::Core::ActionProvider, Nanoc::Core::Site => C::Any
+      contract Nanoc::Core::ItemRepRepo, Nanoc::Core::ActionProvider,
+               Nanoc::Core::Site => C::Any
       def initialize(reps, action_provider, site)
         @reps = reps
         @action_provider = action_provider
@@ -31,12 +36,14 @@ module Nanoc
         action_sequences = {}
         assigned_paths = {}
         @reps.each do |rep|
-          # Sigh. We route reps twice, because the first time, the paths might not have converged
-          # yet. This isn’t ideal, but it’s the only way to work around the divergence issues that
-          # I can think of. For details, see
-          # https://github.com/nanoc/nanoc/pull/1085#issuecomment-280628426.
+          # Sigh. We route reps twice, because the first time, the paths might
+          # not have converged yet. This isn’t ideal, but it’s the only way to
+          # work around the divergence issues that I can think of. For details,
+          # see https://github.com/nanoc/nanoc/pull/1085#issuecomment-280628426.
 
-          @action_provider.action_sequence_for(rep).paths.each do |(snapshot_names, paths)|
+          @action_provider
+            .action_sequence_for(rep)
+            .paths.each do |(snapshot_names, paths)|
             route_rep(rep, paths, snapshot_names, {})
           end
 
@@ -52,7 +59,8 @@ module Nanoc
         action_sequences
       end
 
-      contract Nanoc::Core::ItemRep, C::IterOf[String], C::IterOf[Symbol], C::HashOf[String => Nanoc::Core::ItemRep] => C::Any
+      contract Nanoc::Core::ItemRep, C::IterOf[String], C::IterOf[Symbol],
+               C::HashOf[String => Nanoc::Core::ItemRep] => C::Any
       def route_rep(rep, paths, snapshot_names, assigned_paths)
         # Encode
         paths = paths.map { |path| path.encode('UTF-8') }
@@ -66,7 +74,9 @@ module Nanoc
           # Validate uniqueness
           if assigned_paths.include?(path)
             # TODO: Include snapshot names in error message
-            reps = [assigned_paths[path], rep].sort_by { |r| [r.item.identifier, r.name] }
+            reps = [assigned_paths[path], rep].sort_by do |r|
+              [r.item.identifier, r.name]
+            end
             raise IdenticalRoutesError.new(path, *reps)
           end
           assigned_paths[path] = rep
@@ -74,15 +84,19 @@ module Nanoc
 
         # Assign
         snapshot_names.each do |snapshot_name|
-          rep.raw_paths[snapshot_name] = paths.map { |path| @site.config.output_dir + path }
-          rep.paths[snapshot_name] = paths.map { |path| strip_index_filename(path) }
+          rep.raw_paths[snapshot_name] = paths.map do |path|
+            @site.config.output_dir + path
+          end
+          rep.paths[snapshot_name] = paths.map do |path|
+            strip_index_filename(path)
+          end
         end
       end
 
       contract String => String
       def strip_index_filename(basic_path)
         @site.config[:index_filenames].each do |index_filename|
-          slashed_index_filename = '/' + index_filename
+          slashed_index_filename = "/#{index_filename}"
           if basic_path.end_with?(slashed_index_filename)
             return basic_path[0..(-index_filename.length - 1)]
           end

data/lib/nanoc/core/item_rep_writer.rb

@@ -18,11 +18,23 @@ module Nanoc
 
       def write(item_rep, compiled_content_repo, snapshot_name, written_paths)
         item_rep.raw_paths.fetch(snapshot_name, []).each do |raw_path|
-          write_single(item_rep, compiled_content_repo, snapshot_name, raw_path, written_paths)
+          write_single(
+            item_rep,
+            compiled_content_repo,
+            snapshot_name,
+            raw_path,
+            written_paths,
+          )
         end
       end
 
-      def write_single(item_rep, compiled_content_repo, snapshot_name, raw_path, written_paths)
+      def write_single(
+        item_rep,
+        compiled_content_repo,
+        snapshot_name,
+        raw_path,
+        written_paths
+      )
         assert Nanoc::Core::Assertions::PathIsAbsolute.new(path: raw_path)
 
         # Don’t write twice
@@ -56,7 +68,10 @@ module Nanoc
         # Notify ready for diff generation
         if !is_created && is_modified && !content.binary?
           Nanoc::Core::NotificationCenter.post(
-            :rep_ready_for_diff, raw_path, File.read(raw_path, encoding: 'UTF-8'), content.string
+            :rep_ready_for_diff,
+            raw_path,
+            File.read(raw_path, encoding: 'UTF-8'),
+            content.string,
           )
         end
 
@@ -69,7 +84,12 @@ module Nanoc
 
         # Notify
         Nanoc::Core::NotificationCenter.post(
-          :rep_write_ended, item_rep, content.binary?, raw_path, is_created, is_modified
+          :rep_write_ended,
+          item_rep,
+          content.binary?,
+          raw_path,
+          is_created,
+          is_modified,
         )
       end
 
@@ -84,7 +104,10 @@ module Nanoc
           begin
             res = Clonefile.always(from, to)
             return if res
-          rescue Clonefile::UnsupportedPlatform, Errno::ENOTSUP, Errno::EXDEV, Errno::EINVAL
+          rescue Clonefile::UnsupportedPlatform,
+                 Errno::ENOTSUP,
+                 Errno::EXDEV,
+                 Errno::EINVAL
           end
         end
 

data/lib/nanoc/core/layout.rb

@@ -4,7 +4,7 @@ module Nanoc
   module Core
     class Layout < ::Nanoc::Core::Document
       def reference
-        @_reference ||= "layout:#{identifier}"
+        @_reference ||= :"layout:#{identifier}"
       end
 
       def identifier=(new_identifier)