mofo 0.2.9 → 0.2.10

data/Rakefile

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'rake'
+gem 'echoe', '=1.3'
 
-version = '0.2.9'
+version = '0.2.10'
 
 ENV['RUBY_FLAGS'] = ""
 

data/lib/mofo/xfn.rb

@@ -2,6 +2,27 @@ $:.unshift 'lib'
 require 'microformat'
 
 class XFN < Microformat
+  @@valid_relations = %w( 
+    contact
+    acquaintance
+    friend
+    met
+    co-worker
+    colleague
+    co-resident
+    neighbor
+    child
+    parent
+    sibling
+    spouse
+    kin
+    muse
+    crush
+    date
+    sweetheart
+    me
+  )
+
   class Link < OpenStruct
     def initialize(*args)
       super
@@ -35,9 +56,15 @@ class XFN < Microformat
   
   def initialize(doc)
     @links = doc.search("a[@rel]").map do |rl| 
-      relation = rl[:rel].include?(' ') ? rl[:rel].split(' ') : rl[:rel]
+      relation = rl[:rel].split(' ') 
+
+      # prune invalid relations
+      relation.each { |r| relation.delete(r) unless @@valid_relations.include? r }
+      relation = relation.first if relation.size == 1
+      next if relation.empty?
+
       Link.new(:name => rl.innerHTML, :link => rl[:href], :relation => relation)
-    end
+    end.compact
   end
 
   def relations

data/test/fixtures/xfn.html

@@ -160,6 +160,13 @@
 		<dt>Geographical - multiple values</dt>
 		<dd><a href="#co-resident" rel="co-resident neighbor">co-resident + neighbor</a></dd>
 	</dl>
+
+	<dl class="invalid">
+		<dt>Reserved rels</dt>
+		<dd><a href="#nofollow" rel="nofollow">nofollow</a></dd>
+		<dd><a href="#nofollow" rel="friend nofollow">friend + nofollow</a></dd>
+		<dd><a href="#bookmark" rel="bookmark">bookmark</a></dd>
+	</dl>
 	
 	<dl class="invalid">
 		<dt>Family - multiple values</dt>

data/test/xfn_test.rb

@@ -42,6 +42,12 @@ context "A XFN object" do
     intersection = $xfn.colleague_and_sweetheart_and_muse_and_crush
     intersection.should.be.nil
   end
+
+  specify "should not pick up reserved relationships" do
+    $xfn.nofollow.should.be.nil
+    $xfn.friend_and_nofollow.should.be.nil
+    $xfn.bookmark.should.be.nil
+  end
 end
 
 context "A XFN::Link object" do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: mofo
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
-date: 2007-08-03 00:00:00 -07:00
+  version: 0.2.10
+date: 2007-08-17 00:00:00 -07:00
 summary: mofo is a ruby microformat parser
 require_paths: 
 - lib