nanoc 4.1.6 → 4.2.0b1

data/test/extra/checking/checks/test_internal_links.rb

@@ -63,6 +63,31 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
     end
   end
 
+  def test_exclude_targets
+    with_site do |site|
+      # Create check
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
+      site.config.update({ checks: { internal_links: { exclude_targets: ['^/excluded\d+'] } } })
+
+      # Test
+      assert check.send(:valid?, '/excluded1', 'output/origin')
+      assert check.send(:valid?, '/excluded2', 'output/origin')
+      assert !check.send(:valid?, '/excluded_not', 'output/origin')
+    end
+  end
+
+  def test_exclude_origins
+    with_site do |site|
+      # Create check
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
+      site.config.update({ checks: { internal_links: { exclude_origins: ['^/excluded'] } } })
+
+      # Test
+      assert check.send(:valid?, '/foo', 'output/excluded')
+      assert !check.send(:valid?, '/foo', 'output/not_excluded')
+    end
+  end
+
   def test_unescape_url
     with_site do |site|
       FileUtils.mkdir_p('output/stuff')

data/test/extra/deployers/test_fog.rb

@@ -1,181 +1,4 @@
 class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
-  def test_run
-    if_have 'fog' do
-      # Create deployer
-      fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/',
-        {
-          bucket: 'mybucket',
-          provider: 'local',
-          local_root: 'mylocalcloud' })
-
-      # Create site
-      FileUtils.mkdir_p('output')
-      File.open('output/meow', 'w') { |io| io.write 'I am a cat!' }
-      File.open('output/bark', 'w') { |io| io.write 'I am a dog!' }
-
-      # Create local cloud (but not bucket)
-      FileUtils.mkdir_p('mylocalcloud')
-
-      # Run
-      fog.run
-
-      # Check
-      assert File.file?('mylocalcloud/mybucket/meow')
-      assert File.file?('mylocalcloud/mybucket/bark')
-      assert_equal 'I am a cat!', File.read('mylocalcloud/mybucket/meow')
-      assert_equal 'I am a dog!', File.read('mylocalcloud/mybucket/bark')
-    end
-  end
-
-  def test_run_with_dry_run
-    if_have 'fog' do
-      begin
-        # Create deployer
-        fog = Nanoc::Extra::Deployers::Fog.new(
-          'output/',
-          {
-            provider: 'aws',
-            # FIXME: bucket is necessary for deployer but fog doesn't like it
-            bucket_name: 'doesntmatter',
-            aws_access_key_id: 'meh',
-            aws_secret_access_key: 'dontcare',
-          },
-          dry_run: true,
-        )
-
-        # Create site
-        FileUtils.mkdir_p('output')
-        File.open('output/meow', 'w') { |io| io.write 'I am a cat!' }
-        File.open('output/bark', 'w') { |io| io.write 'I am a dog!' }
-
-        # Create local cloud (but not bucket)
-        FileUtils.mkdir_p('mylocalcloud')
-
-        # Run
-        fog.run
-      ensure
-        # FIXME: ugly hack
-        ::Fog.instance_eval { @mocking = false }
-      end
-    end
-  end
-
-  def test_run_cdn_with_dry_run
-    if_have 'fog' do
-      begin
-        # Create deployer
-        fog = Nanoc::Extra::Deployers::Fog.new(
-          'output/',
-          {
-            provider: 'aws',
-            cdn_id: 'id-cdn',
-            # FIXME: bucket is necessary for deployer but fog doesn't like it
-            bucket_name: 'doesntmatter',
-            aws_access_key_id: 'meh',
-            aws_secret_access_key: 'dontcare',
-          },
-          dry_run: true,
-        )
-
-        # Create site
-        FileUtils.mkdir_p('output')
-        File.open('output/meow', 'w') { |io| io.write 'I am a cat!' }
-        File.open('output/bark', 'w') { |io| io.write 'I am a dog!' }
-
-        # Create local cloud (but not bucket)
-        FileUtils.mkdir_p('mylocalcloud')
-
-        # Run
-        fog.run
-      ensure
-        # HACK: (
-        ::Fog.instance_eval { @mocking = false }
-      end
-    end
-  end
-
-  def test_run_delete_stray
-    if_have 'fog' do
-      # Create deployer
-      fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/',
-        {
-          bucket: 'mybucket',
-          provider: 'local',
-          local_root: 'mylocalcloud',
-        },
-      )
-
-      # Setup fake local cloud
-      FileUtils.mkdir_p('mylocalcloud/mybucket')
-      File.open('mylocalcloud/mybucket/etc', 'w')  { |io| io.write('meh-etc')  }
-      File.open('mylocalcloud/mybucket/meow', 'w') { |io| io.write('meh-meow') }
-      File.open('mylocalcloud/mybucket/bark', 'w') { |io| io.write('meh-bark') }
-
-      # Create site
-      FileUtils.mkdir_p('output')
-      File.open('output/meow', 'w') { |io| io.write 'I am a cat!' }
-      File.open('output/bark', 'w') { |io| io.write 'I am a dog!' }
-
-      # Create local cloud (but not bucket)
-      FileUtils.mkdir_p('mylocalcloud')
-
-      # Run
-      fog.run
-
-      # Check
-      refute File.file?('mylocalcloud/mybucket/etc')
-      assert File.file?('mylocalcloud/mybucket/meow')
-      assert File.file?('mylocalcloud/mybucket/bark')
-      assert_equal 'I am a cat!', File.read('mylocalcloud/mybucket/meow')
-      assert_equal 'I am a dog!', File.read('mylocalcloud/mybucket/bark')
-    end
-  end
-
-  def test_upload
-    if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
-        'output/', provider: 'aws')
-
-      key_old = '__old'
-      key_same = '__same'
-      key_new = '__new'
-
-      File.write(key_same, 'hallo')
-      File.write(key_new, 'hallo new')
-
-      etags = {
-        key_same => '598d4c200461b81522a3328565c25f7c',
-        key_new => '598d4c200461b81522a3328565c25f7c',
-      }
-
-      keys_to_destroy = [key_old, key_same, key_new]
-      keys_to_invalidate = []
-
-      s3_files = mock
-      s3_files.stubs(:create)
-      s3_directory = mock
-      s3_directory.stubs(:files).returns(s3_files)
-
-      # key_same
-      refute fog.send(:needs_upload?, key_same, key_same, etags)
-      fog.send(
-        :upload, key_same, key_same, etags, keys_to_destroy, keys_to_invalidate, s3_directory)
-
-      assert_equal([key_old, key_new], keys_to_destroy)
-      assert_equal([], keys_to_invalidate)
-
-      # key_new
-      assert fog.send(:needs_upload?, key_new, key_new, etags)
-      fog.send(
-        :upload, key_new, key_new, etags, keys_to_destroy, keys_to_invalidate, s3_directory)
-
-      assert_equal([key_old], keys_to_destroy)
-      assert_equal([key_new], keys_to_invalidate)
-    end
-  end
-
   def test_read_etags_with_local_provider
     if_have 'fog' do
       fog = Nanoc::Extra::Deployers::Fog.new(

data/test/filters/test_less.rb

@@ -1,8 +1,13 @@
 class Nanoc::Filters::LessTest < Nanoc::TestCase
+  def view_context
+    dependency_tracker = Nanoc::Int::DependencyTracker.new(nil)
+    Nanoc::ViewContext.new(reps: nil, items: nil, dependency_tracker: dependency_tracker, compiler: nil)
+  end
+
   def test_filter
     if_have 'less' do
       # Create item
-      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), view_context)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -20,7 +25,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
       File.open('content/foo/bar/imported_file.less', 'w') { |io| io.write('p { color: red; }') }
 
       # Create item
