nanoc 3.6.2 → 3.6.3

data/lib/nanoc/filters/colorize_syntax.rb

@@ -273,10 +273,6 @@ module Nanoc::Filters
       stdout.read
     end
 
-  protected
-
-    KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight ]
-
     # Wraps the element in <div class="CodeRay"><div class="code">
     def coderay_postprocess(language, element)
       # Skip if we're a free <code>
@@ -296,6 +292,10 @@ module Nanoc::Filters
       element.swap div_outer
     end
 
+  protected
+
+    KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight ]
+
     # Removes the first blank lines and any whitespace at the end.
     def strip(s)
       s.lines.drop_while { |line| line.strip.empty? }.join.rstrip

data/lib/nanoc/filters/relativize_paths.rb

@@ -90,14 +90,7 @@ module Nanoc::Filters
           end
         end
       end
-      result = doc.send("to_#{type}")
-
-      # FIXME cleanup because it is ugly
-      # # Because using the `Nokogiri::XML::DocumentFragment` class DOCTYPE 
-      # pseudonodes becomes even more creepy than usual.
-      result.sub!(/(!DOCTYPE.+?)(&gt;)/, '<\1>')
-
-      result
+      doc.send("to_#{type}")
     end
 
     def path_is_relativizable?(s)

data/lib/nanoc/filters/uglify_js.rb

@@ -5,28 +5,8 @@ module Nanoc::Filters
 
     requires 'uglifier'
 
-    # Runs the content through [UglifyJS](https://github.com/mishoo/UglifyJS/).
-    # This method optionally takes options to pass directly to Uglifier:
-    #
-    #     {
-    #       :mangle => true, # Mangle variables names
-    #       :toplevel => false, # Mangle top-level variable names
-    #       :except => [], # Variable names to be excluded from mangling
-    #       :max_line_length => 32 * 1024, # Maximum line length
-    #       :squeeze => true, # Squeeze code resulting in smaller, but less-readable code
-    #       :seqs => true, # Reduce consecutive statements in blocks into single statement
-    #       :dead_code => true, # Remove dead code (e.g. after return)
-    #       :unsafe => false, # Optimizations known to be unsafe in some situations
-    #       :copyright => true, # Show copyright message
-    #       :beautify => false, # Ouput indented code
-    #       :beautify_options => {
-    #         :indent_level => 4,
-    #         :indent_start => 0,
-    #         :quote_keys => false,
-    #         :space_colon => 0,
-    #         :ascii_only => false
-    #       }
-    #     }
+    # Runs the content through [UglifyJS](https://github.com/mishoo/UglifyJS2/).
+    # This method optionally takes options to pass directly to Uglifier.
     #
     # @param [String] content The content to filter
     #

data/test/base/test_compiler_dsl.rb

@@ -89,6 +89,36 @@ EOS
     end
   end
 
+  def test_passthrough_with_ext_from_static_data_source
+    with_site do
+      # Create config
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "data_sources:\n"
+        io.write "  - type: static\n"
+      end
+
+      # Create rules
+      File.open('Rules', 'w') do |io|
+        io.write <<EOS
+passthrough "/foo.txt/"
+EOS
+      end
+
+      # Create items
+      FileUtils.mkdir_p('static')
+      File.open('static/foo.txt', 'w') do |io|
+        io.write "Hello I am foo"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check paths
+      assert_equal [ 'output/foo.txt' ], Dir['output/*']
+    end
+  end
+
   def test_passthrough_priority
     with_site do
       # Create rules

data/test/cli/commands/test_compile.rb

@@ -111,7 +111,33 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       Nanoc::CLI.run %w( compile )
       refute File.file?('output/stray.html')
       assert File.directory?('output/excluded_dir'),
-             'excluded_dir should still be there'
+        'excluded_dir should still be there'
     end
   end
+
+  def test_setup_and_teardown_listeners
+    with_site do
+      test_listener_class = Class.new(::Nanoc::CLI::Commands::Compile::Listener) do
+        def start ; @started = true ; end
+        def stop  ; @stopped = true ; end
+        def started? ; @started ; end
+        def stopped? ; @stopped ; end
+      end
+
+      options = {}
+      arguments = []
+      cmd = nil
+      listener_classes = [ test_listener_class ]
+      cmd_runner = Nanoc::CLI::Commands::Compile.new(
+        options, arguments, cmd, :listener_classes => listener_classes)
+
+      cmd_runner.run
+
+      listeners = cmd_runner.send(:listeners)
+      assert listeners.size == 1
+      assert listeners.first.started?
+      assert listeners.first.stopped?
+    end
+  end
+
 end

