nanoc 4.0.0b3 → 4.0.0b4

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

@@ -3,41 +3,23 @@ module Nanoc::Int
   # It provides access to the item representation that is being compiled or
   # routed.
   #
-  # The following variables will be available in this rules context:
-  #
-  # * `rep`     ({Nanoc::Int::ItemRep})         - The current item rep
-  # * `item`    ({Nanoc::Int::Item})            - The current item
-  # * `site`    ({Nanoc::Int::Site})            - The site
-  # * `config`  ({Hash})                    - The site configuration
-  # * `items`   ({Array}<{Nanoc::Int::Item}>)   - A list of all items
-  # * `layouts` ({Array}<{Nanoc::Int::Layout}>) - A list of all layouts
-  #
   # @api private
   class RuleContext < Nanoc::Int::Context
-    # @option params [Nanoc::Int::ItemRep] :rep The item representation that will
-    #   be processed in this rule context
-    #
-    # @option params [Nanoc::Int::Compiler] :compiler The compiler that is being
-    #   used to compile the site
-    #
-    # @raise [ArgumentError] if the `:rep` or the `:compiler` option is
-    #   missing
+    # @option params [Nanoc::Int::ItemRep] :rep
+    # @option params [Nanoc::Int::Compiler] :compiler
     def initialize(params = {})
-      rep = params.fetch(:rep) do
-        raise ArgumentError, 'Required :rep option is missing'
-      end
-      compiler = params.fetch(:compiler) do
-        raise ArgumentError, 'Required :compiler option is missing'
-      end
+      rep = params.fetch(:rep)
+      compiler = params.fetch(:compiler)
+      @_executor = params.fetch(:executor)
 
       super({
-        rep: rep,
-        item_rep: rep,
-        item: rep.item,
-        site: compiler.site,
-        config: compiler.site.config,
-        items: compiler.site.items,
-        layouts: compiler.site.layouts
+        item: Nanoc::ItemView.new(rep.item),
+        rep: Nanoc::ItemRepView.new(rep),
+        item_rep: Nanoc::ItemRepView.new(rep),
+        items: Nanoc::ItemCollectionView.new(compiler.site.items),
+        layouts: Nanoc::LayoutCollectionView.new(compiler.site.layouts),
+        config: Nanoc::ConfigView.new(compiler.site.config),
+        site: Nanoc::SiteView.new(compiler.site),
       })
     end
 
@@ -54,7 +36,7 @@ module Nanoc::Int
     #
     # @return [void]
     def filter(filter_name, filter_args = {})
-      rep.filter(filter_name, filter_args)
+      @_executor.filter(rep.unwrap, filter_name, filter_args)
     end
 
     # Layouts the current representation (calls {Nanoc::Int::ItemRep#layout} with
@@ -66,8 +48,8 @@ module Nanoc::Int
     #   should be laid out with
     #
     # @return [void]
-    def layout(layout_identifier)
-      rep.layout(layout_identifier)
+    def layout(layout_identifier, extra_filter_args = nil)
+      @_executor.layout(rep.unwrap, layout_identifier, extra_filter_args)
     end
 
     # Creates a snapshot of the current compiled item content. Calls
@@ -79,7 +61,7 @@ module Nanoc::Int
     #
     # @return [void]
     def snapshot(snapshot_name)
-      rep.snapshot(snapshot_name)
+      @_executor.snapshot(rep.unwrap, snapshot_name)
     end
   end
 end

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

@@ -19,10 +19,10 @@ module Nanoc::Int
     # @return [Array] The caluclated rule memory for the given object
     def [](obj)
       result =
-        case obj.type
-        when :item_rep
+        case obj
+        when Nanoc::Int::ItemRep
           @rules_collection.new_rule_memory_for_rep(obj)
-        when :layout
+        when Nanoc::Int::Layout
           @rules_collection.new_rule_memory_for_layout(obj)
         else
           raise "Do not know how to calculate the rule memory for #{obj.inspect}"

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

@@ -170,12 +170,6 @@ module Nanoc::Int
       :rules
     end
 
-    # @return [String] The checksum for this object. If its contents change,
-    #   the checksum will change as well.
-    def __nanoc_checksum
-      Nanoc::Int::Checksummer.calc(self)
-    end
-
     def inspect
       "<#{self.class}>"
     end
