nanoc 4.4.4 → 4.4.5

data/lib/nanoc/filters/coffeescript.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.3.0
-  #
   # @api private
   class CoffeeScript < Nanoc::Filter
     requires 'coffee-script'

data/lib/nanoc/filters/colorize_syntax.rb

@@ -250,8 +250,6 @@ module Nanoc::Filters
 
     # Runs the content through [Highlight](http://www.andre-simon.de/doku/highlight/en/highlight.html).
     #
-    # @since 3.2.0
-    #
     # @param [String] code The code to colorize
     #
     # @param [String] language The language the code is written in

data/lib/nanoc/filters/handlebars.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.4.0
-  #
   # @api private
   class Handlebars < Nanoc::Filter
     requires 'handlebars'

data/lib/nanoc/filters/mustache.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.2.0
-  #
   # @api private
   class Mustache < Nanoc::Filter
     requires 'mustache'

data/lib/nanoc/filters/redcarpet.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.2.0
-  #
   # @api private
   class Redcarpet < Nanoc::Filter
     requires 'redcarpet'
@@ -23,8 +21,6 @@ module Nanoc::Filters
     #
     #   For Redcarpet 2.x
     #
-    #   @since 3.2.4
-    #
     #   @param [String] content The content to filter
     #
     #   @option params [Hash] :options ({}) A list of options to pass on to

data/lib/nanoc/filters/slim.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.2.0
-  #
   # @api private
   class Slim < Nanoc::Filter
     requires 'slim'

data/lib/nanoc/filters/typogruby.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.2.0
-  #
   # @api private
   class Typogruby < Nanoc::Filter
     requires 'typogruby'

data/lib/nanoc/filters/xsl.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.3.0
-  #
   # @api private
   class XSL < Nanoc::Filter
     requires 'nokogiri'

data/lib/nanoc/filters/yui_compressor.rb

@@ -1,6 +1,4 @@
 module Nanoc::Filters
-  # @since 3.3.0
-  #
   # @api private
   class YUICompressor < Nanoc::Filter
     requires 'yuicompressor'

data/lib/nanoc/helpers/capturing.rb

@@ -27,30 +27,32 @@ module Nanoc::Helpers
         existing_behavior = params.fetch(:existing, :error)
 
         # Capture
-        content = capture(&block)
+        content_string = capture(&block)
 
-        # Prepare for store
+        # Get existing contents and prep for store
         snapshot_contents = @item.reps[:default].unwrap.snapshot_contents
         capture_name = "__capture_#{name}".to_sym
-        case existing_behavior
-        when :overwrite
-          snapshot_contents[capture_name] = ''
-        when :append
-          snapshot_contents[capture_name] ||= ''
-        when :error
-          if snapshot_contents[capture_name] && snapshot_contents[capture_name] != content
-            # FIXME: get proper exception
-            raise "a capture named #{name.inspect} for #{@item.identifier} already exists"
+        old_content_string =
+          case existing_behavior
+          when :overwrite
+            ''
+          when :append
+            c = snapshot_contents[capture_name]
+            c ? c.string : ''
+          when :error
+            if snapshot_contents[capture_name] && snapshot_contents[capture_name].string != content_string
+              # FIXME: get proper exception
+              raise "a capture named #{name.inspect} for #{@item.identifier} already exists"
+            else
+              ''
+            end
           else
-            snapshot_contents[capture_name] = ''
+            raise ArgumentError, 'expected :existing_behavior param to #content_for to be one of ' \
+              ":overwrite, :append, or :error, but #{existing_behavior.inspect} was given"
           end
-        else
-          raise ArgumentError, 'expected :existing_behavior param to #content_for to be one of ' \
-            ":overwrite, :append, or :error, but #{existing_behavior.inspect} was given"
-        end
 
         # Store
-        snapshot_contents[capture_name] << content
+        snapshot_contents[capture_name] = Nanoc::Int::TextualContent.new(old_content_string + content_string)
       else # Get content
         if args.size != 2
           raise ArgumentError, 'expected 2 arguments (the item ' \
