nanoc 3.7.5 → 3.8.0

data/test/cli/commands/test_create_site.rb

@@ -18,6 +18,19 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     end
   end
 
+  def test_can_compile_new_site_with_binary_items
+    Nanoc::CLI.run %w( create_site foo )
+
+    FileUtils.cd('foo') do
+      File.open('content/blah', 'w') { |io| io << 'asdf' }
+      site = Nanoc::Site.new('.')
+      site.load_data
+      site.compile
+
+      assert File.file?('output/blah')
+    end
+  end
+
   def test_default_encoding
     unless defined?(Encoding)
       skip 'No Encoding class'

data/test/cli/test_cli.rb

@@ -74,6 +74,36 @@ EOS
     end
   end
 
+  def test_load_custom_commands_non_default_commands_dirs
+    Nanoc::CLI.run %w( create_site foo )
+    FileUtils.cd('foo') do
+      File.open('nanoc.yaml', 'w') { |io| io.write('commands_dirs: [commands, commands_alt]') }
+
+      # Create command
+      FileUtils.mkdir_p('commands_alt')
+      File.open('commands_alt/_test.rb', 'w') do |io|
+        io.write(COMMAND_CODE)
+      end
+
+      # Create subcommand
+      FileUtils.mkdir_p('commands_alt/_test')
+      File.open('commands_alt/_test/_sub.rb', 'w') do |io|
+        io.write(SUBCOMMAND_CODE)
+      end
+
+      # Run command
+      begin
+        Nanoc::CLI.run %w( _test _sub )
+      rescue SystemExit
+        assert false, 'Running _test sub should not cause system exit'
+      end
+
+      # Check
+      assert File.file?('_test_sub.out')
+      assert_equal 'It works sub!', File.read('_test_sub.out')
+    end
+  end
+
   def test_load_custom_commands_broken
     Nanoc::CLI.run %w( create_site foo )
 

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