@@ -185,10 +179,10 @@ module Nanoc::Int
     #
     # @return [Array] The rule memory for the given item representation
     def new_rule_memory_for_rep(rep)
-      recording_proxy = rep.to_recording_proxy
-      compilation_rule_for(rep).apply_to(recording_proxy, compiler: @compiler)
-      recording_proxy.rule_memory << [:write, rep.path]
-      make_rule_memory_serializable(recording_proxy.rule_memory)
+      executor = Nanoc::Int::RecordingExecutor.new
+      compilation_rule_for(rep).apply_to(rep, executor: executor, compiler: @compiler)
+      executor.record_write(rep, rep.path)
+      make_rule_memory_serializable(executor.rule_memory)
     end
     memoize :new_rule_memory_for_rep
 

data/lib/nanoc/base/context.rb

@@ -1,6 +1,8 @@
 module Nanoc::Int
   # Provides a context and a binding for use in filters such as the ERB and
   # Haml ones.
+  #
+  # @api private
   class Context
     # Creates a new context based off the contents of the hash.
     #

data/lib/nanoc/base/core_ext/array.rb

@@ -33,16 +33,6 @@ module Nanoc::ArrayExtensions
       end
     end
   end
-
-  # Calculates the checksum for this array. Any change to this array will
-  # result in a different checksum.
-  #
-  # @return [String] The checksum for this array
-  #
-  # @api private
-  def __nanoc_checksum
-    Nanoc::Int::Checksummer.calc(self)
-  end
 end
 
 # @api private

data/lib/nanoc/base/core_ext/hash.rb

@@ -35,16 +35,6 @@ module Nanoc::HashExtensions
       end
     end
   end
-
-  # Calculates the checksum for this hash. Any change to this hash will result
-  # in a different checksum.
-  #
-  # @return [String] The checksum for this hash
-  #
-  # @api private
-  def __nanoc_checksum
-    Nanoc::Int::Checksummer.calc(self)
-  end
 end
 
 # @api private

data/lib/nanoc/base/core_ext/pathname.rb

@@ -1,14 +1,5 @@
 # @api private
 module Nanoc::PathnameExtensions
-  # Calculates the checksum for the file referenced to by this pathname. Any
-  # change to the file contents will result in a different checksum.
-  #
-  # @return [String] The checksum for this file
-  #
-  # @api private
-  def __nanoc_checksum
-    Nanoc::Int::Checksummer.calc(self)
-  end
 end
 
 # @api private

data/lib/nanoc/base/core_ext/string.rb

@@ -6,16 +6,6 @@ module Nanoc::StringExtensions
   def __nanoc_cleaned_identifier
     "/#{self}/".gsub(/^\/+|\/+$/, '/')
   end
-
-  # Calculates the checksum for this string. Any change to this string will
-  # result in a different checksum.
-  #
-  # @return [String] The checksum for this string
-  #
-  # @api private
-  def __nanoc_checksum
-    Nanoc::Int::Checksummer.calc(self)
-  end
 end
 
 # @api private

data/lib/nanoc/base/entities.rb

@@ -0,0 +1,5 @@
+require_relative 'entities/content'
+require_relative 'entities/document'
+require_relative 'entities/identifier'
+require_relative 'entities/layout'
+require_relative 'entities/pattern'

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