@@ -72,7 +74,8 @@ module Nanoc::Helpers
           end
         end
 
-        rep.snapshot_contents["__capture_#{name}".to_sym]
+        content = rep.snapshot_contents["__capture_#{name}".to_sym]
+        content ? content.string : nil
       end
     end
 
@@ -93,7 +96,7 @@ module Nanoc::Helpers
 
       # Depending on how the filter outputs, the result might be a
       # single string or an array of strings (slim outputs the latter).
-      erbout_addition = erbout_addition.join if erbout_addition.is_a? Array
+      erbout_addition = erbout_addition.join('') if erbout_addition.is_a? Array
 
       # Done.
       erbout_addition

data/lib/nanoc/helpers/link_to.rb

@@ -78,15 +78,11 @@ module Nanoc::Helpers
 
       # Calculate the relative path (method depends on whether destination is
       # a directory or not).
-      relative_path =
-        if src_path.to_s[-1, 1] != '/'
-          dst_path.relative_path_from(src_path.dirname).to_s
-        else
-          dst_path.relative_path_from(src_path).to_s
-        end
+      from = src_path.to_s.end_with?('/') ? src_path : src_path.dirname
+      relative_path = dst_path.relative_path_from(from).to_s
 
       # Add trailing slash if necessary
-      if dst_path.to_s[-1, 1] == '/'
+      if dst_path.to_s.end_with?('/')
         relative_path << '/'
       end
 

data/lib/nanoc/helpers/rendering.rb

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

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -55,7 +55,7 @@ module Nanoc::RuleDSL
           reps: reps,
           items: site.items,
           dependency_tracker: dependency_tracker,
-          compiler: site.compiler,
+          compilation_context: site.compiler.compilation_context,
         )
       ctx = new_postprocessor_context(site, view_context)
 
@@ -72,7 +72,7 @@ module Nanoc::RuleDSL
           reps: nil,
           items: nil,
           dependency_tracker: dependency_tracker,
