nanoc 3.3.4 → 3.3.5

data/Gemfile

@@ -19,6 +19,7 @@ gem 'mustache'
 gem 'nokogiri'
 gem 'pygments.rb'
 gem 'rack'
+gem 'rake'
 gem 'rainpress'
 gem 'rdiscount'
 gem 'rdoc'

data/NEWS.md

@@ -1,5 +1,9 @@
 # nanoc news
 
+## 3.3.5 (2012-04-23)
+
+* Fixed issue with relative_link_to not working properly
+
 ## 3.3.4 (2012-04-23)
 
 * Fixed bug which caused the compilation stack to be empty

data/lib/nanoc/filters/relativize_paths.rb

@@ -67,7 +67,7 @@ module Nanoc::Filters
       end
     end
 
-  private
+  protected
 
     def nokogiri_process(content, selectors, namespaces, klass, type)
       # Ensure that all prefixes are strings
@@ -76,18 +76,27 @@ module Nanoc::Filters
       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)
+          if self.path_is_relativizable?(node.content)
+            node.content = relative_path_to(node.content)
+          end
         end
       end
       result = doc.send("to_#{type}")
 
       # FIXME cleanup because it is ugly
-      # Because using the `Nokogiri::XML::DocumentFragment` class DOCTYPE 
+      # # Because using the `Nokogiri::XML::DocumentFragment` class DOCTYPE 
       # pseudonodes becomes even more creepy than usual.
       result.sub!(/(!DOCTYPE.+?)(&gt;)/, '<\1>')
 
       result
     end
 
+    def path_is_relativizable?(s)
+      require 'uri'
+      return false if s =~ URI.regexp
+      return false if s[0,1] == '#'
+      return true
+    end
+
   end
 end

data/lib/nanoc/helpers/link_to.rb

@@ -121,7 +121,9 @@ module Nanoc::Helpers
         path = target
       else
         path = target.path
-        raise RuntimeError, "Cannot get the relative path to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if path.nil?
+        if path.nil?
+          raise "Cannot get the relative path to #{target.inspect} because this target is not outputted (its routing rule returns nil)"
+        end
       end
 
       # Handle Windows network (UNC) paths
@@ -131,7 +133,9 @@ module Nanoc::Helpers
 
       # 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?
+      if @item_rep.path.nil?
+        raise "Cannot get the relative path to #{path} because the current item representation, #{@item_rep.inspect}, is not outputted (its routing rule returns nil)"
+      end
       src_path   = Pathname.new(@item_rep.path)
 
       # Calculate the relative path (method depends on whether destination is

data/lib/nanoc.rb

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

data/test/filters/test_relativize_paths.rb

@@ -197,6 +197,54 @@ class Nanoc::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
     assert_equal(expected_content, actual_content)
   end
 
+  def test_filter_html_with_anchor
+    # 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 = '/woof/meow/'
+    end
+
+    # Set content
+    raw_content      = %[<a href="#max-payne">Max Payne</a>]
+    expected_content = %[<a href="#max-payne">Max Payne</a>]
+
+    # Test
+    actual_content = filter.run(raw_content, :type => :html)
+    assert_equal(expected_content, actual_content)
+  end
+
+  def test_filter_html_with_url
+    # 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 = '/woof/meow/'
+    end
+
+    # Set content
+    raw_content      = %[<a href="http://example.com/">Example</a>]
+    expected_content = %[<a href="http://example.com/">Example</a>]
+
+    # Test
+    actual_content = filter.run(raw_content, :type => :html)
+    assert_equal(expected_content, actual_content)
+  end
+
   def test_filter_implicit
     # Create filter with mock item
     filter = Nanoc::Filters::RelativizePaths.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -123,7 +123,6 @@ extra_rdoc_files:
 files:
 - ChangeLog
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS.md
 - Rakefile

data/Gemfile.lock

@@ -1,135 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nanoc (3.3.4)
-      cri (~> 2.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    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)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.2.0)
-    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)
-    less (2.1.0)
-      commonjs (~> 0.2.0)
-      therubyracer (~> 0.10.0)
-    libv8 (3.3.10.4)
-    markaby (0.7.2)
-      builder (>= 2.0.0)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    metaclass (0.0.1)
-    mime-types (1.18)
-    minitest (2.12.0)
-    mocha (0.10.5)
-      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)
-    rdiscount (1.6.8)
-    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)
-      tilt (~> 1.3.3)
-    syntax (1.0.0)
-    systemu (2.5.0)
-    temple (0.4.0)
-    therubyracer (0.10.1)
-      libv8 (~> 3.3.10)
-    tilt (1.3.3)
-    typogruby (1.0.15)
-      rubypants
-    uglifier (1.2.4)
-      execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    w3c_validators (1.2)
-      json
-      nokogiri
-    yard (0.7.5)
-    yuicompressor (1.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  albino
-  bluecloth
-  builder
-  coderay
-  coffee-script
-  erubis
-  fog
-  haml
-  kramdown
-  less (~> 2.0)
-  markaby
-  maruku
-  mime-types
-  minitest
-  mocha
-  mustache
-  nanoc!
-  nokogiri
-  pygments.rb
-  rack
-  rainpress
-  rake
-  rdiscount
-  rdoc
-  redcarpet
-  rubypants
-  sass (~> 3.1)
-  slim
-  systemu
-  typogruby
-  uglifier
-  w3c_validators
-  yard
-  yuicompressor