-      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), view_context)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -39,7 +44,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
 
       # Create item
       File.open('content/foo/bar.txt', 'w') { |io| io.write('meh') }
-      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), view_context)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])
@@ -108,7 +113,7 @@ class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_compression
     if_have 'less' do
       # Create item
-      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), nil)
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('blah', { content_filename: 'content/foo/bar.txt' }, '/foo/bar/'), view_context)
 
       # Create filter
       filter = ::Nanoc::Filters::Less.new(item: @item, items: [@item])

data/test/helpers/test_capturing.rb

@@ -1,49 +1,49 @@
 class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
   include Nanoc::Helpers::Capturing
 
-  def test_content_for
-    require 'erb'
-
-    File.open('Rules', 'w') do |io|
-      io.write "compile '*' do ; filter :erb ; end\n"
-      io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
+  def item_rep_repo_for(item)
+    Nanoc::Int::ItemRepRepo.new.tap do |repo|
+      repo << Nanoc::Int::ItemRep.new(item, :default)
     end
+  end
 
-    # Build content to be evaluated
-    content = "head <% content_for :sidebar do %>\n" \
-              "  <%= 1+2 %>\n" \
-              '<% end %> foot'
-
-    # Build site
-    site = Nanoc::Int::SiteLoader.new.new_empty
-    item = Nanoc::Int::Item.new('moo', {}, '/blah/')
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemWithRepsView.new(item, nil)
-
-    # Evaluate content
-    result = ::ERB.new(content).result(binding)
-
-    # Check
-    assert_equal '3', content_for(@item, :sidebar).strip
-    assert_match(/^head\s+foot$/, result)
+  def view_context_for(item)
+    Nanoc::ViewContext.new(
+      reps: item_rep_repo_for(item),
+      items: :__irrelevant__,
+      dependency_tracker: :__irrelevant__,
+      compiler: :__irrelevant__,
+    )
   end
 