data/test/cli/commands/test_watch.rb

@@ -56,6 +56,16 @@ class Nanoc::CLI::Commands::WatchTest < Nanoc::TestCase
     end
   end
 
+  def test_growlnotify_cmd
+    notifier = Nanoc::CLI::Commands::Watch::Notifier.new
+    assert_equal [ 'growlnotify', '-m', 'foo' ], notifier.send(:growlnotify_cmd_for, 'foo')
+  end
+
+  def test_growlnotify_windows_cmd
+    notifier = Nanoc::CLI::Commands::Watch::Notifier.new
+    assert_equal [ 'growlnotify', '/t:nanoc', 'foo' ], notifier.send(:growlnotify_windows_cmd_for, 'foo')
+  end
+
   def wait_until_exists(filename)
     20.times do
       break if File.file?(filename)

data/test/data_sources/test_static.rb

@@ -13,6 +13,34 @@ class Nanoc::DataSources::StaticTest < Nanoc::TestCase
     data_source
   end
 
+  def test_items_with_symlinks
+    # Create data source
+    data_source = new_data_source(:prefix => 'foo')
+
+    # Create sample files
+    FileUtils.mkdir_p('foo')
+    FileUtils.mkdir_p('foo-outside-1')
+    FileUtils.mkdir_p('foo-outside-2')
+    File.open('foo/a.png',           'w') { |io| io.write("random binary data") }
+    File.open('foo-outside-1/b.png', 'w') { |io| io.write("more binary data") }
+    File.open('foo-outside-2/c.png', 'w') { |io| io.write("yet more binary data") }
+
+    # Create symlinks
+    File.symlink('../foo-outside-1', 'foo/1')
+    File.symlink('../foo-outside-2/c.png', 'foo/c.png')
+
+    # Check all files
+    expected_filenames = [ 'foo/a.png', 'foo/1/b.png', 'foo/c.png' ].sort
+    actual_filenames   = Nanoc::Extra::FilesystemTools.all_files_in('foo').sort
+    assert_equal expected_filenames, actual_filenames
+
+    # Check items
+    items = data_source.send(:items).sort_by { |i| i.identifier }
+    actual_item_identifiers   = items.map { |i| i.identifier }.sort
+    expected_item_identifiers = %w( /a.png/ /1/b.png/ /c.png/ ).sort
+    assert_equal expected_item_identifiers, actual_item_identifiers
+  end
+
   def test_items
     # Create data source
     data_source = new_data_source(:prefix => 'foo')

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

@@ -21,7 +21,7 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
     end
   end
 
-  def test_valid?
+  def test_valid_by_path
     with_site do |site|
       # Create check
       check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
@@ -36,6 +36,20 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
     end
   end
 
+  def test_valid_by_query
+    with_site do |site|
+      # Create check
+      check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
+      def check.request_url_once(url)
+        Net::HTTPResponse.new('1.1', url.query == 'status=200' ? '200' : '404', 'okay')
+      end
+
+      # Test
+      assert_nil check.validate('http://example.com/?status=200')
+      refute_nil check.validate('http://example.com/?status=404')
+    end
+  end
+
   def test_fallback_to_get_when_head_is_not_allowed
     with_site do |site|
       #Create check
@@ -50,4 +64,16 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
     end
   end
 
+  def test_path_for_url
+    with_site do |site|
+      check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
+
+      assert_equal '/',             check.send(:path_for_url, URI.parse('http://example.com'))
+      assert_equal '/',             check.send(:path_for_url, URI.parse('http://example.com/'))
+      assert_equal '/?foo=bar',     check.send(:path_for_url, URI.parse('http://example.com?foo=bar'))
+      assert_equal '/?foo=bar',     check.send(:path_for_url, URI.parse('http://example.com/?foo=bar'))
+      assert_equal '/meow?foo=bar', check.send(:path_for_url, URI.parse('http://example.com/meow?foo=bar'))
+    end
+  end
+
 end

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

