mofo 0.2.14 → 0.2.15

data/README

@@ -32,6 +32,11 @@
   >> fireball.logo
   => "http://static.flickr.com/9/buddyicons/44621776@N00.jpg?1117572751"
 
+= Grab It
+
+  $ git clone git://github.com/defunkt/mofo.git
+  $ open http://github.com/defunkt/mofo
+
 = Microwhozit?
 
   Microformats are tiny little markup definitions built on top of, usually, 

data/Rakefile

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

data/lib/mofo/hentry.rb

@@ -11,7 +11,7 @@ class HEntry < Microformat
   many :entry_content => :html, :tags => RelTag 
 
   after_find do
-    @domain = @base_url.sub /http:\/\/([^\/]+).*/, '\1'
+    @domain = @base_url.to_s.sub /http:\/\/([^\/]+).*/, '\1'
     @updated ||= @published if @published
   end
 
@@ -37,16 +37,42 @@ class HEntry < Microformat
     #{atom_id}
     #{atom_link}
     #{to_atom :title, @entry_title}
-    <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)}
     </author>
+    <content type="html">#{ERB::Util.h @entry_content}</content>
   </entry>
     atom_entity
   end
+
+  def missing_author?
+    @author.nil?
+  end
+
+  def add_in_parent_hcard
+    @properties << 'author'
+    @author = in_parent_hcard
+  end
+
+  # Per spec: if the entry author is missing find the nearest in
+  # parent <address> element(s) with class name author
+  def in_parent_hcard
+    @in_parent_hcard ||= self.class.find_in_parent_hcard
+  end
+
+  def self.build_class(microformat)
+    hentry = super(microformat)
+    hentry.add_in_parent_hcard if hentry.missing_author?
+    hentry
+  end
+
+  def self.find_in_parent_hcard
+    author = HCard.find(:text => (@doc/"//.hentry/..//address.vcard").to_s)
+    raise InvalidMicroformat if @options[:strict] && author.empty?
+    prepare_value(author)
+  end
 end
 
 class Array

data/test/hatom_test.rb

@@ -15,6 +15,20 @@ context "A parsed hEntry object" do
     $hentry.author.fn.should.equal "Chris"
   end
 
+  specify "should have an author when there are no entry author but a nearest in parent hcard" do
+    with_parent = HEntry.find(:first => fixture(:redflavor),
+                             :base => 'http://journal.redflavor.com')
+    with_parent.author.should.be.an.instance_of HCard
+    with_parent.author.fn.should.equal "Eivind Uggedal"
+    with_parent.author.url.should.equal "http://redflavor.com"
+  end
+
+  specify "should be invalid without any author in strict mode" do
+    proc { HEntry.find(:first => fixture(:hatom_without_author),
+                       :base => 'http://bogus.redflavor.com',
+                       :strict => true) }.should.raise InvalidMicroformat
+  end
+
   specify "should have content" do
     $hentry.entry_content.should.be.an.instance_of String
   end

metadata

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