nanoc 4.1.0rc1 → 4.1.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f346456d3dba147e7b8d020d0df82c6f3c3311
-  data.tar.gz: fb0e46393ce90cef93dc8cf1c6348789604489a7
+  metadata.gz: 023f1a7d6ab12c07227e7173bc85ad3595b292f2
+  data.tar.gz: c6c4d7bdf320ba8fa1c04085b4b2596dcded339d
 SHA512:
-  metadata.gz: 28a7d829fdb9573c028611c9b668c487bb47c3d5a9cf75276848b6283f41b8289b23ec59205834ab88ad1e66d5de48821da7e4dfbe4a71762045aa18cbd9b682
-  data.tar.gz: 47cf5252231f404b94a0ef840975bad6e5e051ee3733a455eb20c7c726bbf9a846c0b17433fe126a49f6df48b610b4644ec9f23f9930969f6cb47ec3959bed84
+  metadata.gz: 196b924475b05dc01d2b96f5c21749ac9d8b8034c93a94fa15abd10298c6e5330c2a4eff31fc687869b30be2fcb7fa64874c818a48a4ad51089001a82446125c
+  data.tar.gz: 000e3458409b477d50a5c3a7cd08c871f5f651639981cf73dd95aa622505cc0960747f882ac133a873a3278f2fd84b9c15824e4762c827af3c41824520f6ef70

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.1.0rc1)
+    nanoc (4.1.0rc2)
       cri (~> 2.3)
 
 GEM

data/NEWS.md

@@ -1,5 +1,15 @@
 # Nanoc news
 
+## 4.1.0rc2 (2015-12-13)
+
+Fixes:
+
+* Fixed children of the root item not having a parent (#769, #770)
+
+Enhancements:
+
+* Made `#path`, `#compiled_content` and `#reps` unavailable during pre-processing, compilation and routing, because they do not make sense in these contexts (#571, #767, #768)
+
 ## 4.1.0rc1 (2015-12-12)
 
 Fixes:

data/lib/nanoc/base/checksummer.rb

@@ -99,7 +99,7 @@ module Nanoc::Int
 
           digest.update(',identifier=')
           update(obj.identifier, digest)
-        when Nanoc::ItemView, Nanoc::LayoutView, Nanoc::ConfigView, Nanoc::IdentifiableCollectionView
+        when Nanoc::ItemWithRepsView, Nanoc::ItemWithoutRepsView, Nanoc::LayoutView, Nanoc::ConfigView, Nanoc::IdentifiableCollectionView
           update(obj.unwrap, digest)
         else
           data = begin

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

@@ -158,10 +158,10 @@ module Nanoc::Int
 
       # TODO: Do not expose @site (necessary for captures store though…)
       content_or_filename_assigns.merge(
-        item: Nanoc::ItemView.new(rep.item, view_context),
+        item: Nanoc::ItemWithRepsView.new(rep.item, view_context),
         rep: Nanoc::ItemRepView.new(rep, view_context),
         item_rep: Nanoc::ItemRepView.new(rep, view_context),
-        items: Nanoc::ItemCollectionView.new(site.items, view_context),
+        items: Nanoc::ItemCollectionWithRepsView.new(site.items, view_context),
         layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
         config: Nanoc::ConfigView.new(site.config, view_context),
         site: Nanoc::SiteView.new(site, view_context),

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

@@ -184,7 +184,7 @@ module Nanoc
     # @return [void]
     def depend_on(items)
       orig_items = items
-      items = items.map { |i| i.is_a?(Nanoc::ItemView) ? i.unwrap : i }
+      items = items.map { |i| i.is_a?(Nanoc::ItemWithRepsView) ? i.unwrap : i }
 
       # Notify
       items.each do |item|

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

@@ -0,0 +1,8 @@
+module Nanoc
+  class ItemCollectionWithRepsView < ::Nanoc::IdentifiableCollectionView
+    # @api private
+    def view_class
+      Nanoc::ItemWithRepsView
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Nanoc
+  class ItemCollectionWithoutRepsView < ::Nanoc::IdentifiableCollectionView
+    # @api private
+    def view_class
+      Nanoc::ItemWithoutRepsView
+    end
+  end
+end

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

@@ -60,9 +60,9 @@ module Nanoc
 
     # Returns the item that this item rep belongs to.
     #
-    # @return [Nanoc::ItemView]
+    # @return [Nanoc::ItemWithRepsView]
     def item
-      Nanoc::ItemView.new(@item_rep.item, @context)
+      Nanoc::ItemWithRepsView.new(@item_rep.item, @context)
     end
 
     # @api private

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

@@ -0,0 +1,5 @@
+module Nanoc
+  class ItemWithRepsView < ::Nanoc::ItemWithoutRepsView
+    include Nanoc::WithRepsViewMixin
+  end
+end

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

@@ -0,0 +1,49 @@
+module Nanoc
+  class ItemWithoutRepsView < ::Nanoc::View
+    include Nanoc::DocumentViewMixin
+
+    # Returns the children of this item. For items with identifiers that have
+    # extensions, returns an empty collection.
+    #
+    # @return [Enumerable<Nanoc::ItemWithRepsView>]
+    def children
+      unless unwrap.identifier.legacy?
+        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
+      end
+
+      children_pattern = Nanoc::Int::Pattern.from(unwrap.identifier.to_s + '*/')
+      children = @context.items.select { |i| children_pattern.match?(i.identifier) }
+
+      children.map { |i| self.class.new(i, @context) }.freeze
+    end
+
+    # Returns the parent of this item, if one exists. For items with identifiers
+    # that have extensions, returns nil.
+    #
+    # @return [Nanoc::ItemWithRepsView] if the item has a parent
+    #
+    # @return [nil] if the item has no parent
+    def parent
+      unless unwrap.identifier.legacy?
+        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
+      end
+
+      parent_identifier = '/' + unwrap.identifier.components[0..-2].join('/') + '/'
+      parent_identifier = '/' if parent_identifier == '//'
+
+      parent = @context.items[parent_identifier]
+
+      parent && self.class.new(parent, @context).freeze
+    end
+
+    # @return [Boolean] True if the item is binary, false otherwise
+    def binary?
+      unwrap.content.binary?
+    end
+
+    # @api private
+    def raw_filename
+      unwrap.content.filename
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module Nanoc
       disallowed_value_classes = Set.new([
         Nanoc::Int::Item,
         Nanoc::Int::Layout,
-        Nanoc::ItemView,
+        Nanoc::ItemWithRepsView,
         Nanoc::LayoutView,
       ])
       if disallowed_value_classes.include?(value.class)

data/lib/nanoc/base/views/{item_view.rb → mixins/with_reps_view_mixin.rb}

@@ -1,7 +1,5 @@
 module Nanoc
-  class ItemView < ::Nanoc::View
-    include Nanoc::DocumentViewMixin
-
+  module WithRepsViewMixin
     # Returns the compiled content.
     #
     # @param [String] rep The name of the representation
@@ -35,53 +33,11 @@ module Nanoc
       reps.fetch(rep).path(snapshot: snapshot)
     end
 
-    # Returns the children of this item. For items with identifiers that have
-    # extensions, returns an empty collection.
-    #
-    # @return [Enumerable<Nanoc::ItemView>]
-    def children
-      unless unwrap.identifier.legacy?
-        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
-      end
-
-      children_pattern = Nanoc::Int::Pattern.from(unwrap.identifier.to_s + '*/')
-      children = @context.items.select { |i| children_pattern.match?(i.identifier) }
-
-      children.map { |i| Nanoc::ItemView.new(i, @context) }.freeze
-    end
-
-    # Returns the parent of this item, if one exists. For items with identifiers
-    # that have extensions, returns nil.
-    #
-    # @return [Nanoc::ItemView] if the item has a parent
-    #
-    # @return [nil] if the item has no parent
-    def parent
-      unless unwrap.identifier.legacy?
-        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
-      end
-
-      parent_identifier = '/' + unwrap.identifier.components[0..-2].join('/') + '/'
-      parent = @context.items[parent_identifier]
-
-      parent && Nanoc::ItemView.new(parent, @context).freeze
-    end
-
-    # @return [Boolean] True if the item is binary, false otherwise
-    def binary?
-      unwrap.content.binary?
-    end
-
     # Returns the representations of this item.
     #
     # @return [Nanoc::ItemRepCollectionView]
     def reps
       Nanoc::ItemRepCollectionView.new(@context.reps[unwrap], @context)
     end
-
-    # @api private
-    def raw_filename
-      unwrap.content.filename
-    end
   end
 end

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

@@ -1,5 +1,5 @@
 module Nanoc
-  class MutableItemView < Nanoc::ItemView
+  class MutableItemView < Nanoc::ItemWithoutRepsView
     include Nanoc::MutableDocumentViewMixin
   end
 end

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

@@ -1,5 +1,5 @@
 module Nanoc
-  class PostCompileItemView < Nanoc::ItemView
+  class PostCompileItemView < Nanoc::ItemWithRepsView
     def modified
       reps.select { |rep| rep.unwrap.modified }
     end

data/lib/nanoc/base/views.rb

@@ -1,13 +1,16 @@
 require_relative 'views/mixins/document_view_mixin'
 require_relative 'views/mixins/mutable_document_view_mixin'
+require_relative 'views/mixins/with_reps_view_mixin'
 
 require_relative 'views/view'
 require_relative 'views/view_context'
 
 require_relative 'views/config_view'
 require_relative 'views/identifiable_collection_view'
-require_relative 'views/item_view'
-require_relative 'views/item_collection_view'
+require_relative 'views/item_without_reps_view'
+require_relative 'views/item_with_reps_view'
+require_relative 'views/item_collection_with_reps_view'
+require_relative 'views/item_collection_without_reps_view'
 require_relative 'views/item_rep_view'
 require_relative 'views/item_rep_collection_view'
 require_relative 'views/layout_view'

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

@@ -23,7 +23,7 @@ module Nanoc::CLI::Commands
 
     def self.env_for_site(site)
       {
-        items: Nanoc::ItemCollectionView.new(site.items, nil),
+        items: Nanoc::ItemCollectionWithRepsView.new(site.items, nil),
         layouts: Nanoc::LayoutCollectionView.new(site.layouts, nil),
         config: Nanoc::ConfigView.new(site.config, nil),
       }

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

@@ -23,7 +23,7 @@ module Nanoc::Extra::Checking
       view_context = site.compiler.create_view_context
 
       context = {
-        items: Nanoc::ItemCollectionView.new(site.items, view_context),
+        items: Nanoc::ItemCollectionWithRepsView.new(site.items, view_context),
         layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
         config: Nanoc::ConfigView.new(site.config, view_context),
         site: Nanoc::SiteView.new(site, view_context), # TODO: remove me

data/lib/nanoc/helpers/capturing.rb

@@ -140,7 +140,7 @@ module Nanoc::Helpers
           raise ArgumentError, 'expected 2 arguments (the item ' \
             "and the name of the capture) but got #{args.size} instead"
         end
-        item = args[0].is_a?(Nanoc::ItemView) ? args[0].unwrap : args[0]
+        item = args[0].is_a?(Nanoc::ItemWithRepsView) ? args[0].unwrap : args[0]
         name = args[1]
 
         # Create dependency

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -13,10 +13,10 @@ module Nanoc::RuleDSL
       @_executor = executor
 
       super({
-        item: Nanoc::ItemView.new(rep.item, view_context),
+        item: Nanoc::ItemWithoutRepsView.new(rep.item, view_context),
         rep: Nanoc::ItemRepView.new(rep, view_context),
         item_rep: Nanoc::ItemRepView.new(rep, view_context),
-        items: Nanoc::ItemCollectionView.new(site.items, view_context),
+        items: Nanoc::ItemCollectionWithoutRepsView.new(site.items, view_context),
         layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
         config: Nanoc::ConfigView.new(site.config, view_context),
         site: Nanoc::SiteView.new(site, view_context),

data/lib/nanoc/version.rb

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

data/tags

@@ -146,7 +146,7 @@ MutableConfigView	lib/nanoc/base/views/mutable_config_view.rb	/^  class MutableC
 MutableDocumentViewMixin	lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb	/^  module MutableDocumentViewMixin$/;"	m	class:Nanoc
 MutableIdentifiableCollectionView	lib/nanoc/base/views/mutable_identifiable_collection_view.rb	/^  class MutableIdentifiableCollectionView < Nanoc::IdentifiableCollectionView$/;"	c	class:Nanoc
 MutableItemCollectionView	lib/nanoc/base/views/mutable_item_collection_view.rb	/^  class MutableItemCollectionView < Nanoc::MutableIdentifiableCollectionView$/;"	c	class:Nanoc
-MutableItemView	lib/nanoc/base/views/mutable_item_view.rb	/^  class MutableItemView < Nanoc::ItemView$/;"	c	class:Nanoc
+MutableItemView	lib/nanoc/base/views/mutable_item_view.rb	/^  class MutableItemView < Nanoc::ItemWithRepsView$/;"	c	class:Nanoc
 MutableLayoutCollectionView	lib/nanoc/base/views/mutable_layout_collection_view.rb	/^  class MutableLayoutCollectionView < Nanoc::MutableIdentifiableCollectionView$/;"	c	class:Nanoc
 MutableLayoutView	lib/nanoc/base/views/mutable_layout_view.rb	/^  class MutableLayoutView < Nanoc::LayoutView$/;"	c	class:Nanoc
 Nanoc	lib/nanoc.rb	/^module Nanoc$/;"	m
@@ -337,7 +337,7 @@ Piper	lib/nanoc/extra/piper.rb	/^  class Piper$/;"	c	class:Nanoc
 PluginMethods	lib/nanoc/base/plugin_registry.rb	/^    module PluginMethods$/;"	m	class:Nanoc.PluginRegistry
 PluginRegistry	lib/nanoc/base/plugin_registry.rb	/^  class PluginRegistry$/;"	c	class:Nanoc
 PostCompileItemCollectionView	lib/nanoc/base/views/post_compile_item_collection_view.rb	/^  class PostCompileItemCollectionView < Nanoc::IdentifiableCollectionView$/;"	c	class:Nanoc
-PostCompileItemView	lib/nanoc/base/views/post_compile_item_view.rb	/^  class PostCompileItemView < Nanoc::ItemView$/;"	c	class:Nanoc
+PostCompileItemView	lib/nanoc/base/views/post_compile_item_view.rb	/^  class PostCompileItemView < Nanoc::ItemWithRepsView$/;"	c	class:Nanoc
 Prune	lib/nanoc/cli/commands/prune.rb	/^  class Prune < ::Nanoc::CLI::CommandRunner$/;"	c	class:Nanoc
 Pruner	lib/nanoc/extra/pruner.rb	/^  class Pruner$/;"	c	class:Nanoc
 RDiscount	lib/nanoc/filters/rdiscount.rb	/^  class RDiscount < Nanoc::Filter$/;"	c	class:Nanoc

data/test/filters/test_less.rb

@@ -2,7 +2,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_filter
     if_have 'less' do
       # Create item
-      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -20,7 +20,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
       File.open('content/foo/bar/imported_file.less', 'w') { |io| io.write('p { color: red; }') }
 
       # Create item
-      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -39,7 +39,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
 
       # Create item
       File.open('content/foo/bar.txt', 'w') { |io| io.write('meh') }
-      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -108,7 +108,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_compression
     if_have 'less' do
       # Create item
-      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])

data/test/filters/test_sass.rb

@@ -296,7 +296,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
     File.open('content/xyzzy.sass', 'w') { |io| io.write('p\n  color: green') }
 
     items = [
-      Nanoc::ItemView.new(
+      Nanoc::ItemWithRepsView.new(
         Nanoc::Int::Item.new(
           'blah',
           { content_filename: 'content/xyzzy.sass' },

data/test/filters/test_xsl.rb

@@ -85,7 +85,7 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN, {}, '/content/')
-      item = Nanoc::ItemView.new(item, nil)
+      item = Nanoc::ItemWithRepsView.new(item, nil)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL, {}, '/layout/')
       layout = Nanoc::LayoutView.new(layout, nil)
 
@@ -107,7 +107,7 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_PARAMS, {}, '/content/')
-      item = Nanoc::ItemView.new(item, nil)
+      item = Nanoc::ItemWithRepsView.new(item, nil)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_PARAMS, {}, '/layout/')
       layout = Nanoc::LayoutView.new(layout, nil)
 
@@ -129,7 +129,7 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_OMIT_XML_DECL, {}, '/content/')
-      item = Nanoc::ItemView.new(item, nil)
+      item = Nanoc::ItemWithRepsView.new(item, nil)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_OMIT_XML_DECL, {}, '/layout/')
       layout = Nanoc::LayoutView.new(layout, nil)
 

data/test/helpers/test_capturing.rb

@@ -18,7 +18,7 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
     site = Nanoc::Int::SiteLoader.new.new_empty
     item = Nanoc::Int::Item.new('moo', {}, '/blah/')
     @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemView.new(item, nil)
+    @item = Nanoc::ItemWithRepsView.new(item, nil)
 
     # Evaluate content
     result = ::ERB.new(content).result(binding)
@@ -33,7 +33,7 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
 
     # Build site
     @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'), nil)
+    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'), nil)
 
     # Capture
     _erbout = 'foo'
@@ -67,7 +67,7 @@ foot
 EOS
 
     @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
+    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
 
     result = ::ERB.new(content).result(binding)
 
@@ -85,7 +85,7 @@ EOS
     end
 
     @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
+    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
     content = '<% content_for :a do %>Content One<% end %>'
     ::ERB.new(content).result(binding)
 
@@ -93,7 +93,7 @@ EOS
     assert_equal nil,           content_for(@item, :b)
 
     @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
+    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
     content = '<% content_for :b do %>Content Two<% end %>'
     ::ERB.new(content).result(binding)
 

data/test/helpers/test_filtering.rb

@@ -32,7 +32,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
       item = Nanoc::Int::Item.new('stuff', { title: 'Bar...' }, '/foo.md')
       item_rep = Nanoc::Int::ItemRep.new(item, :default)
 
-      @item = Nanoc::ItemView.new(item, nil)
+      @item = Nanoc::ItemWithRepsView.new(item, nil)
       @item_rep = Nanoc::ItemRepView.new(item_rep, nil)
 
       result = ::ERB.new(content).result(binding)

data/test/helpers/test_tagging.rb

@@ -3,7 +3,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_without_tags
     # Create item
-    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/path/'), nil)
+    item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', {}, '/path/'), nil)
 
     # Check
     assert_equal(
@@ -14,7 +14,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_base_url
     # Create item
-    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'), nil)
+    item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'), nil)
 
     # Check
     assert_equal(
@@ -26,7 +26,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_none_text
     # Create item
-    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: [] }, '/path/'), nil)
+    item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', { tags: [] }, '/path/'), nil)
 
     # Check
     assert_equal(
@@ -37,7 +37,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_separator
     # Create item
-    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'), nil)
+    item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'), nil)
 
     # Check
     assert_equal(
@@ -49,7 +49,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_without_base_url
     # Create item
-    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'), nil)
+    item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'), nil)
 
     # Check
     assert_equal('foo, bar', tags_for(item))
@@ -57,7 +57,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_items_with_tag
     # Create items
-    @items = Nanoc::ItemCollectionView.new(
+    @items = Nanoc::ItemCollectionWithRepsView.new(
       [
         Nanoc::Int::Item.new('item 1', { tags: [:foo]       }, '/item1/'),
         Nanoc::Int::Item.new('item 2', { tags: [:bar]       }, '/item2/'),

data/test/helpers/test_xml_sitemap.rb

@@ -19,29 +19,29 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @items = Nanoc::Int::IdentifiableCollection.new({})
 
       # Create item 1
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :one_a, '/item-one/a/')
       create_item_rep(item.unwrap, :one_b, '/item-one/b/')
 
       # Create item 2
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 2', { is_hidden: true }, '/item-two/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 2', { is_hidden: true }, '/item-two/'), @view_context)
       @items << item
 
       # Create item 3
       attrs = { mtime: Time.parse('2004-07-12'), changefreq: 'daily', priority: 0.5 }
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 3', attrs, '/item-three/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 3', attrs, '/item-three/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :three_a, '/item-three/a/')
       create_item_rep(item.unwrap, :three_b, '/item-three/b/')
 
       # Create item 4
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 4', {}, '/item-four/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 4', {}, '/item-four/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :four_a, nil)
 
       # Create sitemap item
-      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
 
       # Create site
       @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
@@ -79,7 +79,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       # Create items
       @items = Nanoc::Int::IdentifiableCollection.new({})
       @items << nil
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :one_a, '/item-one/a/')
       create_item_rep(item.unwrap, :one_b, '/item-one/b/')
@@ -115,13 +115,13 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
     if_have 'builder', 'nokogiri' do
       # Create items
       @items = Nanoc::Int::IdentifiableCollection.new({})
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :one_a, '/item-one/a/')
       create_item_rep(item.unwrap, :one_b, '/item-one/b/')
 
       # Create sitemap item
-      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
 
       # Create site
       @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
@@ -146,21 +146,21 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
     if_have 'builder', 'nokogiri' do
       # Create items
       @items = Nanoc::Int::IdentifiableCollection.new({})
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/george/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/george/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :a_alice,   '/george/alice/')
       create_item_rep(item.unwrap, :b_zoey,    '/george/zoey/')
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/walton/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/walton/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :a_eve,     '/walton/eve/')
       create_item_rep(item.unwrap, :b_bob,     '/walton/bob/')
