jekyll 4.0.1 → 4.2.1

data/lib/jekyll/drops/site_drop.rb

@@ -1,66 +1,66 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Drops
-    class SiteDrop < Drop
-      extend Forwardable
-
-      mutable false
-
-      def_delegator  :@obj, :site_data, :data
-      def_delegators :@obj, :time, :pages, :static_files, :tags, :categories
-
-      private def_delegator :@obj, :config, :fallback_data
-
-      def [](key)
-        if key != "posts" && @obj.collections.key?(key)
-          @obj.collections[key].docs
-        else
-          super(key)
-        end
-      end
-
-      def key?(key)
-        (key != "posts" && @obj.collections.key?(key)) || super
-      end
-
-      def posts
-        @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a }
-      end
-
-      def html_pages
-        @site_html_pages ||= @obj.pages.select do |page|
-          page.html? || page.url.end_with?("/")
-        end
-      end
-
-      def collections
-        @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
-      end
-
-      # `Site#documents` cannot be memoized so that `Site#docs_to_write` can access the
-      # latest state of the attribute.
-      #
-      # Since this method will be called after `Site#pre_render` hook, the `Site#documents`
-      # array shouldn't thereafter change and can therefore be safely memoized to prevent
-      # additional computation of `Site#documents`.
-      def documents
-        @documents ||= @obj.documents
-      end
-
-      # `{{ site.related_posts }}` is how posts can get posts related to
-      # them, either through LSI if it's enabled, or through the most
-      # recent posts.
-      # We should remove this in 4.0 and switch to `{{ post.related_posts }}`.
-      def related_posts
-        return nil unless @current_document.is_a?(Jekyll::Document)
-
-        @current_document.related_posts
-      end
-      attr_writer :current_document
-
-      # return nil for `{{ site.config }}` even if --config was passed via CLI
-      def config; end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Drops
+    class SiteDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      delegate_method_as :site_data, :data
+      delegate_methods :time, :pages, :static_files, :tags, :categories
+
+      private delegate_method_as :config, :fallback_data
+
+      def [](key)
+        if key != "posts" && @obj.collections.key?(key)
+          @obj.collections[key].docs
+        else
+          super(key)
+        end
+      end
+
+      def key?(key)
+        (key != "posts" && @obj.collections.key?(key)) || super
+      end
+
+      def posts
+        @site_posts ||= @obj.posts.docs.sort { |a, b| b <=> a }
+      end
+
+      def html_pages
+        @site_html_pages ||= @obj.pages.select do |page|
+          page.html? || page.url.end_with?("/")
+        end
+      end
+
+      def collections
+        @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
+      end
+
+      # `Site#documents` cannot be memoized so that `Site#docs_to_write` can access the
+      # latest state of the attribute.
+      #
+      # Since this method will be called after `Site#pre_render` hook, the `Site#documents`
+      # array shouldn't thereafter change and can therefore be safely memoized to prevent
+      # additional computation of `Site#documents`.
+      def documents
+        @documents ||= @obj.documents
+      end
+
+      # `{{ site.related_posts }}` is how posts can get posts related to
+      # them, either through LSI if it's enabled, or through the most
+      # recent posts.
+      # We should remove this in 4.0 and switch to `{{ post.related_posts }}`.
+      def related_posts
+        return nil unless @current_document.is_a?(Jekyll::Document)
+
+        @current_document.related_posts
+      end
+      attr_writer :current_document
+
+      # return nil for `{{ site.config }}` even if --config was passed via CLI
+      def config; end
+    end
+  end
+end

data/lib/jekyll/drops/static_file_drop.rb

@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Drops
-    class StaticFileDrop < Drop
-      extend Forwardable
-      def_delegators :@obj, :name, :extname, :modified_time, :basename
-      def_delegator :@obj, :relative_path, :path
-      def_delegator :@obj, :type, :collection
-
-      private def_delegator :@obj, :data, :fallback_data
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Drops
+    class StaticFileDrop < Drop
+      extend Forwardable
+      delegate_methods   :name, :extname, :modified_time, :basename
+      delegate_method_as :relative_path, :path
+      delegate_method_as :type, :collection
+
+      private delegate_method_as :data, :fallback_data
+    end
+  end
+end

data/lib/jekyll/drops/unified_payload_drop.rb

@@ -1,26 +1,26 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Drops
-    class UnifiedPayloadDrop < Drop
-      mutable true
-
-      attr_accessor :page, :layout, :content, :paginator
-      attr_accessor :highlighter_prefix, :highlighter_suffix
-
-      def jekyll
-        JekyllDrop.global
-      end
-
-      def site
-        @site_drop ||= SiteDrop.new(@obj)
-      end
-
-      private
-
-      def fallback_data
-        @fallback_data ||= {}
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Drops
+    class UnifiedPayloadDrop < Drop
+      mutable true
+
+      attr_accessor :page, :layout, :content, :paginator
+      attr_accessor :highlighter_prefix, :highlighter_suffix
+
+      def jekyll
+        JekyllDrop.global
+      end
+
+      def site
+        @site_drop ||= SiteDrop.new(@obj)
+      end
+
+      private
+
+      def fallback_data
+        @fallback_data ||= {}
+      end
+    end
+  end
+end

data/lib/jekyll/drops/url_drop.rb

@@ -1,132 +1,140 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Drops
-    class UrlDrop < Drop
-      extend Forwardable
-
-      mutable false
-
-      def_delegator :@obj, :cleaned_relative_path, :path
-      def_delegator :@obj, :output_ext, :output_ext
-
-      def collection
-        @obj.collection.label
-      end
-
-      def name
-        Utils.slugify(@obj.basename_without_ext)
-      end
-
-      def title
-        Utils.slugify(@obj.data["slug"], :mode => "pretty", :cased => true) ||
-          Utils.slugify(@obj.basename_without_ext, :mode => "pretty", :cased => true)
-      end
-
-      def slug
-        Utils.slugify(@obj.data["slug"]) || Utils.slugify(@obj.basename_without_ext)
-      end
-
-      def categories
-        category_set = Set.new
-        Array(@obj.data["categories"]).each do |category|
-          category_set << category.to_s.downcase
-        end
-        category_set.to_a.join("/")
-      end
-
-      # CCYY
-      def year
-        @obj.date.strftime("%Y")
-      end
-
-      # MM: 01..12
-      def month
-        @obj.date.strftime("%m")
-      end
-
-      # DD: 01..31
-      def day
-        @obj.date.strftime("%d")
-      end
-
-      # hh: 00..23
-      def hour
-        @obj.date.strftime("%H")
-      end
-
-      # mm: 00..59
-      def minute
-        @obj.date.strftime("%M")
-      end
-
-      # ss: 00..59
-      def second
-        @obj.date.strftime("%S")
-      end
-
-      # D: 1..31
-      def i_day
-        @obj.date.strftime("%-d")
-      end
-
-      # M: 1..12
-      def i_month
-        @obj.date.strftime("%-m")
-      end
-
-      # MMM: Jan..Dec
-      def short_month
-        @obj.date.strftime("%b")
-      end
-
-      # MMMM: January..December
-      def long_month
-        @obj.date.strftime("%B")
-      end
-
-      # YY: 00..99
-      def short_year
-        @obj.date.strftime("%y")
-      end
-
-      # CCYYw, ISO week year
-      # may differ from CCYY for the first days of January and last days of December
-      def w_year
-        @obj.date.strftime("%G")
-      end
-
-      # WW: 01..53
-      # %W and %U do not comply with ISO 8601-1
-      def week
-        @obj.date.strftime("%V")
-      end
-
-      # d: 1..7 (Monday..Sunday)
-      def w_day
-        @obj.date.strftime("%u")
-      end
-
-      # dd: Mon..Sun
-      def short_day
-        @obj.date.strftime("%a")
-      end
-
-      # ddd: Monday..Sunday
-      def long_day
-        @obj.date.strftime("%A")
-      end
-
-      # DDD: 001..366
-      def y_day
-        @obj.date.strftime("%j")
-      end
-
-      private
-
-      def fallback_data
-        @fallback_data ||= {}
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Drops
+    class UrlDrop < Drop
+      extend Forwardable
+
+      mutable false
+
+      delegate_method :output_ext
+      delegate_method_as :cleaned_relative_path, :path
+
+      def collection
+        @obj.collection.label
+      end
+
+      def name
+        Utils.slugify(@obj.basename_without_ext)
+      end
+
+      def title
+        Utils.slugify(@obj.data["slug"], :mode => "pretty", :cased => true) ||
+          Utils.slugify(@obj.basename_without_ext, :mode => "pretty", :cased => true)
+      end
+
+      def slug
+        Utils.slugify(@obj.data["slug"]) || Utils.slugify(@obj.basename_without_ext)
+      end
+
+      def categories
+        category_set = Set.new
+        Array(@obj.data["categories"]).each do |category|
+          category_set << category.to_s.downcase
+        end
+        category_set.to_a.join("/")
+      end
+
+      # Similar to output from #categories, but each category will be downcased and
+      # all non-alphanumeric characters of the category replaced with a hyphen.
+      def slugified_categories
+        Array(@obj.data["categories"]).each_with_object(Set.new) do |category, set|
+          set << Utils.slugify(category.to_s)
+        end.to_a.join("/")
+      end
+
+      # CCYY
+      def year
+        @obj.date.strftime("%Y")
+      end
+
+      # MM: 01..12
+      def month
+        @obj.date.strftime("%m")
+      end
+
+      # DD: 01..31
+      def day
+        @obj.date.strftime("%d")
+      end
+
+      # hh: 00..23
+      def hour
+        @obj.date.strftime("%H")
+      end
+
+      # mm: 00..59
+      def minute
+        @obj.date.strftime("%M")
+      end
+
+      # ss: 00..59
+      def second
+        @obj.date.strftime("%S")
+      end
+
+      # D: 1..31
+      def i_day
+        @obj.date.strftime("%-d")
+      end
+
+      # M: 1..12
+      def i_month
+        @obj.date.strftime("%-m")
+      end
+
+      # MMM: Jan..Dec
+      def short_month
+        @obj.date.strftime("%b")
+      end
+
+      # MMMM: January..December
+      def long_month
+        @obj.date.strftime("%B")
+      end
+
+      # YY: 00..99
+      def short_year
+        @obj.date.strftime("%y")
+      end
+
+      # CCYYw, ISO week year
+      # may differ from CCYY for the first days of January and last days of December
+      def w_year
+        @obj.date.strftime("%G")
+      end
+
+      # WW: 01..53
+      # %W and %U do not comply with ISO 8601-1
+      def week
+        @obj.date.strftime("%V")
+      end
+
+      # d: 1..7 (Monday..Sunday)
+      def w_day
+        @obj.date.strftime("%u")
+      end
+
+      # dd: Mon..Sun
+      def short_day
+        @obj.date.strftime("%a")
+      end
+
+      # ddd: Monday..Sunday
+      def long_day
+        @obj.date.strftime("%A")
+      end
+
+      # DDD: 001..366
+      def y_day
+        @obj.date.strftime("%j")
+      end
+
+      private
+
+      def fallback_data
+        @fallback_data ||= {}
+      end
+    end
+  end
+end