nanoc 4.11.23 → 4.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62aca390e356bc49d4e3b3f8208d246a8f52e4dd5b55bc5e75ad23f2d17c4997
-  data.tar.gz: 5f1839b2db8203b370e53ae5d2e1a596508dd689a64fd7cb91bd196ff96c0efc
+  metadata.gz: 8f2b5030c2fc46edeec3c725dfa6264fa32f7afa58531960e355479bbef66821
+  data.tar.gz: 25f70a7eb276e2cf83e984c43d69b3f622298ddf82755f4388671f028a6937e9
 SHA512:
-  metadata.gz: 81bc493f92db0f0bedc4f4ea9a8716e1c438bdcd47022f5882ff60ead2046dd00356700e1b54e82f57d370a4711664c9dc62e1847c2b089fac450261e1e5ea64
-  data.tar.gz: 9ef9a998a577c49e47231f641ed4af366c6db7f2386501fe18ec16033513148a34d9474f483fba73f8f41b3fde31b743cd98d0a75f9d044de654454df1b4d68d
+  metadata.gz: 35a0eae0e232086859c07bc620f53d4478558252dd290f2f19d54abbb76f9e3a839af9eb36e1c107ec78bac643e511cab1693d3f98078a063a7c500841ea5a6b
+  data.tar.gz: 88ae09d525cd7a475cc36c48dbfdcba9dfbefafe33e400795cbcbaa17c0dc140447aba434b83c37a0394243856c2a451053f54dcd646cbbf616f9e746f15cffc

data/NEWS.md

@@ -1,5 +1,36 @@
 # Nanoc news
 
+## 4.12.3 (2021-10-09)
+
+Fixes:
+
+- Switched ERB to use keyword arguments (#1547, #1550) [Daniel Aleksandersen]
+- Removed use_helper re-definition warning (#1548, #1553) [Daniel Aleksandersen]
+- Fixed issue which could cause items not to be recalculated when removing items in the preprocess block (#1554, #1555)
+- Dropped Nokogumbo in favor of Nokogiri (#1546, #1549) [Daniel Aleksandersen]
+
+## 4.12.2 (2021-05-28)
+
+Enhancements:
+
+- Add support for `video/@poster` to relativize_paths (#1544) [Masayuki Higashino]
+
+## 4.12.1 (2021-04-05)
+
+Enhancements:
+
+- Made Nanoc expand paths containing `~` (home directory) in the filesystem data source configuration (!4, !5, !6)
+
+## 4.12.0 (2021-02-20)
+
+Features:
+
+- Added `-W`/`--watch` flag to the `compile` command (requires the `nanoc-live` gem)
+
+Enhancements:
+
+- Made the compiler cache binary items
+
 ## 4.11.23 (2021-01-16)
 
 Fixes:

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

@@ -81,6 +81,15 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
       end.compact.flatten
     end
 
+    # Expands the path (including resolving ~ for home directory) and returns
+    # a relative path to the expanded path.
+    def expand_and_relativize_path(path)
+      from = Pathname.new(Dir.getwd)
+      to = Pathname.new(File.expand_path(path))
+
+      to.relative_path_from(from).to_s
+    end
+
     # Returns all files and directories in the given directory and
     # directories below it.
     #

data/lib/nanoc/data_sources/filesystem.rb

@@ -92,14 +92,16 @@ module Nanoc::DataSources
       require 'listen'
 
       Nanoc::Core::ChangesStream.new do |cl|
-        listener =
-          Listen.to(dir) do |_modifieds, _addeds, _deleteds|
-            cl.unknown
-          end
+        if dir
+          listener =
+            Listen.to(File.expand_path(dir)) do |_modifieds, _addeds, _deleteds|
+              cl.unknown
+            end
 
-        listener.start
+          listener.start
 
-        cl.to_stop { listener.stop }
+          cl.to_stop { listener.stop }
+        end
 
         sleep
       end
@@ -182,6 +184,8 @@ module Nanoc::DataSources
 
       return [] if dir_name.nil?
 
+      dir_name = Tools.expand_and_relativize_path(dir_name)
+
       each_content_meta_pair_in(dir_name) do |content_filename, meta_filename|
         proto_doc = read_proto_document(content_filename, meta_filename, klass)
 
@@ -295,6 +299,8 @@ module Nanoc::DataSources
     #     'content/qux' => [ nil,    ['html']       ]
     #   }
     def all_split_files_in(dir_name)
+      dir_name = Tools.expand_and_relativize_path(dir_name)
+
       by_basename =
         all_files_in(dir_name)
         .reject   { |fn| fn =~ /(~|\.orig|\.rej|\.bak)$/ }

data/lib/nanoc/filters/colorize_syntax.rb

@@ -80,7 +80,7 @@ module Nanoc::Filters
         require 'nokogiri'
         Nokogiri::HTML
       when :html5
-        require 'nokogumbo'
+        require 'nokogiri'
         Nokogiri::HTML5
       when :xml, :xhtml
         require 'nokogiri'

data/lib/nanoc/filters/erb.rb

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

data/lib/nanoc/filters/relativize_paths.rb

@@ -15,6 +15,7 @@ module Nanoc::Filters
         '*/@href',
         '*/@src',
         'object/@data',
+        'video/@poster',
         'param[@name="movie"]/@value',
         'form/@action',
         'comment()',
@@ -113,7 +114,7 @@ module Nanoc::Filters
         require 'nokogiri'
         ::Nokogiri::HTML
       when :html5
-        require 'nokogumbo'
+        require 'nokogiri'
         ::Nokogiri::HTML5
       when :xml
         require 'nokogiri'

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.23
+  version: 4.12.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.23
+        version: 4.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.23
+        version: 4.12.3
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.23
+        version: 4.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.23
+        version: 4.12.3
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -236,14 +236,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.