nanoc 4.3.7 → 4.3.8

data/test/{extra/deployers → deploying}/test_fog.rb

@@ -1,7 +1,7 @@
-class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
+class Nanoc::Deploying::Deployers::FogTest < Nanoc::TestCase
   def test_read_etags_with_local_provider
     if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
+      fog = Nanoc::Deploying::Deployers::Fog.new(
         'output/', provider: 'local'
       )
 
@@ -16,7 +16,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
 
   def test_read_etags_with_aws_provider
     if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
+      fog = Nanoc::Deploying::Deployers::Fog.new(
         'output/', provider: 'aws'
       )
 
@@ -36,7 +36,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
 
   def test_calc_local_etag_with_local_provider
     if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
+      fog = Nanoc::Deploying::Deployers::Fog.new(
         'output/', provider: 'local'
       )
 
@@ -49,7 +49,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
 
   def test_calc_local_etag_with_aws_provider
     if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
+      fog = Nanoc::Deploying::Deployers::Fog.new(
         'output/', provider: 'aws'
       )
 
@@ -65,7 +65,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
 
   def test_needs_upload_with_missing_remote_etag
     if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
+      fog = Nanoc::Deploying::Deployers::Fog.new(
         'output/', provider: 'aws'
       )
 
@@ -81,7 +81,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
 
   def test_needs_upload_with_different_etags
     if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
+      fog = Nanoc::Deploying::Deployers::Fog.new(
         'output/', provider: 'aws'
       )
 
@@ -97,7 +97,7 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
 
   def test_needs_upload_with_identical_etags
     if_have 'fog' do
