jekyll 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96201c2ad5de2a82883b9efe695bfd44841b88be07a878479b6cda7bac0c2c9e
-  data.tar.gz: b23a9dcb412a6605a65aea79fbec04cff5f6e2d219c0009cf22a624a7514a19f
+  metadata.gz: 2aeb2bbb34dfbdffa695f378301a1d07489c82828c2e5cbea920786e83d391f6
+  data.tar.gz: 41f746d2a3c406ff6789defd5801212b3fa2f223ab76d7dbf1b367754694b48b
 SHA512:
-  metadata.gz: 457379d010c3e05bd5ee7472a38574ac5101af8740949738b221d8db369dcbae83d659591096876eff2878962a824d1f4abebd17f81be869889d4be2cb6e2d53
-  data.tar.gz: e2feb1925ca0ac86528b53c8e72f1f121b39deaaae92f21d777d10b8c2224e75ea6070553e276962b248d1a8d2a89812472d60d9502b110abf6268702ac2c3d7
+  metadata.gz: e82a99626b40672bb732e28504067169d63ba64761d34e660a4e9d3c0bad678565567955d4766bd52ba49af69d03960627c3076fe96c9de4b1e3b39f36eec49b
+  data.tar.gz: 5d77890bfb0b4ecbeff0f50d5978bbd7a7014460915b06c93a26b822c96ab6afc333cc02e9290e62429828578cef2cb6a0f84053461fa6359940075782a37bd8

data/lib/jekyll/drops/document_drop.rb

@@ -12,7 +12,6 @@ module Jekyll
       mutable false
 
       delegate_method_as :relative_path, :path
-      delegate_method_as :basename, :name
       private delegate_method_as :data, :fallback_data
 
       delegate_methods :id, :output, :content, :to_s, :relative_path, :url, :date
@@ -26,6 +25,10 @@ module Jekyll
         fallback_data["excerpt"].to_s
       end
 
+      def name
+        fallback_data["name"] || @obj.basename
+      end
+
       def <=>(other)
         return nil unless other.is_a? DocumentDrop
 

data/lib/jekyll/drops/excerpt_drop.rb

@@ -16,7 +16,7 @@ module Jekyll
       end
 
       def name
-        @obj.doc.basename
+        @obj.doc.data["name"] || @obj.doc.basename
       end
     end
   end

data/lib/jekyll/drops/site_drop.rb

@@ -7,6 +7,7 @@ module Jekyll
 
       mutable false
 
+      delegate_method_as :site_data, :data
       delegate_methods :time, :pages, :static_files, :tags, :categories
 
       private delegate_method_as :config, :fallback_data
@@ -23,12 +24,6 @@ module Jekyll
         (key != "posts" && @obj.collections.key?(key)) || super
       end
 
-      def data
-        @obj.site_data.tap do |value|
-          value.context = @context if value.respond_to?(:context=)
-        end
-      end
-
       def posts
         @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a }
       end

data/lib/jekyll/readers/data_reader.rb

@@ -6,7 +6,7 @@ module Jekyll
 
     def initialize(site, in_source_dir: nil)
       @site = site
-      @content = DataHash.new
+      @content = {}
       @entry_filter = EntryFilter.new(site)
       @in_source_dir = in_source_dir || @site.method(:in_source_dir)
       @source_dir = @in_source_dir.call("/")
@@ -24,8 +24,6 @@ module Jekyll
       @content
     end
 
-    # rubocop:disable Metrics/AbcSize
-
     # Read and parse all .yaml, .yml, .json, .csv and .tsv
     # files under <dir> and add them to the <data> variable.
     #
@@ -45,14 +43,13 @@ module Jekyll
         next if @entry_filter.symlink?(path)
 
         if File.directory?(path)
-          read_data_to(path, data[sanitize_filename(entry)] = DataHash.new)
+          read_data_to(path, data[sanitize_filename(entry)] = {})
         else
           key = sanitize_filename(File.basename(entry, ".*"))
-          data[key] = DataEntry.new(site, path, read_data_file(path))
+          data[key] = read_data_file(path)
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     # Determines how to read a data file.
     #

data/lib/jekyll/utils.rb

@@ -47,14 +47,7 @@ module Jekyll
     end
 
     def mergable?(value)
-      case value
-      when Hash, Drops::Drop, DataHash
-        true
-      when DataEntry
-        mergable?(value.data)
-      else
-        false
-      end
+      value.is_a?(Hash) || value.is_a?(Drops::Drop)
     end
 
     def duplicable?(obj)

data/lib/jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "4.3.0"
+  VERSION = "4.3.1"
 end

data/lib/jekyll.rb

@@ -45,8 +45,6 @@ module Jekyll
   autoload :Collection,          "jekyll/collection"
   autoload :Configuration,       "jekyll/configuration"
   autoload :Convertible,         "jekyll/convertible"
