lib/jekyll-feed.rb in jekyll-feed-0.2.3 vs lib/jekyll-feed.rb in jekyll-feed-0.3.0

@@ -10,36 +10,53 @@
   class FeedMetaTag < Liquid::Tag
     def config
       @context.registers[:site].config
     end
 
+    def path
+      if config["feed"] && config["feed"]["path"]
+        config["feed"]["path"]
+      else
+        "feed.xml"
+      end
+    end
+
     def url
       if config["url"]
         config["url"]
       elsif config["github"] && config["github"]["url"]
         config["github"]["url"]
       end
     end
 
     def render(context)
       @context = context
-      "<link type=\"application/atom+xml\" rel=\"alternate\" href=\"#{url}/feed.xml\" title=\"#{config["name"]}\" />"
+      "<link type=\"application/atom+xml\" rel=\"alternate\" href=\"#{url}/#{path}\" title=\"#{config["name"]}\" />"
     end
   end
 
   class JekyllFeed < Jekyll::Generator
     safe true
     priority :lowest
 
+    # Path to feed from config, or feed.xml for default
+    def path
+      if @site.config["feed"] && @site.config["feed"]["path"]
+        @site.config["feed"]["path"]
+      else
+        "feed.xml"
+      end
+    end
+
     # Main plugin action, called by Jekyll-core
     def generate(site)
       @site = site
-      @site.config["time"]         = Time.new
+      @site.config["time"] = Time.new
       unless feed_exists?
         write
         @site.keep_files ||= []
-        @site.keep_files << "feed.xml"
+        @site.keep_files << path
       end
     end
 
     # Path to feed.xml template file
     def source_path
@@ -47,35 +64,35 @@
     end
 
     # Destination for feed.xml file within the site source directory
     def destination_path
       if @site.respond_to?(:in_dest_dir)
-        @site.in_dest_dir("feed.xml")
+        @site.in_dest_dir(path)
       else
-        Jekyll.sanitized_path(@site.dest, "feed.xml")
+        Jekyll.sanitized_path(@site.dest, path)
       end
     end
 
     # copy feed template from source to destination
     def write
       FileUtils.mkdir_p File.dirname(destination_path)
       File.open(destination_path, 'w') { |f| f.write(feed_content) }
     end
 
     def feed_content
-      site_map = PageWithoutAFile.new(@site, File.dirname(__FILE__), "", "feed.xml")
+      site_map = PageWithoutAFile.new(@site, File.dirname(__FILE__), "", path)
       site_map.content = File.read(source_path).gsub(/\s*\n\s*/, "\n").gsub(/\n{%/, "{%")
       site_map.data["layout"] = nil
       site_map.render(Hash.new, @site.site_payload)
       site_map.output
     end
 
     # Checks if a feed already exists in the site source
     def feed_exists?
       if @site.respond_to?(:in_source_dir)
-        File.exists? @site.in_source_dir("feed.xml")
+        File.exists? @site.in_source_dir(path)
       else
-        File.exists? Jekyll.sanitized_path(@site.source, "feed.xml")
+        File.exists? Jekyll.sanitized_path(@site.source, path)
       end
     end
   end
 end