-      fog = Nanoc::Extra::Deployers::Fog.new(
+      fog = Nanoc::Deploying::Deployers::Fog.new(
         'output/', provider: 'aws'
       )
 

data/test/{extra/deployers → deploying}/test_rsync.rb

@@ -1,7 +1,7 @@
-class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
+class Nanoc::Deploying::Deployers::RsyncTest < Nanoc::TestCase
   def test_run_without_dst
     # Create deployer
-    rsync = Nanoc::Extra::Deployers::Rsync.new(
+    rsync = Nanoc::Deploying::Deployers::Rsync.new(
       'output/',
       {},
     )
@@ -22,7 +22,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
 
   def test_run_with_erroneous_dst
     # Create deployer
-    rsync = Nanoc::Extra::Deployers::Rsync.new(
+    rsync = Nanoc::Deploying::Deployers::Rsync.new(
       'output/',
       { dst: 'asdf/' },
     )
@@ -43,7 +43,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
 
   def test_run_everything_okay
     # Create deployer
-    rsync = Nanoc::Extra::Deployers::Rsync.new(
+    rsync = Nanoc::Deploying::Deployers::Rsync.new(
       'output',
       { dst: 'asdf' },
     )
@@ -57,7 +57,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     rsync.run
 
     # Check args
-    opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
+    opts = Nanoc::Deploying::Deployers::Rsync::DEFAULT_OPTIONS
     assert_equal(
       ['rsync', opts, 'output/', 'asdf'].flatten,
       rsync.instance_eval { @shell_cms_args },
@@ -66,7 +66,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
 
   def test_run_everything_okay_dry
     # Create deployer
-    rsync = Nanoc::Extra::Deployers::Rsync.new(
+    rsync = Nanoc::Deploying::Deployers::Rsync.new(
       'output',
       { dst: 'asdf' },
       dry_run: true,
@@ -81,7 +81,7 @@ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
     rsync.run
 
     # Check args
-    opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
+    opts = Nanoc::Deploying::Deployers::Rsync::DEFAULT_OPTIONS
     assert_equal(
       ['echo', 'rsync', opts, 'output/', 'asdf'].flatten,
       rsync.instance_eval { @shell_cms_args },

data/test/filters/{test_colorize_syntax.rb → colorize_syntax/test_coderay.rb}

@@ -1,4 +1,4 @@
-class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
+class Nanoc::Filters::ColorizeSyntax::CoderayTest < Nanoc::TestCase
   CODERAY_PRE  = '<div class="CodeRay"><div class="code">'.freeze
   CODERAY_POST = '</div></div>'.freeze
 
@@ -17,56 +17,6 @@ class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
     end
   end
 
-  def test_dummy
-    if_have 'nokogiri' do
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'
-      expected_output = input # because we are using a dummy
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, default_colorizer: :dummy)
-      assert_equal(expected_output, actual_output)
-    end
-  end
-
-  def test_with_frozen_input
-    if_have 'nokogiri' do
-      input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'.freeze
-      input.freeze
-
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-      filter.setup_and_run(input, default_colorizer: :dummy)
-    end
-  end
-
-  def test_full_page
-    if_have 'nokogiri' do
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = <<EOS
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Foo</title>
-  </head>
-  <body>
-    <pre title="moo"><code class="language-ruby"># comment</code></pre>
-  </body>
-</html>
-EOS
-      expected_output_regex = %r{^<!DOCTYPE html>\s*<html>\s*<head>\s*<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\s*<title>Foo</title>\s*</head>\s*<body>\s*<pre title="moo"><code class="language-ruby"># comment</code></pre>\s*</body>\s*</html>}
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, default_colorizer: :dummy, is_fullpage: true)
-      assert_match expected_output_regex, actual_output
-    end
-  end
-
   def test_coderay_with_comment
     if_have 'coderay', 'nokogiri' do
       # Create filter
@@ -132,58 +82,6 @@ EOS
     end
   end
 
-  def test_pygmentize
-    if_have 'nokogiri' do
-      skip_unless_have_command 'pygmentize'
-
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'
-      expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment</span></code></pre>'
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, colorizers: { ruby: :pygmentize })
-      assert_equal(expected_output, actual_output)
-    end
-  end
-
-  def test_pygmentsrb
-    skip 'pygments.rb does not support Windows' if on_windows?
-    if_have 'pygments', 'nokogiri' do
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = '<pre title="moo"><code class="language-ruby"># comment…</code></pre>'
-      expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment…</span></code></pre>'
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, colorizers: { ruby: :pygmentsrb })
-      assert_equal(expected_output, actual_output)
-    end
-  end
-
-  def test_simon_highlight
-    if_have 'nokogiri' do
-      skip_unless_have_command 'highlight'
-
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = %(<pre title="moo"><code class="language-ruby">
-# comment
-</code></pre>)
-      expected_output = '<pre title="moo"><code class="language-ruby"><span class="hl slc"># comment</span></code></pre>'
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, default_colorizer: :simon_highlight)
-      assert_equal(expected_output, actual_output)
-    end
-  end
-
   def test_colorize_syntax_with_unknown_syntax
     if_have 'coderay', 'nokogiri' do
       # Create filter
@@ -226,53 +124,6 @@ EOS
     end
   end
 
-  def test_colorize_syntax_with_default_colorizer
-    skip_unless_have_command 'pygmentize'
-
-    if_have 'nokogiri' do
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
-      expected_output = '<pre><code class="language-ruby"><span class="nb">puts</span> <span class="s2">"foo"</span></code></pre>'
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, default_colorizer: :pygmentize)
-      assert_equal(expected_output, actual_output)
-    end
-  end
-
-  def test_colorize_syntax_with_missing_executables
-    if_have 'nokogiri' do
-      begin
-        original_path = ENV['PATH']
-        ENV['PATH'] = './blooblooblah'
-
-        # Create filter
-        filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-        # Get input and expected output
-        input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
-
-        # Run filter
-        [:albino, :pygmentize, :simon_highlight].each do |colorizer|
-          begin
-            input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
-            filter.setup_and_run(
-              input,
-              colorizers: { ruby: colorizer },
-            )
-            flunk 'expected colorizer to raise if no executable is available'
-          rescue
-          end
-        end
-      ensure
-        ENV['PATH'] = original_path
-      end
-    end
-  end
-
   def test_colorize_syntax_with_non_language_shebang_line
     if_have 'coderay', 'nokogiri' do
       # Create filter
@@ -389,31 +240,4 @@ EOS
       assert_equal(expected_output, actual_output)
     end
   end
-
-  def test_rouge
-    if_have 'rouge', 'nokogiri' do
-      # Create filter
-      filter = ::Nanoc::Filters::ColorizeSyntax.new
-
-      # Get input and expected output
-      input = <<EOS
-before
-<pre><code class="language-ruby">
-  def foo
-  end
-</code></pre>
-after
-EOS
-      expected_output = <<EOS
-before
-<pre><code class=\"language-ruby\">  <span class=\"k\">def</span> <span class=\"nf\">foo</span>
-  <span class=\"k\">end</span></code></pre>
-after
-EOS
-
-      # Run filter
-      actual_output = filter.setup_and_run(input, default_colorizer: :rouge)
-      assert_equal(expected_output, actual_output)
-    end
-  end
 end

data/test/filters/colorize_syntax/test_common.rb

@@ -0,0 +1,81 @@
+class Nanoc::Filters::ColorizeSyntax::CommonTest < Nanoc::TestCase
+  def test_dummy
+    if_have 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'
+      expected_output = input # because we are using a dummy
+
+      # Run filter
+      actual_output = filter.setup_and_run(input, default_colorizer: :dummy)
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
+  def test_with_frozen_input
+    if_have 'nokogiri' do
+      input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'.freeze
+      input.freeze
+
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+      filter.setup_and_run(input, default_colorizer: :dummy)
+    end
+  end
+
+  def test_full_page
+    if_have 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = <<EOS
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Foo</title>
+  </head>
+  <body>
+    <pre title="moo"><code class="language-ruby"># comment</code></pre>
+  </body>
+</html>
+EOS
+      expected_output_regex = %r{^<!DOCTYPE html>\s*<html>\s*<head>\s*<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\s*<title>Foo</title>\s*</head>\s*<body>\s*<pre title="moo"><code class="language-ruby"># comment</code></pre>\s*</body>\s*</html>}
+
+      # Run filter
+      actual_output = filter.setup_and_run(input, default_colorizer: :dummy, is_fullpage: true)
+      assert_match expected_output_regex, actual_output
+    end
+  end
+
+  def test_colorize_syntax_with_missing_executables
+    if_have 'nokogiri' do
+      begin
+        original_path = ENV['PATH']
+        ENV['PATH'] = './blooblooblah'
+
+        # Create filter
+        filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+        # Get input and expected output
+        input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
+
+        # Run filter
+        [:albino, :pygmentize, :simon_highlight].each do |colorizer|
+          begin
+            input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
+            filter.setup_and_run(
+              input,
+              colorizers: { ruby: colorizer },
+            )
+            flunk 'expected colorizer to raise if no executable is available'
+          rescue
+          end
+        end
+      ensure
+        ENV['PATH'] = original_path
+      end
+    end
+  end
+end

data/test/filters/colorize_syntax/test_pygmentize.rb

@@ -0,0 +1,35 @@
+class Nanoc::Filters::ColorizeSyntax::PygmentizeTest < Nanoc::TestCase
+  def test_pygmentize
+    if_have 'nokogiri' do
+      skip_unless_have_command 'pygmentize'
+
+      # Create filter
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'
+      expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment</span></code></pre>'
+
+      # Run filter
+      actual_output = filter.setup_and_run(input, colorizers: { ruby: :pygmentize })
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
+  def test_colorize_syntax_with_default_colorizer
+    skip_unless_have_command 'pygmentize'
+
+    if_have 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
+      expected_output = '<pre><code class="language-ruby"><span class="nb">puts</span> <span class="s2">"foo"</span></code></pre>'
+
+      # Run filter
+      actual_output = filter.setup_and_run(input, default_colorizer: :pygmentize)
+      assert_equal(expected_output, actual_output)
+    end
+  end
+end

data/test/filters/colorize_syntax/test_pygments.rb

@@ -0,0 +1,17 @@
+class Nanoc::Filters::ColorizeSyntax::PygmentsTest < Nanoc::TestCase
+  def test_pygmentsrb
+    skip 'pygments.rb does not support Windows' if on_windows?
+    if_have 'pygments', 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = '<pre title="moo"><code class="language-ruby"># comment…</code></pre>'
+      expected_output = '<pre title="moo"><code class="language-ruby"><span class="c1"># comment…</span></code></pre>'
+
+      # Run filter
+      actual_output = filter.setup_and_run(input, colorizers: { ruby: :pygmentsrb })
+      assert_equal(expected_output, actual_output)
+    end
+  end
+end