RubyGems - nanoc - Versions diffs - 4.7.4 → 4.7.5 - Mend

nanoc 4.7.4 → 4.7.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

checksums.yaml +4 -4
data/Gemfile +2 -2
data/Gemfile.lock +19 -29
data/NEWS.md +11 -0
data/lib/nanoc/base/entities/identifiable_collection.rb +21 -0
data/lib/nanoc/base/services/compilation_context.rb +54 -0
data/lib/nanoc/base/services/compiler/stages/build_reps.rb +27 -0
data/lib/nanoc/base/services/compiler/stages/determine_outdatedness.rb +4 -6
data/lib/nanoc/base/services/compiler/stages/forget_outdated_dependencies.rb +14 -0
data/lib/nanoc/base/services/compiler/stages/load_stores.rb +22 -0
data/lib/nanoc/base/services/compiler/stages/postprocess.rb +16 -0
data/lib/nanoc/base/services/compiler/stages/store_post_compilation_state.rb +14 -0
data/lib/nanoc/base/services/compiler/stages/store_pre_compilation_state.rb +33 -0
data/lib/nanoc/base/services/compiler/stages.rb +6 -0
data/lib/nanoc/base/services/compiler.rb +85 -142
data/lib/nanoc/base/services/compiler_loader.rb +0 -11
data/lib/nanoc/base/services/outdatedness_checker.rb +19 -40
data/lib/nanoc/base/services.rb +1 -0
data/lib/nanoc/base/views/identifiable_collection_view.rb +1 -2
data/lib/nanoc/cli/commands/compile_listeners/timing_recorder.rb +2 -2
data/lib/nanoc/cli/commands/show-data.rb +14 -12
data/lib/nanoc/version.rb +1 -1
data/spec/nanoc/base/compiler_spec.rb +0 -5
data/spec/nanoc/base/entities/identifiable_collection_spec.rb +34 -0
data/spec/nanoc/base/services/compiler/stages/compile_reps_spec.rb +1 -1
data/spec/nanoc/base/services/executor_spec.rb +1 -1
data/spec/nanoc/base/services/outdatedness_checker_spec.rb +21 -8
data/spec/nanoc/base/services/outdatedness_rules_spec.rb +6 -9
data/spec/nanoc/cli/commands/show_data_spec.rb +147 -0
data/spec/nanoc/integration/outdatedness_integration_spec.rb +14 -14
data/spec/nanoc/integration/partial_recompilation_spec.rb +4 -4
data/spec/nanoc/regressions/gh_1145_spec.rb +16 -0
data/spec/nanoc/regressions/gh_970b_spec.rb +3 -3
data/spec/spec_helper.rb +1 -1
metadata +10 -3
data/test/base/test_outdatedness_checker.rb +0 -491

data/test/base/test_outdatedness_checker.rb DELETED Viewed