-  def test_capture
-    require 'erb'
+  def test_dependencies
+    with_site do |_site|
+      # Prepare
+      File.open('lib/helpers.rb', 'w') do |io|
+        io.write 'include Nanoc::Helpers::Capturing'
+      end
+      File.open('content/includer.erb', 'w') do |io|
+        io.write '[<%= content_for(@items.find { |i| i.identifier == \'/includee/\' }, :blah) %>]'
+      end
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do ; filter :erb ; end\n"
+        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
+      end
 
-    # Build site
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'), nil)
+      # Compile once
+      File.open('content/includee.erb', 'w') do |io|
+        io.write '{<% content_for :blah do %>Old content<% end %>}'
+      end
+      Nanoc::CLI.run(%w(compile))
+      assert_equal '[Old content]', File.read('output/includer/index.html')
 
-    # Capture
-    _erbout = 'foo'
-    captured_content = capture do
-      _erbout << 'bar'
+      # Compile again
+      File.open('content/includee.erb', 'w') do |io|
+        io.write '{<% content_for :blah do %>New content<% end %>}'
+      end
+      Nanoc::CLI.run(%w(compile))
+      assert_equal '[New content]', File.read('output/includer/index.html')
     end
-
-    # Check
-    assert_equal 'foo', _erbout
-    assert_equal 'bar', captured_content
   end
 
   def test_content_for_recursively
@@ -66,8 +66,8 @@ head
 foot
 EOS
 
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
+    item = Nanoc::Int::Item.new('content', {}, '/')
+    @item = Nanoc::ItemWithRepsView.new(item, view_context_for(item))
 
     result = ::ERB.new(content).result(binding)
 
@@ -76,180 +76,6 @@ EOS
     assert_equal expected, actual
   end
 