-          compiler: nil,
+          compilation_context: nil,
         )
 
       Nanoc::Int::Context.new(

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -159,8 +159,6 @@ module Nanoc::RuleDSL
     #
     # @return [void]
     #
-    # @since 3.2.0
-    #
     # @example Copying the `/foo/` item as-is
     #
     #     passthrough '/foo/'

data/lib/nanoc/rule_dsl/recording_executor.rb

@@ -19,11 +19,11 @@ module Nanoc
         @rule_memory = Nanoc::Int::RuleMemory.new(item_rep)
       end
 
-      def filter(_rep, filter_name, filter_args = {})
+      def filter(filter_name, filter_args = {})
         @rule_memory.add_filter(filter_name, filter_args)
       end
 
-      def layout(_rep, layout_identifier, extra_filter_args = {})
+      def layout(layout_identifier, extra_filter_args = {})
         unless layout_identifier.is_a?(String)
           raise ArgumentError.new('The layout passed to #layout must be a string')
         end
@@ -36,9 +36,9 @@ module Nanoc
       end
 
       Pathlike = C::Maybe[C::Or[String, Nanoc::Identifier]]
-      contract C::Any, Symbol, C::KeywordArgs[path: C::Optional[Pathlike], final: C::Optional[C::Bool]] => nil
-      def snapshot(rep, snapshot_name, final: true, path: nil)
-        pathlike = final ? (path || basic_path_from_rules_for(rep, snapshot_name)) : nil
+      contract Symbol, C::KeywordArgs[path: C::Optional[Pathlike], final: C::Optional[C::Bool]] => nil
+      def snapshot(snapshot_name, final: true, path: nil)
+        pathlike = final ? (path || basic_path_from_rules_for(@item_rep, snapshot_name)) : nil
         actual_path = pathlike && pathlike.to_s
         @rule_memory.add_snapshot(snapshot_name, final, actual_path)
         nil
@@ -50,7 +50,7 @@ module Nanoc
         return nil if routing_rule.nil?
 
         dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
-        view_context = Nanoc::ViewContext.new(reps: nil, items: nil, dependency_tracker: dependency_tracker, compiler: nil)
+        view_context = Nanoc::ViewContext.new(reps: nil, items: nil, dependency_tracker: dependency_tracker, compilation_context: nil)
         basic_path = routing_rule.apply_to(rep, executor: nil, site: @site, view_context: view_context)
         if basic_path && !basic_path.start_with?('/')
           raise PathWithoutInitialSlashError.new(rep, basic_path)

data/lib/nanoc/rule_dsl/rule.rb

@@ -9,8 +9,6 @@ module Nanoc::RuleDSL
 
     # @return [Symbol] The name of the snapshot this rule will apply to.
     #   Ignored for compilation rules, but used for routing rules.
-    #
-    # @since 3.2.0
     attr_reader :snapshot_name
 
     attr_reader :pattern

data/lib/nanoc/rule_dsl/rule_context.rb

@@ -35,7 +35,7 @@ module Nanoc::RuleDSL
     #
     # @return [void]
     def filter(filter_name, filter_args = {})
-      @_executor.filter(rep.unwrap, filter_name, filter_args)
+      @_executor.filter(filter_name, filter_args)
     end
 
     # Layouts the current representation (calls {Nanoc::Int::ItemRep#layout} with
@@ -48,7 +48,7 @@ module Nanoc::RuleDSL
     #
     # @return [void]
     def layout(layout_identifier, extra_filter_args = nil)
-      @_executor.layout(rep.unwrap, layout_identifier, extra_filter_args)
+      @_executor.layout(layout_identifier, extra_filter_args)
     end
 
     # Creates a snapshot of the current compiled item content. Calls
@@ -62,7 +62,7 @@ module Nanoc::RuleDSL
     #
     # @return [void]
     def snapshot(snapshot_name, path: nil)
-      @_executor.snapshot(rep.unwrap, snapshot_name, path: path)
+      @_executor.snapshot(snapshot_name, path: path)
     end
 
     # Creates a snapshot named :last the current compiled item content, with

data/lib/nanoc/rule_dsl/rule_memory_calculator.rb

@@ -66,7 +66,7 @@ module Nanoc::RuleDSL
     # @return [Nanoc::Int::RuleMemory]
     def new_rule_memory_for_rep(rep)
       dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
-      view_context = @site.compiler.create_view_context(dependency_tracker)
+      view_context = @site.compiler.compilation_context.create_view_context(dependency_tracker)
 
       executor = Nanoc::RuleDSL::RecordingExecutor.new(rep, @rules_collection, @site)
       rule = @rules_collection.compilation_rule_for(rep)
@@ -75,14 +75,14 @@ module Nanoc::RuleDSL
         raise NoRuleMemoryForItemRepException.new(rep)
       end
 
-      executor.snapshot(rep, :raw)
-      executor.snapshot(rep, :pre, final: false)
+      executor.snapshot(:raw)
+      executor.snapshot(:pre, final: false)
       rule.apply_to(rep, executor: executor, site: @site, view_context: view_context)
       if executor.rule_memory.any_layouts?
-        executor.snapshot(rep, :post)
+        executor.snapshot(:post)
       end
       unless executor.rule_memory.snapshot_actions.any? { |sa| sa.snapshot_name == :last }
-        executor.snapshot(rep, :last)
+        executor.snapshot(:last)
       end
 
       executor.rule_memory

data/lib/nanoc/spec.rb

@@ -118,7 +118,7 @@ module Nanoc
           reps: @reps,
           items: @items,
           dependency_tracker: @dependency_tracker,
-          compiler: new_site.compiler,
+          compilation_context: new_site.compiler.compilation_context,
         )
       end
 

data/lib/nanoc/version.rb

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

data/test/base/test_compiler.rb

@@ -11,9 +11,11 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
     action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
 
