nanoc 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25161ec9b45e6f1a49b7eb87b64eeff9a6640b8f
-  data.tar.gz: d4b23a01bbdfc6846fbcf5b1c128c0fcba5b06b3
+  metadata.gz: d2b9d8ce47580844e86624db8a37b07a0cb016a8
+  data.tar.gz: 378d2207727e627067221f9aeb53fa6cbd75401e
 SHA512:
-  metadata.gz: fd3b4caa69b4e48ae48bfb35f2553a1ff6e88eb722a7056f268aa7138984b7e6114f6cfa40328bd41bf8803b8788fb27a491b5195e00b9bd09876d9af05a6c65
-  data.tar.gz: 868162e517d1711878df3d9027617e55b96be2040e36c14497fcea3a8f8f057c4e69ab7aac0b1947a5c513a002e0d378cd612ad263842b5d53986d95e2be91eb
+  metadata.gz: a5da522b136025a8c2a114b3e59197879290f57d1879998dafbd2130ed3b1ed1374034d524a25d17c7143f5058b4cfed06558fccedaed71deeb140f00130f30d
+  data.tar.gz: b4f5e54d978ea6da8b805adfaa24e5f143e4ad6d3ffb7ec3248ceaabe5f9b35ffac0a53a0332ac3d4ee25ebe6a699c20a43022902618ca153481f0ba2f9427b0

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.4.0)
+    nanoc (4.4.1)
       cri (~> 2.3)
       hamster (~> 3.0)
       parallel (~> 1.9)
@@ -224,10 +224,10 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.3)
     json (2.0.2)
-    kramdown (1.12.0)
+    kramdown (1.13.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.15)
+    libv8 (3.16.14.17)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -255,7 +255,7 @@ GEM
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
     parallel (1.9.0)
-    parser (2.3.1.4)
+    parser (2.3.2.0)
       ast (~> 2.2)
     posix-spawn (0.3.12)
     powerpack (0.1.1)

data/NEWS.md

@@ -1,6 +1,16 @@
 # Nanoc news
 
-## 4.4.0 (2015-11-19)
+## 4.4.1 (2016-11-21)
+
+Fixes:
+
+* Fixed an issue where the `xsl` filter would not generate a correct dependency on the layout (#996)
+
+Enhancements:
+
+* Made `view` command use index filenames specified in the `index_filenames` site configuration attribute (#998)
+
+## 4.4.0 (2016-11-19)
 
 Features:
 

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 Coveralls::RakeTask.new
 
-SUBDIRS = %w(* base cli data_sources extra filters helpers).freeze
+SUBDIRS = %w(* base checking cli data_sources deploying extra filters helpers).freeze
 
 namespace :test do
   SUBDIRS.each do |dir|

data/lib/nanoc/base/entities/directed_graph.rb

@@ -41,6 +41,8 @@ module Nanoc::Int
       @from_graph = {}
       @to_graph   = {}
 
+      @edge_props = {}
+
       @roots = Set.new(@vertices.keys)
 
       invalidate_caches
@@ -55,7 +57,7 @@ module Nanoc::Int
     # @param to   Vertex where the edge should end
     #
     # @return [void]
-    def add_edge(from, to)
+    def add_edge(from, to, props: nil)
       add_vertex(from)
       add_vertex(to)
 
@@ -65,6 +67,10 @@ module Nanoc::Int
       @to_graph[to] ||= Set.new
       @to_graph[to] << from
 
+      if props
+        @edge_props[[from, to]] = props
+      end
+
       @roots.delete(to)
 
       invalidate_caches
@@ -87,6 +93,8 @@ module Nanoc::Int
       @to_graph[to] ||= Set.new
       @to_graph[to].delete(from)
 
+      @edge_props.delete([from, to])
+
       @roots.add(to) if @to_graph[to].empty?
 
       invalidate_caches
@@ -119,6 +127,7 @@ module Nanoc::Int
 
       @from_graph[from].each do |to|
         @to_graph[to].delete(from)
+        @edge_props.delete([from, to])
         @roots.add(to) if @to_graph[to].empty?
       end
       @from_graph.delete(from)
@@ -134,6 +143,7 @@ module Nanoc::Int
 
       @to_graph[to].each do |from|
         @from_graph[from].delete(to)
+        @edge_props.delete([from, to])
       end
       @to_graph.delete(to)
       @roots.add(to)
@@ -196,6 +206,10 @@ module Nanoc::Int
       @successors[from] ||= recursively_find_vertices(from, :direct_successors_of)
     end
 
+    def props_for(from, to)
+      @edge_props[[from, to]]
+    end
+
     # @return [Array] The list of all vertices in this graph.
     def vertices
       @vertices.keys.sort_by { |v| @vertices[v] }
@@ -208,8 +222,8 @@ module Nanoc::Int
     def edges
       result = []
       @vertices.each_pair do |v1, i1|
-        direct_successors_of(v1).map { |v2| @vertices[v2] }.each do |i2|
-          result << [i1, i2]
+        direct_successors_of(v1).map { |v2| [@vertices[v2], v2] }.each do |i2, v2|
+          result << [i1, i2, @edge_props[[v1, v2]]]
         end
       end
       result

data/lib/nanoc/base/repos/dependency_store.rb

@@ -1,6 +1,50 @@
 module Nanoc::Int
   # @api private
   class DependencyStore < ::Nanoc::Int::Store
+    # A dependency between two items/layouts.
+    class Dependency
+      include Nanoc::Int::ContractsSupport
+
+      contract C::None => C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]
+      attr_reader :from
+
+      contract C::None => C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]
+      attr_reader :to
+
+      contract C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
+      def initialize(from, to, raw_content:, attributes:, compiled_content:, path:)
+        @from             = from
+        @to               = to
+
+        @raw_content      = raw_content
+        @attributes       = attributes
+        @compiled_content = compiled_content
+        @path             = path
+      end
+
+      contract C::None => C::Bool
+      def raw_content?
+        @raw_content
+      end
+
+      contract C::None => C::Bool
+      def attributes?
+        @attributes
+      end
+
+      contract C::None => C::Bool
+      def compiled_content?
+        @compiled_content
+      end
+
+      contract C::None => C::Bool
+      def path?
+        @path
+      end
+    end
+
+    include Nanoc::Int::ContractsSupport
+
     # @return [Array<Nanoc::Int::Item, Nanoc::Int::Layout>]
     attr_accessor :objects
 
@@ -12,6 +56,22 @@ module Nanoc::Int
       @graph   = Nanoc::Int::DirectedGraph.new([nil] + @objects)
     end
 
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::ArrayOf[Dependency]
+    def dependencies_causing_outdatedness_of(object)
+      objects_causing_outdatedness_of(object).map do |other_object|
+        props = @graph.props_for(other_object, object) || {}
+
+        Dependency.new(
+          other_object,
+          object,
+          raw_content: props.fetch(:raw_content, false),
+          attributes: props.fetch(:attributes, false),
+          compiled_content: props.fetch(:compiled_content, false),
+          path: props.fetch(:path, false),
+        )
+      end
+    end
+
     # Returns the direct dependencies for the given object.
     #
     # The direct dependencies of the given object include the items and
@@ -50,6 +110,7 @@ module Nanoc::Int
       @graph.direct_successors_of(object).compact
     end
 
+    contract C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
     # Records a dependency from `src` to `dst` in the dependency graph. When
     # `dst` is oudated, `src` will also become outdated.
     #
@@ -61,9 +122,13 @@ module Nanoc::Int
     #   outdated if the destination is outdated
     #
     # @return [void]
-    def record_dependency(src, dst)
+    def record_dependency(src, dst, raw_content: false, attributes: false, compiled_content: false, path: false)
+      existing_props = @graph.props_for(dst, src) || {}
+      new_props = { raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path }
+      props = merge_props(existing_props, new_props)
+
       # Warning! dst and src are *reversed* here!
-      @graph.add_edge(dst, src) unless src == dst
+      @graph.add_edge(dst, src, props: props) unless src == dst
     end
 
     # Empties the list of dependencies for the given object. This is necessary
@@ -81,6 +146,13 @@ module Nanoc::Int
 
     protected
 
+    def merge_props(p1, p2)
+      keys = (p1.keys + p2.keys).uniq
+      keys.each_with_object({}) do |key, memo|
+        memo[key] = p1.fetch(key, false) || p2.fetch(key, false)
+      end
+    end
+
     def data
       {
         edges: @graph.edges,
@@ -99,10 +171,10 @@ module Nanoc::Int
 
       # Load edges
       new_data[:edges].each do |edge|
-        from_index, to_index = *edge
+        from_index, to_index, props = *edge
         from = from_index && previous_objects[from_index]
         to   = to_index && previous_objects[to_index]
-        @graph.add_edge(from, to)
+        @graph.add_edge(from, to, props: props)
       end
 
       # Record dependency from all items on new items

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

@@ -4,16 +4,16 @@ module Nanoc::Int
     class Null
       include Nanoc::Int::ContractsSupport
 
-      contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
-      def enter(_obj)
+      contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout], C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
+      def enter(_obj, raw_content: false, attributes: false, compiled_content: false, path: false)
       end
 
       contract C::None => C::Any
       def exit
       end
 
