nanoc 4.0.0b3 → 4.0.0b4

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

@@ -330,7 +330,6 @@ module Nanoc::Int
         items_in_ds = ds.items
         items_in_ds.each do |i|
           i.identifier = i.identifier.prefix(ds.items_root)
-          i.site = self
         end
         @items.concat(items_in_ds)
       end

data/lib/nanoc/base/views.rb

@@ -0,0 +1,18 @@
+require_relative 'views/mixins/document'
+require_relative 'views/mixins/mutable_document'
+
+require_relative 'views/config'
+require_relative 'views/identifiable_collection'
+require_relative 'views/item'
+require_relative 'views/item_collection'
+require_relative 'views/item_rep'
+require_relative 'views/item_rep_collection'
+require_relative 'views/layout'
+require_relative 'views/layout_collection'
+require_relative 'views/mutable_config'
+require_relative 'views/mutable_identifiable_collection'
+require_relative 'views/mutable_item'
+require_relative 'views/mutable_item_collection'
+require_relative 'views/mutable_layout'
+require_relative 'views/mutable_layout_collection'
+require_relative 'views/site'

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

@@ -14,7 +14,7 @@ module Nanoc
     end
 
     # @see Hash#fetch
-    def fetch(key, fallback=NONE, &block)
+    def fetch(key, fallback = NONE, &_block)
       @config.fetch(key) do
         if !fallback.equal?(NONE)
           fallback

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

@@ -1,61 +1,6 @@
 module Nanoc
   class ItemView
-    # @api private
-    NONE = Object.new
-
-    # @api private
-    def initialize(item)
-      @item = item
-    end
-
-    # @api private
-    def unwrap
-      @item
-    end
-
-    # @see Object#==
-    def ==(other)
-      identifier == other.identifier
-    end
-    alias_method :eql?, :==
-
-    # @see Object#hash
-    def hash
-      self.class.hash ^ identifier.hash
-    end
-
-    # @return [Nanoc::Identifier]
-    def identifier
-      @item.identifier
-    end
-
-    # @see Hash#fetch
-    def fetch(key, fallback=NONE, &block)
-      res = @item[key] # necessary for dependency tracking
-
-      if @item.attributes.key?(key)
-        res
-      else
-        if !fallback.equal?(NONE)
-          fallback
-        elsif block_given?
-          yield(key)
-        else
-          raise KeyError, "key not found: #{key.inspect}"
-        end
-      end
-    end
-
-    # @see Hash#key?
-    def key?(key)
-      _res = @item[key] # necessary for dependency tracking
-      @item.attributes.key?(key)
-    end
-
-    # @see Hash#[]
-    def [](key)
-      @item[key]
-    end
+    include Nanoc::DocumentViewMixin
 
     # Returns the compiled content.
     #
@@ -70,7 +15,7 @@ module Nanoc
     #
     # @return [String] The content of the given rep at the given snapshot.
     def compiled_content(params = {})
-      @item.compiled_content(params)
+      reps.fetch(params.fetch(:rep, :default)).compiled_content(params)
     end
 
     # Returns the item path, as used when being linked to. It starts
@@ -87,7 +32,7 @@ module Nanoc
     #
     # @return [String] The item’s path.
     def path(params = {})
-      @item.path(params)
+      reps.fetch(params.fetch(:rep, :default)).path(params)
     end
 
     # Returns the children of this item. For items with identifiers that have
@@ -95,7 +40,7 @@ module Nanoc
     #
     # @return [Enumerable<Nanoc::ItemView>]
     def children
-      @item.children.map { |i| Nanoc::ItemView.new(i) }
+      unwrap.children.map { |i| Nanoc::ItemView.new(i) }
     end
 
     # Returns the parent of this item, if one exists. For items with identifiers
@@ -105,34 +50,24 @@ module Nanoc
     #
     # @return [nil] if the item has no parent
     def parent
-      @item.parent && Nanoc::ItemView.new(@item.parent)
+      unwrap.parent && Nanoc::ItemView.new(unwrap.parent)
     end
 
     # @return [Boolean] True if the item is binary, false otherwise
     def binary?
