nanoc 4.12.21 → 4.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28408245b8e292560660f368cba6239710507eeb50cf7875882f678bd63716dc
-  data.tar.gz: c8dccabf7933ff565b75bfb1021393bb1c4ba2432ce28c9fdb45b77d5bb8fe81
+  metadata.gz: bb791b5de67044d256948c55f43367018ccedeb8944804a7db504ec91d594ea2
+  data.tar.gz: 677d9977396024531624b6ee797e9488ff1d1319489961438947ef71b8ac7e98
 SHA512:
-  metadata.gz: 4e5b6933046445063948e9675791aae5f13a84678a0c5a3e22de9a167611e8b2d1cc3c08559d28b460348114b48026027408a10d6320284811bc4c9a72f37730
-  data.tar.gz: e5c0dc7d42a8354b9bcad95390ee870bf5d05c6adac69c75f8e153e5e75dfefd518b0f93ad200fb68007f03aa996ce172565f751962f490616d3116112bbe9c8
+  metadata.gz: 7c2eda52973be5e964da94b267239a8a8ffef6da019ed123a3bbe4b5dafbf0fbc90a1a7e198ded11d7192c19e91ce2b47adc3321eb83362d6d39579bb0aba2c4
+  data.tar.gz: b740135f6f69866ff620bfd2552aa490062e2b6f3aa59fd2459391d9d591962401529aafd7881a42191039631e435493b497d6022736dfd79a480e7a4bb10ab9

data/NEWS.md

@@ -1,5 +1,25 @@
 # Nanoc news
 
+## 4.13.1 (2024-11-04)
+
+Enhancements:
+
+- Dropped explicit dependency on `psych`, simplifying usage on Windows (#1712, #1713)
+
+## 4.13.0 (2024-06-19)
+
+Features:
+
+- Added `--focus` option to the `compile` and `live` commands (#1707)
+
+Fixes:
+
+- Made `delete` log lines use relative (not absolute) paths (#1706)
+
+Changes:
+
+- Dropped support for Ruby 3.0 (EOL) (#1704)
+
 ## 4.12.21 (2024-04-27)
 
 Fixes:

data/lib/nanoc/data_sources/filesystem/parser.rb

@@ -35,7 +35,7 @@ class Nanoc::DataSources::Filesystem
       content = content_filename ? Tools.read_file(content_filename, config: @config) : ''
       meta_raw = Tools.read_file(meta_filename, config: @config)
       meta = parse_metadata(meta_raw, meta_filename)
-      ParseResult.new(content: content, attributes: meta, attributes_data: meta_raw)
+      ParseResult.new(content:, attributes: meta, attributes_data: meta_raw)
     end
 
     # @return [ParseResult]
@@ -54,7 +54,7 @@ class Nanoc::DataSources::Filesystem
       meta = parse_metadata(pieces[2], content_filename)
       content = pieces[4].sub(/\A\n/, '')
 
-      ParseResult.new(content: content, attributes: meta, attributes_data: pieces[2])
+      ParseResult.new(content:, attributes: meta, attributes_data: pieces[2])
     end
 
     # @return [Hash]

data/lib/nanoc/data_sources/filesystem/tools.rb

@@ -141,7 +141,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
     #   detected (something other than file, directory or link)
     def resolve_symlink(filename, recursion_limit = 5)
       target = File.readlink(filename)
-      absolute_target = File.expand_path(target, File.dirname(filename))
+      absolute_target = Nanoc::Core::Utils.expand_path_without_drive_identifier(target, File.dirname(filename))
 
       case File.ftype(absolute_target)
       when 'link'

data/lib/nanoc/data_sources/filesystem.rb

@@ -248,8 +248,8 @@ module Nanoc::DataSources
     def extra_attributes_for(content_filename, meta_filename)
       {
         filename: content_filename,
-        content_filename: content_filename,
-        meta_filename: meta_filename,
+        content_filename:,
+        meta_filename:,
         extension: content_filename ? ext_of(content_filename)[1..] : nil,
         mtime: mtime_of(content_filename, meta_filename),
       }
@@ -407,7 +407,7 @@ module Nanoc::DataSources
     end
 
     def parser
-      @parser ||= Parser.new(config: @config)
+      @_parser ||= Parser.new(config: @config)
     end
 
     def parse(content_filename, meta_filename)

data/lib/nanoc/extra/srcset_parser.rb

@@ -25,7 +25,7 @@ module Nanoc
               x           #     and a U+0078 LATIN SMALL LETTER X character.
             )
           )*
-        /x.freeze
+        /x
 
       def initialize(value)
         @value = value

data/lib/nanoc/filters/erb.rb

@@ -27,7 +27,7 @@ module Nanoc::Filters
 
       # Get result
       trim_mode = params[:trim_mode]
-      erb = ::ERB.new(content, trim_mode: trim_mode)
+      erb = ::ERB.new(content, trim_mode:)
       erb.filename = filename
       erb.result(assigns_binding)
     end

data/lib/nanoc/filters/erubi.rb

@@ -23,7 +23,7 @@ module Nanoc::Filters
       assigns_binding = context.get_binding(&proc)
 
       # Get result
-      engine_opts = { bufvar: '_erbout', filename: filename }.merge(params)
+      engine_opts = { bufvar: '_erbout', filename: }.merge(params)
       engine = ::Erubi::Engine.new(content, engine_opts)
       eval(engine.src, assigns_binding, filename)
     end

data/lib/nanoc/filters/erubis.rb

@@ -22,7 +22,7 @@ module Nanoc::Filters
       assigns_binding = context.get_binding(&proc)
 
       # Get result
-      erubis_with_erbout.new(content, filename: filename).result(assigns_binding)
+      erubis_with_erbout.new(content, filename:).result(assigns_binding)
     end
 
     private

data/lib/nanoc/filters/haml.rb

@@ -15,7 +15,7 @@ module Nanoc::Filters
     # @return [String] The filtered content
     def run(content, params = {})
       # Get options
-      options = params.merge(filename: filename)
+      options = params.merge(filename:)
 
       # Create context
       context = ::Nanoc::Core::Context.new(assigns)

data/lib/nanoc/filters/less.rb

@@ -22,7 +22,7 @@ module Nanoc::Filters
       # Add filename to load path
       paths = [File.dirname(@item[:content_filename])]
       on_main_fiber do
-        parser = ::Less::Parser.new(paths: paths)
+        parser = ::Less::Parser.new(paths:)
         parser.parse(content).to_css(params)
       end
     end

data/lib/nanoc/filters/sass.rb

@@ -21,7 +21,7 @@ module Nanoc::Filters
 
       options = params.merge(
         load_paths: [importer, *params[:load_paths]&.reject { |p| p.is_a?(String) && %r{^content/} =~ p }],
-        importer: importer,
+        importer:,
         filename: rep.item.identifier.to_s,
         cache: false,
       )
@@ -40,7 +40,7 @@ module Nanoc::Filters
         encoded = "data:application/json;base64,#{Base64.urlsafe_encode64(sourcemap)}"
         [css.gsub(%r{^/\*#\s+sourceMappingURL=\s*#{sourcemap_path}\s*\*/$}, "/*# sourceMappingURL=#{encoded} */")]
       else
-        sourcemap = sourcemap&.to_json(css_path: css_path, sourcemap_path: sourcemap_path, type: params[:sources_content] ? :inline : :auto)
+        sourcemap = sourcemap&.to_json(css_path:, sourcemap_path:, type: params[:sources_content] ? :inline : :auto)
         sourcemap = sourcemap&.split("\n")&.reject { |l| l =~ /^\s*"file":\s*"#{filter.object_id}"\s*$/ }&.join("\n")
         [css, sourcemap]
       end

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -33,12 +33,12 @@ module Nanoc::Helpers
 
       # e.g. unfold(10.class, &:superclass)
       # => [Integer, Numeric, Object, BasicObject]
-      def self.unfold(obj, &blk)
+      def self.unfold(obj, &)
         acc = [obj]
 
         res = yield(obj)
         if res
-          acc + unfold(res, &blk)
+          acc + unfold(res, &)
         else
           acc
         end

data/lib/nanoc/helpers/capturing.rb

@@ -13,11 +13,11 @@ module Nanoc::Helpers
         @item = item
       end
 
-      def run(&block)
+      def run(&)
         existing_behavior = @params.fetch(:existing, :error)
 
         # Capture
-        content_string = capture(&block)
+        content_string = capture(&)
 
         # Get existing contents and prep for store
         compiled_content_store = @item._context.compiled_content_store
@@ -102,7 +102,7 @@ module Nanoc::Helpers
     # @overload content_for(item, name)
     #   @param [Symbol, String] name
     #   @return [String]
-    def content_for(*args, &block)
+    def content_for(*args, &)
       if block_given? # Set content
         name = args[0]
         params =
@@ -116,7 +116,7 @@ module Nanoc::Helpers
               "of the capture, and optionally params) but got #{args.size} instead"
           end
 
-        SetContent.new(name, params, @item).run(&block)
+        SetContent.new(name, params, @item).run(&)
       elsif args.size > 1 && (args.first.is_a?(Symbol) || args.first.is_a?(String)) # Set content
         name = args[0]
         content = args.last

data/lib/nanoc/orig_cli/commands/show-rules.rb

@@ -22,8 +22,8 @@ module Nanoc::OrigCLI::Commands
       items = site.items.sort_by(&:identifier)
       layouts = site.layouts.sort_by(&:identifier)
 
-      items.each   { |e| explain_item(e, rules: rules, reps: reps) }
-      layouts.each { |e| explain_layout(e, rules: rules) }
+      items.each   { |e| explain_item(e, rules:, reps:) }
+      layouts.each { |e| explain_layout(e, rules:) }
     end
 
     def explain_item(item, rules:, reps:)

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -12,7 +12,7 @@ module Nanoc::RuleDSL
 
       action_sequence_calculator =
         Nanoc::RuleDSL::ActionSequenceCalculator.new(
-          rules_collection: rules_collection, site: site,
+          rules_collection:, site:,
         )
 
       action_provider = new(rules_collection, action_sequence_calculator)
@@ -61,10 +61,10 @@ module Nanoc::RuleDSL
 
       view_context =
         Nanoc::Core::ViewContextForCompilation.new(
-          reps: reps,
+          reps:,
           items: site.items,
-          dependency_tracker: dependency_tracker,
-          compilation_context: compiler.compilation_context(reps: reps),
+          dependency_tracker:,
+          compilation_context: compiler.compilation_context(reps:),
           compiled_content_store: Nanoc::Core::CompiledContentStore.new,
         )
       ctx = new_postprocessor_context(site, view_context)

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -62,7 +62,7 @@ module Nanoc::RuleDSL
       end
 
       recorder.snapshot(:raw)
-      rule.apply_to(rep, recorder: recorder, site: @site, view_context: view_context)
+      rule.apply_to(rep, recorder:, site: @site, view_context:)
       recorder.snapshot(:post) if recorder.any_layouts?
       recorder.snapshot(:last)
       recorder.snapshot(:pre) unless recorder.pre_snapshot?
@@ -70,7 +70,7 @@ module Nanoc::RuleDSL
       copy_paths_from_routing_rules(
         compact_snapshots(recorder.action_sequence),
         recorder.snapshots_for_which_to_skip_routing_rule,
-        rep: rep,
+        rep:,
       )
     end
 
@@ -98,7 +98,7 @@ module Nanoc::RuleDSL
           actions << action
         end
       end
-      Nanoc::Core::ActionSequence.new(actions: actions)
+      Nanoc::Core::ActionSequence.new(actions:)
     end
 
     def copy_paths_from_routing_rules(seq, snapshots_for_which_to_skip_routing_rule, rep:)
@@ -119,7 +119,7 @@ module Nanoc::RuleDSL
         # For each snapshot name, find a path from a routing rule. The routing
         # rule might return nil, so we need #compact.
         paths = action.snapshot_names.map { |sn| basic_path_from_rules_for(rep, sn) }.compact
-        action.update(snapshot_names: [], paths: paths)
+        action.update(snapshot_names: [], paths:)
       end
     end
 
@@ -136,7 +136,7 @@ module Nanoc::RuleDSL
         routing_rule.apply_to(
           rep,
           site: @site,
-          view_context: view_context,
+          view_context:,
         )
 
       if basic_path && !basic_path.start_with?('/')

data/lib/nanoc/rule_dsl/compilation_rule.rb

@@ -11,10 +11,10 @@ module Nanoc::RuleDSL
     ] => C::Any
     def apply_to(rep, site:, recorder:, view_context:)
       context = Nanoc::RuleDSL::CompilationRuleContext.new(
-        rep: rep,
-        recorder: recorder,
-        site: site,
-        view_context: view_context,
+        rep:,
+        recorder:,
+        site:,
+        view_context:,
       )
 
       context.instance_exec(matches(rep.item.identifier), &@block)

data/lib/nanoc/rule_dsl/compilation_rule_context.rb

@@ -13,7 +13,7 @@ module Nanoc::RuleDSL
     def initialize(rep:, site:, recorder:, view_context:)
       @_recorder = recorder
 
-      super(rep: rep, site: site, view_context: view_context)
+      super(rep:, site:, view_context:)
     end
 
     # Filters the current representation (calls {Nanoc::Core::ItemRep#filter} with
@@ -56,7 +56,7 @@ module Nanoc::RuleDSL
     #
     # @return [void]
     def snapshot(snapshot_name, path: Nanoc::Core::UNDEFINED)
-      @_recorder.snapshot(snapshot_name, path: path)
+      @_recorder.snapshot(snapshot_name, path:)
     end
 
     # Creates a snapshot named :last the current compiled item content, with
@@ -79,7 +79,7 @@ module Nanoc::RuleDSL
         if arg.key?(:ext)
           ext = arg[:ext].sub(/\A\./, '')
           path = @item.identifier.without_exts + '.' + ext
-          snapshot(snapshot_name, path: path)
+          snapshot(snapshot_name, path:)
         else
           raise ArgumentError, 'Cannot call #write this way (need path or :ext)'
         end

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -20,7 +20,7 @@ module Nanoc::RuleDSL
     def initialize(rules_collection, config)
       @rules_collection = rules_collection
       @config = config
-      super({ config: config })
+      super({ config: })
     end
 
     # Creates a preprocessor block that will be executed after all data is

data/lib/nanoc/rule_dsl/routing_rule.rb

@@ -20,7 +20,7 @@ module Nanoc::RuleDSL
     ] => C::Any
     def apply_to(rep, site:, view_context:)
       context = Nanoc::RuleDSL::RoutingRuleContext.new(
-        rep: rep, site: site, view_context: view_context,
+        rep:, site:, view_context:,
       )
 
       context.instance_exec(matches(rep.item.identifier), &@block)

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.21
+  version: 4.13.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-27 00:00:00.000000000 Z
+date: 2024-11-04 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.21
+        version: 4.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.21
+        version: 4.13.1
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.21
+        version: 4.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.21
+        version: 4.13.1
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +233,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/4.12.21/nanoc
+  source_code_uri: https://github.com/nanoc/nanoc/tree/4.13.1/nanoc
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -242,14 +242,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.