nanoc 4.4.4 → 4.4.5

data/test/filters/test_uglify_js.rb

@@ -1,5 +1,7 @@
 class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
   def test_filter
+    skip_v8_on_ruby24
+
     if_have 'uglifier' do
       # Create filter
       filter = ::Nanoc::Filters::UglifyJS.new
@@ -12,6 +14,8 @@ class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
   end
 
   def test_filter_with_options
+    skip_v8_on_ruby24
+
     if_have 'uglifier' do
       filter = ::Nanoc::Filters::UglifyJS.new
       input = "if(donkey) alert('It is a donkey!');"

data/test/filters/test_xsl.rb

@@ -97,7 +97,7 @@ EOS
       reps: :__irrelevat_reps,
       items: :__irrelevat_items,
       dependency_tracker: @dependency_tracker,
-      compiler: :__irrelevat_compiler,
+      compilation_context: :__irrelevat_compiler,
     )
   end
 

data/test/helper.rb

@@ -28,6 +28,12 @@ module Nanoc::TestHelpers
     ENV.key?('DISABLE_NOKOGIRI')
   end
 
+  def skip_v8_on_ruby24
+    if ENV.key?('DISABLE_V8')
+      skip 'V8 specs are disabled (broken on Ruby 2.4)'
+    end
+  end
+
   def if_have(*libs)
     libs.each do |lib|
       if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && lib == 'nokogiri' && disable_nokogiri?

data/test/helpers/test_capturing.rb

@@ -12,10 +12,15 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
       reps: item_rep_repo_for(item),
       items: :__irrelevant__,
       dependency_tracker: :__irrelevant__,
-      compiler: :__irrelevant__,
+      compilation_context: :__irrelevant__,
     )
   end
 
+  def before
+    super
+    Nanoc::CLI::ErrorHandler.enable
+  end
+
   def test_dependencies
     with_site do |_site|
       # Prepare

data/test/helpers/test_xml_sitemap.rb

@@ -6,7 +6,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
 
     @reps = Nanoc::Int::ItemRepRepo.new
     dependency_tracker = Nanoc::Int::DependencyTracker.new(nil)
-    @view_context = Nanoc::ViewContext.new(reps: @reps, items: nil, dependency_tracker: dependency_tracker, compiler: :__irrelevant__)
+    @view_context = Nanoc::ViewContext.new(reps: @reps, items: nil, dependency_tracker: dependency_tracker, compilation_context: :__irrelevant__)
 
     @items = nil
     @item = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.4.5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -124,9 +124,6 @@ files:
 - bin/nanoc
 - lib/nanoc.rb
 - lib/nanoc/base.rb
-- lib/nanoc/base/compilation/compiler.rb
-- lib/nanoc/base/compilation/outdatedness_checker.rb
-- lib/nanoc/base/compilation/outdatedness_reasons.rb
 - lib/nanoc/base/contracts_support.rb
 - lib/nanoc/base/core_ext.rb
 - lib/nanoc/base/core_ext/array.rb
@@ -147,6 +144,7 @@ files:
 - lib/nanoc/base/entities/item_rep.rb
 - lib/nanoc/base/entities/layout.rb
 - lib/nanoc/base/entities/lazy_value.rb
+- lib/nanoc/base/entities/outdatedness_reasons.rb
 - lib/nanoc/base/entities/outdatedness_status.rb
 - lib/nanoc/base/entities/pattern.rb
 - lib/nanoc/base/entities/processing_action.rb
@@ -176,6 +174,7 @@ files:
 - lib/nanoc/base/services.rb
 - lib/nanoc/base/services/action_provider.rb
 - lib/nanoc/base/services/checksummer.rb
+- lib/nanoc/base/services/compiler.rb
 - lib/nanoc/base/services/compiler_loader.rb
 - lib/nanoc/base/services/dependency_tracker.rb
 - lib/nanoc/base/services/executor.rb
@@ -185,6 +184,7 @@ files:
 - lib/nanoc/base/services/item_rep_selector.rb
 - lib/nanoc/base/services/item_rep_writer.rb
 - lib/nanoc/base/services/notification_center.rb
+- lib/nanoc/base/services/outdatedness_checker.rb
 - lib/nanoc/base/services/outdatedness_rule.rb
 - lib/nanoc/base/services/outdatedness_rules.rb
 - lib/nanoc/base/services/pruner.rb
@@ -251,6 +251,7 @@ files:
 - lib/nanoc/cli/stream_cleaners/utf8.rb
 - lib/nanoc/data_sources.rb
 - lib/nanoc/data_sources/filesystem.rb
+- lib/nanoc/data_sources/filesystem/errors.rb
 - lib/nanoc/data_sources/filesystem/tools.rb
 - lib/nanoc/deploying.rb
 - lib/nanoc/deploying/deployer.rb
@@ -321,7 +322,6 @@ files:
 - test/base/core_ext/hash_spec.rb
 - test/base/core_ext/pathname_spec.rb
 - test/base/core_ext/string_spec.rb
