mofo 0.2.13 → 0.2.14

data/Rakefile

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

data/lib/mofo/hentry.rb

@@ -11,15 +11,16 @@ class HEntry < Microformat
   many :entry_content => :html, :tags => RelTag 
 
   after_find do
+    @domain = @base_url.sub /http:\/\/([^\/]+).*/, '\1'
     @updated ||= @published if @published
   end
 
   def atom_id
-    "<id>tag:#{@base_url.sub('http://','')},#{Date.today.year}:#{Digest::MD5.hexdigest(entry_content)}</id>"
+    "<id>tag:#{@domain},2008-01-22:#{Digest::MD5.hexdigest(entry_content)}</id>"
   end
 
   def atom_link
-    %(<link type="text/html" href="#{@base_url}#{@bookmark}" rel="alternate"/>)
+    %(<link type="text/html" href="http://#{@domain}#{@bookmark}" rel="alternate"/>)
   end
 
   def to_atom(property = nil, value = nil)
@@ -56,7 +57,6 @@ class Array
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom">
   #{first.atom_id}
   <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).try(:xmlschema)}</updated>
   #{entries}

data/test/hatom_test.rb

@@ -63,14 +63,19 @@ end
 
 context "An hFeed" do
   setup do
-    $hentries ||= HEntry.find(:all => fixture(:hatom), :base => 'http://errtheblog.com')
+    $hentries ||= HEntry.find(:all => fixture(:hatom), :base => 'http://errtheblog.com/posts/rss')
+  end
+
+  specify "should know its atom id" do
+    $hentries.first.atom_id.should == "<id>tag:errtheblog.com,2008-01-22:a7ec6beee025594bbed6817b361e0e45</id>"
+
   end
 
   specify "should know its Atom representation" do
     to_atom = $hentries.to_atom(:title => 'Err the Blog')
     expected = <<-end_atom
       <entry>
-        <id>tag:errtheblog.com,2008
+        <id>tag:errtheblog.com,2008-01-22:
         <link type="text/html" href="http://errtheblog.com/post/13" rel="alternate"/>
         <title>Err the Blog</title>
         <content type="html">
@@ -90,7 +95,6 @@ context "An hFeed" do
     <?xml version="1.0" encoding="UTF-8"?>
     <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom">
       <link type="text/html" href="
-      <link type="application/atom+xml" href="
     </feed>
     end_atom
 

metadata

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