mofo 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 0.2.5
+  - Added ability to find ALL microformats on a page using Microformat.find.  
+    Only searches using loaded microformat classes, so make sure to just require 'mofo'
+  - Added cute aliases for H* classes, e.g. hCard.find(:first => 'url') and hResume.find('resume.html')
+
+= 0.2.4
+  - Fixed mofo to not choke on broken URL attributes
+
 = 0.2.3
   - Moved to Echoe
   - Added feature of figuring out the base URL for relative URLs

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-version = '0.2.4'
+version = '0.2.5'
 svn_repo = 'svn+ssh://chris@errtheblog.com/svn/projects/mofo'
 
 begin

data/lib/microformat.rb

@@ -1,12 +1,16 @@
-%w(rubygems hpricot microformat/string microformat/array open-uri ostruct timeout).each { |f| require f }
+%w(rubygems set hpricot microformat/string microformat/array open-uri ostruct timeout).each { |f| require f }
 gem 'hpricot', '>=0.4.59'
 
 class Microformat
   module Base
+    @@subclasses = Set.new
+
     ##
     # The Gateway
     #
     def find(*args)
+      return find_in_children(*args) if self == Microformat
+
       target, @options = args
       @options ||= target.is_a?(Hash) ? target : {}
       [:first, :all].each { |key| target = @options[key] if @options[key] }
@@ -31,6 +35,13 @@ class Microformat
       end
     end
 
+    def find_in_children(*args)
+      @@subclasses.map do |klass|
+        klass.find(*args)
+      end.flatten
+    end
+
+    # i have no idea what the hell this is doing
     names_and_keys = proc do |attributes| 
       attributes.map do |att|
         att.respond_to?(:keys) ? att.keys.first : att 
@@ -59,10 +70,17 @@ class Microformat
     alias :after_finds :after_find
 
     def inherited(klass)
+      @@subclasses << klass
+      define_cute_class_name(klass)
       klass.instance_variable_set(:@container,  klass.name.downcase)
       klass.instance_variable_set(:@attributes, Hash.new([]))
     end
 
+    def define_cute_class_name(klass)
+      return unless (name = klass.name) =~ /^H/
+      Object.send(:define_method, name.sub(/^H/, 'h')) { klass }
+    end
+
     def collector
       collector = Hash.new([])
       def collector.method_missing(method, *classes)

data/lib/mofo/xfn.rb

@@ -22,7 +22,10 @@ class XFN < Microformat
   attr_accessor :links
 
   def self.find_occurences(doc)
-    @occurences ||= XFN.new(doc)
+    case doc
+    when Hpricot::Doc then @occurences = XFN.new(doc)
+    else @occurences 
+    end
   end
 
   class << self

data/site/index.html

@@ -62,7 +62,7 @@ $ sudo gem install mofo -y
 $ irb -rubygems 
 >> require 'mofo'
 => true
->> fireball = HCard.find 'http://flickr.com/people/gruber/'
+>> fireball = hCard.find 'http://flickr.com/people/gruber/'
 => #<HCard:0x6db898 ...>
 >> fireball.properties
 => ["fn", "logo", "url", "n", "adr", "title", "nickname"]
@@ -147,7 +147,7 @@ How'd we parse this, tho?
 $ irb -rubygems
 >> require 'mofo'
 => true
->> post = HEntry.find 'http://milesofstyle.org/posts/351-megadeth-show-last-night'
+>> post = hEntry.find 'http://milesofstyle.org/posts/351-megadeth-show-last-night'
 => #<HEntry:0x6db898 ... > 
 >> post.entry_title
 => "Megadeth Show Last Night"
@@ -165,7 +165,7 @@ $ irb -rubygems
 => "Went to a show last night.  Megadeth.  It was alright."
 </pre>
 <p>
-That's, like, stupid easy.  If HEntry.find gets back more than one hEntry, you'll get an array.
+That's, like, stupid easy.  If hEntry.find gets back more than one hEntry, you'll get an array.
 </p>
 
 <h3 id="find">Mofo#find</h3>
@@ -206,7 +206,7 @@ That's it.
 
 <p><strong>hCard</strong> - <a href="http://microformats.org/wiki/hcard">http://microformats.org/wiki/hcard</a></p>
 <pre>
-&gt;&gt; messina = HCard.find 'http://www.flickr.com/people/factoryjoe/'
+&gt;&gt; messina = hCard.find 'http://www.flickr.com/people/factoryjoe/'
 =&gt; #&lt;HCard:0x125eb5c ...&gt;
 &gt;&gt; messina.properties
 =&gt; ["fn", "note", "logo", "url", "n", "adr", "title", "nickname"]
@@ -226,7 +226,7 @@ That's it.
 
 <p><strong>hCalendar</strong> - <a href="http://microformats.org/wiki/hcalendar">http://microformats.org/wiki/hcalendar</a></p>
 <pre>