@@ -0,0 +1,188 @@
+# encoding: utf-8
+
+class Nanoc::Extra::Checking::Checks::MixedContentTest < Nanoc::TestCase
+  def create_output_file(name, lines)
+    FileUtils.mkdir_p('output')
+    File.open('output/' + name, 'w') { |io|
+      io.write(lines.join('\n'))
+    }
+  end
+
+  def assert_include(haystack, needle)
+    assert haystack.include?(needle), "Expected to find '#{needle}' in #{haystack}"
+  end
+
+  def test_https_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<img src="https://nanoc.ws/logo.png" />',
+        '<img src="HTTPS://nanoc.ws/logo.png" />',
+        '<link href="https://nanoc.ws/style.css" />',
+        '<script src="https://nanoc.ws/app.js"></script>',
+        '<form action="https://nanoc.ws/process.cgi"></form>',
+        '<iframe src="https://nanoc.ws/preview.html"></iframe>',
+        '<audio src="https://nanoc.ws/theme-song.flac"></audio>',
+        '<video src="https://nanoc.ws/screen-cast.mkv"></video>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      assert check.issues.empty?
+    end
+  end
+
+  def test_root_relative_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<img src="/logo.png" />',
+        '<link href="/style.css" />',
+        '<script src="/app.js"></script>',
+        '<form action="/process.cgi"></form>',
+        '<iframe src="/preview.html"></iframe>',
+        '<audio src="/theme-song.flac"></audio>',
+        '<video src="/screen-cast.mkv"></video>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      assert check.issues.empty?
+    end
+  end
+
+  def test_protocol_relative_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<img src="//nanoc.ws/logo.png" />',
+        '<link href="//nanoc.ws/style.css" />',
+        '<script src="//nanoc.ws/app.js"></script>',
+        '<form action="//nanoc.ws/process.cgi"></form>',
+        '<iframe src="//nanoc.ws/preview.html"></iframe>',
+        '<audio src="//nanoc.ws/theme-song.flac"></audio>',
+        '<video src="//nanoc.ws/screen-cast.mkv"></video>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      assert check.issues.empty?
+    end
+  end
+
+  def test_document_relative_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<img src="logo.png" />',
+        '<link href="style.css" />',
+        '<script src="app.js"></script>',
+        '<form action="process.cgi"></form>',
+        '<iframe src="preview.html"></iframe>',
+        '<audio src="theme-song.flac"></audio>',
+        '<video src="screen-cast.mkv"></video>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      assert check.issues.empty?
+    end
+  end
+
+  def test_query_relative_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<img src="?query-string" />',
+        '<link href="?query-string" />',
+        '<script src="?query-string"></script>',
+        '<form action="?query-string"></form>',
+        '<iframe src="?query-string"></iframe>',
+        '<audio src="?query-string"></audio>',
+        '<video src="?query-string"></video>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      assert check.issues.empty?
+    end
+  end
+
+  def test_fragment_relative_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<img src="#fragment" />',
+        '<link href="#fragment" />',
+        '<script src="#fragment"></script>',
+        '<form action="#fragment"></form>',
+        '<iframe src="#fragment"></iframe>',
+        '<audio src="#fragment"></audio>',
+        '<video src="#fragment"></video>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      assert check.issues.empty?
+    end
+  end
+
+  def test_http_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<img src="http://nanoc.ws/logo.png" />',
+        '<img src="HTTP://nanoc.ws/logo.png" />',
+        '<link href="http://nanoc.ws/style.css" />',
+        '<script src="http://nanoc.ws/app.js"></script>',
+        '<form action="http://nanoc.ws/process.cgi"></form>',
+        '<iframe src="http://nanoc.ws/preview.html"></iframe>',
+        '<audio src="http://nanoc.ws/theme-song.flac"></audio>',
+        '<video src="http://nanoc.ws/screencast.mkv"></video>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      issues = check.issues.to_a
+      assert_equal 8, issues.count
+
+      descriptions = issues.map { |issue| issue.description }
+      issues.each do |issue|
+        assert_equal 'output/foo.html', issue.subject
+      end
+
+      # The order of the reported issues is not important, so use this class's
+      # `assert_include` helper to avoid asserting those details
+      assert_include descriptions, 'mixed content include: http://nanoc.ws/logo.png'
+
+      assert_include descriptions, 'mixed content include: HTTP://nanoc.ws/logo.png'
+
+      assert_include descriptions, 'mixed content include: http://nanoc.ws/style.css'
+
+      assert_include descriptions, 'mixed content include: http://nanoc.ws/app.js'
+
+      assert_include descriptions, 'mixed content include: http://nanoc.ws/process.cgi'
+
+      assert_include descriptions, 'mixed content include: http://nanoc.ws/preview.html'
+
+      assert_include descriptions, 'mixed content include: http://nanoc.ws/theme-song.flac'
+
+      assert_include descriptions, 'mixed content include: http://nanoc.ws/screencast.mkv'
+    end
+  end
+
+  def test_inert_content
+    with_site do |site|
+      create_output_file('foo.html', [
+        '<a href="http://nanoc.ws">The homepage</a>',
+        '<a name="Not a link">Content</a>',
+        '<script>// inline JavaScript</script>',
+        '<img href="http://nanoc.ws/logo.png" />',
+        '<link src="http://nanoc.ws/style.css" />',
+        '<script href="http://nanoc.ws/app.js"></script>',
+        '<form src="http://nanoc.ws/process.cgi"></form>',
+        '<iframe href="http://nanoc.ws/preview.html"></iframe>',
+        '<audio href="http://nanoc.ws/theme-song.flac"></audio>',
+        '<video target="http://nanoc.ws/screen-cast.mkv"></video>',
+        '<p>http://nanoc.ws/harmless-text</p>'
+      ])
+      check = Nanoc::Extra::Checking::Checks::MixedContent.new(site)
+      check.run
+
+      assert check.issues.empty?
+    end
+  end
+end

data/test/extra/deployers/test_fog.rb

@@ -61,6 +61,38 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
     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

data/test/filters/test_pandoc.rb

@@ -14,7 +14,7 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
     end
   end
 
-  def test_params
+  def test_params_old
     if_have 'pandoc-ruby' do
       skip_unless_have_command 'pandoc'
 
@@ -22,8 +22,22 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Pandoc.new
 
       # Run filter