+    objects = site.items.to_a + site.layouts.to_a
+
     params = {
       compiled_content_cache: Nanoc::Int::CompiledContentCache.new(items: site.items),
-      checksum_store: Nanoc::Int::ChecksumStore.new(site: site),
+      checksum_store: Nanoc::Int::ChecksumStore.new(site: site, objects: objects),
       rule_memory_store: Nanoc::Int::RuleMemoryStore.new,
       dependency_store: Nanoc::Int::DependencyStore.new(
         site.items.to_a + site.layouts.to_a,

data/test/base/test_dependency_tracker.rb

@@ -87,25 +87,6 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     assert_contains_exactly [items[1]], store.objects_causing_outdatedness_of(items[0])
   end
 
-  def test_objects_outdated_due_to
-    # Mock items
-    items = [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-      Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ]
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items)
-
-    # Record some dependencies
-    store.record_dependency(items[0], items[1])
-    store.record_dependency(items[1], items[2])
-
-    # Verify dependencies
-    assert_contains_exactly [items[0]], store.objects_outdated_due_to(items[1])
-  end
-
   def test_store_graph_and_load_graph_simple
     # Mock items
     items = [

data/test/base/test_item_rep.rb

@@ -139,7 +139,10 @@ class Nanoc::Int::ItemRepTest < Nanoc::TestCase
   def test_access_compiled_content_of_binary_item
     content = Nanoc::Int::BinaryContent.new(File.expand_path('content/somefile.dat'))
     item = Nanoc::Int::Item.new(content, {}, '/somefile/')
+
     item_rep = Nanoc::Int::ItemRep.new(item, :foo)
+    item_rep.expects(:compiled?).returns(true)
+
     assert_raises(Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem) do
       item_rep.compiled_content
     end

data/test/cli/commands/test_create_site.rb

@@ -75,7 +75,7 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     FileUtils.cd('foo') do
       # Try with encoding = default encoding = utf-8
       File.open('content/index.html', 'w') { |io| io.write('Hello ' + 0xD6.chr + "!\n") }
-      exception = assert_raises(RuntimeError) do
+      exception = assert_raises(Nanoc::DataSources::Filesystem::Errors::InvalidEncoding) do
         Nanoc::Int::SiteLoader.new.new_from_cwd
       end
       assert_equal 'Could not read content/index.html because the file is not valid UTF-8.', exception.message

data/test/data_sources/test_filesystem.rb

@@ -135,7 +135,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     File.open('foo/stuff.dat', 'w') { |io| io.write('random binary data') }
 
     # Load
-    assert_raises(RuntimeError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::BinaryLayout) do
       data_source.send(:load_objects, 'foo', Nanoc::Int::Layout)
     end
   end
@@ -642,7 +642,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     end
 
     # Check
-    assert_raises RuntimeError do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::MultipleContentFiles) do
       data_source.send(:all_split_files_in, '.')
     end
   end
@@ -829,7 +829,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
     # Parse it
-    assert_raises(RuntimeError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::InvalidFormat) do
       data_source.instance_eval { parse('test.html', nil) }
     end
   end
@@ -981,7 +981,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
-    assert_raises(Nanoc::DataSources::Filesystem::InvalidMetadataError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::InvalidMetadata) do
       data_source.instance_eval { parse('test.html', nil) }
     end
   end
@@ -992,7 +992,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
 
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, nil)
 
-    assert_raises(Nanoc::DataSources::Filesystem::InvalidMetadataError) do
+    assert_raises(Nanoc::DataSources::Filesystem::Errors::InvalidMetadata) do
       data_source.instance_eval { parse('test.html', 'test.yaml') }
     end
   end

data/test/filters/test_coffeescript.rb

@@ -1,5 +1,7 @@
 class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
   def test_filter
+    skip_v8_on_ruby24
+
     if_have 'coffee-script' do
       # Create filter
       filter = ::Nanoc::Filters::CoffeeScript.new

data/test/filters/test_handlebars.rb

@@ -1,5 +1,7 @@
 class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
   def test_filter
+    skip_v8_on_ruby24
+
     if_have 'handlebars' do
       # Create data
       item = Nanoc::Int::Item.new(
@@ -34,6 +36,8 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
   end
 
   def test_filter_without_layout
+    skip_v8_on_ruby24
+
     if_have 'handlebars' do
       # Create data
       item = Nanoc::Int::Item.new(