nanoc3 3.2.0b2 → 3.2.0b3

data/lib/nanoc3/base/core_ext/array.rb

@@ -34,6 +34,7 @@ module Nanoc3::ArrayExtensions
   #
   # @since 3.2.0
   def freeze_recursively
+    return if self.frozen?
     freeze
     each do |value|
       if value.respond_to?(:freeze_recursively)
@@ -44,6 +45,16 @@ module Nanoc3::ArrayExtensions
     end
   end
 
+  # Calculates the checksum for this array. Any change to this array will
+  # result in a different checksum.
+  #
+  # @return [String] The checksum for this array
+  #
+  # @api private
+  def checksum
+    Marshal.dump(self).checksum
+  end
+
 end
 
 class Array

data/lib/nanoc3/base/core_ext/hash.rb

@@ -34,6 +34,7 @@ module Nanoc3::HashExtensions
   #
   # @since 3.2.0
   def freeze_recursively
+    return if self.frozen?
     freeze
     each_pair do |key, value|
       if value.respond_to?(:freeze_recursively)
@@ -51,7 +52,8 @@ module Nanoc3::HashExtensions
   #
   # @api private
   def checksum
-    Marshal.dump(self).checksum
+    array = self.to_a.sort_by { |kv| kv[0] }
+    array.checksum
   end
 
 end

data/lib/nanoc3/base/result_data/item_rep.rb

@@ -391,19 +391,21 @@ module Nanoc3
       Nanoc3::NotificationCenter.post(:visit_started, layout)
       Nanoc3::NotificationCenter.post(:visit_ended,   layout)
 
-      # Notify start
-      Nanoc3::NotificationCenter.post(:processing_started, layout)
-      Nanoc3::NotificationCenter.post(:filtering_started,  self, filter_name)
-
-      # Layout
-      @content[:last] = filter.run(layout.raw_content, filter_args)
-
-      # Create "post" snapshot
-      snapshot(:post, :final => false)
-    ensure
-      # Notify end
-      Nanoc3::NotificationCenter.post(:filtering_ended,    self, filter_name)
-      Nanoc3::NotificationCenter.post(:processing_ended,   layout)
+      begin
+        # Notify start
+        Nanoc3::NotificationCenter.post(:processing_started, layout)
+        Nanoc3::NotificationCenter.post(:filtering_started,  self, filter_name)
+
+        # Layout
+        @content[:last] = filter.run(layout.raw_content, filter_args)
+
+        # Create "post" snapshot
+        snapshot(:post, :final => false)
+      ensure
+        # Notify end
+        Nanoc3::NotificationCenter.post(:filtering_ended,    self, filter_name)
+        Nanoc3::NotificationCenter.post(:processing_ended,   layout)
+      end
     end
 
     # Creates a snapshot of the current compiled item content.

data/lib/nanoc3/cli/command.rb

@@ -60,6 +60,25 @@ module Nanoc3::CLI
     def run
     end
 
+    # Gets the site ({Nanoc3::Site} instance) in the current directory and
+    # loads its data.
+    #
+    # @return [Nanoc3::Site] The site in the current working directory
+    def site
+      # Load site if possible
+      @site ||= nil
+      if File.file?('config.yaml') && @site.nil?
+        begin
+          @site = Nanoc3::Site.new('.')
+        rescue Nanoc3::Errors::UnknownDataSource => e
+          $stderr.puts "Unknown data source: #{e}"
+          exit 1
+        end
+      end
+
+      @site
+    end
+
   protected
 
     # @return [Boolean] true if debug output is enabled, false if not
@@ -83,25 +102,6 @@ module Nanoc3::CLI
       end
     end
 
-    # Gets the site ({Nanoc3::Site} instance) in the current directory and
-    # loads its data.
-    #
-    # @return [Nanoc3::Site] The site in the current working directory
-    def site
-      # Load site if possible
-      @site ||= nil
-      if File.file?('config.yaml') && @site.nil?
-        begin
-          @site = Nanoc3::Site.new('.')
-        rescue Nanoc3::Errors::UnknownDataSource => e
-          $stderr.puts "Unknown data source: #{e}"
-          exit 1
-        end
-      end
-
-      @site
-    end
-
     # Sets the data source's VCS to the VCS with the given name. Does nothing
     # when the site's data source does not support VCSes (i.e. does not
     # implement #vcs=).