-  autoload :DataEntry,           "jekyll/data_entry"
-  autoload :DataHash,            "jekyll/data_hash"
   autoload :Deprecator,          "jekyll/deprecator"
   autoload :Document,            "jekyll/document"
   autoload :EntryFilter,         "jekyll/entry_filter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -295,8 +295,6 @@ files:
 - lib/jekyll/converters/markdown/kramdown_parser.rb
 - lib/jekyll/converters/smartypants.rb
 - lib/jekyll/convertible.rb
-- lib/jekyll/data_entry.rb
-- lib/jekyll/data_hash.rb
 - lib/jekyll/deprecator.rb
 - lib/jekyll/document.rb
 - lib/jekyll/drops/collection_drop.rb

data/lib/jekyll/data_entry.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class DataEntry
-    attr_accessor :context
-    attr_reader :data
-
-    # Create a Jekyll wrapper for given parsed data object.
-    #
-    #        site - The current Jekyll::Site instance.
-    #    abs_path - Absolute path to the data source file.
-    # parsed_data - Parsed representation of data source file contents.
-    #
-    # Returns nothing.
-    def initialize(site, abs_path, parsed_data)
-      @site = site
-      @path = abs_path
-      @data = parsed_data
-    end
-
-    # Liquid representation of current instance is the parsed data object.
-    #
-    # Mark as a dependency for regeneration here since every renderable object primarily uses the
-    # parsed data object while the parent resource is being rendered by Liquid. Accessing the data
-    # object directly via Ruby interface `#[]()` is outside the scope of regeneration.
-    #
-    # FIXME: Marking as dependency on every call is non-ideal. Optimize at later day.
-    #
-    # Returns the parsed data object.
-    def to_liquid
-      add_regenerator_dependencies if incremental_build?
-      @data
-    end
-
-    # -- Overrides to maintain backwards compatibility --
-
-    # Any missing method will be forwarded to the underlying data object stored in the instance
-    # variable `@data`.
-    def method_missing(method, *args, &block)
-      @data.respond_to?(method) ? @data.send(method, *args, &block) : super
-    end
-
-    def respond_to_missing?(method, *)
-      @data.respond_to?(method) || super
-    end
-
-    def <=>(other)
-      data <=> (other.is_a?(self.class) ? other.data : other)
-    end
-
-    def ==(other)
-      data == (other.is_a?(self.class) ? other.data : other)
-    end
-
-    # Explicitly defined to bypass re-routing from `method_missing` hook for greater performance.
-    #
-    # Returns string representation of parsed data object.
-    def inspect
-      @data.inspect
-    end
-
-    private
-
-    def incremental_build?
-      @incremental = @site.config["incremental"] if @incremental.nil?
-      @incremental
-    end
-
-    def add_regenerator_dependencies
-      page = context.registers[:page]
-      return unless page&.key?("path")
-
-      absolute_path = \
-        if page["collection"]
-          @site.in_source_dir(@site.config["collections_dir"], page["path"])
-        else
-          @site.in_source_dir(page["path"])
-        end
-
-      @site.regenerator.add_dependency(absolute_path, @path)
-    end
-  end
-end

data/lib/jekyll/data_hash.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Jekyll
-  # A class that behaves very similar to Ruby's `Hash` class yet different in how it is handled by
-  # Liquid. This class emulates Hash by delegation instead of inheritance to minimize overridden
-  # methods especially since some Hash methods returns another Hash instance instead of the
-  # subclass instance.
-  class DataHash
-    #
-    # Delegate given (zero-arity) method(s) to the Hash object stored in instance variable
-    # `@registry`.
-    # NOTE: Avoiding the use of `Forwardable` module's `def_delegators` for preventing unnecessary
-    # creation of interim objects on multiple calls.
-    def self.delegate_to_registry(*symbols)
-      symbols.each { |sym| define_method(sym) { @registry.send(sym) } }
-    end
-    private_class_method :delegate_to_registry
-
-    # -- core instance methods --
-
-    attr_accessor :context
-
-    def initialize
-      @registry = {}
-    end
-
-    def [](key)
-      @registry[key].tap do |value|
-        value.context = context if value.respond_to?(:context=)
-      end
-    end
-
-    # `Hash#to_liquid` returns the Hash instance itself.
-    # Mimic that behavior by returning `self` instead of returning the `@registry` variable value.
-    def to_liquid
-      self
-    end
-
-    # -- supplementary instance methods to emulate Hash --
-
-    delegate_to_registry :freeze, :inspect
-
-    def merge(other, &block)
-      merged_registry = @registry.merge(other, &block)
-      dup.tap { |d| d.instance_variable_set(:@registry, merged_registry) }
-    end
-
-    def merge!(other, &block)
-      @registry.merge!(other, &block)
-      self
-    end
-
-    def method_missing(method, *args, &block)
-      @registry.send(method, *args, &block)
-    end
-
-    def respond_to_missing?(method, *)
-      @registry.respond_to?(method)
-    end
-  end
-end