-&gt;&gt; events = HCalendar.find 'http://upcoming.org'
+&gt;&gt; events = hCalendar.find 'http://upcoming.org'
 =&gt; [#&lt;HCalendar:0x131d304 ...&gt; ... ]
 &gt;&gt; events.size
 =&gt; 17
@@ -240,7 +240,7 @@ That's it.
 
 <p><strong>hReview</strong> - <a href="http://microformats.org/wiki/hreview">http://microformats.org/wiki/hreview</a></p>
 <pre>
-&gt;&gt; wine = HReview.find 'http://corkd.com/wine/view/1772'
+&gt;&gt; wine = hReview.find 'http://corkd.com/wine/view/1772'
 =&gt; [#&lt;HReview:0x156c3f8 ...&gt; ...]
 &gt;&gt; wine.size
 =&gt; 7
@@ -256,7 +256,7 @@ That's it.
 
 <p><strong>hEntry</strong> - <a href="http://microformats.org/wiki/hatom">http://microformats.org/wiki/hatom</a></p>
 <pre>
-&gt;&gt; post = HEntry.find 'http://errtheblog.com'
+&gt;&gt; post = hEntry.find 'http://errtheblog.com'
 =&gt; #&lt;HEntry:0x169309c ...&gt;
 &gt;&gt; post.properties
 =&gt; ["published", "entry_title", "author", "entry_content", "bookmark", "tags"]
@@ -272,7 +272,7 @@ That's it.
 
 <p><strong>hResume</strong> - <a href="http://microformats.org/wiki/hresume">http://microformats.org/wiki/hresume</a></p>
 <pre>
-&gt;&gt; crunch = HResume.find 'http://www.linkedin.com/in/michaelarrington'
+&gt;&gt; crunch = hResume.find 'http://www.linkedin.com/in/michaelarrington'
 =&gt; #&lt;HResume:0x129d370 ...&gt;
 &gt;&gt; crunch.properties
 =&gt; ["summary", "education", "experience", "contact"]
@@ -349,7 +349,7 @@ Install with <a href="http://www.rubyinside.com/advent2006/12-piston.html">Pisto
 </p>
 
 <pre>
-$ piston import svn://errtheblog.com/svn/mofo/trunk vendor/plugins/mofo  
+$ piston import svn://errtheblog.com/svn/projects/mofo vendor/plugins/mofo  
 </pre>
 
 <p>
@@ -357,15 +357,15 @@ Install with SVN:
 </p>
 
 <pre>
-$ ./script/plugin install -x svn://errtheblog.com/svn/mofo/trunk  
+$ ./script/plugin install -x svn://errtheblog.com/svn/projects/mofo
 </pre>
 
 <h3 id="touch">Get in Touch</h3>
 
 <ul>
   <li>Me: chris[at]ozmm[dot]org (chris wanstrath)</li>
-  <li>Trac: <a href="http://require.errtheblog.com/mofo/browser">http://require.errtheblog.com/mofo/browser</a></li>
-  <li>SVN: svn://errtheblog.com/svn/mofo/trunk</li>
+  <li>Trac: <a href="http://require.errtheblog.com/projects/browser/mofo">http://require.errtheblog.com/projects/browser/mofo</a></li>
+  <li>SVN: svn://errtheblog.com/svn/projects/mofo</li>
 </ul>
     </div>
 

data/test/ext_test.rb

@@ -1,6 +1,9 @@
 require File.dirname(__FILE__) + '/test_helper'
 require 'microformat/string'
 require 'microformat/array'
+require 'mofo/hcard'
+require 'mofo/hcalendar'
+require 'mofo/hentry'
 
 context "A string should be coercable into" do
   specify "an integer" do
@@ -32,7 +35,7 @@ end
 
 context "An array sent first_or_self" do
   setup do
-    @array = %w[one two]
+    @array = %w(one two)
   end
 
   specify "should return itself if it has more than one element" do
@@ -44,3 +47,23 @@ context "An array sent first_or_self" do
     @array.first_or_self.should.be.an.instance_of String
   end
 end
+
+context "Any defined h* microformat" do
+  specify "should have a lowercase h* method, for fun" do 
+    hCard.should.equal HCard
+    hCalendar.should.equal HCalendar
+  end
+end
+
+context "Searching a page with multiple uformats using Microformat.find" do
+  setup do
+    $multi_formats ||= Microformat.find(fixture(:chowhound))
+  end
+
+  specify "should find all the instances of the different microformats" do
+    $multi_formats.should.be.an.instance_of Array
+    classes = $multi_formats.map { |i| i.class }
+    classes.should.include HEntry
+    classes.should.include HCard
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: mofo
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
-date: 2007-04-30 00:00:00 -07:00
+  version: 0.2.5
+date: 2007-05-07 00:00:00 -07:00
 summary: mofo is a ruby microformat parser
 require_paths: 
 - lib