@@ -6,7 +6,7 @@ class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
     with_site do |site|
       # Create files
       FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write('<!DOCTYPE html><html><head><title>Hello</title></head><body><h1>Hi!</h1></body>') }
+      File.open('output/blah.html', 'w') { |io| io.write('<!DOCTYPE html><html><head><meta charset="utf-8"><title>Hello</title></head><body><h1>Hi!</h1></body>') }
       File.open('output/style.css', 'w') { |io| io.write('h1 { coxlor: rxed; }') }
 
       # Run check

data/test/extra/test_filesystem_tools.rb

@@ -0,0 +1,100 @@
+# encoding: utf-8
+
+class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
+
+  def test_all_files_in_follows_symlinks_to_dirs
+    # Write sample files
+    (0..15).each do |i|
+      FileUtils.mkdir_p("dir#{i}")
+      File.open("dir#{i}/foo.md", 'w') { |io| io.write('o hai') }
+    end
+    (1..10).each do |i|
+      File.symlink("../dir#{i}", "dir#{i-1}/sub")
+    end
+
+    # Check
+    # 11 expected files (follow symlink 10 times)
+    # sort required because 10 comes before 2
+    expected_files = [
+      'dir0/foo.md',
+      'dir0/sub/foo.md',
+      'dir0/sub/sub/foo.md',
+      'dir0/sub/sub/sub/foo.md',
+      'dir0/sub/sub/sub/sub/foo.md',
+      'dir0/sub/sub/sub/sub/sub/foo.md',
+      'dir0/sub/sub/sub/sub/sub/sub/foo.md',
+      'dir0/sub/sub/sub/sub/sub/sub/sub/foo.md',
+      'dir0/sub/sub/sub/sub/sub/sub/sub/sub/foo.md',
+      'dir0/sub/sub/sub/sub/sub/sub/sub/sub/sub/foo.md',
+      'dir0/sub/sub/sub/sub/sub/sub/sub/sub/sub/sub/foo.md'
+    ]
+    actual_files = Nanoc::Extra::FilesystemTools.all_files_in('dir0').sort
+    assert_equal expected_files, actual_files
+  end
+
+  def test_all_files_in_follows_symlinks_to_dirs_too_many
+    # Write sample files
+    (0..15).each do |i|
+      FileUtils.mkdir_p("dir#{i}")
+      File.open("dir#{i}/foo.md", 'w') { |io| io.write('o hai') }
+    end
+    (1..15).each do |i|
+      File.symlink("../dir#{i}", "dir#{i-1}/sub")
+    end
+
+    assert_raises Nanoc::Extra::FilesystemTools::MaxSymlinkDepthExceededError do
+      Nanoc::Extra::FilesystemTools.all_files_in('dir0')
+    end
+  end
+
+  def test_all_files_in_relativizes_directory_names
+    FileUtils.mkdir('foo')
+    FileUtils.mkdir('bar')
+
+    File.open('foo/x.md', 'w') { |io| io.write('o hai from foo/x') }
+    File.open('bar/y.md', 'w') { |io| io.write('o hai from bar/y') }
+
+    File.symlink('../bar', 'foo/barlink')
+
+    expected_files = [ 'foo/barlink/y.md', 'foo/x.md' ]
+    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('foo').sort
+    assert_equal expected_files, actual_files
+  end
+
+  def test_all_files_in_follows_symlinks_to_files
+    # Write sample files
+    File.open('bar', 'w') { |io| io.write('o hai from bar') }
+    FileUtils.mkdir_p('dir')
+    File.open('dir/foo', 'w') { |io| io.write('o hai from foo') }
+    File.symlink('../bar', 'dir/bar-link')
+
+    # Check
+    expected_files = [ 'dir/bar-link', 'dir/foo' ]
+    actual_files   = Nanoc::Extra::FilesystemTools.all_files_in('dir').sort
+    assert_equal expected_files, actual_files
+  end
+
+  def test_resolve_symlink
+    File.open('foo', 'w') { |io| io.write('o hai') }
+    File.symlink('foo', 'bar')
+    File.symlink('bar', 'baz')
+    File.symlink('baz', 'qux')
+
+    expected = File.expand_path('foo')
+    actual   = Nanoc::Extra::FilesystemTools.resolve_symlink('qux')
+    assert_equal expected, actual
+  end
+
+  def test_resolve_symlink_too_many
+    File.open('foo', 'w') { |io| io.write('o hai') }
+    File.symlink('foo', 'symlin-0')
+    (1..7).each do |i|
+      File.symlink("symlink-#{i-1}", "symlink-#{i}")
+    end
+
+    assert_raises Nanoc::Extra::FilesystemTools::MaxSymlinkDepthExceededError do
+      Nanoc::Extra::FilesystemTools.resolve_symlink('symlink-7')
+    end
+  end
+
+end

