nanoc 4.9.2 → 4.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b913559b6a6971b80377035d086779ac7d799a7ffee38289778bec2e8a82cd7c
-  data.tar.gz: 28bb11a9f2146ace9c6a018a69bc11c766bfe29ee08fbce18923f4686bda8379
+  metadata.gz: d01ae1a36cc8bd7ac120b0f9f26ec0017083ec01086d2c954a45f0e4814b0fa7
+  data.tar.gz: f2bb6242846d090fb321f1136a70f955dba3b43696a0266965c225fb0fb13d7a
 SHA512:
-  metadata.gz: 9862f93c33f34a75792f371ff106bfe9119f61c0e052e648ef8caa66364e81adc91ec36d015b22f8f9faea4479839fe013edb388886785b7149089428bb57b69
-  data.tar.gz: 75f1f8f4039bc15ba041861696b80ededbf7fb67ed18f57b2c1b4e0cd65efef46a331e5ea6e659de37eb1e8c5f05dfea39a097a2d5f4d25a493410fd77e2ec3b
+  metadata.gz: 2180c9c63d7d19d2e87aafa2ffe0094d9685e8b0b821b7bb171ad016009668850c3aab9860f5d78a0704b90f93602f34587c987bcff748aafce1910ca4b43782
+  data.tar.gz: 53285c7562eb828a349f3d2ba42a0c022f4dd83a0e801432e5cffdf7d659e8755e9d742b4bd253d8fe05bef2ea293886892f8d57e270f2109f4f352715ee79f5

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.9.3 (2018-06-09)
+
+Enhancements:
+
+* Added an `:exclude` option to `relativize_paths`, to exclude certain paths from being relativized (#1340)
+
 ## 4.9.2 (2018-03-30)
 
 Fixes:

data/lib/nanoc/base/contracts_support.rb

@@ -6,11 +6,9 @@ module Nanoc::Int
     class Ignorer
       include Singleton
 
-      # rubocop:disable Style/MethodMissing
-      def method_missing(*_args)
+      def method_missing(*_args) # rubocop:disable Style/MethodMissingSuper
         self
       end
-      # rubocop:enable Style/MethodMissing
 
       def respond_to_missing?(*_args)
         true

data/lib/nanoc/cli/error_handler.rb

@@ -159,7 +159,7 @@ module Nanoc::CLI
       when Nanoc::Int::Errors::GenericTrivial, Errno::EADDRINUSE
         true
       when LoadError
-        GEM_NAMES.keys.include?(gem_name_from_load_error(error))
+        GEM_NAMES.key?(gem_name_from_load_error(error))
       else
         false
       end

data/lib/nanoc/cli/stack_trace_writer.rb

@@ -38,7 +38,7 @@ module Nanoc::CLI
         @stream.puts "  ... #{error.backtrace.size - count} lines omitted (see crash.log for details)"
       end
 
-      backtrace.each_with_index.to_a.reverse.each do |(item, index)|
+      backtrace.each_with_index.to_a.reverse_each do |(item, index)|
         if index.zero?
           @stream.puts "  #{item}"
         else

data/lib/nanoc/filters/relativize_paths.rb

@@ -8,6 +8,8 @@ module Nanoc::Filters
     require 'nanoc/helpers/link_to'
     include Nanoc::Helpers::LinkTo
 
+    DDMemoize.activate(self)
+
     SELECTORS = ['*/@href', '*/@src', 'object/@data', 'param[@name="movie"]/@content', 'form/@action', 'comment()'].freeze
 
     GCSE_SEARCH_WORKAROUND = 'nanoc__gcse_search__f7ac3462f628a053f86fe6563c0ec98f1fe45cee'
@@ -41,7 +43,7 @@ module Nanoc::Filters
       # Filter
       case params[:type]
       when :css
-        relativize_css(content)
+        relativize_css(content, params)
       when :html, :html5, :xml, :xhtml
         relativize_html_like(content, params)
       else
@@ -53,15 +55,37 @@ module Nanoc::Filters
 
     protected
 
-    def relativize_css(content)
+    def relativize_css(content, params)
       # FIXME: parse CSS the proper way using csspool or something
       content.gsub(/url\((['"]?)(\/(?:[^\/].*?)?)\1\)/) do
         quote = Regexp.last_match[1]
         path = Regexp.last_match[2]
-        'url(' + quote + relative_path_to(path) + quote + ')'
+
+        if exclude?(path, params)
+          Regexp.last_match[0]
+        else
+          'url(' + quote + relative_path_to(path) + quote + ')'
+        end
+      end
+    end
+
+    memoized def excludes(params)
+      raw = [params.fetch(:exclude, [])].flatten
+      raw.map do |exclusion|
+        case exclusion
+        when Regexp
+          exclusion
+        when String
+          /\A#{exclusion}(\z|\/)/
+        end
       end
     end
 
+    def exclude?(path, params)
+      # TODO: Use #match? on newer Ruby versions
+      excludes(params).any? { |ex| path =~ ex }
+    end
+
     def relativize_html_like(content, params)
       selectors             = params.fetch(:select, SELECTORS)
       namespaces            = params.fetch(:namespaces, {})
@@ -71,7 +95,7 @@ module Nanoc::Filters
       parser = parser_for(type)
       content = fix_content(content, type)
 
-      nokogiri_process(content, selectors, namespaces, parser, type, nokogiri_save_options)
+      nokogiri_process(content, selectors, namespaces, parser, type, nokogiri_save_options, params)
     end
 
     def parser_for(type)
@@ -104,7 +128,7 @@ module Nanoc::Filters
       end
     end
 
-    def nokogiri_process(content, selectors, namespaces, klass, type, nokogiri_save_options = nil)
+    def nokogiri_process(content, selectors, namespaces, klass, type, nokogiri_save_options, params)
       # Ensure that all prefixes are strings
       namespaces = namespaces.reduce({}) { |new, (prefix, uri)| new.merge(prefix.to_s => uri) }
 
@@ -114,8 +138,8 @@ module Nanoc::Filters
       selector = selectors.map { |sel| "descendant-or-self::#{sel}" }.join('|')
       doc.xpath(selector, namespaces).each do |node|
         if node.name == 'comment'
-          nokogiri_process_comment(node, doc, selectors, namespaces, klass, type)
-        elsif path_is_relativizable?(node.content)
+          nokogiri_process_comment(node, doc, selectors, namespaces, klass, type, params)
+        elsif path_is_relativizable?(node.content, params)
           node.content = relative_path_to(node.content)
         end
       end
@@ -139,20 +163,20 @@ module Nanoc::Filters
       content.gsub(GCSE_SEARCH_WORKAROUND, 'gcse:search')
     end
 
-    def nokogiri_process_comment(node, doc, selectors, namespaces, klass, type)
+    def nokogiri_process_comment(node, doc, selectors, namespaces, klass, type, params)
       content = node.content.dup.sub(%r{^(\s*\[.+?\]>\s*)(.+?)(\s*<!\[endif\])}m) do |_m|
         beginning = Regexp.last_match[1]
         body = Regexp.last_match[2]
         ending = Regexp.last_match[3]
 
-        beginning + nokogiri_process(body, selectors, namespaces, klass, type) + ending
+        beginning + nokogiri_process(body, selectors, namespaces, klass, type, nil, params) + ending
       end
 
       node.replace(Nokogiri::XML::Comment.new(doc, content))
     end
 
-    def path_is_relativizable?(path)
-      path.start_with?('/')
+    def path_is_relativizable?(path, params)
+      path.start_with?('/') && !exclude?(path, params)
     end
   end
 end

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.9.2'
+  VERSION = '4.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.9.2
+  version: 4.9.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.