@@ -1,491 +0,0 @@
-require 'helper'
-class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
-  def test_not_outdated
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_nil outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_item_checksum_nil
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Delete checksums
-    with_site(name: 'foo') do |_site|
-      Dir['tmp/nanoc/*/checksums'].each { |fn| FileUtils.rm(fn) }
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::ContentModified, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_compiled_file_doesnt_exist
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Delete old item
-    FileUtils.cd('foo') do
-      FileUtils.rm_rf('output/index.html')
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::NotWritten, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_item_content_checksum_is_different
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('content/new.html', 'w') { |io| io.write('o hello too') }
-      File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Update item
-    FileUtils.cd('foo') do
-      File.open('content/new.html', 'w') { |io| io.write('o hello DIFFERENT!!!') }
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/new/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::ContentModified, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_item_attributes_checksum_is_different
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('content/new.html', 'w') { |io| io.write('o hello too') }
-      File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Update item
-    FileUtils.cd('foo') do
-      File.open('content/new.html', 'w') { |io| io.write("---\ntitle: donkey\n---\no hello too") }
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/new/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::AttributesModified, outdatedness_checker.outdatedness_reason_for(rep).class
-    end
-  end
-  def test_outdated_if_dependent_layout_outdated
-    # Compile once
-    with_site(name: 'foo', compilation_rule_content: 'layout "/default/"', has_layout: true) do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('layouts/default.html', 'w') { |io| io.write('!!! <%= yield %> !!!') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Change layout
-    FileUtils.cd('foo') do
-      File.open('layouts/default.html', 'w') { |io| io.write('!!! <%= yield %> !!! different') }
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      # FIXME: ugly fugly hack
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_dependent_item_outdated
-    # Compile once
-    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
-      File.open('content/a.html', 'w') do |io|
-        io.write('<%= @items.find { |i| i.identifier == "/b/" }.compiled_content %>')
-      end
-      File.open('content/b.html', 'w') do |io|
-        io.write('stuff')
-      end
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Change item
-    FileUtils.cd('foo') do
-      File.open('content/b.html', 'w') do |io|
-        io.write('stuff different!!!')
-      end
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      # FIXME: ugly fugly hack
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/a/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_dependent_item_outdated_chained
-    # Compile once
-    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
-      File.open('content/a.html', 'w') do |io|
-        io.write('<%= @items.find { |i| i.identifier == "/b/" }.compiled_content %> aaa')
-      end
-      File.open('content/b.html', 'w') do |io|
-        io.write('<%= @items.find { |i| i.identifier == "/c/" }.compiled_content %> bbb')
-      end
-      File.open('content/c.html', 'w') do |io|
-        io.write('stuff')
-      end
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Change item
-    FileUtils.cd('foo') do
-      File.open('content/c.html', 'w') do |io|
-        io.write('stuff different!!!')
-      end
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      # FIXME: ugly fugly hack
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/a/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_dependent_item_removed
-    # Compile once
-    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
-      File.open('content/a.html', 'w') do |io|
-        io.write('<% @items.select { |i| i.identifier != @item.identifier }.each do |i| %>')
-        io.write('  <%= i.compiled_content %>')
-        io.write('<% end %>')
-      end
-      File.open('content/b.html', 'w') do |io|
-        io.write('stuff')
-      end
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Delete item
-    FileUtils.cd('foo') do
-      FileUtils.rm_rf('content/b.html')
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      # FIXME: ugly fugly hack
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/a/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_dependent_item_added
-    # Compile once
-    with_site(name: 'foo', compilation_rule_content: 'filter :erb') do |site|
-      File.open('content/a.html', 'w') do |io|
-        io.write('<% @items.select { |i| i.identifier != @item.identifier }.each do |i| %>')
-        io.write('  <%= i.compiled_content %>')
-        io.write('<% end %>')
-      end
-      File.open('content/b.html', 'w') do |io|
-        io.write('stuff')
-      end
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Add item
-    FileUtils.cd('foo') do
-      File.open('content/z.html', 'w') do |io|
-        io.write('moar stuff')
-      end
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      # FIXME: ugly fugly hack
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/a/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  # TODO: make sure outdatedness of non-outdated items is correct
-  def test_outdated_if_code_snippets_outdated
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Change code
-    FileUtils.cd('foo') do
-      File.open('lib/moo.rb', 'w') { |io| io.write('def moo ; puts "moo" ; end') }
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::CodeSnippetsModified, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_config_outdated
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Change code
-    FileUtils.cd('foo') do
-      File.open('nanoc.yaml', 'w') do |io|
-        io << 'awesome: true' << "\n"
-        io << 'string_pattern_type: legacy' << "\n"
-        io << 'data_sources:' << "\n"
-        io << '  -' << "\n"
-        io << '    type: filesystem' << "\n"
-        io << '    identifier_type: legacy' << "\n"
-      end
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::ConfigurationModified, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_not_outdated_if_irrelevant_rule_modified
-    # Compile once
-    with_site(name: 'foo') do |site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Change code
-    FileUtils.cd('foo') do
-      File.open('Rules', 'a') { |io| io.write('layout "/moo/", :haml') }
-    end
-    # Check
-    with_site(name: 'foo') do |site|
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_nil outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_outdated_if_relevant_rule_modified
-    # Create site
-    with_site(name: 'foo') do |_site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('Rules', 'w') do |io|
-        io.write("compile '/' do\n")
-        io.write("  filter :erb\n")
-        io.write("end\n")
-        io.write("\n")
-        io.write("route '/' do\n")
-        io.write("  '/index.html'\n")
-        io.write("end\n")
-      end
-    end
-    # Compile once
-    FileUtils.cd('foo') do
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Modify rules
-    FileUtils.cd('foo') do
-      File.open('Rules', 'w') do |io|
-        io.write("compile '/' do\n")
-        io.write("end\n")
-        io.write("\n")
-        io.write("route '/' do\n")
-        io.write("  '/index.html'\n")
-        io.write("end\n")
-      end
-    end
-    # Check
-    FileUtils.cd('foo') do
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compiler.build_reps
-      site.compiler.load_stores
-      outdatedness_checker = site.compiler.send :outdatedness_checker
-      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::RulesModified, outdatedness_checker.outdatedness_reason_for(rep)
-    end
-  end
-  def test_items_in_rules_should_not_cause_outdatedness
-    # Create site
-    with_site(name: 'foo') do |_site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('Rules', 'w') do |io|
-        io.write("compile '/' do\n")
-        io.write("  filter :erb, :stuff => @items\n")
-        io.write("end\n")
-        io.write("\n")
-        io.write("route '/' do\n")
-        io.write("  '/index.html'\n")
-        io.write("end\n")
-      end
-    end
-    # Compile
-    FileUtils.cd('foo') do
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Assert not outdated
-    FileUtils.cd('foo') do
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      outdatedness_checker = site.compiler.outdatedness_checker
-      site.items.each do |item|
-        refute outdatedness_checker.outdated?(item), 'item should not be outdated'
-      end
-    end
-  end
-  def test_non_serializable_parameters_in_rules_should_be_allowed
-    # Create site
-    with_site(name: 'foo') do |_site|
-      File.open('content/index.html', 'w') { |io| io.write('o hello') }
-      File.open('Rules', 'w') do |io|
-        io.write("compile '/' do\n")
-        io.write("  c = Class.new {}\n")
-        io.write("  def c.inspect ; 'I am so classy' ; end\n")
-        io.write("  filter :erb, :stuff => c, :more => 123\n")
-        io.write("end\n")
-        io.write("\n")
-        io.write("route '/' do\n")
-        io.write("  '/index.html'\n")
-        io.write("end\n")
-      end
-    end
-    # Compile
-    FileUtils.cd('foo') do
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      site.compile
-    end
-    # Assert not outdated
-    FileUtils.cd('foo') do
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      outdatedness_checker = site.compiler.outdatedness_checker
-      site.items.each do |item|
-        refute outdatedness_checker.outdated?(item), 'item should not be outdated'
-      end
-    end
-  end
-end