jekyll 4.2.1 → 4.3.2

data/lib/jekyll/drops/collection_drop.rb

@@ -1,20 +1,20 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Drops
-    class CollectionDrop < Drop
-      extend Forwardable
-
-      mutable false
-
-      delegate_method_as :write?, :output
-      delegate_methods :label, :docs, :files, :directory, :relative_directory
-
-      private delegate_method_as :metadata, :fallback_data
-
-      def to_s
-        docs.to_s
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Drops
+    class CollectionDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      delegate_method_as :write?, :output
+      delegate_methods :label, :docs, :files, :directory, :relative_directory
+
+      private delegate_method_as :metadata, :fallback_data
+
+      def to_s
+        docs.to_s
+      end
+    end
+  end
+end

data/lib/jekyll/drops/document_drop.rb

@@ -1,70 +1,74 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Drops
-    class DocumentDrop < Drop
-      extend Forwardable
-
-      NESTED_OBJECT_FIELD_BLACKLIST = %w(
-        content output excerpt next previous
-      ).freeze
-
-      mutable false
-
-      delegate_method_as :relative_path, :path
-      private delegate_method_as :data, :fallback_data
-
-      delegate_methods :id, :output, :content, :to_s, :relative_path, :url, :date
-      data_delegators "title", "categories", "tags"
-
-      def collection
-        @obj.collection.label
-      end
-
-      def excerpt
-        fallback_data["excerpt"].to_s
-      end
-
-      def <=>(other)
-        return nil unless other.is_a? DocumentDrop
-
-        cmp = self["date"] <=> other["date"]
-        cmp = self["path"] <=> other["path"] if cmp.nil? || cmp.zero?
-        cmp
-      end
-
-      def previous
-        @obj.previous_doc.to_liquid
-      end
-
-      def next
-        @obj.next_doc.to_liquid
-      end
-
-      # Generate a Hash for use in generating JSON.
-      # This is useful if fields need to be cleared before the JSON can generate.
-      #
-      # state - the JSON::State object which determines the state of current processing.
-      #
-      # Returns a Hash ready for JSON generation.
-      def hash_for_json(state = nil)
-        to_h.tap do |hash|
-          if state && state.depth >= 2
-            hash["previous"] = collapse_document(hash["previous"]) if hash["previous"]
-            hash["next"]     = collapse_document(hash["next"]) if hash["next"]
-          end
-        end
-      end
-
-      # Generate a Hash which breaks the recursive chain.
-      # Certain fields which are normally available are omitted.
-      #
-      # Returns a Hash with only non-recursive fields present.
-      def collapse_document(doc)
-        doc.keys.each_with_object({}) do |(key, _), result|
-          result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Drops
+    class DocumentDrop < Drop
+      extend Forwardable
+
+      NESTED_OBJECT_FIELD_BLACKLIST = %w(
+        content output excerpt next previous
+      ).freeze
+
+      mutable false
+
+      delegate_method_as :relative_path, :path
+      private delegate_method_as :data, :fallback_data
+
+      delegate_methods :id, :output, :content, :to_s, :relative_path, :url, :date
+      data_delegators "title", "categories", "tags"
+
+      def collection
+        @obj.collection.label
+      end
+
+      def excerpt
+        fallback_data["excerpt"].to_s
+      end
+
+      def name
+        fallback_data["name"] || @obj.basename
+      end
+
+      def <=>(other)
+        return nil unless other.is_a? DocumentDrop
+
+        cmp = self["date"] <=> other["date"]
+        cmp = self["path"] <=> other["path"] if cmp.nil? || cmp.zero?
+        cmp
+      end
+
+      def previous
+        @obj.previous_doc.to_liquid
+      end
+
+      def next
+        @obj.next_doc.to_liquid
+      end
+
+      # Generate a Hash for use in generating JSON.
+      # This is useful if fields need to be cleared before the JSON can generate.
+      #
+      # state - the JSON::State object which determines the state of current processing.
+      #
+      # Returns a Hash ready for JSON generation.
+      def hash_for_json(state = nil)
+        to_h.tap do |hash|
+          if state && state.depth >= 2
+            hash["previous"] = collapse_document(hash["previous"]) if hash["previous"]
+            hash["next"]     = collapse_document(hash["next"]) if hash["next"]
+          end
+        end
+      end
+
+      # Generate a Hash which breaks the recursive chain.
+      # Certain fields which are normally available are omitted.
+      #
+      # Returns a Hash with only non-recursive fields present.
+      def collapse_document(doc)
+        doc.keys.each_with_object({}) do |(key, _), result|
+          result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key)
+        end
+      end
+    end
+  end
+end