nanoc 3.3.3 → 3.3.4

data/Gemfile

@@ -8,6 +8,7 @@ gem 'builder'
 gem 'coderay'
 gem 'coffee-script'
 gem 'erubis'
+gem 'fog'
 gem 'haml'
 gem 'kramdown'
 gem 'less', '~> 2.0'
@@ -16,6 +17,7 @@ gem 'maruku'
 gem 'mime-types'
 gem 'mustache'
 gem 'nokogiri'
+gem 'pygments.rb'
 gem 'rack'
 gem 'rainpress'
 gem 'rdiscount'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.3.2)
+    nanoc (3.3.4)
       cri (~> 2.2)
 
 GEM
@@ -10,6 +10,7 @@ GEM
     RedCloth (4.2.9)
     albino (1.3.3)
       posix-spawn (>= 0.3.6)
+    blankslate (2.1.2.4)
     bluecloth (2.2.0)
     builder (3.0.0)
     coderay (1.0.6)
@@ -20,8 +21,21 @@ GEM
     commonjs (0.2.5)
     cri (2.2.1)
     erubis (2.7.0)
+    excon (0.13.4)
     execjs (1.3.0)
       multi_json (~> 1.0)
+    ffi (1.0.11)
+    fog (1.3.1)
+      builder
+      excon (~> 0.13.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.0.4)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.1)
     haml (3.1.4)
     json (1.6.6)
     kramdown (0.13.5)
@@ -40,8 +54,13 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.2.0)
     mustache (0.99.4)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.3.0)
     nokogiri (1.5.2)
     posix-spawn (0.3.6)
+    pygments.rb (0.2.12)
+      rubypython (~> 0.5.3)
     rack (1.4.1)
     rainpress (1.0)
     rake (0.9.2.2)
@@ -49,7 +68,11 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.1.1)
+    ruby-hmac (0.4.0)
     rubypants (0.2.0)
+    rubypython (0.5.3)
+      blankslate (>= 2.1.2.3)
+      ffi (~> 1.0.7)
     sass (3.1.15)
     slim (1.2.0)
       temple (~> 0.4.0)
@@ -82,6 +105,7 @@ DEPENDENCIES
   coderay
   coffee-script
   erubis
+  fog
   haml
   kramdown
   less (~> 2.0)
@@ -93,6 +117,7 @@ DEPENDENCIES
   mustache
   nanoc!
   nokogiri
+  pygments.rb
   rack
   rainpress
   rake

data/NEWS.md

@@ -1,12 +1,17 @@
 # nanoc news
 
+## 3.3.4 (2012-04-23)
+
+* Fixed bug which caused the compilation stack to be empty
+* Restored Ruby 1.8 compatibility
+
 ## 3.3.3 (2012-04-11)
 
 * Fixed directed graph implementation on Rubinius
 * Made capturing helper not remember content between runs
 * Fixed Date#freeze issue on Ruby 1.8.x
 * Made it possible to have any kind of object as parameters in the Rules file
-* Fixed bug which caused changes routes not to cause a recompile
+* Fixed bug which caused changed routes not to cause a recompile
 
 ## 3.3.2 (2012-03-16)
 

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.3.3'
+  VERSION = '3.3.4'
 
   # @return [String] A string containing information about this nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).

data/lib/nanoc/base/compilation/compiler.rb

@@ -385,14 +385,14 @@ module Nanoc
 
       rep.compiled = true
       compiled_content_cache[rep] = rep.content
+
+      Nanoc::NotificationCenter.post(:visit_ended,       rep.item)
+      Nanoc::NotificationCenter.post(:processing_ended,  rep)
+      Nanoc::NotificationCenter.post(:compilation_ended, rep)
     rescue => e
       rep.forget_progress
       Nanoc::NotificationCenter.post(:compilation_failed, rep, e)
       raise e
-    ensure
-      Nanoc::NotificationCenter.post(:visit_ended,       rep.item)
-      Nanoc::NotificationCenter.post(:processing_ended,  rep)
-      Nanoc::NotificationCenter.post(:compilation_ended, rep)
     end
 
     # Clears the list of dependencies for items that will be recompiled.

data/lib/nanoc/base/compilation/rules_collection.rb

@@ -210,7 +210,7 @@ module Nanoc
     def make_rule_memory_serializable(rs)
       rs.map do |r|
         if r[0] == :filter
-          [ r[0], r[1], r[2].to_a.sort.map { |a| a.inspect }  ]
+          [ r[0], r[1], r[2].to_a.map { |a| a.inspect }  ]
         else
           r
         end

data/lib/nanoc/filters/relativize_paths.rb

@@ -34,21 +34,23 @@ module Nanoc::Filters
 
       # Filter
       case params[:type]
