nanoc 4.12.18 → 4.12.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074e7b4f75962816ac9445e735e1f18eb6b1d396711442c396689d205ef2996e
-  data.tar.gz: ef27fc91be2da058cc4bd30be55bee0270a3f00de83995152515710cdd1d0900
+  metadata.gz: a4f4f1156179e5c1fc63d9d2a7eb8539d41f3f2141fa1109027935cd7191f6e6
+  data.tar.gz: e80a883c6c173dd2c767539ecbf060b30f0a41e23dfaaa028cb00037c80819a7
 SHA512:
-  metadata.gz: fe9a2052a3900bdd57220b1c6c29b3df023dad7908ebba4a07abcafedf4189dd99163c4543fb6ba5d754754694be0b0d15f777febf45ff7f79c614d8bd742fb5
-  data.tar.gz: fcffcee72a4f21f641162913627508cd9c6781a2ad89fa33f3fadeee09e86b545677df951dfbdd32e9a9ccaed475182a64dec630959c8f870a052355ffa8ac1e
+  metadata.gz: 54f4bc19b599bb1223fedce0c505896c6554596ee8a110f1f171b9cddc6faa1ca5a72f675e8a404483c250e897da0ca85347280c96f48fe3c13cb1e093bd3ddb
+  data.tar.gz: 4605c0f855c3cdb3b1d352089087eb6a1ddbfc333fe3b11e77b7ddb3d6a8313f92cf8c20c93d22ea23887af8afa9b71d743c1bfe8852dd6f394a17b933e80fc9

data/NEWS.md

@@ -1,5 +1,27 @@
 # Nanoc news
 
+## 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:
+
+- Restored support for YAML aliases (#1677) [zor-el]
+- Fixed inadvertent reference to `Nanoc::` namespace from within `nanoc-cli` gem (#1673)
+
+Enhancements:
+
+- Made the default Rules file use `#passthrough` (#1668) [Hendrik Jäger]
+- Added support for slim 5.x (#1675)
+- Added support for psych 5.x (#1674)
+- Added `source_code_uri` metadata to gemspecs (#1669) [Junichi Sato]
+
 ## 4.12.18 (2023-10-15)
 
 Fixes:
@@ -1327,11 +1349,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.
 
@@ -2044,7 +2066,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/data_sources/filesystem/parser.rb

@@ -4,7 +4,6 @@
 class Nanoc::DataSources::Filesystem
   class Parser
     SEPARATOR = /(-{5}|-{3})/.source
-    PERMITTED_YAML_CLASSES = Nanoc::Core::ConfigLoader::PERMITTED_YAML_CLASSES
 
     class ParseResult
       attr_reader :content
@@ -61,7 +60,7 @@ class Nanoc::DataSources::Filesystem
     # @return [Hash]
     def parse_metadata(data, filename)
       begin
-        meta = YAML.safe_load(data, permitted_classes: PERMITTED_YAML_CLASSES) || {}
+        meta = Nanoc::Core::YamlLoader.load(data) || {}
       rescue => e
         raise Errors::UnparseableMetadata.new(filename, e)
       end

data/lib/nanoc/data_sources/filesystem.rb

@@ -48,8 +48,6 @@ module Nanoc::DataSources
   #
   # @api private
   class Filesystem < Nanoc::DataSource
-    PERMITTED_YAML_CLASSES = Nanoc::Core::ConfigLoader::PERMITTED_YAML_CLASSES
-
     class AmbiguousMetadataAssociationError < ::Nanoc::Core::Error
       def initialize(content_filenames, meta_filename)
         super("There are multiple content files (#{content_filenames.sort.join(', ')}) that could match the file containing metadata (#{meta_filename}).")
@@ -154,7 +152,7 @@ module Nanoc::DataSources
       is_binary = content_filename && !@site_config[:text_extensions].include?(File.extname(content_filename)[1..])
 
       if is_binary && klass == Nanoc::Core::Item
-        meta = (meta_filename && YAML.safe_load_file(meta_filename, permitted_classes: PERMITTED_YAML_CLASSES)) || {}
+        meta = (meta_filename && Nanoc::Core::YamlLoader.load_file(meta_filename)) || {}
 
         ProtoDocument.new(is_binary: true, filename: content_filename, attributes: meta)
       elsif is_binary && klass == Nanoc::Core::Layout

data/lib/nanoc/extra.rb

@@ -15,7 +15,6 @@ 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/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
@@ -120,8 +120,8 @@ module Nanoc::Helpers
           xml.updated(updated.__nanoc_to_iso8601_time)
 
           # Add links
-          xml.link(rel: 'alternate', href: (alt_link || root_url), type: 'text/html')
-          xml.link(rel: 'self',      href: feed_url,               type: 'application/atom+xml')
+          xml.link(rel: 'alternate', href: alt_link || root_url, type: 'text/html')
+          xml.link(rel: 'self',      href: feed_url,             type: 'application/atom+xml')
 
           # Add author information
           xml.author do

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
@@ -22,7 +22,7 @@ module Nanoc::Helpers
         # Get existing contents and prep for store
         compiled_content_store = @item._context.compiled_content_store
         rep = @item.reps[:default]._unwrap
-        capture_name = "__capture_#{@name}".to_sym
+        capture_name = :"__capture_#{@name}"
         old_content_string =
           case existing_behavior
           when :overwrite
@@ -74,7 +74,7 @@ module Nanoc::Helpers
         end
 
         compiled_content_store = @config._context.compiled_content_store
-        content = compiled_content_store.get(rep, "__capture_#{@name}".to_sym)
+        content = compiled_content_store.get(rep, :"__capture_#{@name}")
         content&.string
       end
     end

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/rule_dsl/compilation_rule_context.rb

@@ -69,7 +69,7 @@ module Nanoc::RuleDSL
     # @return [void]
     def write(arg)
       @_write_snapshot_counter ||= 0
-      snapshot_name = "_#{@_write_snapshot_counter}".to_sym
+      snapshot_name = :"_#{@_write_snapshot_counter}"
       @_write_snapshot_counter += 1
 
       case arg

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.12.18'
+  VERSION = '4.12.20'
 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.18
+  version: 4.12.20
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2024-03-15 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.18
+        version: 4.12.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.18
+        version: 4.12.20
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.18
+        version: 4.12.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.18
+        version: 4.12.20
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,6 @@ files:
 - 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,11 +229,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.20/nanoc
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.

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