-- test/base/test_checksum_store.rb
 - test/base/test_code_snippet.rb
 - test/base/test_compiler.rb
 - test/base/test_context.rb

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

@@ -1,295 +0,0 @@
-module Nanoc::Int
-  # Responsible for compiling a site’s item representations.
-  #
-  # The compilation process makes use of notifications (see
-  # {Nanoc::Int::NotificationCenter}) to track dependencies between items,
-  # layouts, etc. The following notifications are used:
-  #
-  # * `compilation_started` — indicates that the compiler has started
-  #   compiling this item representation. Has one argument: the item
-  #   representation itself. Only one item can be compiled at a given moment;
-  #   therefore, it is not possible to get two consecutive
-  #   `compilation_started` notifications without also getting a
-  #   `compilation_ended` notification in between them.
-  #
-  # * `compilation_ended` — indicates that the compiler has finished compiling
-  #   this item representation (either successfully or with failure). Has one
-  #   argument: the item representation itself.
-  #
-  # @api private
-  class Compiler
-    # @api private
-    attr_reader :site
-
-    # @api private
-    attr_reader :compiled_content_cache
-
-    # @api private
-    attr_reader :checksum_store
-
-    # @api private
-    attr_reader :rule_memory_store
-
-    # @api private
-    attr_reader :action_provider
-
-    # @api private
-    attr_reader :dependency_store
-
-    # @api private
-    attr_reader :outdatedness_checker
-
-    # @api private
-    attr_reader :reps
-
-    def initialize(site, compiled_content_cache:, checksum_store:, rule_memory_store:, action_provider:, dependency_store:, outdatedness_checker:, reps:)
-      @site = site
-
-      @compiled_content_cache = compiled_content_cache
-      @checksum_store         = checksum_store
-      @rule_memory_store      = rule_memory_store
-      @dependency_store       = dependency_store
-      @outdatedness_checker   = outdatedness_checker
-      @reps                   = reps
-      @action_provider        = action_provider
-    end
-
-    def run_all
-      @action_provider.preprocess(@site)
-      build_reps
-      prune
-      run
-      @action_provider.postprocess(@site, @reps)
-    end
-
-    def run
-      load_stores
-      @site.freeze
-
-      # Determine which reps need to be recompiled
-      forget_dependencies_if_outdated
-
-      compile_reps
-      store
-    ensure
-      Nanoc::Int::TempFilenameFactory.instance.cleanup(
-        Nanoc::Filter::TMP_BINARY_ITEMS_DIR,
-      )
-      Nanoc::Int::TempFilenameFactory.instance.cleanup(
-        Nanoc::Int::ItemRepWriter::TMP_TEXT_ITEMS_DIR,
-      )
-    end
-
-    def load_stores
-      # FIXME: icky hack to update the dependency store’s list of objects
-      # (does not include preprocessed objects otherwise)
-      dependency_store.objects = site.items.to_a + site.layouts.to_a
-
-      stores.each(&:load)
-    end
-
-    # Store the modified helper data used for compiling the site.
-    #
-    # @return [void]
-    def store
-      # Calculate rule memory
-      (@reps.to_a + @site.layouts.to_a).each do |obj|
-        rule_memory_store[obj] = action_provider.memory_for(obj).serialize
-      end
-
-      # Calculate checksums
-      objects_to_checksum =
-        site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
-      objects_to_checksum.each { |obj| checksum_store.add(obj) }
-
-      # Store
-      stores.each(&:store)
-    end
-
-    def build_reps
-      builder = Nanoc::Int::ItemRepBuilder.new(
-        site, action_provider, @reps
-      )
-      builder.run
-    end
-
-    # @param [Nanoc::Int::ItemRep] rep The item representation for which the
-    #   assigns should be fetched
-    #
-    # @return [Hash] The assigns that should be used in the next filter/layout
-    #   operation
-    #
-    # @api private
-    def assigns_for(rep, dependency_tracker)
-      content_or_filename_assigns =
-        if rep.binary?
-          { filename: rep.snapshot_contents[:last].filename }
-        else
-          { content: rep.snapshot_contents[:last].string }
-        end
-
-      view_context = create_view_context(dependency_tracker)
-
-      content_or_filename_assigns.merge(
-        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::ItemCollectionWithRepsView.new(site.items, view_context),
-        layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
-        config: Nanoc::ConfigView.new(site.config, view_context),
-      )
-    end
-
-    def create_view_context(dependency_tracker)
-      Nanoc::ViewContext.new(
-        reps: @reps,
-        items: @site.items,
-        dependency_tracker: dependency_tracker,
-        compiler: self,
-      )
-    end
-
-    # @api private
-    def filter_name_and_args_for_layout(layout)
-      mem = action_provider.memory_for(layout)
-      if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::ProcessingActions::Filter)
-        # FIXME: Provide a nicer error message
-        raise Nanoc::Int::Errors::Generic, "No rule memory found for #{layout.identifier}"
-      end
-      [mem[0].filter_name, mem[0].params]
-    end
-
-    private
-
-    def prune
-      if site.config[:prune][:auto_prune]
-        Nanoc::Pruner.new(site.config, reps, exclude: prune_config_exclude).run
-      end
-    end
-
-    def prune_config
-      site.config[:prune] || {}
-    end
-
-    def prune_config_exclude
-      prune_config[:exclude] || {}
-    end
-
-    def compile_reps
-      # Assign snapshots
-      @reps.each do |rep|
-        rep.snapshot_defs = action_provider.snapshots_defs_for(rep)
-      end
-
-      # Find item reps to compile and compile them
-      outdated_reps = @reps.select { |r| outdatedness_checker.outdated?(r) }
-      selector = Nanoc::Int::ItemRepSelector.new(outdated_reps)
-      selector.each do |rep|
-        handle_errors_while(rep) { compile_rep(rep) }
-      end
-    end
-
-    def handle_errors_while(item_rep)
-      yield
-    rescue => e
-      raise Nanoc::Int::Errors::CompilationError.new(e, item_rep)
-    end
-
-    # Compiles the given item representation.
-    #
-    # This method should not be called directly; please use
-    # {Nanoc::Int::Compiler#run} instead, and pass this item representation's item
-    # as its first argument.
-    #
-    # @param [Nanoc::Int::ItemRep] rep The rep that is to be compiled
-    #
-    # @return [void]
-    def compile_rep(rep)
-      @fibers ||= {}
-      @fibers[rep] ||=
-        Fiber.new do
-          begin
-            dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
-            dependency_tracker.enter(rep.item)
-
-            if can_reuse_content_for_rep?(rep)
-              Nanoc::Int::NotificationCenter.post(:cached_content_used, rep)
-              rep.snapshot_contents = compiled_content_cache[rep]
-            else
-              recalculate_content_for_rep(rep, dependency_tracker)
-            end
-
-            rep.compiled = true
-            compiled_content_cache[rep] = rep.snapshot_contents
-
-            @fibers.delete(rep)
-          ensure
-            dependency_tracker.exit
-          end
-        end
-
-      fiber = @fibers[rep]
-      while fiber.alive?
-        Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
-        res = fiber.resume
-
-        case res
-        when Nanoc::Int::Errors::UnmetDependency
-          Nanoc::Int::NotificationCenter.post(:compilation_suspended, rep, res)
-          raise(res)
-        when Proc
-          fiber.resume(res.call)
-        else
-          # TODO: raise
-        end
-      end
-
-      Nanoc::Int::NotificationCenter.post(:compilation_ended, rep)
-    end
-
-    # @return [Boolean]
-    def can_reuse_content_for_rep?(rep)
-      !outdatedness_checker.outdated?(rep) && compiled_content_cache[rep]
-    end
-
-    # @return [void]
-    def recalculate_content_for_rep(rep, dependency_tracker)
-      executor = Nanoc::Int::Executor.new(self, dependency_tracker)
-
-      action_provider.memory_for(rep).each do |action|
-        case action
-        when Nanoc::Int::ProcessingActions::Filter
-          executor.filter(rep, action.filter_name, action.params)
-        when Nanoc::Int::ProcessingActions::Layout
-          executor.layout(rep, action.layout_identifier, action.params)
-        when Nanoc::Int::ProcessingActions::Snapshot
-          executor.snapshot(rep, action.snapshot_name, final: action.final?, path: action.path)
-        else
-          raise "Internal inconsistency: unknown action #{action.inspect}"
-        end
-      end
-    end
-
-    # Clears the list of dependencies for items that will be recompiled.
-    #
-    # @return [void]
-    def forget_dependencies_if_outdated
-      @site.items.each do |i|
-        if @reps[i].any? { |r| outdatedness_checker.outdated?(r) }
-          @dependency_store.forget_dependencies_for(i)
-        end
-      end
-    end
-
-    # Returns all stores that can load/store data that can be used for
-    # compilation.
-    def stores
-      [
-        checksum_store,
-        compiled_content_cache,
-        @dependency_store,
-        rule_memory_store,
-      ]
-    end
-  end
-end

data/test/base/test_checksum_store.rb

@@ -1,28 +0,0 @@
-class Nanoc::Int::ChecksumStoreTest < Nanoc::TestCase
-  def test_get_with_existing_object
-    require 'pstore'
-
-    # Create store
-    FileUtils.mkdir_p('tmp')
-    pstore = PStore.new('tmp/checksums')
-    pstore.transaction do
-      pstore[:data] = { [:item, '/moo/'] => 'zomg' }
-      pstore[:version] = 1
-    end
-
-    # Check
-    store = Nanoc::Int::ChecksumStore.new
-    store.load
-    obj = Nanoc::Int::Item.new('Moo?', {}, '/moo/')
-    assert_equal 'zomg', store[obj]
-  end
-
-  def test_get_with_nonexistant_object
-    store = Nanoc::Int::ChecksumStore.new
-    store.load
-
-    # Check
-    obj = Nanoc::Int::Item.new('Moo?', {}, '/animals/cow/')
-    assert_equal nil, store[obj]
-  end
-end