-      when :html
-        # FIXME parse HTML the proper way using nokogiri
-        content.gsub(/(<[^>]+\s+(src|href))=(['"]?)(\/(?:[^\/].*?)?)\3([\s\/>])/) do
-          $1 + '=' + $3 + relative_path_to($4) + $3 + $5
-        end
       when :css
         # FIXME parse CSS the proper way using csspool or something
         content.gsub(/url\((['"]?)(\/(?:[^\/].*?)?)\1\)/) do
           'url(' + $1 + relative_path_to($2) + $1 + ')'
         end
-      when :xml, :xhtml
+      when :html, :xml, :xhtml
         selectors  = params.fetch(:select) { SELECTORS }
         namespaces = params[:namespaces] || {}
 
-        if params[:type] == :xhtml
+        require 'nokogiri'
+        case params[:type]
+        when :html
+          klass = ::Nokogiri::HTML
+        when :xml
+          klass = ::Nokogiri::XML
+        when :xhtml
+          klass = ::Nokogiri::XML
           # FIXME cleanup because it is ugly
           # this cleans the XHTML namespace to process fragments and full
           # documents in the same way. At least, Nokogiri adds this namespace
@@ -56,7 +58,7 @@ module Nanoc::Filters
           content.sub!(%r{(<html[^>]+)xmlns="http://www.w3.org/1999/xhtml"}, '\1')
         end
 
-        nokogiri_process(content, selectors, namespaces, params[:type])
+        nokogiri_process(content, selectors, namespaces, klass, params[:type])
       else
         raise RuntimeError.new(
           "The relativize_paths needs to know the type of content to " +
@@ -67,13 +69,11 @@ module Nanoc::Filters
 
   private
 
-    def nokogiri_process(content, selectors, namespaces, type)
-      require 'nokogiri'
-
+    def nokogiri_process(content, selectors, namespaces, klass, type)
       # Ensure that all prefixes are strings
       namespaces = namespaces.inject({}) { |new, (prefix, uri)| new.merge(prefix.to_s => uri) }
 
-      doc = ::Nokogiri::XML.fragment(content)
+      doc = klass.fragment(content)
       selectors.map { |sel| "descendant-or-self::#{sel}" }.each do |selector|
         doc.xpath(selector, namespaces).each do |node|
           node.content = relative_path_to(node.content)
@@ -88,7 +88,6 @@ module Nanoc::Filters
 
       result
     end
-    
-    
+
   end
-end
+end

data/lib/nanoc/helpers/link_to.rb

@@ -124,6 +124,11 @@ module Nanoc::Helpers
         raise RuntimeError, "Cannot get the relative path to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if path.nil?
       end
 
+      # Handle Windows network (UNC) paths
+      if path.start_with?('//') || path.start_with?('\\\\')
+        return path
+      end
+
       # Get source and destination paths
       dst_path   = Pathname.new(path)
       raise RuntimeError, "Cannot get the relative path to #{path} because the current item representation, #{@item_rep.inspect}, is not outputted (its routing rule returns nil)" if @item_rep.path.nil?

data/test/base/test_outdatedness_checker.rb

@@ -399,7 +399,7 @@ class Nanoc::OutdatednessCheckerTest < MiniTest::Unit::TestCase
         io.write("compile '/' do\n")
         io.write("  c = Class.new {}\n")
         io.write("  def c.inspect ; 'I am so classy' ; end\n")
-        io.write("  filter :erb, :stuff => c\n")
+        io.write("  filter :erb, :stuff => c, :more => 123\n")
         io.write("end\n")
         io.write("\n")
         io.write("route '/' do\n")

data/test/filters/test_relativize_paths.rb

@@ -46,7 +46,7 @@ class Nanoc::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Set content
     raw_content      = %[<a href='/foo'>foo</a>]
-    expected_content = %[<a href='../..'>foo</a>]
+    expected_content = %[<a href="../..">foo</a>]
 
     # Test
     actual_content = filter.run(raw_content, :type => :html)
@@ -70,7 +70,7 @@ class Nanoc::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
 
     # Set content
     raw_content      = %[<a href=/foo>foo</a>]
-    expected_content = %[<a href=../..>foo</a>]
+    expected_content = %[<a href="../..">foo</a>]
 
     # Test
     actual_content = filter.run(raw_content, :type => :html)
@@ -101,6 +101,30 @@ class Nanoc::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
     assert_equal(expected_content, actual_content)
   end
 
+  def test_filter_html_nested
+    # 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      = %[<a href="/"><img src="/bar.png" /></a>]
+    expected_content = %[<a href="../../../"><img src="../../../bar.png"></a>]
+
+    # Test
+    actual_content = filter.run(raw_content, :type => :html)
+    assert_equal(expected_content, actual_content)
+  end
+
   def test_filter_html_outside_tag
     # Create filter with mock item
     filter = Nanoc::Filters::RelativizePaths.new
@@ -530,4 +554,4 @@ XML
   end
 
 
-end
+end

data/test/helpers/test_link_to.rb

@@ -200,6 +200,13 @@ class Nanoc::Helpers::LinkToTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_relative_path_to_to_windows_path
+    @item_rep = mock
+    @item_rep.stubs(:path).returns('/foo/quux/')
+
+    assert_equal '//mydomain/tahontaenrat', relative_path_to('//mydomain/tahontaenrat')
+  end
+
   def test_examples_link_to
     # Parse
     YARD.parse('../lib/nanoc/helpers/link_to.rb')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized