nanoc 4.12.6 → 4.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7930f72e16665dbb7ec96deb6430f004a6c67fc948809ee464786910138aa702
-  data.tar.gz: dd34cd1ee0145b4308351885bda5d5a7b9d7b81025d76e0c253e7577e2baf2d4
+  metadata.gz: fdb0492ec48bece377285f3e02e3cec63ec48af4542c4aa55006e3bb1b06a6e9
+  data.tar.gz: 8daf5631e1711f91e6ed2c2f571f456d12140fb4285def555f0d18e4b311ad5b
 SHA512:
-  metadata.gz: 327c9540056f40e9bf62b2f8fab40eb6d0b28c21b255f38350fefc8132732249289368a88aa98c7871298f58c7b289c7fe0cb29413108b2d3f20151adc0f9309
-  data.tar.gz: 05a90540eb2bda0268bb00d82fde2d498e8eb60be6640c19d9ae77a3a630d22ecd7788f80862032b8088aee361766036b6fac9e3690a8aeb56f26e7eb3c07543
+  metadata.gz: ebb45b98247466d11385db0285d1e24d210c6aeb037bbbbe10b655dfdfcfdd05f80206c7282b5cfb4bcb69bbeb16ce73355423b43111905edd49a1c062b7c5bf
+  data.tar.gz: ff4219588e17be3de27c20e0fdaa76036587e94b6b204480baffc06786d5ad1a79ae0280297ec01e9af50fa580d2541d7178eb1ae2c9b5bc16a02065c4545f61

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.12.7 (2022-06-06)
+
+Fixes:
+
+- Dropped support for incompatible Psych versions (#1577, #1583)
+
+Enhancements:
+
+- Replaced UglifyJS (unmaintained) with Terser (#1578, #1579)
+- Dropped support for Ruby 2.6 (EOL) (#1580)
+
 ## 4.12.6 (2022-05-28)
 
 Fixes:

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

@@ -4,7 +4,7 @@
 class Nanoc::DataSources::Filesystem
   class Parser
     SEPARATOR = /(-{5}|-{3})/.source
-    PERMITTED_YAML_CLASSES = [Symbol, Date, Time].freeze
+    PERMITTED_YAML_CLASSES = Nanoc::Core::ConfigLoader::PERMITTED_YAML_CLASSES
 
     class ParseResult
       attr_reader :content

data/lib/nanoc/data_sources/filesystem.rb

@@ -48,6 +48,8 @@ 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}).")
@@ -116,7 +118,7 @@ module Nanoc::DataSources
       attr_reader :is_binary
       alias binary? is_binary
 
-      def initialize(is_binary:, content: nil, filename: nil, attributes:, content_checksum_data: nil, attributes_checksum_data: nil)
+      def initialize(is_binary:, attributes:, content: nil, filename: nil, content_checksum_data: nil, attributes_checksum_data: nil)
         if content.nil? && filename.nil?
           raise ArgumentError, '#initialize needs at least content or filename'
         end
@@ -150,7 +152,7 @@ module Nanoc::DataSources
       is_binary = content_filename && !@site_config[:text_extensions].include?(File.extname(content_filename)[1..-1])
 
       if is_binary && klass == Nanoc::Core::Item
-        meta = (meta_filename && YAML.load_file(meta_filename, permitted_classes: Parser::PERMITTED_YAML_CLASSES)) || {}
+        meta = (meta_filename && YAML.safe_load_file(meta_filename, permitted_classes: PERMITTED_YAML_CLASSES)) || {}
 
         ProtoDocument.new(is_binary: true, filename: content_filename, attributes: meta)
       elsif is_binary && klass == Nanoc::Core::Layout
@@ -318,10 +320,8 @@ module Nanoc::DataSources
           raise Errors::MultipleMetaFiles.new(meta_filenames, basename)
         end
 
-        unless config[:identifier_type] == 'full'
-          unless [0, 1].include?(content_filenames.size)
-            raise Errors::MultipleContentFiles.new(meta_filenames, basename)
-          end
+        if (config[:identifier_type] != 'full') && ![0, 1].include?(content_filenames.size)
+          raise Errors::MultipleContentFiles.new(meta_filenames, basename)
         end
 
         all[basename] = []

data/lib/nanoc/filters/{uglify_js.rb → terser.rb}

@@ -2,22 +2,23 @@
 
 module Nanoc::Filters
   # @api private
-  class UglifyJS < Nanoc::Filter
+  class Terser < Nanoc::Filter
+    identifier :terser
     identifier :uglify_js
 
-    requires 'uglifier'
+    requires 'terser'
 
-    # Runs the content through [UglifyJS](https://github.com/mishoo/UglifyJS2/).
-    # This method optionally takes options to pass directly to Uglifier.
+    # Runs the content through [terser](https://github.com/ahorek/terser-ruby).
+    # This method optionally takes options to pass directly to Terser.
     #
     # @param [String] content The content to filter
     #
-    # @option params [Array] :options ([]) A list of options to pass on to Uglifier
+    # @option params [Array] :options ([]) A list of options to pass on to Terser
     #
     # @return [String] The filtered content
     def run(content, params = {})
       # Add filename to load path
-      Uglifier.new(params).compile(content)
+      ::Terser.new(params).compile(content)
     end
   end
 end

data/lib/nanoc/filters.rb

@@ -30,6 +30,6 @@ require_relative 'filters/rubypants'
 require_relative 'filters/sass'
 require_relative 'filters/slim'
 require_relative 'filters/typogruby'
-require_relative 'filters/uglify_js'
+require_relative 'filters/terser'
 require_relative 'filters/xsl'
 require_relative 'filters/yui_compressor'

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.6
+  version: 4.12.7
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-06-06 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.6
+        version: 4.12.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.6
+        version: 4.12.7
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.6
+        version: 4.12.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.6
+        version: 4.12.7
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -197,8 +197,8 @@ files:
 - lib/nanoc/filters/sass/functions.rb
 - lib/nanoc/filters/sass/importer.rb
 - lib/nanoc/filters/slim.rb
+- lib/nanoc/filters/terser.rb
 - lib/nanoc/filters/typogruby.rb
-- lib/nanoc/filters/uglify_js.rb
 - lib/nanoc/filters/xsl.rb
 - lib/nanoc/filters/yui_compressor.rb
 - lib/nanoc/helpers.rb
@@ -243,14 +243,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.