nanoc 4.11.5 → 4.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e67e26b0ffd077aa8a4c28ecf16e992f75486e70d8695868b166b789ad2a66
-  data.tar.gz: 9b09738037843e30d6c3c947825c5b2c3cdfeb9597e398534c97c6036a50adaa
+  metadata.gz: 4f496f51806769179378bf62baf2dbb44b25d30d693b6633e660e4fcbb231018
+  data.tar.gz: 0f5537bcfaf52c942b5f9e700f6db79cea7e377a26ff5efa06ee1f268d0b5bbd
 SHA512:
-  metadata.gz: 78a5a649be27147d22e1bed0a0599db2bf1d013233cc0af24476257e1703b49351f6f268f3d617eaebf9efd74514c1f68f3d37b5254005317393119a78c3a330
-  data.tar.gz: ac3fab845b4a1677d19577965ecc683b0977528391d447337fdf4cfd358f1acfd40108e12759ebf7aa8a284261496c92f3f671face43ec35d36fbaa81cea8fad
+  metadata.gz: 5d2c628542ba571d14a032338e4f8cc7ccf27d35836f727056d8fb68621065118dfdd3f5f53bf91eea5734de66cfde6f74478345f748129a88f30c9fd47dec6e
+  data.tar.gz: 89e5f4747eb9596dc3af6c905600672ba1be957d350f13508443836450d58121bb81fa6082efe8fed95763fe3fec2298bfa36f543021c2343ebc4dcd0bc9905e

data/NEWS.md

@@ -1,5 +1,18 @@
 # Nanoc news
 