data/test/filters/test_pandoc.rb

@@ -13,7 +13,7 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
 
       # Run filter
       result = filter.setup_and_run("# Heading\n")
-      assert_equal("<h1 id=\"heading\">Heading</h1>", result)
+      assert_match(%r{<h1 id=\"heading\">Heading</h1>\s*}, result)
     end
   end
 

data/test/filters/test_relativize_paths.rb

@@ -750,5 +750,28 @@ XML
     end
   end
 
+  def test_filter_html_doctype
+    # Create filter with mock item
+    filter = Nanoc::Filters::RelativizePaths.new
+
+    # Mock item
+    filter.instance_eval do
+      @item_rep = Nanoc::ItemRep.new(
+        Nanoc::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/foo/bar/baz/'
+    end
+
+    # Set content
+    raw_content      = %[<!DOCTYPE html>]
+    expected_content = %[<!DOCTYPE html>]
+
+    # Test
+    actual_content = filter.setup_and_run(raw_content, :type => :html)
+    assert_equal(expected_content, actual_content)
+  end
 
 end

data/test/filters/test_uglify_js.rb

@@ -8,20 +8,22 @@ class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::UglifyJS.new
 
       # Run filter
-      result = filter.setup_and_run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)")
+      input = "foo = 1; (function(bar) { if (true) alert(bar); })(foo)"
+      result = filter.setup_and_run(input)
       assert_match(/foo=1,function\((.)\)\{alert\(\1\)\}\(foo\);/, result)
     end
   end
 
   def test_filter_with_options
-
     if_have 'uglifier' do
-      # Create filter
       filter = ::Nanoc::Filters::UglifyJS.new
+      input = "if(donkey) alert('It is a donkey!');"
 
-      # Run filter
-      result = filter.setup_and_run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)", :toplevel => true)
-      assert_match(/foo=1,function\((.)\)\{alert\(\1\)\}\(foo\);/, result)
+      result = filter.setup_and_run(input, output: { beautify: false })
+      assert_equal 'donkey&&alert("It is a donkey!");', result
+
+      result = filter.setup_and_run(input, output: { beautify: true })
+      assert_equal 'donkey && alert("It is a donkey!");', result
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -108,6 +108,7 @@ extra_rdoc_files:
 - README.md
 - NEWS.md
 files:
+- Architecture.md
 - ChangeLog
 - CONTRIBUTING.md
 - Gemfile
@@ -116,6 +117,7 @@ files:
 - NEWS.md
 - Rakefile
 - README.md
+- TODO.md
 - doc/yardoc_templates/default/layout/html/footer.erb
 - bin/nanoc
 - lib/nanoc/base/compilation/checksum_store.rb
@@ -216,6 +218,7 @@ files:
 - lib/nanoc/extra/deployers/rsync.rb
 - lib/nanoc/extra/deployers.rb
 - lib/nanoc/extra/file_proxy.rb
+- lib/nanoc/extra/filesystem_tools.rb
 - lib/nanoc/extra/link_collector.rb
 - lib/nanoc/extra/pruner.rb
 - lib/nanoc/extra/validators/links.rb
@@ -341,6 +344,7 @@ files:
 - test/extra/deployers/test_rsync.rb
 - test/extra/test_auto_compiler.rb
 - test/extra/test_file_proxy.rb
+- test/extra/test_filesystem_tools.rb
 - test/extra/test_link_collector.rb
 - test/extra/test_vcs.rb
 - test/extra/validators/test_links.rb