-      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/lucas/'), @view_context)
+      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/lucas/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :a_trudy,   '/lucas/trudy/')
       create_item_rep(item.unwrap, :b_mallory, '/lucas/mallory/')
 
       # Create sitemap item
-      @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
 
       # Create site
       @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.0rc1
+  version: 4.1.0rc2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -131,14 +131,17 @@ files:
 - lib/nanoc/base/views.rb
 - lib/nanoc/base/views/config_view.rb
 - lib/nanoc/base/views/identifiable_collection_view.rb
-- lib/nanoc/base/views/item_collection_view.rb
+- lib/nanoc/base/views/item_collection_with_reps_view.rb
+- lib/nanoc/base/views/item_collection_without_reps_view.rb
 - lib/nanoc/base/views/item_rep_collection_view.rb
 - lib/nanoc/base/views/item_rep_view.rb
-- lib/nanoc/base/views/item_view.rb
+- lib/nanoc/base/views/item_with_reps_view.rb
+- lib/nanoc/base/views/item_without_reps_view.rb
 - lib/nanoc/base/views/layout_collection_view.rb
 - lib/nanoc/base/views/layout_view.rb
 - lib/nanoc/base/views/mixins/document_view_mixin.rb
 - lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb
+- lib/nanoc/base/views/mixins/with_reps_view_mixin.rb
 - lib/nanoc/base/views/mutable_config_view.rb
 - lib/nanoc/base/views/mutable_identifiable_collection_view.rb
 - lib/nanoc/base/views/mutable_item_collection_view.rb

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

@@ -1,8 +0,0 @@
-module Nanoc
-  class ItemCollectionView < ::Nanoc::IdentifiableCollectionView
-    # @api private
-    def view_class
-      Nanoc::ItemView
-    end
-  end
-end