mofo 0.2.12 → 0.2.13

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 gem 'echoe', '=1.3'
 
-version = '0.2.12'
+version = '0.2.13'
 
 ENV['RUBY_FLAGS'] = ""
 

data/lib/mofo/hentry.rb

@@ -3,7 +3,6 @@ require 'microformat'
 require 'mofo/hcard'
 require 'mofo/rel_tag'
 require 'mofo/rel_bookmark'
-require 'digest/md5'
 
 class HEntry < Microformat
   one :entry_title, :entry_summary, :updated, :published,
@@ -24,6 +23,9 @@ class HEntry < Microformat
   end
 
   def to_atom(property = nil, value = nil)
+    require 'digest/md5'
+    require 'erb'
+
     if property
       value ||= instance_variable_get("@#{property}")
       return value ? ("<#{property}>%s</#{property}>" % value) : nil
@@ -34,9 +36,9 @@ class HEntry < Microformat
     #{atom_id}
     #{atom_link}
     #{to_atom :title, @entry_title}
-    <content type="html">#{@entry_content}</content>
-    #{to_atom :updated}
-    #{to_atom :published}
+    <content type="html">#{ERB::Util.h @entry_content}</content>
+    #{to_atom :updated, @updated.try(:xmlschema)}
+    #{to_atom :published, @updated.try(:xmlschema)}
     <author>
       #{to_atom :name, @author.try(:fn)}
       #{to_atom :email, @author.try(:email)}
@@ -56,7 +58,7 @@ class Array
   <link type="text/html" href="#{first.base_url}" rel="alternate"/>
   <link type="application/atom+xml" href="" rel="self"/>
   <title>#{options[:title]}</title>
-  <updated>#{first.updated || first.published}</updated>
+  <updated>#{(first.updated || first.published).try(:xmlschema)}</updated>
   #{entries}
 </feed>
     end_atom

data/test/hatom_test.rb

@@ -44,10 +44,10 @@ context "A parsed hEntry object" do
         <link type="text/html" href="http://errtheblog.com/post/13" rel="alternate"/>
         <title>&ldquo;A Rails Toolbox&rdquo;</title>
         <content type="html">
-          <img 
+          &lt;img 
           src=
           http://errtheblog.com/static/images/pink-toolbox.jpg
-          <p>
+          &lt;p&gt;
         </content>
         <author>
           <name>Chris</name>
@@ -74,14 +74,10 @@ context "An hFeed" do
         <link type="text/html" href="http://errtheblog.com/post/13" rel="alternate"/>
         <title>Err the Blog</title>
         <content type="html">
-          <img 
+          &lt;img 
           src=
           http://errtheblog.com/static/images/pink-toolbox.jpg
-          <p>
-          <pre>
-          just a normal
-          test okay
-          </pre>
+          &lt;p&gt;
         </content>
         <updated>
         <author>

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: mofo
 version: !ruby/object:Gem::Version 
-  version: 0.2.12
+  version: 0.2.13
 date: 2008-01-22 00:00:00 -08:00
 summary: mofo is a ruby microformat parser
 require_paths: