nanoc 4.8.9 → 4.8.10

data/test/helpers/test_link_to.rb

@@ -11,9 +11,9 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
 
     # Mock
     @items = [
-      Nanoc::ItemRepView.new(mock, {}),
-      Nanoc::ItemRepView.new(mock, {}),
-      Nanoc::ItemRepView.new(mock, {}),
+      Nanoc::CompilationItemRepView.new(mock, {}),
+      Nanoc::CompilationItemRepView.new(mock, {}),
+      Nanoc::CompilationItemRepView.new(mock, {}),
     ]
     @items[0].stubs(:identifier).returns('/about/')
     @items[0].stubs(:path).returns('/about.html')
@@ -21,7 +21,7 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     @items[1].stubs(:path).returns('/software.html')
     @items[2].stubs(:identifier).returns('/software/nanoc/')
     @items[2].stubs(:path).returns('/software/nanoc.html')
-    about_rep_vcard = Nanoc::ItemRepView.new(mock, {})
+    about_rep_vcard = Nanoc::CompilationItemRepView.new(mock, {})
     about_rep_vcard.stubs(:path).returns('/about.vcf')
     @items[0].stubs(:rep).with(:vcard).returns(about_rep_vcard)
 

data/test/helpers/test_xml_sitemap.rb

@@ -15,12 +15,12 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
     dependency_tracker = Nanoc::Int::DependencyTracker.new(dep_store)
 
     @reps = Nanoc::Int::ItemRepRepo.new