-      opts = [:s, { f: :markdown, to: :html }, 'no-wrap', :toc]
-      result = filter.setup_and_run("# Heading\n", *opts)
+      args = { f: :markdown, to: :html }
+      result = filter.setup_and_run("# Heading\n", args)
+      assert_match(%r{<h1 id=\"heading\">Heading</h1>\s*}, result)
+    end
+  end
+
+  def test_params_new
+    if_have 'pandoc-ruby' do
+      skip_unless_have_command 'pandoc'
+
+      # Create filter
+      filter = ::Nanoc::Filters::Pandoc.new
+
+      # Run filter
+      args = [:s, { f: :markdown, to: :html }, 'no-wrap', :toc]
+      result = filter.setup_and_run("# Heading\n", args: args)
       assert_match '<div id="TOC">', result
       assert_match(%r{<h1 id=\"heading\">Heading</h1>\s*}, result)
     end

data/test/filters/test_sass.rb

@@ -270,6 +270,17 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
     end
   end
 
+  def test_sass_without_filter
+    if_have 'sass' do
+      File.open('_morestuff.sass', 'w') do |io|
+        io.write("p\n  color: blue")
+      end
+
+      options = { :filename => File.join(Dir.getwd, 'test.sass') }
+      ::Sass::Engine.new('@import "morestuff"', options).render
+    end
+  end
+
   private
 
   def create_filter(params = {})

data/test/helper.rb

@@ -4,7 +4,7 @@
 require File.dirname(__FILE__) + '/gem_loader.rb'
 
 # Load unit testing stuff
-require 'minitest/unit'
+require 'minitest/test'
 require 'minitest/spec'
 require 'minitest/mock'
 require 'mocha/setup'
@@ -256,12 +256,12 @@ EOS
   end
 end
 
-class Nanoc::TestCase < MiniTest::Unit::TestCase
+class Nanoc::TestCase < Minitest::Test
   include Nanoc::TestHelpers
 end
 
 # Unexpected system exit is unexpected
-::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.delete(SystemExit)
+::Minitest::Test::PASSTHROUGH_EXCEPTIONS.delete(SystemExit)
 
 # A more precise inspect method for Time improves assert failure messages.
 #

data/test/helpers/test_blogging.rb

@@ -503,6 +503,36 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     end
   end
 
+  def test_atom_feed_preserve_order
+    if_have 'builder' do
+      # Mock articles
+      @items = [mock_article, mock_article]
+      @items.each_with_index do |article, i|
+        article.stubs(:[]).with(:title).returns("Article #{i}")
+      end
+      @items[0].stubs(:[]).with(:created_at).returns('01-01-2015')
+      @items[1].stubs(:[]).with(:created_at).returns('01-01-2014')
+
+      # Mock site
+      @site = mock
+      @site.stubs(:config).returns({ base_url: 'http://example.com' })
+
+      # Create feed item
+      @item = mock
+      @item.stubs(:[]).with(:title).returns('My Blog Or Something')
+      @item.stubs(:[]).with(:author_name).returns('J. Doe')
+      @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
+      @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
+
+      # Check
+      result = atom_feed(preserve_order: true)
+      assert_match(
+        Regexp.new('Article 1.*Article 0', Regexp::MULTILINE),
+        result
+      )
+    end
+  end
+
   def test_atom_feed_with_content_proc_param
     if_have 'builder' do
       # Mock article

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.7.5
+  version: 3.8.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -154,6 +154,7 @@ files:
 - lib/nanoc/extra/checking/checks/external_links.rb
 - lib/nanoc/extra/checking/checks/html.rb
 - lib/nanoc/extra/checking/checks/internal_links.rb
+- lib/nanoc/extra/checking/checks/mixed_content.rb
 - lib/nanoc/extra/checking/checks/stale.rb
 - lib/nanoc/extra/checking/dsl.rb
 - lib/nanoc/extra/checking/issue.rb
@@ -254,6 +255,7 @@ files:
 - test/base/test_item.rb
 - test/base/test_item_array.rb
 - test/base/test_item_rep.rb
+- test/base/test_item_rep_recorder_proxy.rb
 - test/base/test_layout.rb
 - test/base/test_memoization.rb
 - test/base/test_notification_center.rb
@@ -287,6 +289,7 @@ files:
 - test/extra/checking/checks/test_external_links.rb
 - test/extra/checking/checks/test_html.rb
 - test/extra/checking/checks/test_internal_links.rb
+- test/extra/checking/checks/test_mixed_content.rb
 - test/extra/checking/checks/test_stale.rb
 - test/extra/checking/test_check.rb
 - test/extra/checking/test_dsl.rb
@@ -372,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: a web publishing system written in Ruby for building small to medium-sized