nanoc 4.12.19 → 4.12.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18feaf5a34e4f6b1568cc865aa2aeeb21fc5f38047e963f415677a39cbfa92a0
-  data.tar.gz: 79196f822d81016f5572f41a0688c3095ccdb1aa207a4d3ead4fe1116ad6630a
+  metadata.gz: 28408245b8e292560660f368cba6239710507eeb50cf7875882f678bd63716dc
+  data.tar.gz: c8dccabf7933ff565b75bfb1021393bb1c4ba2432ce28c9fdb45b77d5bb8fe81
 SHA512:
-  metadata.gz: 6bd6fe3d69e578df252e4d72d5640de0c4ea3c6a769830e05438a3f25b695110e43c356dba33d86416ff77611be21e570b09c5931e2eb2c83c8ef1b554d769f6
-  data.tar.gz: 3544b32362e9b3aaec9dffcb045f3c25812eca46dbb211e596e257ac37249aebc78a3fe06231bb21a98443c02c49fc4e190aa0d2c8910072f37e5daebb31f5bc
+  metadata.gz: 4e5b6933046445063948e9675791aae5f13a84678a0c5a3e22de9a167611e8b2d1cc3c08559d28b460348114b48026027408a10d6320284811bc4c9a72f37730
+  data.tar.gz: e5c0dc7d42a8354b9bcad95390ee870bf5d05c6adac69c75f8e153e5e75dfefd518b0f93ad200fb68007f03aa996ce172565f751962f490616d3116112bbe9c8

data/NEWS.md

@@ -1,5 +1,24 @@
 # Nanoc news
 