@@ -0,0 +1,86 @@
+module Nanoc
+  module Int
+    # Abstract content.
+    #
+    # The filename is the full filename on the default filesystem. It can be
+    # nil. It is used by filters such as Sass, which look up items on the
+    # filesystem.
+    #
+    # @abstract
+    #
+    # @api private
+    class Content
+      # @return [String, nil]
+      attr_reader :filename
+
+      # @param [String, nil] filename
+      def initialize(filename)
+        if filename && !filename.start_with?('/')
+          raise ArgumentError, 'Content filename is not absolute'
+        end
+
+        @filename = filename
+      end
+
+      def freeze
+        super
+        @filename.freeze
+      end
+
+      # @param [String] content The uncompiled item content (if it is textual
+      #   content) or the path to the filename containing the content (if this
+      #   is binary content).
+      #
+      # @option params [Boolean] :binary (false) Whether or not this item is
+      #   binary
+      #
+      # @option params [String] :filename (nil) Absolute path to the file
+      #   containing this content (if any)
+      def self.create(content, params = {})
+        if content.nil?
+          raise ArgumentError, 'Cannot create nil content'
+        elsif content.is_a?(Nanoc::Int::Content)
+          content
+        elsif params.fetch(:binary, false)
+          Nanoc::Int::BinaryContent.new(content)
+        else
+          Nanoc::Int::TextualContent.new(content, filename: params[:filename])
+        end
+      end
+
+      # @abstract
+      #
+      # @return [Boolean]
+      def binary?
+        raise NotImplementedError
+      end
+    end
+
+    # @api private
+    class TextualContent < Content
+      # @return [String]
+      attr_reader :string
+
+      def initialize(string, params = {})
+        super(params[:filename])
+        @string = string
+      end
+
+      def freeze
+        super
+        @string.freeze
+      end
+
+      def binary?
+        false
+      end
+    end
+
+    # @api private
+    class BinaryContent < Content
+      def binary?
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Nanoc
+  module Int
+    # @api private
+    class Document
+      # @return [Nanoc::Int::Content]
+      attr_reader :content
+
+      # @return [Hash]
+      attr_reader :attributes
+
+      # @return [Nanoc::Identifier]
+      attr_accessor :identifier
+
+      # @param [String, Nanoc::Int::Content] content
+      #
+      # @param [Hash] attributes
+      #
+      # @param [String, Nanoc::Identifier] identifier
+      def initialize(content, attributes, identifier)
+        @content = Nanoc::Int::Content.create(content)
+        @attributes = attributes.__nanoc_symbolize_keys_recursively
+        @identifier = Nanoc::Identifier.from(identifier)
+      end
+
+      # @return [void]
+      def freeze
+        super
+        attributes.__nanoc_freeze_recursively
+        content.freeze
+      end
+
+      # @abstract
+      #
+      # @return Unique reference to this object
+      def reference
+        raise NotImplementedError
+      end
+
+      def inspect
+        "<#{self.class} identifier=\"#{identifier}\">"
+      end
+
+      def hash
+        self.class.hash ^ identifier.hash
+      end
+
+      def eql?(other)
+        self.class == other.class && identifier == other.identifier
+      end
+
+      def ==(other)
+        self.eql?(other)
+      end
+    end
+  end
+end

data/lib/nanoc/base/{source_data → entities}/identifier.rb

@@ -84,7 +84,7 @@ module Nanoc
       extname = File.extname(@string)
       string =
         if extname.size > 0
-          @string[0..-extname.size-1]
+          @string[0..-extname.size - 1]
         else
           @string
         end
@@ -106,6 +106,17 @@ module Nanoc
       with_ext('')
     end
 
+    # @return [String] The extension, without a leading dot.
+    def ext
+      unless full?
+        raise Nanoc::Int::Errors::Generic,
+          'Cannot use #ext on identifier that does not include the file extension'
+      end
+
+      s = File.extname(@string)
+      s && s[1..-1]
+    end
+
     def to_s
       @string
     end

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

@@ -0,0 +1,8 @@
+module Nanoc::Int
+  # @api private
+  class Layout < ::Nanoc::Int::Document
+    def reference
+      [:layout, identifier]
+    end
+  end
+end

data/lib/nanoc/base/errors.rb

@@ -153,7 +153,8 @@ module Nanoc::Int
       #
       # @param [Symbol] snapshot The requested snapshot
       def initialize(item_rep, snapshot)
-        @item_rep, @snapshot = item_rep, snapshot
+        @item_rep = item_rep
+        @snapshot = snapshot
         super("The “#{item_rep.inspect}” item rep does not have a snapshot “#{snapshot.inspect}”")
       end
     end

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

@@ -10,10 +10,7 @@ module Nanoc::Int
     #
     # @api private
     module Private
-      # @return [Hash] A hash containing the assigns that will be used in the
-      #   next filter or layout operation. The keys (symbols) will be made
-      #   available during the next operation.
-      attr_accessor :assigns
+      attr_accessor :content_snapshots
 
       # @return [Boolean] true if this representation has already been
       #   compiled during the current or last compilation session; false
@@ -38,72 +35,6 @@ module Nanoc::Int
       # @api private
       attr_accessor :paths
 
-      # @return [Hash<Symbol,String>] A hash containing the paths to the
-      #   temporary _files_ that filters write binary content to. This is only
-      #   used when the item representation is binary. The keys correspond
-      #   with the snapshot names, and the values with the filename. When
-      #   writing the item representation, the file corresponding with the
-      #   requested snapshot (usually `:last`) will be copied from
-      #   `filenames[snapshot]` to `raw_paths[snapshot]`.
-      #
-      # @api private
-      attr_reader :temporary_filenames
-
-      # @return [Hash<Symbol,String>] A hash containing the content at all
-      #   snapshots. The keys correspond with the snapshot names, and the
-      #   values with the content.
-      #
-      # @api private
-      attr_accessor :content
-
-      # Writes the item rep's compiled content to the rep's output file.
-      #
-      # This method will send two notifications: one before writing the item
-      # representation, and one after. These notifications can be used for
-      # generating diffs, for example.
-      #
-      # @api private
-      #
-      # @param [Symbol, nil] snapshot The name of the snapshot to write.
-      #
-      # @return [void]
-      def write(snapshot = :last)
-        # Get raw path
-        raw_path = self.raw_path(snapshot: snapshot)
-        return if raw_path.nil?
-
-        # Create parent directory
-        FileUtils.mkdir_p(File.dirname(raw_path))
-
-        # Check if file will be created
-        is_created = !File.file?(raw_path)
-
-        # Notify
-        Nanoc::Int::NotificationCenter.post(:will_write_rep, self, snapshot)
-
-        if self.binary?
-          temp_path = temporary_filenames[:last]
-        else
-          temp_path = temp_filename
-          File.open(temp_path, 'w') { |io| io.write(@content[:last]) }
-        end
-
-        # Check whether content was modified
-        is_modified = is_created || !FileUtils.identical?(raw_path, temp_path)
-
-        # Write
-        FileUtils.cp(temp_path, raw_path) if is_modified
-
-        # Notify
-        Nanoc::Int::NotificationCenter.post(:rep_written, self, raw_path, is_created, is_modified)
-      end
-
-      TMP_TEXT_ITEMS_DIR = 'text_items'
-
-      def temp_filename
-        Nanoc::Int::TempFilenameFactory.instance.create(TMP_TEXT_ITEMS_DIR)
-      end
-
       # Resets the compilation progress for this item representation. This is
       # necessary when an unmet dependency is detected during compilation.
       #
@@ -113,17 +44,6 @@ module Nanoc::Int
       def forget_progress
         initialize_content
       end
-
-      # Returns the type of this object. Will always return `:item_rep`,
-      # because this is an item rep. For layouts, this method returns
-      # `:layout`.
-      #
-      # @api private
-      #
-      # @return [Symbol] :item_rep
-      def type
-        :item_rep
-      end
     end
 
     include Private
@@ -134,10 +54,6 @@ module Nanoc::Int
     # @return [Symbol] The representation's unique name
     attr_reader :name
 
-    # @return [Boolean] true if this rep is currently binary; false otherwise
-    attr_reader :binary
-    alias_method :binary?, :binary
-
     # @return [Array] A list of snapshots, represented as arrays where the
     #   first element is the snapshot name (a Symbol) and the last element is
     #   a Boolean indicating whether the snapshot is final or not
@@ -154,13 +70,9 @@ module Nanoc::Int
       @item   = item
       @name   = name
 
-      # Set binary
-      @binary = @item.binary?
-
       # Set default attributes
       @raw_paths  = {}
       @paths      = {}
-      @assigns    = {}
       @snapshots  = []
       initialize_content
 
@@ -168,6 +80,10 @@ module Nanoc::Int
       @compiled = false
     end
 
+    def binary?
+      @content_snapshots[:last].binary?
+    end
+
     # Returns the compiled content from a given snapshot.
     #
     # @option params [String] :snapshot The name of the snapshot from which to
@@ -179,16 +95,12 @@ module Nanoc::Int
     #   default snapshot if no snapshot is specified)
     def compiled_content(params = {})
       # Make sure we're not binary
-      if item.binary?
+      if binary?
         raise Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem.new(self)
       end
 
-      # Notify
-      Nanoc::Int::NotificationCenter.post(:visit_started, item)
-      Nanoc::Int::NotificationCenter.post(:visit_ended,   item)
-
       # Get name of last pre-layout snapshot