-      contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
-      def bounce(_obj)
+      contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout], C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
+      def bounce(_obj, raw_content: false, attributes: false, compiled_content: false, path: false)
       end
     end
 
@@ -24,11 +24,18 @@ module Nanoc::Int
       @stack = []
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
-    def enter(obj)
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout], C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => 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)
+        @dependency_store.record_dependency(
+          @stack.last,
+          obj,
+          raw_content: raw_content,
+          attributes: attributes,
+          compiled_content: compiled_content,
+          path: path,
+        )
       end
 
       @stack.push(obj)
@@ -39,9 +46,9 @@ module Nanoc::Int
       @stack.pop
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
-    def bounce(obj)
-      enter(obj)
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout], C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => 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

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

@@ -67,7 +67,7 @@ module Nanoc
         filter = klass.new(assigns_for(rep).merge({ layout: layout_view }))
 
         # Visit
-        @dependency_tracker.bounce(layout)
+        @dependency_tracker.bounce(layout, raw_content: true)
 
         begin
           # Notify start

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

@@ -195,7 +195,7 @@ module Nanoc
 
       # Notify
       dependency_tracker = @assigns[:item]._context.dependency_tracker
-      items.each { |item| dependency_tracker.bounce(item) }
+      items.each { |item| dependency_tracker.bounce(item, compiled_content: true) }
 
       # Raise unmet dependency error if necessary
       items.each do |item|

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

@@ -42,7 +42,7 @@ module Nanoc
     #
     # @return [String] The content at the given snapshot.
     def compiled_content(snapshot: nil)
-      @context.dependency_tracker.bounce(unwrap.item)
+      @context.dependency_tracker.bounce(unwrap.item, compiled_content: true)
       @item_rep.compiled_content(snapshot: snapshot)
     end
 
@@ -56,7 +56,7 @@ module Nanoc
     #
     # @return [String] The item rep’s path.
     def path(snapshot: :last)
-      @context.dependency_tracker.bounce(unwrap.item)
+      @context.dependency_tracker.bounce(unwrap.item, path: true)
       @item_rep.path(snapshot: snapshot)
     end
 
@@ -69,7 +69,7 @@ module Nanoc
 
     # @api private
     def raw_path(snapshot: :last)
-      @context.dependency_tracker.bounce(unwrap.item)
+      @context.dependency_tracker.bounce(unwrap.item, path: true)
       @item_rep.raw_path(snapshot: snapshot)
     end
 

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

@@ -36,19 +36,19 @@ module Nanoc
 
     # @see Hash#[]
     def [](key)
-      @context.dependency_tracker.bounce(unwrap)
+      @context.dependency_tracker.bounce(unwrap, attributes: true)
       unwrap.attributes[key]
     end
 
     # @return [Hash]
     def attributes
-      @context.dependency_tracker.bounce(unwrap)
+      @context.dependency_tracker.bounce(unwrap, attributes: true)
       unwrap.attributes
     end
 
     # @see Hash#fetch
     def fetch(key, fallback = NONE, &_block)
-      @context.dependency_tracker.bounce(unwrap)
+      @context.dependency_tracker.bounce(unwrap, attributes: true)
 
       if unwrap.attributes.key?(key)
         unwrap.attributes[key]
@@ -63,7 +63,7 @@ module Nanoc
 
     # @see Hash#key?
     def key?(key)
-      @context.dependency_tracker.bounce(unwrap)
+      @context.dependency_tracker.bounce(unwrap, attributes: true)
       unwrap.attributes.key?(key)
     end
 
@@ -74,6 +74,7 @@ module Nanoc
 
     # @api private
     def raw_content
+      @context.dependency_tracker.bounce(unwrap, raw_content: true)
       unwrap.content.string
     end
 

data/lib/nanoc/cli/commands/show-data.rb

@@ -62,11 +62,23 @@ module Nanoc::CLI::Commands
     def print_item_dependencies(items, dependency_store)
       print_header('Item dependencies')
 
