<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -7,13 +7,8 @@ You can display feeds in your templates
 Install
 ==========
    ruby script/install svn://hasno.info/mephisto/plugins/feedreader
-   copy the migration file located in db/migrate into the main mephisto
-   db/migrate dir. run rake db:migrate 
+   ruby script/runner -e production 'MephistoPlugins::FeedReader.install'
 
-   this plugin requires a fixed/patched version of feedtools, so
-   freeze the feedtools gem using: rake rails:freeze:gem GEM=feedtools
-   once it's frozen, copy feedtools_patch/parse.rb to
-    vendor/feedtools-VERSIONHERE/vendor/htree
 
 
 Usage
@@ -28,4 +23,4 @@ The plugin makes a new liquid template tag 'feedreader':
    &lt;/ul&gt;
 
 
-(C) Mark Guzman 2006, under an MIT license.
+(C) Mark Guzman 2006-2007, under an MIT license.</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -1,2 +1,4 @@
 require 'feedreader'
-Liquid::Template.register_tag('feedreader', MephistoFeedReader::FeedReader)
+require 'liquidized_feedreader'
+require 'feedreader/plugin'
+Liquid::Template.register_tag('feedreader', FeedReader)</diff>
      <filename>init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,62 +1,49 @@
+# $Id$
+# Mephisto FeedReader plugin 
 require 'feed_tools'
 require 'liquid'
 
-class FeedTools::FeedItem
-  def to_liquid
-    {
-      'href' =&gt; link,
-      'description' =&gt; title,
-      'extended' =&gt; content,
-      'tags' =&gt; tags,
-      'time' =&gt; time
-    }
-  end
-end
+class FeedReader &lt; Liquid::Block
+  Syntax = /((#{Liquid::TagAttributes}\s?,?\s?)*)as\s(#{Liquid::VariableSignature}+)/
 
-module MephistoFeedReader
-  class FeedReader &lt; Liquid::Block
-    Syntax = /((#{Liquid::TagAttributes}\s?,?\s?)*)as\s(#{Liquid::VariableSignature}+)/
-
-    def initialize(tag_name, markup, tokens)
-      super
-      if markup =~ Syntax
-        @options = parse_options( $1 )
-        @as = $5
-      else
-        raise Liquid::SyntaxError.new(&quot;Syntax Error in tag 'feedreader'&quot;)
-      end
+  def initialize(tag_name, markup, tokens)
+    super
+    if markup =~ Syntax
+      @options = parse_options( $1 )
+      @as = $5
+    else
+      raise Liquid::SyntaxError.new(&quot;Syntax Error in tag 'feedreader'&quot;)
     end
+  end
 
-    def render(context)
-      result = []
-      ft_feed = FeedTools::Feed.open(@options[:url])
-      ft_entries = ft_feed.entries
-      max = @options[:max]
-      max = 15 unless max
-      max = max.to_i
-      max = ft_entries.length if ft_entries.length &lt; max
-      view_range = 0..max      
-
-      ft_entries[view_range].each_with_index do |ent, index|
-        context['feedreader'] = { 'index' =&gt; index + 1 }
-        context[@as] = ent 
-        result &lt;&lt; render_all(@nodelist, context)
-      end
-
-      result
+  def render(context)
+    result = []
+    ft_feed = FeedTools::Feed.open(@options[:url])
+    ft_entries = ft_feed.entries
+    max = @options[:max]
+    max = 15 unless max
+    max = max.to_i
+    max = ft_entries.length if ft_entries.length &lt; max
+    view_range = 0..max      
+
+    ft_entries[view_range].each_with_index do |ent, index|
+      context['feedreader'] = { 'index' =&gt; index + 1 }
+      context[@as] = ent 
+      result &lt;&lt; render_all(@nodelist, context)
     end
 
-    private
-      def parse_options(opt_string)
-        opts = {}
-        pairs = opt_string.split(',')
-        pairs.each do |pair|
-          opt, value = pair.split(/:[^\/]/)          
-          opts[opt.strip.to_sym] = value.strip.gsub(/\'/,'')
-        end
+    result
+  end
 
-        opts
-      end
+  private
+  def parse_options(opt_string)
+    opts = {}
+    pairs = opt_string.split(',')
+    pairs.each do |pair|
+      opt, value = pair.split(/:[^\/]/)          
+      opts[opt.strip.to_sym] = value.strip.gsub(/\'/,'')
+    end
 
+    opts
   end
 end</diff>
      <filename>lib/feedreader.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,11 +1,14 @@
+# $Id$
+# liquid-ify the feedtools feeditems
 class FeedTools::FeedItem
   def to_liquid
     {
       'href' =&gt; link,
-      'description' =&gt; abstract,
-      'extended' =&gt; description,
+      'description' =&gt; title,
+      'extended' =&gt; content,
       'tags' =&gt; tags,
-      'time' =&gt; Time.parse(time)
+      'time' =&gt; time
     }
   end
 end
+</diff>
      <filename>lib/liquidized_feedreader.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>db/migration/069_add_feedtools_tables.rb</filename>
    </removed>
    <removed>
      <filename>feedtools_patch/parse.rb</filename>
    </removed>
    <removed>
      <filename>lib/mephisto_feedreader/schema.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>9a7a1a39bbd42d4402f46882cda730a06ca6e886</id>
    </parent>
  </parents>
  <author>
    <name>segfault</name>
    <email>segfault@c10dc6e2-ae21-0410-890e-c4c894b30763</email>
  </author>
  <url>http://github.com/tsykoduk/mephisto_feedreader/commit/7e6b67bc9950213383d9972935d09f8eaf9793be</url>
  <id>7e6b67bc9950213383d9972935d09f8eaf9793be</id>
  <committed-date>2007-02-13T14:34:31-08:00</committed-date>
  <authored-date>2007-02-13T14:34:31-08:00</authored-date>
  <message>updated to work with the latest mephisto svn trunk


git-svn-id: svn://hasno.info/mephisto/plugins/mephisto_feedreader@80 c10dc6e2-ae21-0410-890e-c4c894b30763</message>
  <tree>0a8fa36b9aff3a2ec31f22ac1bc91afce7bcbc8f</tree>
  <committer>
    <name>segfault</name>
    <email>segfault@c10dc6e2-ae21-0410-890e-c4c894b30763</email>
  </committer>
</commit>