+## 4.11.6 (2019-07-06)
+
+Fixes:
+
+* Fixed crash in the `show-data` command when printing layout outdatedness (#1432)
+* Fixed crash in the `view` command when host/port is not specified
+
+Enhancements:
+
+* Added `#env_name` to `@config` (#1437)
+* Made the `external_links` checker detect more kinds of broken links (#1422) [Daniel Aleksandersen]
+* Made the `external_links` checker shuffle the list of links (#1429) [Daniel Aleksandersen]
+
 ## 4.11.5 (2019-04-30)
 
 Fixes:
@@ -18,6 +31,7 @@ Enhancements:
 
 * Set a User-Agent for HTTP requests made by the `external_links` check (#1417) [Daniel Aleksandersen]
 * Added `atom:link[type]` attributes (#1415) [Daniel Aleksandersen]
+* Made the `external_links` check treat permanent redirects as errors (#1419) [Daniel Aleksandersen]
 
 ## 4.11.2 (2019-02-16)
 

data/lib/nanoc/base/services/outdatedness_checker.rb

@@ -156,11 +156,14 @@ module Nanoc
         @_basic ||= Basic.new(outdatedness_checker: self, reps: @reps)
       end
 
-      contract C_ITEM_OR_REP, Hamster::Set => C::Bool
+      contract C_OBJ, Hamster::Set => C::Bool
       def outdated_due_to_dependencies?(obj, processed = Hamster::Set.new)
         # Convert from rep to item if necessary
         obj = obj.item if obj.is_a?(Nanoc::Core::ItemRep)
 
+        # Only items can have dependencies
+        return false unless obj.is_a?(Nanoc::Core::Item)
+
         # Get from cache
         if @objects_outdated_due_to_dependencies.key?(obj)
           return @objects_outdated_due_to_dependencies[obj]

data/lib/nanoc/base/views/config_view.rb

@@ -53,6 +53,12 @@ module Nanoc
       @config.each(&block)
     end
 
+    # @see Configuration#env_name
+    def env_name
+      @context.dependency_tracker.bounce(_unwrap, attributes: true)
+      @config.env_name
+    end
+
     # @see Hash#dig
     def dig(*keys)
       @context.dependency_tracker.bounce(_unwrap, attributes: keys.take(1))

data/lib/nanoc/checking/checks/external_links.rb

@@ -12,7 +12,7 @@ module ::Nanoc::Checking::Checks
       # TODO: de-duplicate this (duplicated in internal links check)
       filenames = output_html_filenames.reject { |f| excluded_file?(f) }
       hrefs_with_filenames = ::Nanoc::Extra::LinkCollector.new(filenames, :external).filenames_per_href
-      results = select_invalid(hrefs_with_filenames.keys)
+      results = select_invalid(hrefs_with_filenames.keys.shuffle)
 
       # Report them
       results.each do |res|

data/lib/nanoc/checking/checks/internal_links.rb

@@ -16,10 +16,8 @@ module Nanoc::Checking::Checks
     def run
       # TODO: de-duplicate this (duplicated in external links check)
       filenames = output_html_filenames
-      hrefs_with_filenames = ::Nanoc::Extra::LinkCollector.new(filenames, :internal).filenames_per_href
-      resource_uris_with_filenames = ::Nanoc::Extra::LinkCollector.new(filenames, :internal).filenames_per_resource_uri
+      uris = ::Nanoc::Extra::LinkCollector.new(filenames, :internal).filenames_per_href
 
-      uris = hrefs_with_filenames.merge(resource_uris_with_filenames)
       uris.each_pair do |href, fns|
         fns.each do |filename|
           next if valid?(href, filename)
@@ -39,11 +37,23 @@ module Nanoc::Checking::Checks
       # FIXME: this is ugly and won’t always be correct
       return true if href == '.'
 
+      # Turn file: into output_dir-as-root relative paths
+
+      output_dir = @config.output_dir
+      output_dir += '/' unless output_dir.end_with?('/')
+      base_uri = URI("file://#{output_dir}")
+      path = href.sub(/#{base_uri.to_s}/, '').sub(/file:\/{1,3}/, '')
+
+      path = "/#{path}" unless path.start_with?('/')
+
       # Skip hrefs that are specified in the exclude configuration
-      return true if excluded?(href, origin)
+      return true if excluded?(path, origin)
 
-      # Remove target
-      path = href.sub(/#.*$/, '')
+      # Make an absolute path
+      path = ::File.join(output_dir, path[1..path.length])
+
+      # Remove fragment
+      path = path.sub(/#.*$/, '')
       return true if path.empty?
 
       # Remove query string
@@ -53,14 +63,6 @@ module Nanoc::Checking::Checks
       # Decode URL (e.g. '%20' -> ' ')
       path = CGI.unescape(path)
 
-      # Make absolute
-      path =
-        if path[0, 1] == '/'
-          @config.output_dir + path
-        else
-          ::File.expand_path(path, ::File.dirname(origin))
-        end
-
       # Check whether file exists
       return true if File.file?(path)
 

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

@@ -31,8 +31,8 @@ module Nanoc::CLI::Commands
           root: File.absolute_path(config.output_dir),
           live: options[:'live-reload'],
           index_filenames: config[:index_filenames],
-          host: options.fetch(:host),
-          port: options.fetch(:port),
+          host: options[:host],
+          port: options[:port],
           handler: options[:handler],
         )
 

data/lib/nanoc/extra/link_collector.rb

@@ -3,16 +3,24 @@
 module ::Nanoc::Extra
   # @api private
   class LinkCollector
+    # HTML5 element attributes
     URI_ATTRS = {
-      'a' => :href,
-      'audio' => :src,
-      'form' => :action,
-      'iframe' => :src,
-      'img' => :src,
-      'link' => :href,
-      'script' => :src,
-      'video' => :src,
+      'a' => %i[href ping],
+      'area' => %i[href ping],
+      'audio' => %i[src],
+      'base' => %i[href],
+      'blockquote' => %i[cite],
+      'form' => %i[action],
+      'iframe' => %i[src],
+      'img' => %i[src srcset],
+      'link' => %i[href],
+      'object' => %i[data],
+      'script' => %i[src],
+      'source' => %i[src srcset],
+      'video' => %i[poster src],
     }.freeze
+    # HTML+RDFa global URI attributes
+    GLOBAL_ATTRS = %i[about resource].freeze
 
     def initialize(filenames, mode = nil)
       Nanoc::Extra::JRubyNokogiriWarner.check_and_warn
@@ -25,7 +33,7 @@ module ::Nanoc::Extra
         when :external
           ->(h) { external_href?(h) }
         when :internal
-          ->(h) { !external_href?(h) }
+          ->(h) { internal_href?(h) }
         else
           raise ArgumentError, 'Expected mode argument to be :internal, :external or nil'
         end
@@ -40,15 +48,25 @@ module ::Nanoc::Extra
     end
 
     def external_href?(href)
+      return false if internal_href?(href)
+
       href =~ %r{^(\/\/|[a-z\-]+:)}
     end
 
+    def internal_href?(href)
+      return false if href.nil?
+
+      href.start_with?('file:/')
+    end
+
+    # all links
     def hrefs_in_file(filename)
-      uris_in_file filename, %w[a img]
+      uris_in_file filename, nil
     end
 
+    # embedded resources, used by the mixed-content checker
     def resource_uris_in_file(filename)
-      uris_in_file filename, %w[audio form img iframe link script video]
+      uris_in_file filename, %w[audio base form iframe img link object script source video]
     end
 
     private
@@ -67,16 +85,40 @@ module ::Nanoc::Extra
 
     def uris_in_file(filename, tag_names)
       uris = Set.new
+      base_uri = URI("file://#{filename}")
       doc = Nokogiri::HTML(::File.read(filename))
-      tag_names.each do |tag_name|
-        attr = URI_ATTRS[tag_name]
-        doc.css(tag_name).each do |e|
-          uris << e[attr] unless e[attr].nil?
+      doc.traverse do |tag|
+        next unless tag_names.nil? || tag_names.include?(tag.name)
+
+        attrs = []
+        attrs += URI_ATTRS[tag.name] unless URI_ATTRS[tag.name].nil?
+        attrs += GLOBAL_ATTRS if tag_names.nil?
+        next if attrs.nil?
+
+        attrs.each do |attr_name|
+          next if tag[attr_name].nil?
+
+          if attr_name == :srcset
+            uris = uris.merge(tag[attr_name].split(',').map { |v| v.strip.split[0].strip }.compact)
+          elsif %i[about ping resource].include?(attr_name)
+            uris = uris.merge(tag[attr_name].split.map(&:strip).compact)
+          else
+            uris << tag[attr_name.to_s]
+          end
         end
       end
 
       # Strip fragment
-      uris.map! { |href| href.gsub(/#.*$/, '') }
+      uris.map! { |uri| uri.gsub(/#.*$/, '') }
+
+      # Resolve paths relative to the filename, return invalid URIs as-is
+      uris.map! do |uri|
+        begin
+          URI.join(base_uri, uri).to_s
+        rescue
+          uri
+        end
+      end
 
       uris.select(&@filter)
     end

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.5
+  version: 4.11.6
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.5
+        version: 4.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.5
+        version: 4.11.6
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.