-      snapshot_name = params.fetch(:snapshot) { @content[:pre] ? :pre : :last }
+      snapshot_name = params.fetch(:snapshot) { @content_snapshots[:pre] ? :pre : :last }
       is_moving = [:pre, :post, :last].include?(snapshot_name)
 
       # Check existance of snapshot
@@ -205,12 +117,12 @@ module Nanoc::Int
         when :pre
           snapshot.nil? || !snapshot[-1]
         end
-      is_usable_snapshot = @content[snapshot_name] && (self.compiled? || !is_still_moving)
+      is_usable_snapshot = @content_snapshots[snapshot_name] && (self.compiled? || !is_still_moving)
       unless is_usable_snapshot
         raise Nanoc::Int::Errors::UnmetDependency.new(self)
       end
 
-      @content[snapshot_name]
+      @content_snapshots[snapshot_name].string
     end
 
     # Checks whether content exists at a given snapshot.
@@ -220,7 +132,7 @@ module Nanoc::Int
     #
     # @since 3.2.0
     def snapshot?(snapshot_name)
-      !@content[snapshot_name].nil?
+      !@content_snapshots[snapshot_name].nil?
     end
     alias_method :has_snapshot?, :snapshot?
 
@@ -232,9 +144,6 @@ module Nanoc::Int
     #
     # @return [String] The item rep’s path
     def raw_path(params = {})
-      Nanoc::Int::NotificationCenter.post(:visit_started, item)
-      Nanoc::Int::NotificationCenter.post(:visit_ended,   item)
-
       snapshot_name = params[:snapshot] || :last
       @raw_paths[snapshot_name]
     end
@@ -249,180 +158,17 @@ module Nanoc::Int
     #
     # @return [String] The item rep’s path
     def path(params = {})
-      Nanoc::Int::NotificationCenter.post(:visit_started, item)
-      Nanoc::Int::NotificationCenter.post(:visit_ended,   item)
-
       snapshot_name = params[:snapshot] || :last
       @paths[snapshot_name]
     end
 
-    # Runs the item content through the given filter with the given arguments.
-    # This method will replace the content of the `:last` snapshot with the
-    # filtered content of the last snapshot.
-    #
-    # This method is supposed to be called only in a compilation rule block
-    # (see {Nanoc::Int::CompilerDSL#compile}).
-    #
-    # @see Nanoc::Int::ItemRepProxy#filter
-    #
-    # @param [Symbol] filter_name The name of the filter to run the item
-    #   representations' content through
-    #
-    # @param [Hash] filter_args The filter arguments that should be passed to
-    #   the filter's #run method
-    #
-    # @return [void]
-    def filter(filter_name, filter_args = {})
-      # Get filter class
-      klass = filter_named(filter_name)
-      raise Nanoc::Int::Errors::UnknownFilter.new(filter_name) if klass.nil?
-
-      # Check whether filter can be applied
-      if klass.from_binary? && !self.binary?
-        raise Nanoc::Int::Errors::CannotUseBinaryFilter.new(self, klass)
-      elsif !klass.from_binary? && self.binary?
-        raise Nanoc::Int::Errors::CannotUseTextualFilter.new(self, klass)
-      end
-
-      begin
-        # Notify start
-        Nanoc::Int::NotificationCenter.post(:filtering_started, self, filter_name)
-
-        # Create filter
-        filter = klass.new(assigns)
-
-        # Run filter
-        source = self.binary? ? temporary_filenames[:last] : @content[:last]
-        result = filter.setup_and_run(source, filter_args)
-        if klass.to_binary?
-          temporary_filenames[:last] = filter.output_filename
-        else
-          @content[:last] = result
-          @content[:last].freeze
-        end
-        @binary = klass.to_binary?
-
-        # Check whether file was written
-        if self.binary? && !File.file?(filter.output_filename)
-          raise "The #{filter_name.inspect} filter did not write anything to the required output file, #{filter.output_filename}."
-        end
-
-        # Create snapshot
-        snapshot(@content[:post] ? :post : :pre, final: false) unless self.binary?
-      ensure
-        # Notify end
-        Nanoc::Int::NotificationCenter.post(:filtering_ended, self, filter_name)
-      end
-    end
-
-    # Lays out the item using the given layout. This method will replace the
-    # content of the `:last` snapshot with the laid out content of the last
-    # snapshot.
-    #
-    # This method is supposed to be called only in a compilation rule block
-    # (see {Nanoc::Int::CompilerDSL#compile}).
-    #
-    # @see Nanoc::Int::ItemRepProxy#layout
-    #
-    # @param [Nanoc::Int::Layout] layout The layout to use
-    #
-    # @param [Symbol] filter_name The name of the filter to layout the item
-    #   representations' content with
-    #
-    # @param [Hash] filter_args The filter arguments that should be passed to
-    #   the filter's #run method
-    #
-    # @return [void]
-    def layout(layout, filter_name, filter_args)
-      # Check whether item can be laid out
-      raise Nanoc::Int::Errors::CannotLayoutBinaryItem.new(self) if self.binary?
-
-      # Create "pre" snapshot
-      if @content[:post].nil?
-        snapshot(:pre, final: true)
-      end
-
-      # Create filter
-      klass = filter_named(filter_name)
-      raise Nanoc::Int::Errors::UnknownFilter.new(filter_name) if klass.nil?
-      filter = klass.new(assigns.merge({ layout: layout }))
-
-      # Visit
-      Nanoc::Int::NotificationCenter.post(:visit_started, layout)
-      Nanoc::Int::NotificationCenter.post(:visit_ended,   layout)
-
-      begin
-        # Notify start
-        Nanoc::Int::NotificationCenter.post(:processing_started, layout)
-        Nanoc::Int::NotificationCenter.post(:filtering_started,  self, filter_name)
-
-        # Layout
-        @content[:last] = filter.setup_and_run(layout.raw_content, filter_args)
-
-        # Create "post" snapshot
-        snapshot(:post, final: false)
-      ensure
-        # Notify end
-        Nanoc::Int::NotificationCenter.post(:filtering_ended,  self, filter_name)
-        Nanoc::Int::NotificationCenter.post(:processing_ended, layout)
-      end
-    end
-
-    # Creates a snapshot of the current compiled item content.
-    #
-    # @param [Symbol] snapshot_name The name of the snapshot to create
-    #
-    # @option params [Boolean] :final (true) True if this is the final time
-    #   the snapshot will be updated; false if it is a non-final moving
-    #   snapshot (such as `:pre`, `:post` or `:last`)
-    #
-    # @return [void]
-    def snapshot(snapshot_name, params = {})
-      is_final = params.fetch(:final, true)
-
-      unless self.binary?
-        @content[snapshot_name] = @content[:last]
-      end
-
-      if snapshot_name == :pre && is_final
-        snapshots << [:pre, true]
-      end
-
-      write(snapshot_name) if is_final
-    end
-
-    # Returns a recording proxy that is used for determining whether the
-    # compilation has changed, and thus whether the item rep needs to be
-    # recompiled.
-    #
-    # @api private
-    #
-    # @return [Nanoc::Int::ItemRepRecorderProxy] The recording proxy
-    def to_recording_proxy
-      Nanoc::Int::ItemRepRecorderProxy.new(self)
-    end
-
-    # Returns false because this item is not yet a proxy, and therefore does
-    # need to be wrapped in a proxy during compilation.
-    #
-    # @api private
-    #
-    # @return [false]
-    #
-    # @see Nanoc::Int::ItemRepRecorderProxy#proxy?
-    # @see Nanoc::Int::ItemRepProxy#proxy?
-    def proxy?
-      false
-    end
-    alias_method :is_proxy?, :proxy?
-
     # Returns an object that can be used for uniquely identifying objects.
     #
     # @api private
     #
     # @return [Object] An unique reference to this object
     def reference
-      [type, item.identifier, name]
+      [:item_rep, item.identifier, name]
     end
 
     def inspect
@@ -432,19 +178,8 @@ module Nanoc::Int
     private
 
     def initialize_content
-      # Initialize content and filenames
-      if self.binary?
-        @temporary_filenames = { last: @item.raw_filename }
-        @content             = {}
-      else
-        @content             = { last: @item.raw_content }
-        @content[:last].freeze
-        @temporary_filenames = {}
-      end
-    end
-
-    def filter_named(name)
-      Nanoc::Filter.named(name)
+      # FIXME: Where is :raw?
+      @content_snapshots = { last: @item.content }
     end
   end
 end