-  def test_different_sites
-    require 'erb'
-
-    File.open('Rules', 'w') do |io|
-      io.write "compile '*' do ; filter :erb ; end\n"
-      io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
-    end
-
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
-    content = '<% content_for :a do %>Content One<% end %>'
-    ::ERB.new(content).result(binding)
-
-    assert_equal 'Content One', content_for(@item, :a)
-    assert_equal nil,           content_for(@item, :b)
-
-    @site = Nanoc::SiteView.new(Nanoc::Int::SiteLoader.new.new_empty, nil)
-    @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('content', {}, '/'), nil)
-    content = '<% content_for :b do %>Content Two<% end %>'
-    ::ERB.new(content).result(binding)
-
-    assert_equal nil,           content_for(@item, :a)
-    assert_equal 'Content Two', content_for(@item, :b)
-  end
-
-  def test_content_for_with_existing_symbol
-    with_site do |_site|
-      # Prepare
-      File.open('lib/helpers.rb', 'w') do |io|
-        io.write 'include Nanoc::Helpers::Capturing'
-      end
-      File.open('content/includer.erb', 'w') do |io|
-        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
-      end
-      File.open('Rules', 'w') do |io|
-        io.write "compile '*' do ; filter :erb ; end\n"
-        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
-      end
-
-      File.open('content/includee.erb', 'w') do |io|
-        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah do %>Second content<% end %>}'
-      end
-
-      # Using the same symbols twice now raises an error, to be changed to concatenating in a future version
-      assert_raises do
-        Nanoc::CLI.run(%w(compile))
-      end
-    end
-  end
-
-  def test_content_for_with_existing_symbol_with_error_option
-    with_site do |_site|
-      # Prepare
-      File.open('lib/helpers.rb', 'w') do |io|
-        io.write 'include Nanoc::Helpers::Capturing'
-      end
-      File.open('content/includer.erb', 'w') do |io|
-        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
-      end
-      File.open('Rules', 'w') do |io|
-        io.write "compile '*' do ; filter :erb ; end\n"
-        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
-      end
-
-      File.open('content/includee.erb', 'w') do |io|
-        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah, existing: :error do %>Second content<% end %>}'
-      end
-
-      assert_raises do
-        Nanoc::CLI.run(%w(compile))
-      end
-    end
-  end
-
-  def test_content_for_with_existing_symbol_with_overwrite_option
-    with_site do |_site|
-      # Prepare
-      File.open('lib/helpers.rb', 'w') do |io|
-        io.write 'include Nanoc::Helpers::Capturing'
-      end
-      File.open('content/includer.erb', 'w') do |io|
-        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
-      end
-      File.open('Rules', 'w') do |io|
-        io.write "compile '*' do ; filter :erb ; end\n"
-        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
-      end
-
-      File.open('content/includee.erb', 'w') do |io|
-        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah, existing: :overwrite do %>Second content<% end %>}'
-      end
-
-      Nanoc::CLI.run(%w(compile))
-      assert_equal '[Second content]', File.read('output/includer/index.html')
-    end
-  end
-
-  def test_content_for_with_existing_symbol_with_append_option
-    with_site do |_site|
-      # Prepare
-      File.open('lib/helpers.rb', 'w') do |io|
-        io.write 'include Nanoc::Helpers::Capturing'
-      end
-      File.open('content/includer.erb', 'w') do |io|
-        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
-      end
-      File.open('Rules', 'w') do |io|
-        io.write "compile '*' do ; filter :erb ; end\n"
-        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
-      end
-
-      File.open('content/includee.erb', 'w') do |io|
-        io.write '{<% content_for :blah do %>First content<% end %><% content_for :blah, existing: :append do %>Second content<% end %>}'
-      end
-
-      Nanoc::CLI.run(%w(compile))
-      assert_equal '[First contentSecond content]', File.read('output/includer/index.html')
-    end
-  end
-
-  def test_content_for_with_existing_symbol_with_unrecognised_option
-    with_site do |_site|
-      # Prepare
-      File.open('lib/helpers.rb', 'w') do |io|
-        io.write 'include Nanoc::Helpers::Capturing'
-      end
-      File.open('content/includer.erb', 'w') do |io|
-        io.write '[<%= content_for(@items["/includee/"], :blah) %>]'
-      end
-      File.open('Rules', 'w') do |io|
-        io.write "compile '*' do ; filter :erb ; end\n"
-        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
-      end
-
-      File.open('content/includee.erb', 'w') do |io|
-        io.write '{<% content_for :blah, existing: :donkey do %>First content<% end %>}'
-      end
-
-      assert_raises(ArgumentError) do
-        Nanoc::CLI.run(%w(compile))
-      end
-    end
-  end
-
-  def test_dependencies
-    with_site do |_site|
-      # Prepare
-      File.open('lib/helpers.rb', 'w') do |io|
-        io.write 'include Nanoc::Helpers::Capturing'
-      end
-      File.open('content/includer.erb', 'w') do |io|
-        io.write '[<%= content_for(@items.find { |i| i.identifier == \'/includee/\' }, :blah) %>]'
-      end
-      File.open('Rules', 'w') do |io|
-        io.write "compile '*' do ; filter :erb ; end\n"
-        io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
-      end
-
-      # Compile once
-      File.open('content/includee.erb', 'w') do |io|
-        io.write '{<% content_for :blah do %>Old content<% end %>}'
-      end
-      Nanoc::CLI.run(%w(compile))
-      assert_equal '[Old content]', File.read('output/includer/index.html')
-
-      # Compile again
-      File.open('content/includee.erb', 'w') do |io|
-        io.write '{<% content_for :blah do %>New content<% end %>}'
-      end
-      Nanoc::CLI.run(%w(compile))
-      assert_equal '[New content]', File.read('output/includer/index.html')
-    end
-  end
-
   def test_dependency_without_item_variable
     with_site do |_site|
       # Prepare