diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb index e1d7da95978..858a721a6f6 100644 --- a/lib/jekyll/drops/collection_drop.rb +++ b/lib/jekyll/drops/collection_drop.rb @@ -11,12 +11,11 @@ class CollectionDrop < Drop 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 727997810f3..9c19ec911a2 100644 --- a/lib/jekyll/drops/document_drop.rb +++ b/lib/jekyll/drops/document_drop.rb @@ -14,6 +14,8 @@ class DocumentDrop < Drop 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 @@ def collapse_document(doc) 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 0a9002fee2f..1cb636d8825 100644 --- a/lib/jekyll/drops/site_drop.rb +++ b/lib/jekyll/drops/site_drop.rb @@ -11,6 +11,8 @@ class SiteDrop < Drop 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 @@ def related_posts # 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 f855cf33629..e76566b054f 100644 --- a/lib/jekyll/drops/static_file_drop.rb +++ b/lib/jekyll/drops/static_file_drop.rb @@ -6,8 +6,9 @@ class StaticFileDrop < Drop 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