nanoc 4.11.0 → 4.11.1

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

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::Compiler::Stages
-  class ForgetOutdatedDependencies < Nanoc::Int::Compiler::Stage
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    class Compiler
+      module Stages
+        class ForgetOutdatedDependencies < Nanoc::Int::Compiler::Stage
+          include Nanoc::Core::ContractsSupport
 
-    def initialize(dependency_store:)
-      @dependency_store = dependency_store
-    end
+          def initialize(dependency_store:)
+            @dependency_store = dependency_store
+          end
 
-    contract C::IterOf[Nanoc::Int::Item] => C::Any
-    def run(outdated_items)
-      outdated_items.each { |i| @dependency_store.forget_dependencies_for(i) }
+          contract C::IterOf[Nanoc::Core::Item] => C::Any
+          def run(outdated_items)
+            outdated_items.each { |i| @dependency_store.forget_dependencies_for(i) }
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,30 +1,36 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::Compiler::Stages
-  class LoadStores < Nanoc::Int::Compiler::Stage
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    class Compiler
+      module Stages
+        class LoadStores < Nanoc::Int::Compiler::Stage
+          include Nanoc::Core::ContractsSupport
 
-    def initialize(checksum_store:, compiled_content_cache:, dependency_store:, action_sequence_store:, outdatedness_store:)
-      @checksum_store = checksum_store
-      @compiled_content_cache = compiled_content_cache
-      @dependency_store = dependency_store
-      @action_sequence_store = action_sequence_store
-      @outdatedness_store = outdatedness_store
-    end
+          def initialize(checksum_store:, compiled_content_cache:, dependency_store:, action_sequence_store:, outdatedness_store:)
+            @checksum_store = checksum_store
+            @compiled_content_cache = compiled_content_cache
+            @dependency_store = dependency_store
+            @action_sequence_store = action_sequence_store
+            @outdatedness_store = outdatedness_store
+          end
 
-    contract C::None => C::Any
-    def run
-      load_store(@checksum_store)
-      load_store(@compiled_content_cache)
-      load_store(@dependency_store)
-      load_store(@action_sequence_store)
-      load_store(@outdatedness_store)
-    end
+          contract C::None => C::Any
+          def run
+            load_store(@checksum_store)
+            load_store(@compiled_content_cache)
+            load_store(@dependency_store)
+            load_store(@action_sequence_store)
+            load_store(@outdatedness_store)
+          end
 
-    contract Nanoc::Int::Store => C::Any
-    def load_store(store)
-      Nanoc::Int::Instrumentor.call(:store_loaded, store.class) do
-        store.load
+          contract Nanoc::Int::Store => C::Any
+          def load_store(store)
+            Nanoc::Int::Instrumentor.call(:store_loaded, store.class) do
+              store.load
+            end
+          end
+        end
       end
     end
   end

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

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::Compiler::Stages
-  class Postprocess < Nanoc::Int::Compiler::Stage
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    class Compiler
+      module Stages
+        class Postprocess < Nanoc::Int::Compiler::Stage
+          include Nanoc::Core::ContractsSupport
 
-    def initialize(action_provider:, site:)
-      @action_provider = action_provider
-      @site = site
-    end
+          def initialize(action_provider:, site:)
+            @action_provider = action_provider
+            @site = site
+          end
 
-    contract Nanoc::Int::Compiler => C::Any
-    def run(compiler)
-      @action_provider.postprocess(@site, compiler)
+          contract Nanoc::Int::Compiler => C::Any
+          def run(compiler)
+            @action_provider.postprocess(@site, compiler)
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,28 +1,34 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::Compiler::Stages
-  class Preprocess < Nanoc::Int::Compiler::Stage
-    def initialize(action_provider:, site:, dependency_store:, checksum_store:)
-      @action_provider = action_provider
-      @site = site
-      @dependency_store = dependency_store
-      @checksum_store = checksum_store
-    end
+module Nanoc
+  module Int
+    class Compiler
+      module Stages
+        class Preprocess < Nanoc::Int::Compiler::Stage
+          def initialize(action_provider:, site:, dependency_store:, checksum_store:)
+            @action_provider = action_provider
+            @site = site
+            @dependency_store = dependency_store
+            @checksum_store = checksum_store
+          end
 
-    def run
-      return if @site.preprocessed?
+          def run
+            return if @site.preprocessed?
 
-      if @action_provider.need_preprocessing?
-        @site.data_source = Nanoc::Int::InMemDataSource.new(@site.items, @site.layouts, @site.data_source)
-        @action_provider.preprocess(@site)
+            if @action_provider.need_preprocessing?
+              @site.data_source = Nanoc::Int::InMemDataSource.new(@site.items, @site.layouts, @site.data_source)
+              @action_provider.preprocess(@site)
 
-        @dependency_store.items = @site.items
-        @dependency_store.layouts = @site.layouts
-        @checksum_store.objects = @site.items.to_a + @site.layouts.to_a + @site.code_snippets + [@site.config]
-      end
+              @dependency_store.items = @site.items
+              @dependency_store.layouts = @site.layouts
+              @checksum_store.objects = @site.items.to_a + @site.layouts.to_a + @site.code_snippets + [@site.config]
+            end
 
-      @site.mark_as_preprocessed
-      @site.freeze
+            @site.mark_as_preprocessed
+            @site.freeze
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,26 +1,32 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::Compiler::Stages
-  class Prune < Nanoc::Int::Compiler::Stage
-    def initialize(config:, reps:)
-      @config = config
-      @reps = reps
-    end
+module Nanoc
+  module Int
+    class Compiler
+      module Stages
+        class Prune < Nanoc::Int::Compiler::Stage
+          def initialize(config:, reps:)
+            @config = config
+            @reps = reps
+          end
 
-    def run
-      if @config[:prune][:auto_prune]
-        Nanoc::Pruner.new(@config, @reps, exclude: prune_config_exclude).run
-      end
-    end
+          def run
+            if @config[:prune][:auto_prune]
+              Nanoc::Pruner.new(@config, @reps, exclude: prune_config_exclude).run
+            end
+          end
 
-    private
+          private
 
-    def prune_config
-      @config[:prune] || {}
-    end
+          def prune_config
+            @config[:prune] || {}
+          end
 
-    def prune_config_exclude
-      prune_config[:exclude] || {}
+          def prune_config_exclude
+            prune_config[:exclude] || {}
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::Compiler::Stages
-  class StorePostCompilationState < Nanoc::Int::Compiler::Stage
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    class Compiler
+      module Stages
+        class StorePostCompilationState < Nanoc::Int::Compiler::Stage
+          include Nanoc::Core::ContractsSupport
 
-    def initialize(dependency_store:)
-      @dependency_store = dependency_store
-    end
+          def initialize(dependency_store:)
+            @dependency_store = dependency_store
+          end
 
-    contract C::None => C::Any
-    def run
-      @dependency_store.store
+          contract C::None => C::Any
+          def run
+            @dependency_store.store
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,28 +1,34 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::Compiler::Stages
-  class StorePreCompilationState < Nanoc::Int::Compiler::Stage
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    class Compiler
+      module Stages
+        class StorePreCompilationState < Nanoc::Int::Compiler::Stage
+          include Nanoc::Core::ContractsSupport
 
-    def initialize(reps:, layouts:, checksum_store:, action_sequence_store:, action_sequences:)
-      @reps = reps
-      @layouts = layouts
-      @checksum_store = checksum_store
-      @action_sequence_store = action_sequence_store
-      @action_sequences = action_sequences
-    end
+          def initialize(reps:, layouts:, checksum_store:, action_sequence_store:, action_sequences:)
+            @reps = reps
+            @layouts = layouts
+            @checksum_store = checksum_store
+            @action_sequence_store = action_sequence_store
+            @action_sequences = action_sequences
+          end
 
-    contract Nanoc::Int::ChecksumCollection => C::Any
-    def run(checksums)
-      # Calculate action sequence
-      (@reps.to_a + @layouts.to_a).each do |obj|
-        @action_sequence_store[obj] = @action_sequences[obj].serialize
-      end
-      @action_sequence_store.store
+          contract Nanoc::Int::ChecksumCollection => C::Any
+          def run(checksums)
+            # Calculate action sequence
+            (@reps.to_a + @layouts.to_a).each do |obj|
+              @action_sequence_store[obj] = @action_sequences[obj].serialize
+            end
+            @action_sequence_store.store
 
-      # Set checksums
-      @checksum_store.checksums = checksums.to_h
-      @checksum_store.store
+            # Set checksums
+            @checksum_store.checksums = checksums.to_h
+            @checksum_store.store
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,37 +1,39 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  # @api private
-  class CompilerLoader
-    def load(site, action_provider: nil)
-      action_sequence_store = Nanoc::Int::ActionSequenceStore.new(config: site.config)
+module Nanoc
+  module Int
+    # @api private
+    class CompilerLoader
+      def load(site, action_provider: nil)
+        action_sequence_store = Nanoc::Int::ActionSequenceStore.new(config: site.config)
 
-      dependency_store =
-        Nanoc::Int::DependencyStore.new(site.items, site.layouts, site.config)
+        dependency_store =
+          Nanoc::Int::DependencyStore.new(site.items, site.layouts, site.config)
 
-      objects = site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
+        objects = site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
 
-      checksum_store =
-        Nanoc::Int::ChecksumStore.new(config: site.config, objects: objects)
+        checksum_store =
+          Nanoc::Int::ChecksumStore.new(config: site.config, objects: objects)
 
-      action_provider ||= Nanoc::Int::ActionProvider.named(site.config.action_provider).for(site)
+        action_provider ||= Nanoc::Int::ActionProvider.named(site.config.action_provider).for(site)
 