-    @view_context = Nanoc::ViewContext.new(
-      reps: @reps,
-      items: nil,
-      dependency_tracker: dependency_tracker,
+    @view_context = Nanoc::ViewContextForCompilation.new(
+      reps:                @reps,
+      items:               Nanoc::Int::ItemCollection.new(config),
+      dependency_tracker:  dependency_tracker,
       compilation_context: :__irrelevant__,
-      snapshot_repo: :__irrelevant_snapshot_repo,
+      snapshot_repo:       :__irrelevant_snapshot_repo,
     )
 
     @items = nil
@@ -35,24 +35,24 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       items = []
 
       # Create item 1
-      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one'), @view_context)
+      item = Nanoc::CompilationItemView.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::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 2', { is_hidden: true }, '/item-two'), @view_context)
+      item = Nanoc::CompilationItemView.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 00:00:00 +02:00'), changefreq: 'daily', priority: 0.5 }
-      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 3', attrs, '/item-three'), @view_context)
+      item = Nanoc::CompilationItemView.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::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 4', {}, '/item-four'), @view_context)
+      item = Nanoc::CompilationItemView.new(Nanoc::Int::Item.new('some content 4', {}, '/item-four'), @view_context)
       items << item
       create_item_rep(item.unwrap, :four_a, nil)
 
@@ -60,7 +60,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @items = Nanoc::Int::ItemCollection.new({}, items)
 
       # Create sitemap item
-      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
+      @item = Nanoc::CompilationItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
 
       # Create site
       config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
@@ -99,7 +99,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       # Create items
       items = []
       items << nil
-      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one'), @view_context)
+      item = Nanoc::CompilationItemView.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/')
@@ -136,13 +136,13 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_filter
     if_have 'builder', 'nokogiri' do
       # Create items
-      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one'), @view_context)
+      item = Nanoc::CompilationItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one'), @view_context)
       @items = Nanoc::Int::ItemCollection.new({}, [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::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
+      @item = Nanoc::CompilationItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
 
       # Create site
       config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
@@ -168,22 +168,22 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
     if_have 'builder', 'nokogiri' do
       # Create items
       items = []
-      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/george'), @view_context)
+      item = Nanoc::CompilationItemView.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::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/walton'), @view_context)
+      item = Nanoc::CompilationItemView.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::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/lucas'), @view_context)
+      item = Nanoc::CompilationItemView.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/')
       @items = Nanoc::Int::ItemCollection.new({}, items)
 
       # Create sitemap item
-      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
+      @item = Nanoc::CompilationItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
 
       # Create site
       config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
@@ -210,12 +210,12 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_url_escape
     if_have 'builder', 'nokogiri' do
       # Create items
-      item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/george'), @view_context)
+      item = Nanoc::CompilationItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/george'), @view_context)
       @items = Nanoc::Int::ItemCollection.new({}, [item])
       create_item_rep(item.unwrap, :default, '/cool projects/проверка')
 
       # Create sitemap item
-      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
+      @item = Nanoc::CompilationItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap'), @view_context)
 
       # Create site
       config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.9
+  version: 4.8.10
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -247,19 +247,20 @@ files:
 - lib/nanoc/base/services/pruner.rb
 - lib/nanoc/base/services/temp_filename_factory.rb
 - lib/nanoc/base/views.rb
+- lib/nanoc/base/views/basic_item_rep_collection_view.rb
+- lib/nanoc/base/views/basic_item_rep_view.rb
+- lib/nanoc/base/views/basic_item_view.rb
+- lib/nanoc/base/views/compilation_item_rep_collection_view.rb
+- lib/nanoc/base/views/compilation_item_rep_view.rb
+- lib/nanoc/base/views/compilation_item_view.rb
 - lib/nanoc/base/views/config_view.rb
 - lib/nanoc/base/views/identifiable_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_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
@@ -271,7 +272,9 @@ files:
 - lib/nanoc/base/views/post_compile_item_rep_view.rb
 - lib/nanoc/base/views/post_compile_item_view.rb
 - lib/nanoc/base/views/view.rb
-- lib/nanoc/base/views/view_context.rb
+- lib/nanoc/base/views/view_context_for_compilation.rb
+- lib/nanoc/base/views/view_context_for_pre_compilation.rb
+- lib/nanoc/base/views/view_context_for_shell.rb
 - lib/nanoc/checking.rb
 - lib/nanoc/checking/check.rb
 - lib/nanoc/checking/checks.rb
@@ -292,6 +295,7 @@ files:
 - lib/nanoc/cli/commands/check.rb
 - lib/nanoc/cli/commands/compile.rb
 - lib/nanoc/cli/commands/compile_listeners/abstract.rb
+- lib/nanoc/cli/commands/compile_listeners/aggregate.rb
 - lib/nanoc/cli/commands/compile_listeners/debug_printer.rb
 - lib/nanoc/cli/commands/compile_listeners/diff_generator.rb
 - lib/nanoc/cli/commands/compile_listeners/file_action_printer.rb
@@ -399,7 +403,6 @@ files:
 - spec/nanoc/base/compiler_spec.rb
 - spec/nanoc/base/core_ext/array_spec.rb
 - spec/nanoc/base/core_ext/hash_spec.rb
-- spec/nanoc/base/core_ext/pathname_spec.rb
 - spec/nanoc/base/core_ext/string_spec.rb
 - spec/nanoc/base/directed_graph_spec.rb
 - spec/nanoc/base/entities/action_sequence_spec.rb
@@ -439,6 +442,8 @@ files:
 - spec/nanoc/base/services/compiler/stages/calculate_checksums_spec.rb
 - spec/nanoc/base/services/compiler/stages/cleanup_spec.rb
 - spec/nanoc/base/services/compiler/stages/compile_reps_spec.rb
+- spec/nanoc/base/services/compiler/stages/determine_outdatedness_spec.rb
+- spec/nanoc/base/services/compiler/stages/preprocess_spec.rb
 - spec/nanoc/base/services/dependency_tracker_spec.rb
 - spec/nanoc/base/services/executor_spec.rb
 - spec/nanoc/base/services/item_rep_router_spec.rb
@@ -447,19 +452,17 @@ files:
 - spec/nanoc/base/services/outdatedness_rules_spec.rb
 - spec/nanoc/base/services/pruner_spec.rb
 - spec/nanoc/base/services/temp_filename_factory_spec.rb
+- spec/nanoc/base/views/basic_item_rep_collection_view_spec.rb
+- spec/nanoc/base/views/basic_item_rep_view_spec.rb
+- spec/nanoc/base/views/compilation_item_rep_collection_view_spec.rb
+- spec/nanoc/base/views/compilation_item_rep_view_spec.rb
 - spec/nanoc/base/views/config_view_spec.rb
-- spec/nanoc/base/views/document_view_spec.rb
-- spec/nanoc/base/views/identifiable_collection_view_spec.rb
 - spec/nanoc/base/views/item_collection_with_reps_view_spec.rb
 - spec/nanoc/base/views/item_collection_without_reps_view_spec.rb
-- spec/nanoc/base/views/item_rep_collection_view_spec.rb
-- spec/nanoc/base/views/item_rep_view_spec.rb
 - spec/nanoc/base/views/item_view_spec.rb
 - spec/nanoc/base/views/layout_collection_view_spec.rb
 - spec/nanoc/base/views/layout_view_spec.rb
 - spec/nanoc/base/views/mutable_config_view_spec.rb
-- spec/nanoc/base/views/mutable_document_view_spec.rb
-- spec/nanoc/base/views/mutable_identifiable_collection_view_spec.rb
 - spec/nanoc/base/views/mutable_item_collection_view_spec.rb
 - spec/nanoc/base/views/mutable_item_view_spec.rb
 - spec/nanoc/base/views/mutable_layout_collection_view_spec.rb
@@ -467,8 +470,15 @@ files:
 - spec/nanoc/base/views/post_compile_item_rep_collection_view_spec.rb
 - spec/nanoc/base/views/post_compile_item_rep_view_spec.rb
 - spec/nanoc/base/views/post_compile_item_view_spec.rb
+- spec/nanoc/base/views/support/document_view_examples.rb
+- spec/nanoc/base/views/support/identifiable_collection_view_examples.rb
+- spec/nanoc/base/views/support/item_rep_collection_view_examples.rb
+- spec/nanoc/base/views/support/item_rep_view_examples.rb
+- spec/nanoc/base/views/support/mutable_document_view_examples.rb
+- spec/nanoc/base/views/support/mutable_identifiable_collection_view_examples.rb
 - spec/nanoc/checking/runner_spec.rb
 - spec/nanoc/cli/command_runner_spec.rb
+- spec/nanoc/cli/commands/compile/abstract_spec.rb
 - spec/nanoc/cli/commands/compile/diff_generator_spec.rb
 - spec/nanoc/cli/commands/compile/file_action_printer_spec.rb
 - spec/nanoc/cli/commands/compile/timing_recorder_spec.rb

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

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  class ItemWithRepsView < ::Nanoc::ItemWithoutRepsView
-    include Nanoc::WithRepsViewMixin
-  end
-end