+      puts 'Legend:'
+      puts '  r = dependency on raw content'
+      puts '  a = dependency on attributes'
+      puts '  c = dependency on compiled content'
+      puts '  p = dependency on the path'
+      puts
+
       sorted_with_prev(items) do |item, prev|
         puts if prev
         puts "item #{item.identifier} depends on:"
-        predecessors = dependency_store.objects_causing_outdatedness_of(item).sort_by { |i| i ? i.identifier : '' }
-        predecessors.each do |pred|
+        dependencies =
+          dependency_store
+          .dependencies_causing_outdatedness_of(item)
+          .sort_by { |dep| dep.from ? dep.from.identifier : '' }
+        dependencies.each do |dep|
+          pred = dep.from
+
           type =
             case pred
             when Nanoc::Int::Layout
@@ -77,13 +89,19 @@ module Nanoc::CLI::Commands
               'item'
             end
 
+          props = ''
+          props << (dep.raw_content? ? 'r' : '_')
+          props << (dep.attributes? ? 'a' : '_')
+          props << (dep.compiled_content? ? 'c' : '_')
+          props << (dep.path? ? 'p' : '_')
+
           if pred
-            puts "  [ #{format '%6s', type} ] #{pred.identifier}"
+            puts "  [ #{format '%6s', type} ] (#{props}) #{pred.identifier}"
           else
             puts '  ( removed item )'
           end
         end
-        puts '  (nothing)' if predecessors.empty?
+        puts '  (nothing)' if dependencies.empty?
       end
     end
 

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

@@ -46,7 +46,7 @@ module Nanoc::CLI::Commands
         use Rack::Head
         use Adsf::Rack::IndexFileFinder,
             root: site.config[:output_dir],
-            index_filenames: %w(index.html index.xhtml)
+            index_filenames: site.config[:index_filenames]
         run Rack::File.new(site.config[:output_dir])
       end.to_app
 

data/lib/nanoc/helpers/capturing.rb

@@ -64,7 +64,7 @@ module Nanoc::Helpers
         # Create dependency
         if @item.nil? || item != @item.unwrap
           dependency_tracker = @config._context.dependency_tracker
-          dependency_tracker.bounce(item.unwrap)
+          dependency_tracker.bounce(item.unwrap, compiled_content: true)
 
           unless rep.compiled?
             Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(rep))

data/lib/nanoc/helpers/rendering.rb

@@ -20,7 +20,7 @@ module Nanoc::Helpers
 
       # Visit
       dependency_tracker = @config._context.dependency_tracker
-      dependency_tracker.bounce(layout)
+      dependency_tracker.bounce(layout, raw_content: true)
 
       # Capture content, if any
       captured_content = block_given? ? capture(&block) : nil

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.4.0'.freeze
+  VERSION = '4.4.1'.freeze
 end

data/test/base/test_directed_graph.rb

@@ -44,7 +44,7 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
-    assert_equal [[0, 1], [1, 2]], graph.edges.sort
+    assert_equal [[0, 1, nil], [1, 2, nil]], graph.edges.sort
   end
 
   def test_edges_with_new_vertices
@@ -55,7 +55,50 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     graph.add_edge(3, 2)
     assert_equal [1, 2, 3], graph.vertices
 
-    assert_equal [[0, 1], [2, 1]], graph.edges.sort
+    assert_equal [[0, 1, nil], [2, 1, nil]], graph.edges.sort
+  end
+
+  def test_edge_with_props
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3])
+    graph.add_edge(1, 2, props: { donkey: 14 })
+    graph.add_edge(2, 3, props: { giraffe: 3 })
+
+    assert_equal [[0, 1, { donkey: 14 }], [1, 2, { giraffe: 3 }]], graph.edges.sort
+  end
+
+  def test_props_for
+    graph = Nanoc::Int::DirectedGraph.new([1, 2, 3, 4])
+    graph.add_edge(1, 2, props: { donkey: 14 })
+    graph.add_edge(2, 3, props: { giraffe: 3 })
+    graph.add_edge(3, 4)
+
+    assert_equal({ donkey: 14 }, graph.props_for(1, 2))
+    assert_equal({ giraffe: 3 }, graph.props_for(2, 3))
+    assert_equal(nil, graph.props_for(3, 4))
+  end
+
+  def test_props_for_with_deleted_edge
+    graph = Nanoc::Int::DirectedGraph.new([1, 2])
+    graph.add_edge(1, 2, props: { donkey: 14 })
+    graph.delete_edge(1, 2)
+
+    assert_equal(nil, graph.props_for(1, 2))
+  end
+
+  def test_props_for_with_deleted_edges_from
+    graph = Nanoc::Int::DirectedGraph.new([1, 2])
+    graph.add_edge(1, 2, props: { donkey: 14 })
+    graph.delete_edges_from(1)
+
+    assert_equal(nil, graph.props_for(1, 2))
+  end
+
+  def test_props_for_with_deleted_edges_to
+    graph = Nanoc::Int::DirectedGraph.new([1, 2])
+    graph.add_edge(1, 2, props: { donkey: 14 })
+    graph.delete_edges_to(2)
+
+    assert_equal(nil, graph.props_for(1, 2))
   end
 
   def test_add_edge

