Merge pull request #73 from pathawks/liquid

Merge pull request 73

Author: parkr

lib/feed.xml

@@ -49,7 +49,7 @@
       {% endif %}
 
       <id>{{ post.id | prepend: url_base | xml_escape }}</id>
-      <content type="html" xml:base="{{ post.url | prepend: url_base | xml_escape }}">{{ post.content | markdownify | strip | xml_escape }}</content>
+      <content type="html" xml:base="{{ post.url | prepend: url_base | xml_escape }}">{{ post.content | strip | xml_escape }}</content>
 
       {% if post.author %}
         <author>
@@ -76,7 +76,7 @@
       {% endfor %}
 
       {% if post.excerpt and post.excerpt != empty %}
-        <summary>{{ post.excerpt | markdownify | strip_html | replace: '\n', ' ' | strip | xml_escape }}</summary>
+        <summary>{{ post.excerpt | strip_html | replace: '\n', ' ' | strip | xml_escape }}</summary>
       {% endif %}
     </entry>
   {% endfor %}

lib/jekyll-feed.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module Jekyll
   class PageWithoutAFile < Page
@@ -58,9 +58,7 @@ def generate(site)
       @site = site
       @site.config["time"] = Time.new
       unless feed_exists?
-        write
-        @site.keep_files ||= []
-        @site.keep_files << path
+        @site.pages << feed_content
       end
     end
 
@@ -69,27 +67,13 @@ def source_path
       File.expand_path "feed.xml", File.dirname(__FILE__)
     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(path)
-      else
-        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__), "", 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
+      feed = PageWithoutAFile.new(@site, File.dirname(__FILE__), "", path)
+      feed.content = File.read(source_path).gsub(/\s*\n\s*/, "\n").gsub(/\s+{%/, "{%").gsub(/\s+</,"<")
+      feed.data["layout"] = nil
+      feed.data["sitemap"] = false
+      feed.output
+      feed
     end
 
     # Checks if a feed already exists in the site source
@@ -107,4 +91,4 @@ def feed_exists?
     Liquid::Template.register_filter(Jekyll::StripWhitespace)
 end
 
-Liquid::Template.register_tag('feed_meta', Jekyll::FeedMetaTag)
+Liquid::Template.register_tag("feed_meta", Jekyll::FeedMetaTag)

spec/fixtures/_posts/2015-05-12-liquid.md

@@ -0,0 +1,7 @@
+---
+---
+
+{% capture liquidstring %}
+Liquid is not rendered.
+{% endcapture %}
+{{ liquidstring | replace:'not ','' }}

spec/jekyll-feed_spec.rb

@@ -76,6 +76,11 @@
     expect(contents).to match /<title>The plugin will properly strip newlines.<\/title>/
   end
 
+  it "renders Liquid inside posts" do
+    expect(contents).to match /Liquid is rendered\./
+    expect(contents).not_to match /Liquid is not rendered\./
+  end
+
   context "parsing" do
     let(:feed) { RSS::Parser.parse(contents) }
 
@@ -95,7 +100,7 @@
     end
 
     it "includes the items" do
-      expect(feed.items.count).to eql(7)
+      expect(feed.items.count).to eql(8)
     end
 
     it "includes item contents" do