-      @item.binary?
-    end
-
-    # For textual items, returns the raw (source) content of this item; for
-    # binary items, returns `nil`.
-    #
-    # @return [String] if the item is textual
-    #
-    # @return [nil] if the item is binary
-    def raw_content
-      @item.raw_content
+      unwrap.content.binary?
     end
 
     # Returns the representations of this item.
     #
     # @return [Nanoc::ItemRepCollectionView]
     def reps
-      Nanoc::ItemRepCollectionView.new(@item.reps)
+      Nanoc::ItemRepCollectionView.new(unwrap.reps)
     end
 
     # @api private
     def raw_filename
-      @item.raw_filename
+      unwrap.content.filename
     end
   end
 end

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

@@ -35,6 +35,9 @@ module Nanoc
     #
     # @return [String] The content at the given snapshot.
     def compiled_content(params = {})
+      Nanoc::Int::NotificationCenter.post(:visit_started, unwrap.item)
+      Nanoc::Int::NotificationCenter.post(:visit_ended,   unwrap.item)
+
       @item_rep.compiled_content(params)
     end
 
@@ -48,6 +51,9 @@ module Nanoc
     #
     # @return [String] The item rep’s path.
     def path(params = {})
+      Nanoc::Int::NotificationCenter.post(:visit_started, unwrap.item)
+      Nanoc::Int::NotificationCenter.post(:visit_ended,   unwrap.item)
+
       @item_rep.path(params)
     end
 
@@ -60,6 +66,9 @@ module Nanoc
 
     # @api private
     def raw_path(params = {})
+      Nanoc::Int::NotificationCenter.post(:visit_started, unwrap.item)
+      Nanoc::Int::NotificationCenter.post(:visit_ended,   unwrap.item)
+
       @item_rep.raw_path(params)
     end
 

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

@@ -44,5 +44,22 @@ module Nanoc
       res = @item_reps.find { |ir| ir.name == rep_name }
       res && Nanoc::ItemRepView.new(res)
     end
+
+    # Return the item rep with the given name, or raises an exception if there
+    # is no rep with the given name.
+    #
+    # @param [Symbol] rep_name
+    #
+    # @return [Nanoc::ItemRepView]
+    #
+    # @raise if no rep was found
+    def fetch(rep_name)
+      res = @item_reps.find { |ir| ir.name == rep_name }
+      if res
+        Nanoc::ItemRepView.new(res)
+      else
+        raise Nanoc::Int::Errors::Generic, "No rep named #{rep_name.inspect} was found."
+      end
+    end
   end
 end

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

@@ -1,44 +1,5 @@
 module Nanoc
   class LayoutView
-    # @api private
-    def initialize(layout)
-      @layout = layout
-    end
-
-    # @api private
-    def unwrap
-      @layout
-    end
-
-    # @see Object#==
-    def ==(other)
-      identifier == other.identifier
-    end
-    alias_method :eql?, :==
-
-    # @see Object#hash
-    def hash
-      self.class.hash ^ identifier.hash
-    end
-
-    # @return [Nanoc::Identifier]
-    def identifier
-      @layout.identifier
-    end
-
-    # @see Hash#[]
-    def [](key)
-      @layout[key]
-    end
-
-    # @api private
-    def reference
-      @layout.reference
-    end
-
-    # @api private
-    def raw_content
-      @layout.raw_content
-    end
+    include Nanoc::DocumentViewMixin
   end
 end

data/lib/nanoc/base/views/mixins/document.rb

