jekyll 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9bb463108a912141ea62519f0bdc81fae3a6d13
-  data.tar.gz: 23d8dd8e5debaa25629fa60f66abc5a4cc45a71c
+  metadata.gz: 94f9cf84e2e166318a010d9830c88946ae04deec
+  data.tar.gz: c004941e48a5ac91b1a1d4621d4d5b46fae3ae5a
 SHA512:
-  metadata.gz: 25338fa1d266b0d40e8ad9588e9dbd082dbd1f43b173546849556cd70880c7a13610a3adca57565b04607469580b298690f34b6ed58ef5de24dc1ec9fa11862b
-  data.tar.gz: af318e2939e059fc1dde55b12d9b5c9713ec284760ecd642b9e74b225e95a6ef8a863c02653ee8ffd993e20b851f765b3399354c6c73b45ca807703c24a52528
+  metadata.gz: 416cf930d756be71e48285d54fc35a6baa54033d9589c2cdecd7e3372d82f1d67c81051a267768ffb3ebdd18735db8514ad9df88272d78d4824fb56f681934f5
+  data.tar.gz: e19b78a77f2b60f5f212811b5f461a94d2f8149d18c1267b01544a88f2c7e1b4122a6e698f228d9f482fda6aa4c49944e3eea483a3fc5c176ae4943c9fe236ba

data/lib/jekyll/drops/document_drop.rb

@@ -5,10 +5,12 @@ module Jekyll
     class DocumentDrop < Drop
       extend Forwardable
 
+      NESTED_OBJECT_FIELD_BLACKLIST = %w{
+        content output excerpt next previous
+      }.freeze
+
       mutable false
 
-      def_delegator :@obj, :next_doc, :next
-      def_delegator :@obj, :previous_doc, :previous
       def_delegator :@obj, :relative_path, :path
       def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url
 
@@ -20,6 +22,37 @@ module Jekyll
         fallback_data['excerpt'].to_s
       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.
+      #
+      # 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
+
       private
       def_delegator :@obj, :data, :fallback_data
     end

data/lib/jekyll/drops/drop.rb

@@ -3,7 +3,9 @@
 module Jekyll
   module Drops
     class Drop < Liquid::Drop
-      NON_CONTENT_METHODS = [:fallback_data].freeze
+      include Enumerable
+
+      NON_CONTENT_METHODS = [:fallback_data, :collapse_document].freeze
 
       # Get or set whether the drop class is mutable.
       # Mutability determines whether or not pre-defined fields may be
@@ -138,6 +140,22 @@ module Jekyll
         JSON.pretty_generate to_h
       end
 
+      # Generate a Hash for use in generating JSON.
+      # This is useful if fields need to be cleared before the JSON can generate.
+      #
+      # Returns a Hash ready for JSON generation.
+      def hash_for_json(state = nil)
+        to_h
+      end
+
+      # Generate a JSON representation of the Drop.
+      #
+      # Returns a JSON representation of the Drop in a String.
+      def to_json(state = nil)
+        require 'json'
+        JSON.generate(hash_for_json(state), state)
+      end
+
       # Collects all the keys and passes each to the block in turn.
       #
       # block - a block which accepts one argument, the key

data/lib/jekyll/drops/jekyll_drop.rb

@@ -16,6 +16,18 @@ module Jekyll
       def environment
         Jekyll.env
       end
+
+      def to_h
+        @to_h ||= {
+          "version" => version,
+          "environment" => environment
+        }
+      end
+
+      def to_json(state = nil)
+        require 'json'
+        JSON.generate(to_h, state)
+      end
     end
   end
 end

data/lib/jekyll/site.rb

@@ -262,6 +262,7 @@ module Jekyll
     def site_payload
       Drops::UnifiedPayloadDrop.new self
     end
+    alias_method :to_liquid, :site_payload
 
     # Get the implementation class for the given Converter.
     # Returns the Converter instance implementing the given Converter.

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.5'
+  VERSION = '3.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Tom Preston-Werner