data/lib/nanoc3/cli/commands/compile.rb

@@ -97,17 +97,25 @@ module Nanoc3::CLI::Commands
       end
 
       # Debug notifications
-      Nanoc3::NotificationCenter.on(:compilation_started) do |rep|
-        puts "*** Started compilation of #{rep.inspect}" if self.debug?
-      end
-      Nanoc3::NotificationCenter.on(:compilation_ended) do |rep|
-        puts "*** Ended compilation of #{rep.inspect}" if self.debug?
-      end
-      Nanoc3::NotificationCenter.on(:compilation_failed) do |rep|
-        puts "*** Suspended compilation of #{rep.inspect} due to unmet dependencies" if self.debug?
-      end
-      Nanoc3::NotificationCenter.on(:cached_content_used) do |rep|
-        puts "*** Used cached compiled content for #{rep.inspect} instead of recompiling" if self.debug?
+      if self.debug?
+        Nanoc3::NotificationCenter.on(:compilation_started) do |rep|
+          puts "*** Started compilation of #{rep.inspect}"
+        end
+        Nanoc3::NotificationCenter.on(:compilation_ended) do |rep|
+          puts "*** Ended compilation of #{rep.inspect}"
+        end
+        Nanoc3::NotificationCenter.on(:compilation_failed) do |rep|
+          puts "*** Suspended compilation of #{rep.inspect} due to unmet dependencies"
+        end
+        Nanoc3::NotificationCenter.on(:cached_content_used) do |rep|
+          puts "*** Used cached compiled content for #{rep.inspect} instead of recompiling"
+        end
+        Nanoc3::NotificationCenter.on(:filtering_started) do |rep, filter_name|
+          puts "*** Started filtering #{rep.inspect} with #{filter_name}"
+        end
+        Nanoc3::NotificationCenter.on(:filtering_ended) do |rep, filter_name|
+          puts "*** Ended filtering #{rep.inspect} with #{filter_name}"
+        end
       end
 
       # Timing notifications

data/lib/nanoc3/cli/commands/view.rb

@@ -3,7 +3,7 @@
 usage       'view [options]'
 summary     'start the web server that serves static files'
 description <<-EOS
-Start the static web server. Unless specified, the web server will run on port 3000 and listen on all IP addresses. Running the autocompiler requires 'adsf' and 'rack'.
+Start the static web server. Unless specified, the web server will run on port 3000 and listen on all IP addresses. Running this static web server requires 'adsf' (not 'asdf'!).
 EOS
 
 option :H, :handler, 'specify the handler to use (webrick/mongrel/...)'
@@ -19,8 +19,8 @@ module Nanoc3::CLI::Commands
   class View < ::Nanoc3::CLI::Command
 
     def run
+      load_adsf
       require 'rack'
-      require 'adsf'
 
       # Make sure we are in a nanoc site directory
       self.require_site
@@ -55,6 +55,30 @@ module Nanoc3::CLI::Commands
       handler.run(app, options_for_rack)
     end
 
+  protected
+
+    def load_adsf
+      # Load adsf
+      begin
+        require 'adsf'
+        return
+      rescue LoadError
+        $stderr.puts "Could not find the required 'adsf' gem, " \
+          "which is necessary for the view command."
+      end
+
+      # Check asdf
+      begin
+        require 'asdf'
+        $stderr.puts "You appear to have 'asdf' installed, " \
+          "but not 'adsf'. Please install 'adsf' (check the spelling)!"
+      rescue LoadError
+      end
+
+      # Done
+      exit 1
+    end
+
   end
 
 end

data/lib/nanoc3/cli.rb

@@ -104,7 +104,7 @@ protected
   def self.load_command_at(filename, command_name=nil)
     # Load
     code = File.read(filename)