@@ -0,0 +1,76 @@
+module Nanoc
+  module DocumentViewMixin
+    # @api private
+    NONE = Object.new
+
+    # @api private
+    def initialize(document)
+      @document = document
+    end
+
+    # @api private
+    def unwrap
+      @document
+    end
+
+    # @see Object#==
+    def ==(other)
+      identifier == other.identifier
+    end
+    alias_method :eql?, :==
+
+    # @see Object#hash
+    def hash
+      self.class.hash ^ identifier.hash
+    end
+
+    # @return [Nanoc::Identifier]
+    def identifier
+      unwrap.identifier
+    end
+
+    # @see Hash#[]
+    def [](key)
+      Nanoc::Int::NotificationCenter.post(:visit_started, unwrap)
+      Nanoc::Int::NotificationCenter.post(:visit_ended,   unwrap)
+
+      unwrap.attributes[key]
+    end
+
+    # @see Hash#fetch
+    def fetch(key, fallback = NONE, &_block)
+      Nanoc::Int::NotificationCenter.post(:visit_started, unwrap)
+      Nanoc::Int::NotificationCenter.post(:visit_ended,   unwrap)
+
+      if unwrap.attributes.key?(key)
+        unwrap.attributes[key]
+      else
+        if !fallback.equal?(NONE)
+          fallback
+        elsif block_given?
+          yield(key)
+        else
+          raise KeyError, "key not found: #{key.inspect}"
+        end
+      end
+    end
+
+    # @see Hash#key?
+    def key?(key)
+      Nanoc::Int::NotificationCenter.post(:visit_started, unwrap)
+      Nanoc::Int::NotificationCenter.post(:visit_ended,   unwrap)
+
+      unwrap.attributes.key?(key)
+    end
+
+    # @api private
+    def reference
+      unwrap.reference
+    end
+
+    # @api private
+    def raw_content
+      unwrap.content.string
+    end
+  end
+end

data/lib/nanoc/base/views/mixins/mutable_document.rb

@@ -0,0 +1,22 @@
+module Nanoc
+  module MutableDocumentViewMixin
+    # Sets the value for the given attribute.
+    #
+    # @param [Symbol] key
+    #
+    # @see Hash#[]=
+    def []=(key, value)
+      unwrap.attributes[key] = value
+    end
+
+    # Updates the attributes based on the given hash.
+    #
+    # @param [Hash] hash
+    #
+    # @return [self]
+    def update_attributes(hash)
+      hash.each { |k, v| unwrap.attributes[k] = v }
+      self
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Nanoc
     # @yieldreturn [Boolean]
     #
     # @return [self]
-    def delete_if(&block)
+    def delete_if(&_block)
       @objects.delete_if { |o| yield(view_class.new(o)) }
       self
     end

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

@@ -1,22 +1,5 @@
 module Nanoc
   class MutableItemView < Nanoc::ItemView
-    # Sets the value for the given attribute.
-    #
-    # @param [Symbol] key
-    #
-    # @see Hash#[]=
-    def []=(key, value)
-      unwrap[key] = value
-    end
-
-    # Updates the attributes based on the given hash.
-    #
-    # @param [Hash] hash
-    #
-    # @return [self]
-    def update_attributes(hash)
-      hash.each { |k, v| unwrap[k] = v }
-      self
-    end
+    include Nanoc::MutableDocumentViewMixin
   end
 end

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

@@ -17,12 +17,16 @@ module Nanoc
     #
     # @param [Hash] params Extra parameters.
     #
-    # @option params [Symbol, nil] :binary (true) Whether or not this item is
+    # @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)
+    #
     # @return [self]
     def create(content, attributes, identifier, params = {})
-      @objects << Nanoc::Int::Item.new(content, attributes, identifier, params)
+      content = Nanoc::Int::Content.create(content, params)
+      @objects << Nanoc::Int::Item.new(content, attributes, identifier)
       self
     end
   end

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

@@ -1,12 +1,5 @@
 module Nanoc
   class MutableLayoutView < Nanoc::LayoutView
-    # Sets the value for the given attribute.
-    #
-    # @param [Symbol] key
-    #
-    # @see Hash#[]=
-    def []=(key, value)
-      unwrap[key] = value
-    end
+    include Nanoc::MutableDocumentViewMixin
   end
 end

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

@@ -65,8 +65,7 @@ module Nanoc::CLI::Commands
         require 'tempfile'
         setup_diffs
         old_contents = {}
-        Nanoc::Int::NotificationCenter.on(:will_write_rep) do |rep, snapshot|
-          path = rep.raw_path(snapshot: snapshot)
+        Nanoc::Int::NotificationCenter.on(:will_write_rep) do |rep, path|
           old_contents[rep] = File.file?(path) ? File.read(path) : nil
         end
         Nanoc::Int::NotificationCenter.on(:rep_written) do |rep, path, _is_created, _is_modified|