nanoc 4.11.11 → 4.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481798e39546d0e6b7e7a2a98832958b1666d8ee34b68d3dea32cd59fd99cfe0
-  data.tar.gz: 01b653399a15957f5562bdb10757e75efa2f8368d1d37f336836804827de02d7
+  metadata.gz: 022d4d52cb5ae57bd458ef8d4272d255a4845cec76627311020dbd4680143d03
+  data.tar.gz: 21f357e65efed5e243627a2c9aaab4e688c0cd8ec2c7d1d0d789317435f853d8
 SHA512:
-  metadata.gz: f64c2863d201a92188b92df86808d629fe498365a900d02e8658978159fb027167a009e69924b6381ddfda11653b9511de463dde6c8766e7df3c96b57591fbaa
-  data.tar.gz: 61f913a10ccd33ce05431194be1edfdea46c5513789399cf9e3594118477ffac5b94a22c7d2ba840744af2bf1722362ce97483aec34e9cf5bbf64e2f17d289f5
+  metadata.gz: d8d8d5e86ff63450ce7e4d9a80cb7c850468ebc96aebe5e0a0245dc4464a6b65a4757929ef587119942e7961e8e397e250e54f32b41b1a7afc0989857a19c48e
+  data.tar.gz: 36309e62ab8c585dab399ac8f5c09fe56c8ce10c19c3df86a317f07a0fd3a0d4f89eca2f0d943f4a1c918978c65f74f8ffff7d61acb8f958b33daf7c7789495b

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.11.12 (2019-09-21)
+
+Fixes:
+
+* Fixed an issue with the output diff, where some hunks would not appear (#1457)
+
 ## 4.11.11 (2019-09-07)
 
 Fixes:

data/lib/nanoc/base/errors.rb

@@ -150,12 +150,6 @@ module Nanoc
         end
       end
 
-      class UndefinedFilterForLayout < Generic
-        def initialize(layout)
-          super("There is no filter defined for the layout #{layout.identifier}")
-        end
-      end
-
       class AmbiguousMetadataAssociation < Generic
         def initialize(content_filenames, meta_filename)
           super("There are multiple content files (#{content_filenames.sort.join(', ')}) that could match the file containing metadata (#{meta_filename}).")

data/lib/nanoc/base/services.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'services/compilation_context'
 require_relative 'services/compiler'
 require_relative 'services/compiler_loader'
 require_relative 'services/executor'
 require_relative 'services/filter'
 require_relative 'services/item_rep_builder'
-require_relative 'services/item_rep_router'
 require_relative 'services/item_rep_selector'
 require_relative 'services/item_rep_writer'
 require_relative 'services/pruner'

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

@@ -93,7 +93,7 @@ module Nanoc
       end
 
       def compilation_context(reps:)
-        Nanoc::Int::CompilationContext.new(
+        Nanoc::Core::CompilationContext.new(
           action_provider: @action_provider,
           reps: reps,
           site: @site,

data/lib/nanoc/base/services/executor.rb

@@ -10,7 +10,7 @@ module Nanoc
       end
 
       def filter(filter_name, filter_args = {})
-        filter = filter_for_filtering(@rep, filter_name)
+        filter = filter_for_filtering(filter_name)
 
         begin
           Nanoc::Core::NotificationCenter.post(:filtering_started, @rep, filter_name)
@@ -36,11 +36,13 @@ module Nanoc
 
       def layout(layout_identifier, extra_filter_args = nil)
         layout = find_layout(layout_identifier)
-        filter_name, filter_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::Error, "Cannot find rule for layout matching #{layout_identifier}"
         end
 
+        filter_args = filter_name_and_args.args
         filter_args = filter_args.merge(extra_filter_args || {})
         filter_args.freeze
 
@@ -50,9 +52,8 @@ module Nanoc
 
         # Create filter
         klass = Nanoc::Filter.named!(filter_name)
-        view_context = @compilation_context.create_view_context(@dependency_tracker)
         layout_view = Nanoc::LayoutView.new(layout, view_context)
-        filter = klass.new(assigns_for(@rep).merge(layout: layout_view))
+        filter = klass.new(assigns.merge(layout: layout_view))
 
         # Visit
         @dependency_tracker.bounce(layout, raw_content: true)
@@ -79,8 +80,8 @@ module Nanoc
         Nanoc::Core::NotificationCenter.post(:snapshot_created, @rep, snapshot_name)
       end
 
-      def assigns_for(rep)
-        @compilation_context.assigns_for(rep, @dependency_tracker)
+      def assigns
+        view_context.assigns_for(@rep, site: @compilation_context.site)
       end
 
       def layouts
@@ -89,7 +90,7 @@ module Nanoc
 
       def find_layout(arg)
         req_id = arg.__nanoc_cleaned_identifier
-        layout = layouts.find { |l| l.identifier == req_id }
+        layout = layouts[req_id]
         return layout if layout
 
         if use_globs?
@@ -101,22 +102,33 @@ module Nanoc
         raise Nanoc::Int::Errors::UnknownLayout.new(arg)
       end
 
-      def filter_for_filtering(rep, filter_name)
+      def filter_for_filtering(filter_name)
         klass = Nanoc::Filter.named!(filter_name)
 
         last = @compilation_context.compiled_content_store.get_current(@rep)
         if klass.from_binary? && !last.binary?
-          raise Nanoc::Int::Errors::CannotUseBinaryFilter.new(rep, klass)
+          raise Nanoc::Int::Errors::CannotUseBinaryFilter.new(@rep, klass)
         elsif !klass.from_binary? && last.binary?
-          raise Nanoc::Int::Errors::CannotUseTextualFilter.new(rep, klass)
+          raise Nanoc::Int::Errors::CannotUseTextualFilter.new(@rep, klass)
         end
 
-        klass.new(assigns_for(rep))
+        klass.new(assigns)
       end
 
       def use_globs?
         @compilation_context.site.config[:string_pattern_type] == 'glob'
       end
+
+      def view_context
+        @_view_context ||=
+          Nanoc::Core::ViewContextForCompilation.new(
+            reps: @compilation_context.reps,
+            items: @compilation_context.site.items,
+            dependency_tracker: @dependency_tracker,
+            compilation_context: @compilation_context,
+            compiled_content_store: @compilation_context.compiled_content_store,
+          )
+      end
     end
   end
 end

data/lib/nanoc/base/services/item_rep_builder.rb

@@ -22,7 +22,7 @@ module Nanoc
           end
         end
 
-        action_sequences = Nanoc::Int::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])

data/lib/nanoc/base/views.rb

@@ -3,10 +3,6 @@
 require_relative 'views/mixins/document_view_mixin'
 require_relative 'views/mixins/mutable_document_view_mixin'
 
-require_relative 'views/view_context_for_compilation'
-require_relative 'views/view_context_for_pre_compilation'
-require_relative 'views/view_context_for_shell'
-
 require_relative 'views/view'
 
 require_relative 'views/basic_item_rep_view'

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

@@ -2,7 +2,15 @@
 
 module Nanoc
   class View
+    include Nanoc::Core::ContractsSupport
+
     # @api private
+    # TODO: disallow nil
+    contract C::Maybe[C::Or[
+      Nanoc::Core::ViewContextForCompilation,
+      Nanoc::Core::ViewContextForPreCompilation,
+      Nanoc::Core::ViewContextForShell
+    ]] => C::Any
     def initialize(context)
       @context = context
     end

data/lib/nanoc/checking/check.rb

@@ -35,8 +35,11 @@ module Nanoc::Checking
       compiler = Nanoc::Int::Compiler.new_for(site)
       res = compiler.run_until_reps_built
       reps = res.fetch(:reps)
-      compilation_context = compiler.compilation_context(reps: reps)
-      view_context = compilation_context.create_view_context(Nanoc::Core::DependencyTracker::Null.new)
+      view_context =
+        Nanoc::Core::ViewContextForShell.new(
+          items: site.items,
+          reps: reps,
+        )
 
       context = {
         items: Nanoc::PostCompileItemCollectionView.new(site.items, view_context),

data/lib/nanoc/cli/commands/compile_listeners/diff_generator.rb

@@ -21,29 +21,27 @@ module Nanoc::CLI::Commands::CompileListeners
 
         diffs = Diff::LCS.diff(lines_a, lines_b)
 
-        # Find hunks
-        hunks = []
+        output = +''
+        output << "--- #{@path}\n"
+        output << "+++ #{@path}\n"
+
+        prev_hunk = hunk = nil
         file_length_difference = 0
         diffs.each do |piece|
-          hunk = Diff::LCS::Hunk.new(lines_a, lines_b, piece, 3, file_length_difference)
-          file_length_difference = hunk.file_length_difference
-          hunks << hunk
-        end
+          begin
+            hunk = Diff::LCS::Hunk.new(lines_a, lines_b, piece, 3, file_length_difference)
+            file_length_difference = hunk.file_length_difference
 
-        # Merge hunks
-        merged_hunks = []
-        hunks.each do |hunk|
-          merged = merged_hunks.any? && hunk.merge(merged_hunks.last)
-          merged_hunks << hunk unless merged
-        end
+            next unless prev_hunk
+            next if hunk.merge(prev_hunk)
 
-        # Output hunks
-        output = +''
-        output << "--- #{@path}\n"
-        output << "+++ #{@path}\n"
-        merged_hunks.each do |hunk|
-          output << hunk.diff(:unified) << "\n"
+            output << prev_hunk.diff(:unified) << "\n"
+          ensure
+            prev_hunk = hunk
+          end
         end
+        last = prev_hunk.diff(:unified)
+        output << last << "\n"
 
         output
       end

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

@@ -36,7 +36,7 @@ module Nanoc::CLI::Commands
     end
 
     def self.view_context_for(site)
-      Nanoc::ViewContextForShell.new(
+      Nanoc::Core::ViewContextForShell.new(
         items: site.items,
         reps: reps_for(site),
       )

data/lib/nanoc/helpers/rendering.rb

@@ -40,7 +40,9 @@ module Nanoc::Helpers
       }.merge(other_assigns)
 
       # Get filter name
-      filter_name, filter_args = *@config._context.compilation_context.filter_name_and_args_for_layout(layout)
+      filter_name_and_args = @config._context.compilation_context.filter_name_and_args_for_layout(layout)
+      filter_name = filter_name_and_args.name
+      filter_args = filter_name_and_args.args
       raise Nanoc::Int::Errors::CannotDetermineFilter.new(layout.identifier) if filter_name.nil?
 
       # Get filter class

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -60,7 +60,7 @@ module Nanoc::RuleDSL
       reps = res.fetch(:reps)
 
       view_context =
-        Nanoc::ViewContextForCompilation.new(
+        Nanoc::Core::ViewContextForCompilation.new(
           reps: reps,
           items: site.items,
           dependency_tracker: dependency_tracker,
@@ -77,7 +77,7 @@ module Nanoc::RuleDSL
     # @api private
     def new_preprocessor_context(site)
       view_context =
-        Nanoc::ViewContextForPreCompilation.new(items: site.items)
+        Nanoc::Core::ViewContextForPreCompilation.new(items: site.items)
 
       Nanoc::Core::Context.new(
         config: Nanoc::MutableConfigView.new(site.config, view_context),

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -54,7 +54,7 @@ module Nanoc::RuleDSL
 
     def new_action_sequence_for_rep(rep)
       view_context =
-        Nanoc::ViewContextForPreCompilation.new(items: @site.items)
+        Nanoc::Core::ViewContextForPreCompilation.new(items: @site.items)
 
       recorder = Nanoc::RuleDSL::ActionRecorder.new(rep)
       rule = @rules_collection.compilation_rule_for(rep)
@@ -132,7 +132,7 @@ module Nanoc::RuleDSL
       return nil if routing_rule.nil?
 
       view_context =
-        Nanoc::ViewContextForPreCompilation.new(items: @site.items)
+        Nanoc::Core::ViewContextForPreCompilation.new(items: @site.items)
 
       basic_path =
         routing_rule.apply_to(

data/lib/nanoc/rule_dsl/compilation_rule.rb

@@ -7,7 +7,7 @@ module Nanoc::RuleDSL
     contract Nanoc::Core::ItemRep, C::KeywordArgs[
       site: Nanoc::Core::Site,
       recorder: Nanoc::RuleDSL::ActionRecorder,
-      view_context: Nanoc::ViewContextForPreCompilation,
+      view_context: Nanoc::Core::ViewContextForPreCompilation,
     ] => C::Any
     def apply_to(rep, site:, recorder:, view_context:)
       context = Nanoc::RuleDSL::CompilationRuleContext.new(

data/lib/nanoc/rule_dsl/compilation_rule_context.rb

@@ -8,7 +8,7 @@ module Nanoc::RuleDSL
       rep: Nanoc::Core::ItemRep,
       site: Nanoc::Core::Site,
       recorder: Nanoc::RuleDSL::ActionRecorder,
-      view_context: Nanoc::ViewContextForPreCompilation,
+      view_context: Nanoc::Core::ViewContextForPreCompilation,
     ] => C::Any
     def initialize(rep:, site:, recorder:, view_context:)
       @_recorder = recorder

data/lib/nanoc/rule_dsl/routing_rule.rb

@@ -16,7 +16,7 @@ module Nanoc::RuleDSL
 
     contract Nanoc::Core::ItemRep, C::KeywordArgs[
       site: Nanoc::Core::Site,
-      view_context: Nanoc::ViewContextForPreCompilation,
+      view_context: Nanoc::Core::ViewContextForPreCompilation,
     ] => C::Any
     def apply_to(rep, site:, view_context:)
       context = Nanoc::RuleDSL::RoutingRuleContext.new(

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -7,7 +7,7 @@ module Nanoc::RuleDSL
     contract C::KeywordArgs[
       rep: Nanoc::Core::ItemRep,
       site: Nanoc::Core::Site,
-      view_context: Nanoc::ViewContextForPreCompilation,
+      view_context: Nanoc::Core::ViewContextForPreCompilation,
     ] => C::Any
     def initialize(rep:, site:, view_context:)
       super({

data/lib/nanoc/spec.rb

@@ -161,7 +161,7 @@ module Nanoc
 
       def view_context
         compilation_context =
-          Nanoc::Int::CompilationContext.new(
+          Nanoc::Core::CompilationContext.new(
             action_provider: @action_provider,
             reps: @reps,
             site: site,
@@ -169,7 +169,7 @@ module Nanoc
             compiled_content_store: @compiled_content_store,
           )
 
-        Nanoc::ViewContextForCompilation.new(
+        Nanoc::Core::ViewContextForCompilation.new(
           reps: @reps,
           items: @items,
           dependency_tracker: @dependency_tracker,

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.11.11'
+  VERSION = '4.11.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.11
+  version: 4.11.12
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.11
+        version: 4.11.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.11
+        version: 4.11.12
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,6 @@ files:
 - lib/nanoc/base/repos/config_loader.rb
 - lib/nanoc/base/repos/site_loader.rb
 - lib/nanoc/base/services.rb
-- lib/nanoc/base/services/compilation_context.rb
 - lib/nanoc/base/services/compiler.rb
 - lib/nanoc/base/services/compiler/phases.rb
 - lib/nanoc/base/services/compiler/phases/abstract.rb
@@ -201,7 +200,6 @@ files:
 - lib/nanoc/base/services/executor.rb
 - lib/nanoc/base/services/filter.rb
 - lib/nanoc/base/services/item_rep_builder.rb
-- lib/nanoc/base/services/item_rep_router.rb
 - lib/nanoc/base/services/item_rep_selector.rb
 - lib/nanoc/base/services/item_rep_writer.rb
 - lib/nanoc/base/services/outdatedness_checker.rb
@@ -241,9 +239,6 @@ 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_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

data/lib/nanoc/base/services/compilation_context.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    class CompilationContext
-      include Nanoc::Core::ContractsSupport
-
-      attr_reader :site
-      attr_reader :compiled_content_cache
-      attr_reader :compiled_content_store
-
-      C_COMPILED_CONTENT_CACHE =
-        C::Or[
-          Nanoc::Core::CompiledContentCache,
-          Nanoc::Core::TextualCompiledContentCache,
-          Nanoc::Core::BinaryCompiledContentCache,
-        ]
-
-      contract C::KeywordArgs[
-        action_provider: Nanoc::Core::ActionProvider,
-        reps: Nanoc::Core::ItemRepRepo,
-        site: Nanoc::Core::Site,
-        compiled_content_cache: C_COMPILED_CONTENT_CACHE,
-        compiled_content_store: Nanoc::Core::CompiledContentStore,
-      ] => C::Any
-      def initialize(action_provider:, reps:, site:, compiled_content_cache:, compiled_content_store:)
-        @action_provider = action_provider
-        @reps = reps
-        @site = site
-        @compiled_content_cache = compiled_content_cache
-        @compiled_content_store = compiled_content_store
-      end
-
-      # FIXME: Expand contract
-      contract Nanoc::Core::Layout => C::Any
-      def filter_name_and_args_for_layout(layout)
-        seq = @action_provider.action_sequence_for(layout)
-        if seq.nil? || seq.size != 1 || !seq[0].is_a?(Nanoc::Core::ProcessingActions::Filter)
-          raise Nanoc::Int::Errors::UndefinedFilterForLayout.new(layout)
-        end
-
-        [seq[0].filter_name, seq[0].params]
-      end
-
-      contract Nanoc::Core::DependencyTracker => C::Named['Nanoc::ViewContextForCompilation']
-      def create_view_context(dependency_tracker)
-        Nanoc::ViewContextForCompilation.new(
-          reps: @reps,
-          items: @site.items,
-          dependency_tracker: dependency_tracker,
-          compilation_context: self,
-          compiled_content_store: @compiled_content_store,
-        )
-      end
-
-      contract Nanoc::Core::ItemRep, Nanoc::Core::DependencyTracker => Hash
-      def assigns_for(rep, dependency_tracker)
-        last_content = @compiled_content_store.get_current(rep)
-        content_or_filename_assigns =
-          if last_content.binary?
-            { filename: last_content.filename }
-          else
-            { content: last_content.string }
-          end
-
-        view_context = create_view_context(dependency_tracker)
-
-        content_or_filename_assigns.merge(
-          item: Nanoc::CompilationItemView.new(rep.item, view_context),
-          rep: Nanoc::CompilationItemRepView.new(rep, view_context),
-          item_rep: Nanoc::CompilationItemRepView.new(rep, 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),
-        )
-      end
-    end
-  end
-end

data/lib/nanoc/base/services/item_rep_router.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Int
-    # Assigns paths to reps.
-    #
-    # @api private
-    class ItemRepRouter
-      include Nanoc::Core::ContractsSupport
-
-      class IdenticalRoutesError < ::Nanoc::Error
-        def initialize(output_path, rep_a, rep_b)
-          super("The item representations #{rep_a} and #{rep_b} are both routed to #{output_path}.")
-        end
-      end
-
-      class RouteWithoutSlashError < ::Nanoc::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.")
-        end
-      end
-
-      contract Nanoc::Core::ItemRepRepo, Nanoc::Core::ActionProvider, Nanoc::Core::Site => C::Any
-      def initialize(reps, action_provider, site)
-        @reps = reps
-        @action_provider = action_provider
-        @site = site
-      end
-
-      def run
-        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.
-
-          @action_provider.action_sequence_for(rep).paths.each do |(snapshot_names, paths)|
-            route_rep(rep, paths, snapshot_names, {})
-          end
-
-          seq = @action_provider.action_sequence_for(rep)
-          action_sequences[rep] = seq
-          seq.paths.each do |(snapshot_names, paths)|
-            route_rep(rep, paths, snapshot_names, assigned_paths)
-          end
-
-          # TODO: verify that paths converge
-        end
-
-        action_sequences
-      end
-
-      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') }
-
-        # Validate format
-        paths.each do |path|
-          unless path.start_with?('/')
-            raise RouteWithoutSlashError.new(path, rep)
-          end
-        end
-
-        # Validate uniqueness
-        paths.each do |path|
-          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] }
-            raise IdenticalRoutesError.new(path, *reps)
-          end
-        end
-        paths.each do |path|
-          assigned_paths[path] = rep
-        end
-
-        # 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) }
-        end
-      end
-
-      contract String => String
-      def strip_index_filename(basic_path)
-        @site.config[:index_filenames].each do |index_filename|
-          slashed_index_filename = '/' + index_filename
-          if basic_path.end_with?(slashed_index_filename)
-            return basic_path[0..-index_filename.length - 1]
-          end
-        end
-
-        basic_path
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  # @api private
-  class ViewContextForCompilation
-    include Nanoc::Core::ContractsSupport
-
-    attr_reader :reps
-    attr_reader :items
-    attr_reader :dependency_tracker
-    attr_reader :compilation_context
-    attr_reader :compiled_content_store
-
-    contract C::KeywordArgs[
-      reps: Nanoc::Core::ItemRepRepo,
-      items: Nanoc::Core::IdentifiableCollection,
-      dependency_tracker: Nanoc::Core::DependencyTracker,
-      compilation_context: C::Any,
-      compiled_content_store: Nanoc::Core::CompiledContentStore,
-    ] => C::Any
-    def initialize(reps:, items:, dependency_tracker:, compilation_context:, compiled_content_store:)
-      @reps = reps
-      @items = items
-      @dependency_tracker = dependency_tracker
-      @compilation_context = compilation_context
-      @compiled_content_store = compiled_content_store
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  # @api private
-  class ViewContextForPreCompilation
-    include Nanoc::Core::ContractsSupport
-
-    attr_reader :items
-    attr_reader :dependency_tracker
-
-    contract C::KeywordArgs[items: Nanoc::Core::IdentifiableCollection] => C::Any
-    def initialize(items:)
-      @items = items
-
-      @dependency_tracker = Nanoc::Core::DependencyTracker::Null.new
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  # @api private
-  class ViewContextForShell
-    include Nanoc::Core::ContractsSupport
-
-    attr_reader :items
-    attr_reader :reps
-    attr_reader :dependency_tracker
-
-    contract C::KeywordArgs[
-      items: Nanoc::Core::IdentifiableCollection,
-      reps: Nanoc::Core::ItemRepRepo,
-    ] => C::Any
-    def initialize(items:, reps:)
-      @items = items
-      @reps = reps
-
-      @dependency_tracker = Nanoc::Core::DependencyTracker::Null.new
-    end
-  end
-end