-    cmd = Cri::Command.define(code)
+    cmd = Cri::Command.define(code, filename)
 
     # Set name
     command_name ||= File.basename(filename, '.rb')

data/lib/nanoc3/helpers/rendering.rb

@@ -91,23 +91,27 @@ module Nanoc3::Helpers
       # Create filter
       filter = filter_class.new(assigns)
 
-      # Notify start
-      Nanoc3::NotificationCenter.post(:processing_started, layout)
-
-      # Layout
-      result = filter.run(layout.raw_content, filter_args)
-
-      # Append to erbout if we have a block
-      if block_given?
-        erbout = eval('_erbout', block.binding)
-        erbout << result
+      begin
+        # Notify start
+        Nanoc3::NotificationCenter.post(:processing_started, layout)
+
+        # Layout
+        result = filter.run(layout.raw_content, filter_args)
+
+        # Append to erbout if we have a block
+        if block_given?
+          # Append result and return nothing
+          erbout = eval('_erbout', block.binding)
+          erbout << result
+          ''
+        else
+          # Return result
+          result
+        end
+      ensure
+        # Notify end
+        Nanoc3::NotificationCenter.post(:processing_ended, layout)
       end
-
-      # Done
-      result
-    ensure
-      # Notify end
-      Nanoc3::NotificationCenter.post(:processing_ended, layout)
     end
 
   end

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.2.0b2'
+  VERSION = '3.2.0b3'
 
 end
 

data/test/base/core_ext/array_spec.rb

@@ -50,4 +50,24 @@ describe 'Array#freeze_recursively' do
     assert raised
   end
 
+  it 'should not freeze infinitely' do
+    a = []
+    a << a
+
+    a.freeze_recursively
+
+    assert a.frozen?
+    assert a[0].frozen?
+    assert_equal a, a[0]
+  end
+
+end
+
+describe 'Array#checksum' do
+
+  it 'should work' do
+    expectation = '78468f950645150238a26f5b8f2dde39a75a7028'
+    [ [ :foo, 123 ]].checksum.must_equal expectation
+  end
+
 end

data/test/base/core_ext/hash_spec.rb

@@ -68,13 +68,31 @@ describe 'Hash#freeze_recursively' do
     assert raised
   end
 
+  it 'should not freeze infinitely' do
+    a = {}
+    a[:x] = a
+
+    a.freeze_recursively
+
+    assert a.frozen?
+    assert a[:x].frozen?
+    assert_equal a, a[:x]
+  end
+
 end
 
 describe 'Hash#checksum' do
 
   it 'should work' do
-    expectation = 'fec9ae7163e8b8d57a15d51821d2c68d4a6bb169'
+    expectation = '78468f950645150238a26f5b8f2dde39a75a7028'
     { :foo => 123 }.checksum.must_equal expectation
+    [ [ :foo, 123 ]].checksum.must_equal expectation
+  end
+
+  it 'should sort keys' do
+    a = { :a => 1, :c => 2, :b => 3 }.checksum
+    b = { :a => 1, :b => 3, :c => 2 }.checksum
+    a.must_equal b
   end
 
 end

data/test/cli/test_cli.rb

@@ -95,6 +95,7 @@ EOS
       # Check error output
       stderr_addition = $stderr.string[position_before, position_after]
       assert_match(/=== BACKTRACE:/, stderr_addition)
+      assert_match(/commands\/_test.rb/, stderr_addition)
     end
   end
 

data/test/extra/test_auto_compiler.rb

@@ -396,20 +396,22 @@ class Nanoc3::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
   end
 
   def test_call_with_uri_encoded_path
