From 297371e6e281f82cf929068c6ac88982b8d675e2 Mon Sep 17 00:00:00 2001
From: ashmaroli <ashmaroli@users.noreply.github.com>
Date: Thu, 8 Mar 2018 21:28:57 +0530
Subject: [PATCH] Delegated methods after `private` keyword are meant to be
 private (#6819)

Merge pull request 6819
---
 lib/jekyll/drops/collection_drop.rb  | 5 ++---
 lib/jekyll/drops/document_drop.rb    | 5 ++---
 lib/jekyll/drops/site_drop.rb        | 5 ++---
 lib/jekyll/drops/static_file_drop.rb | 3 ++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb
index e1d7da95..858a721a 100644
--- a/lib/jekyll/drops/collection_drop.rb
+++ b/lib/jekyll/drops/collection_drop.rb
@@ -11,12 +11,11 @@ module Jekyll
       def_delegators :@obj, :label, :docs, :files, :directory,
                             :relative_directory
 
+      private def_delegator :@obj, :metadata, :fallback_data
+
       def to_s
         docs.to_s
       end
-
-      private
-      def_delegator :@obj, :metadata, :fallback_data
     end
   end
 end
diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb
index 72799781..9c19ec91 100644
--- a/lib/jekyll/drops/document_drop.rb
+++ b/lib/jekyll/drops/document_drop.rb
@@ -14,6 +14,8 @@ module Jekyll
       def_delegator :@obj, :relative_path, :path
       def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url
 
+      private def_delegator :@obj, :data, :fallback_data
+
       def collection
         @obj.collection.label
       end
@@ -61,9 +63,6 @@ module Jekyll
           result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key)
         end
       end
-
-      private
-      def_delegator :@obj, :data, :fallback_data
     end
   end
 end
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index 0a9002fe..1cb636d8 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -11,6 +11,8 @@ module Jekyll
       def_delegators :@obj, :time, :pages, :static_files, :documents,
                             :tags, :categories
 
+      private def_delegator :@obj, :config, :fallback_data
+
       def [](key)
         if @obj.collections.key?(key) && key != "posts"
           @obj.collections[key].docs
@@ -49,9 +51,6 @@ module Jekyll
 
       # return nil for `{{ site.config }}` even if --config was passed via CLI
       def config; end
-
-      private
-      def_delegator :@obj, :config, :fallback_data
     end
   end
 end
diff --git a/lib/jekyll/drops/static_file_drop.rb b/lib/jekyll/drops/static_file_drop.rb
index f855cf33..e76566b0 100644
--- a/lib/jekyll/drops/static_file_drop.rb
+++ b/lib/jekyll/drops/static_file_drop.rb
@@ -6,8 +6,9 @@ module Jekyll
       extend Forwardable
       def_delegators :@obj, :name, :extname, :modified_time, :basename
       def_delegator :@obj, :relative_path, :path
-      def_delegator :@obj, :data, :fallback_data
       def_delegator :@obj, :type, :collection
+
+      private def_delegator :@obj, :data, :fallback_data
     end
   end
 end