-      outdatedness_store =
-        Nanoc::Int::OutdatednessStore.new(config: site.config)
+        outdatedness_store =
+          Nanoc::Int::OutdatednessStore.new(config: site.config)
 
-      compiled_content_cache =
-        Nanoc::Int::CompiledContentCache.new(config: site.config)
+        compiled_content_cache =
+          Nanoc::Int::CompiledContentCache.new(config: site.config)
 
-      params = {
-        compiled_content_cache: compiled_content_cache,
-        checksum_store: checksum_store,
-        action_sequence_store: action_sequence_store,
-        dependency_store: dependency_store,
-        action_provider: action_provider,
-        outdatedness_store: outdatedness_store,
-      }
+        params = {
+          compiled_content_cache: compiled_content_cache,
+          checksum_store: checksum_store,
+          action_sequence_store: action_sequence_store,
+          dependency_store: dependency_store,
+          action_provider: action_provider,
+          outdatedness_store: outdatedness_store,
+        }
 
-      Nanoc::Int::Compiler.new(site, params)
+        Nanoc::Int::Compiler.new(site, params)
+      end
     end
   end
 end

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

@@ -1,61 +1,63 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  # @api private
-  class DependencyTracker
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    # @api private
+    class DependencyTracker
+      include Nanoc::Core::ContractsSupport
 
-    C_OBJ = C::Or[Nanoc::Int::Item, Nanoc::Int::Layout, Nanoc::Int::Configuration, Nanoc::Int::IdentifiableCollection]
-    C_RAW_CONTENT = C::Or[C::IterOf[C::Or[String, Regexp]], C::Bool]
-    C_ATTR = C::Or[C::IterOf[Symbol], C::Bool]
-    C_ARGS = C::KeywordArgs[raw_content: C::Optional[C_RAW_CONTENT], attributes: C::Optional[C_ATTR], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]]
+      C_OBJ = C::Or[Nanoc::Core::Item, Nanoc::Core::Layout, Nanoc::Core::Configuration, Nanoc::Core::IdentifiableCollection]
+      C_RAW_CONTENT = C::Or[C::IterOf[C::Or[String, Regexp]], C::Bool]
+      C_ATTR = C::Or[C::IterOf[Symbol], C::Bool]
+      C_ARGS = C::KeywordArgs[raw_content: C::Optional[C_RAW_CONTENT], attributes: C::Optional[C_ATTR], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]]
 
-    class Null
-      include Nanoc::Int::ContractsSupport
+      class Null
+        include Nanoc::Core::ContractsSupport
 
-      contract C_OBJ, C_ARGS => C::Any
-      def enter(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
-
-      contract C_OBJ => C::Any
-      def exit; end
+        contract C_OBJ, C_ARGS => C::Any
+        def enter(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
 
-      contract C_OBJ, C_ARGS => C::Any
-      def bounce(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
-    end
+        contract C_OBJ => C::Any
+        def exit; end
 
-    attr_reader :dependency_store
+        contract C_OBJ, C_ARGS => C::Any
+        def bounce(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
+      end
 
-    def initialize(dependency_store)
-      @dependency_store = dependency_store
-      @stack = []
-    end
+      attr_reader :dependency_store
 
-    contract C_OBJ, C_ARGS => C::Any
-    def enter(obj, raw_content: false, attributes: false, compiled_content: false, path: false)
-      unless @stack.empty?
-        Nanoc::Int::NotificationCenter.post(:dependency_created, @stack.last, obj)
-        @dependency_store.record_dependency(
-          @stack.last,
-          obj,
-          raw_content: raw_content,
-          attributes: attributes,
-          compiled_content: compiled_content,
-          path: path,
-        )
+      def initialize(dependency_store)
+        @dependency_store = dependency_store
+        @stack = []
       end
 
-      @stack.push(obj)
-    end
+      contract C_OBJ, C_ARGS => C::Any
+      def enter(obj, raw_content: false, attributes: false, compiled_content: false, path: false)
+        unless @stack.empty?
+          Nanoc::Core::NotificationCenter.post(:dependency_created, @stack.last, obj)
+          @dependency_store.record_dependency(
+            @stack.last,
+            obj,
+            raw_content: raw_content,
+            attributes: attributes,
+            compiled_content: compiled_content,
+            path: path,
+          )
+        end
+
+        @stack.push(obj)
+      end
 
-    contract C_OBJ => C::Any
-    def exit
-      @stack.pop
-    end
+      contract C_OBJ => C::Any
+      def exit
+        @stack.pop
+      end
 
-    contract C_OBJ, C_ARGS => C::Any
-    def bounce(obj, raw_content: false, attributes: false, compiled_content: false, path: false)
-      enter(obj, raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path)
-      exit
+      contract C_OBJ, C_ARGS => C::Any
+      def bounce(obj, raw_content: false, attributes: false, compiled_content: false, path: false)
+        enter(obj, raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path)
+        exit
+      end
     end
   end
 end