+## 4.12.21 (2024-04-27)
+
+Fixes:
+
+- Fixed a rare “private method printf” error (#1694)
+
+Enhancements:
+
+- Sped up checksummer and made it more reliable and correct (#1693)
+- Removed Nokogiri warning message on JRuby (#1700)
+
+## 4.12.20 (2024-03-15)
+
+Enhancements:
+
+- Add base64 as a gem dependency (#1681)
+- Specify pry as one of nanoc-cli's runtime dependencies (#1679) [Junichi Sato]
+- Add `org` extension (for Org Mode) to list of text file extensions (#1688) [Antar]
+
 ## 4.12.19 (2023-12-08)
 
 Fixes:
@@ -1341,11 +1360,11 @@ Enhancements:
 
 - Added several convenience methods to view classes (#570, #572)
 
-See the [nanoc 4 upgrade guide](https://nanoc.ws/doc/nanoc-4-upgrade-guide/) for details.
+See the [nanoc 4 upgrade guide](https://nanoc.app/doc/nanoc-4-upgrade-guide/) for details.
 
 ## 4.0.0a1 (2015-05-09)
 
-This is a major upgrade. For details on upgrading, see the [nanoc 4 upgrade guide](https://nanoc.ws/doc/nanoc-4-upgrade-guide/).
+This is a major upgrade. For details on upgrading, see the [nanoc 4 upgrade guide](https://nanoc.app/doc/nanoc-4-upgrade-guide/).
 
 This release provides no new features, but streamlines the API and functionality, in order to easen future development, both for features and for optimisations.
 
@@ -2058,7 +2077,7 @@ Removed:
 ## 2.1 (2008-08-17)
 
 This is only a short summary of all changes in 2.1. For details, see the
-[nanoc web site](https://nanoc.ws/). Especially the blog and the
+[nanoc web site](https://nanoc.app/). Especially the blog and the
 updated manual will be useful.
 
 New:

data/README.md

@@ -2,4 +2,4 @@
 
 # Nanoc
 
-Nanoc is a flexible static-site generator written in Ruby. See the [Nanoc web site](https://nanoc.ws) for more information.
+Nanoc is a flexible static-site generator written in Ruby. See the [Nanoc web site](https://nanoc.app) for more information.

data/lib/nanoc/extra.rb

@@ -15,7 +15,5 @@ module Nanoc::Extra
   Pruner = Nanoc::Core::Pruner
 end
 
-require_relative 'extra/link_collector'
-require_relative 'extra/jruby_nokogiri_warner'
 require_relative 'extra/srcset_parser'
 require_relative 'extra/core_ext'

data/lib/nanoc/filters/colorize_syntax.rb

@@ -12,8 +12,6 @@ module Nanoc::Filters
     ExtractedLanguage = Struct.new(:language, :from_class)
 
     def run(content, params = {})
-      Nanoc::Extra::JRubyNokogiriWarner.check_and_warn
-
       @colorizers = colorizers_from_params(params)
 
       syntax = params.fetch(:syntax, :html)

data/lib/nanoc/filters/relativize_paths.rb

@@ -45,8 +45,6 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, params = {})
-      Nanoc::Extra::JRubyNokogiriWarner.check_and_warn
-
       # Set assigns so helper function can be used
       @item_rep = assigns[:item_rep] if @item_rep.nil?
 

data/lib/nanoc/filters/xsl.rb

@@ -36,8 +36,6 @@ module Nanoc::Filters
     #
     # @return [String] The transformed content
     def run(_content, params = {})
-      Nanoc::Extra::JRubyNokogiriWarner.check_and_warn
-
       if assigns[:layout].nil?
         raise 'The XSL filter can only be run as a layout'
       end

data/lib/nanoc/helpers/blogging.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#blogging
+  # @see https://nanoc.app/doc/reference/helpers/#blogging
   module Blogging
     # @return [Array]
     def articles

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#breadcrumbs
+  # @see https://nanoc.app/doc/reference/helpers/#breadcrumbs
   module Breadcrumbs
     class AmbiguousAncestorError < ::Nanoc::Core::Error
       def initialize(pattern, items)

data/lib/nanoc/helpers/capturing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#capturing
+  # @see https://nanoc.app/doc/reference/helpers/#capturing
   module Capturing
     # @api private
     class SetContent

data/lib/nanoc/helpers/child_parent.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#childparent
+  # @see https://nanoc.app/doc/reference/helpers/#childparent
   module ChildParent
     def parent_of(item)
       if item.identifier.legacy?

data/lib/nanoc/helpers/filtering.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#filtering
+  # @see https://nanoc.app/doc/reference/helpers/#filtering
   module Filtering
     require 'nanoc/helpers/capturing'
     include Nanoc::Helpers::Capturing

data/lib/nanoc/helpers/html_escape.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#filtering
+  # @see https://nanoc.app/doc/reference/helpers/#filtering
   module HTMLEscape
     require 'nanoc/helpers/capturing'
     include Nanoc::Helpers::Capturing

data/lib/nanoc/helpers/link_to.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#linkto
+  # @see https://nanoc.app/doc/reference/helpers/#linkto
   module LinkTo
     require 'nanoc/helpers/html_escape'
     include Nanoc::Helpers::HTMLEscape

data/lib/nanoc/helpers/rendering.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#rendering
+  # @see https://nanoc.app/doc/reference/helpers/#rendering
   module Rendering
     include Nanoc::Helpers::Capturing
 

data/lib/nanoc/helpers/tagging.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#tagging
+  # @see https://nanoc.app/doc/reference/helpers/#tagging
   module Tagging
     require 'nanoc/helpers/html_escape'
     include Nanoc::Helpers::HTMLEscape

data/lib/nanoc/helpers/text.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#text
+  # @see https://nanoc.app/doc/reference/helpers/#text
   module Text
     # @param [String] string
     # @param [Number] length

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see https://nanoc.ws/doc/reference/helpers/#xmlsitemap
+  # @see https://nanoc.app/doc/reference/helpers/#xmlsitemap
   module XMLSitemap
     # @option params [Array] :items
     # @option params [Proc] :rep_select

data/lib/nanoc/version.rb

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

data/lib/nanoc.rb

@@ -11,7 +11,6 @@ module Nanoc
 end
 
 # Load general requirements
-require 'base64'
 require 'cgi'
 require 'digest'
 require 'English'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.19
+  version: 4.12.21
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -64,28 +64,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.19
+        version: 4.12.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.19
+        version: 4.12.21
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.19
+        version: 4.12.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.19
+        version: 4.12.21
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -165,8 +165,6 @@ files:
 - lib/nanoc/extra.rb
 - lib/nanoc/extra/core_ext.rb
 - lib/nanoc/extra/core_ext/time.rb
-- lib/nanoc/extra/jruby_nokogiri_warner.rb
-- lib/nanoc/extra/link_collector.rb
 - lib/nanoc/extra/srcset_parser.rb
 - lib/nanoc/filters.rb
 - lib/nanoc/filters/asciidoc.rb
@@ -230,12 +228,12 @@ files:
 - lib/nanoc/rule_dsl/rules_collection.rb
 - lib/nanoc/rule_dsl/rules_loader.rb
 - lib/nanoc/version.rb
-homepage: https://nanoc.ws/
+homepage: https://nanoc.app/
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/4.12.19/nanoc
+  source_code_uri: https://github.com/nanoc/nanoc/tree/4.12.21/nanoc
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -251,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.

data/lib/nanoc/extra/jruby_nokogiri_warner.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Extra
-  # @api private
-  class JRubyNokogiriWarner
-    include Singleton
-
-    TEXT = <<~EOS
-      --------------------------------------------------------------------------------
-      Note:
-
-      The behavior of Pure Java Nokogiri differs from the Nokogiri used on the
-      standard Ruby interpreter (MRI) due to differences in underlying libraries.
-
-      These sometimes problematic behavioral differences can cause Nanoc filters not
-      to function properly, if at all. If you need reliable (X)HTML and XML handling
-      functionality, consider not using Nokogiri on JRuby for the time being.
-
-      These issues are being worked on both from the Nokogiri and the Nanoc side. Keep
-      your Nokogiri and Nanoc versions up to date!
-
-      For details, see https://github.com/nanoc/nanoc/pull/422.
-      --------------------------------------------------------------------------------
-    EOS
-
-    def self.check_and_warn
-      instance.check_and_warn
-    end
-
-    def initialize
-      @warned = false
-    end
-
-    def check_and_warn
-      return unless defined?(RUBY_ENGINE)
-      return if RUBY_ENGINE != 'jruby'
-      return if @warned
-
-      $stderr.puts TEXT
-      @warned = true
-    end
-  end
-end

data/lib/nanoc/extra/link_collector.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-module ::Nanoc::Extra
-  # @api private
-  class LinkCollector
-    # HTML5 element attributes
-    URI_ATTRS = {
-      '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
-
-      @filenames = filenames
-      @filter =
-        case mode
-        when nil
-          ->(_h) { true }
-        when :external
-          ->(h) { external_href?(h) }
-        when :internal
-          ->(h) { internal_href?(h) }
-        else
-          raise ArgumentError, 'Expected mode argument to be :internal, :external or nil'
-        end
-    end
-
-    def filenames_per_href
-      grouped_filenames { |filename| hrefs_in_file(filename) }
-    end
-
-    def filenames_per_resource_uri
-      grouped_filenames { |filename| resource_uris_in_file(filename) }
-    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, nil
-    end
-
-    # embedded resources, used by the mixed-content checker
-    def resource_uris_in_file(filename)
-      uris_in_file filename, %w[audio base form iframe img link object script source video]
-    end
-
-    private
-
-    def grouped_filenames
-      require 'nokogiri'
-      grouped_filenames = {}
-      @filenames.each do |filename|
-        yield(filename).each do |resouce_uri|
-          grouped_filenames[resouce_uri] ||= Set.new
-          grouped_filenames[resouce_uri] << filename
-        end
-      end
-      grouped_filenames
-    end
-
-    def uris_in_file(filename, tag_names)
-      uris = Set.new
-      base_uri = URI("file://#{filename}")
-      doc = Nokogiri::HTML(::File.read(filename))
-      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! { |uri| uri.gsub(/#.*$/, '') }
-
-      # Resolve paths relative to the filename, return invalid URIs as-is
-      uris.map! do |uri|
-        if uri.start_with?('//')
-          # Don’t modify protocol-relative URLs. They’re absolute!
-          uri
-        else
-          begin
-            URI.join(base_uri, uri).to_s
-          rescue
-            uri
-          end
-        end
-      end
-
-      uris.select(&@filter)
-    end
-  end
-end