data/test/filters/test_xsl.rb

@@ -81,13 +81,33 @@ EOS
 
   SAMPLE_XML_OUT_WITH_OMIT_XML_DECL = %r{\A<html>\s*<head>\s*<title>My Report</title>\s*</head>\s*<body>\s*<h1>My Report</h1>\s*</body>\s*</html>\s*\Z}m
 
+  def setup
+    super
+
+    @dependency_store = Nanoc::Int::DependencyStore.new([])
+    @dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
+
+    @base_item = Nanoc::Int::Item.new('base', {}, '/base.md')
+
+    @dependency_tracker.enter(@base_item)
+  end
+
+  def new_view_context
+    Nanoc::ViewContext.new(
+      reps: :__irrelevat_reps,
+      items: :__irrelevat_items,
+      dependency_tracker: @dependency_tracker,
+      compiler: :__irrelevat_compiler,
+    )
+  end
+
   def test_filter_as_layout
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN, {}, '/content/')
-      item = Nanoc::ItemWithRepsView.new(item, nil)
+      item = Nanoc::ItemWithRepsView.new(item, new_view_context)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL, {}, '/layout/')
-      layout = Nanoc::LayoutView.new(layout, nil)
+      layout = Nanoc::LayoutView.new(layout, new_view_context)
 
       # Create an instance of the filter
       assigns = {
@@ -100,6 +120,10 @@ EOS
       # Run the filter and validate the results
       result = filter.setup_and_run(layout.raw_content)
       assert_match SAMPLE_XML_OUT, result
+
+      # Verify dependencies
+      dep = @dependency_store.dependencies_causing_outdatedness_of(@base_item)[0]
+      refute_nil dep
     end
   end
 
@@ -107,9 +131,9 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_PARAMS, {}, '/content/')
-      item = Nanoc::ItemWithRepsView.new(item, nil)
+      item = Nanoc::ItemWithRepsView.new(item, new_view_context)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_PARAMS, {}, '/layout/')
-      layout = Nanoc::LayoutView.new(layout, nil)
+      layout = Nanoc::LayoutView.new(layout, new_view_context)
 
       # Create an instance of the filter
       assigns = {
@@ -122,6 +146,10 @@ EOS
       # Run the filter and validate the results
       result = filter.setup_and_run(layout.raw_content, foo: 'bar')
       assert_match SAMPLE_XML_OUT_WITH_PARAMS, result
+
+      # Verify dependencies
+      dep = @dependency_store.dependencies_causing_outdatedness_of(@base_item)[0]
+      refute_nil dep
     end
   end
 
@@ -129,9 +157,9 @@ EOS
     if_have 'nokogiri' do
       # Create our data objects
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_OMIT_XML_DECL, {}, '/content/')
-      item = Nanoc::ItemWithRepsView.new(item, nil)
+      item = Nanoc::ItemWithRepsView.new(item, new_view_context)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_OMIT_XML_DECL, {}, '/layout/')
-      layout = Nanoc::LayoutView.new(layout, nil)
+      layout = Nanoc::LayoutView.new(layout, new_view_context)
 
       # Create an instance of the filter
       assigns = {
@@ -144,6 +172,10 @@ EOS
       # Run the filter and validate the results
       result = filter.setup_and_run(layout.raw_content)
       assert_match SAMPLE_XML_OUT_WITH_OMIT_XML_DECL, result
+
+      # Verify dependencies
+      dep = @dependency_store.dependencies_causing_outdatedness_of(@base_item)[0]
+      refute_nil dep
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri