Output feed links for collections

Author: goulvench

lib/jekyll-feed/generator.rb

@@ -19,19 +19,6 @@ def generate(site)
       end
     end
 
-    private
-
-    # Matches all whitespace that follows
-    #   1. A '>', which closes an XML tag or
-    #   2. A '}', which closes a Liquid tag
-    # We will strip all of this whitespace to minify the template
-    MINIFY_REGEX = %r!(?<=>|})\s+!.freeze
-
-    # Returns the plugin's config or an empty hash if not set
-    def config
-      @config ||= @site.config["feed"] || {}
-    end
-
     # Determines the destination path of a given feed
     #
     # collection - the name of a collection, e.g., "posts"
@@ -45,7 +32,7 @@ def feed_path(collection: "posts", category: nil)
       prefix = collection == "posts" ? "/feed" : "/feed/#{collection}"
       return "#{prefix}/#{category}.xml" if category
 
-      collections.dig(collection, "path") || "#{prefix}.xml"
+      @collections.dig(collection, "path") || "#{prefix}.xml"
     end
 
     # Returns a hash representing all collections to be processed and their metadata
@@ -69,6 +56,19 @@ def collections
       @collections
     end
 
+    private
+
+    # Matches all whitespace that follows
+    #   1. A '>', which closes an XML tag or
+    #   2. A '}', which closes a Liquid tag
+    # We will strip all of this whitespace to minify the template
+    MINIFY_REGEX = %r!(?<=>|})\s+!.freeze
+
+    # Returns the plugin's config or an empty hash if not set
+    def config
+      @config ||= @site.config["feed"] || {}
+    end
+
     # Path to feed.xml template file
     def feed_source_path
       @feed_source_path ||= File.expand_path "feed.xml", __dir__

lib/jekyll-feed/meta-tag.rb

@@ -7,8 +7,15 @@ class MetaTag < Liquid::Tag
 
     def render(context)
       @context = context
-      attrs    = attributes.map { |k, v| %(#{k}="#{v}") }.join(" ")
-      "<link #{attrs} />"
+      @generator = generator
+      links = []
+      generator.collections.each do |collection, meta|
+        (meta["categories"] + [nil]).each do |category|
+          attrs = attributes(collection, category).map { |k, v| %(#{k}="#{v}") }.join(" ")
+          links << "<link #{attrs} />"
+        end
+      end
+      links.reverse.join "\n"
     end
 
     private
@@ -17,19 +24,20 @@ def config
       @config ||= @context.registers[:site].config
     end
 
-    def attributes
+    def generator
+      @generator ||= @context.registers[:site].generators.select { |it| it.is_a? JekyllFeed::Generator }.first # rubocop:disable Metrics/LineLength
+    end
+
+    def attributes(collection, category)
+      href = absolute_url(generator.feed_path(:collection => collection, :category => category))
       {
         :type  => "application/atom+xml",
         :rel   => "alternate",
-        :href  => absolute_url(path),
+        :href  => href,
         :title => title,
       }.keep_if { |_, v| v }
     end
 
-    def path
-      config.dig("feed", "path") || "feed.xml"
-    end
-
     def title
       config["title"] || config["name"]
     end

spec/jekyll-feed_spec.rb

@@ -269,6 +269,32 @@
         expect(feed_meta).not_to include("title=")
       end
     end
+    context "with a collection" do
+      let(:overrides) do
+        {
+          "collections" => {
+            "collection" => {
+              "output" => true,
+            },
+          },
+          "feed"        => {
+            "collections" => {
+              "collection" => {
+                "categories" => ["news"],
+              },
+            },
+          },
+        }
+      end
+      it "renders a feed meta for each collection" do
+        default_feed    = '<link type="application/atom+xml" rel="alternate" href="http://example.org/feed.xml" title="My awesome site" />'
+        collection_feed = '<link type="application/atom+xml" rel="alternate" href="http://example.org/feed/collection.xml" title="My awesome site" />'
+        category_feed   = '<link type="application/atom+xml" rel="alternate" href="http://example.org/feed/collection/news.xml" title="My awesome site" />'
+        expect(feed_meta).to include(default_feed)
+        expect(feed_meta).to include(collection_feed)
+        expect(feed_meta).to include(category_feed)
+      end
+    end
   end
 
   context "changing the feed path" do