-    # Create autocompiler
-    autocompiler = Nanoc3::Extra::AutoCompiler.new('.')
-
-    # Mock dependencies
-    site = mock
-    site.stubs(:config).returns({ :output_dir => 'output/' })
-    site.stubs(:items).returns([])
-    autocompiler.stubs(:build_site)
-    autocompiler.stubs(:site).returns(site)
-
-    # Test
-    result = autocompiler.call('PATH_INFO' => '/%73oftware')
-    assert_equal 404, result[0]
-    assert_match "File not found: /software\n", result[2][0]
+    if_have 'rack' do
+      # Create autocompiler
+      autocompiler = Nanoc3::Extra::AutoCompiler.new('.')
+
+      # Mock dependencies
+      site = mock
+      site.stubs(:config).returns({ :output_dir => 'output/' })
+      site.stubs(:items).returns([])
+      autocompiler.stubs(:build_site)
+      autocompiler.stubs(:site).returns(site)
+
+      # Test
+      result = autocompiler.call('PATH_INFO' => '/%73oftware')
+      assert_equal 404, result[0]
+      assert_match "File not found: /software\n", result[2][0]
+    end
   end
 
 end

data/test/filters/test_asciidoc.rb

@@ -5,16 +5,18 @@ class Nanoc3::Filters::AsciiDocTest < MiniTest::Unit::TestCase
   include Nanoc3::TestHelpers
 
   def test_filter
-    if `which asciidoc`.strip.empty?
-      skip "could not find asciidoc"
-    end
+    if_have 'systemu' do
+      if `which asciidoc`.strip.empty?
+        skip "could not find asciidoc"
+      end
 
-    # Create filter
-    filter = ::Nanoc3::Filters::AsciiDoc.new
+      # Create filter
+      filter = ::Nanoc3::Filters::AsciiDoc.new
 
-    # Run filter
-    result = filter.run("== Blah blah")
-    assert_match %r{<h2 id="_blah_blah">Blah blah</h2>}, result
+      # Run filter
+      result = filter.run("== Blah blah")
+      assert_match %r{<h2 id="_blah_blah">Blah blah</h2>}, result
+    end
   end
 
 end

data/test/filters/test_colorize_syntax.rb

@@ -65,7 +65,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
   end
 
   def test_pygmentize
-    if_have 'nokogiri' do
+    if_have 'nokogiri', 'systemu' do
       if `which pygmentize`.strip.empty?
         skip "could not find pygmentize"
       end
@@ -84,7 +84,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
   end
 
   def test_simon_highlight
-    if_have 'nokogiri' do
+    if_have 'nokogiri', 'systemu' do
       if `which highlight`.strip.empty?
         skip "could not find `highlight`"
       end
@@ -150,7 +150,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
       return
     end
 
-    if_have 'nokogiri' do
+    if_have 'nokogiri', 'systemu' do
       # Create filter
       filter = ::Nanoc3::Filters::ColorizeSyntax.new
 
@@ -165,7 +165,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
   end
 
   def test_colorize_syntax_with_missing_executables
-    if_have 'nokogiri' do
+    if_have 'nokogiri', 'systemu' do
       begin
         original_path = ENV['PATH']
         ENV['PATH'] = './blooblooblah'

data/test/filters/test_redcarpet.rb

@@ -5,7 +5,9 @@ class Nanoc3::Filters::RedcarpetTest < MiniTest::Unit::TestCase
   include Nanoc3::TestHelpers
 
   def test_find
-    refute Nanoc3::Filter.named(:redcarpet).nil?
+    if_have 'redcarpet' do
+      refute Nanoc3::Filter.named(:redcarpet).nil?
+    end
   end
 
   def test_filter

data/test/helpers/test_rendering.rb

@@ -77,11 +77,12 @@ class Nanoc3::Helpers::RenderingTest < MiniTest::Unit::TestCase
       end
 
       _erbout = '[erbout-before]'
-      render '/foo/' do
+      result = render '/foo/' do
         _erbout << "This is some extra content"
       end
 
       assert_equal('[erbout-before][partial-before]This is some extra content[partial-after]', _erbout)
+      assert_equal '', result
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: nanoc3
 version: !ruby/object:Gem::Version 
   prerelease: 5
-  version: 3.2.0b2
+  version: 3.2.0b3
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-16 00:00:00 Z
+date: 2011-07-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cri