mofo 0.2.5 → 0.2.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 0.2.6
+  - Added rel-license [Mark Murphy]
+  - Performance optimization [Mark Murphy]
+  - Fix bug in hEntry rel-tag [Mark Murphy]
+
 = 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'

data/README

@@ -191,6 +191,8 @@ them in a session.
   >> Christian Carter
   >> Grant Rodgers
   >> Denis Defreyne
+  >> Andrew Turner
+  >> Mark Murphy
 
 = Author
 

data/Rakefile

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

data/lib/microformat.rb

@@ -174,21 +174,26 @@ class Microformat
     def build_hash(doc, attributes = @attributes)
       hash = {}
 
+      # rel="bookmark" pattern
+      if bookmark = extract_bookmark(doc)
+        hash[:bookmark] = bookmark
+      end
+
+      # rel="license" pattern
+      if license = extract_license(doc)
+        hash[:license] = license
+      end
+
+      # rel="tag" pattern
+      if tags = extract_tags(doc)
+        hash[:tags] = tags
+      end
+
       [:one, :many].each do |name|
         attributes[name].each do |attribute|
           is_hash = attribute.is_a? Hash
           key = is_hash ? attribute.keys.first : attribute
 
-          # rel="bookmark" pattern
-          if bookmark = extract_bookmark(doc)
-            hash[:bookmark] = bookmark
-          end
-
-          # rel="tag" pattern
-          if tags = extract_tags(doc)
-            hash[:tags] = tags
-          end
-
           found = doc/".#{key.no_bang.to_s.gsub('_','-')}"
           raise InvalidMicroformat if found.empty? && key.to_s =~ /!/
           next if found.empty?
@@ -236,10 +241,15 @@ class Microformat
     end
 
     def extract_bookmark(doc)
-      bookmark = doc.at("[@rel=bookmark]") rescue nil
+      bookmark = (doc.at("[@rel=bookmark]") || doc.at("[@rel='self bookmark']")) rescue nil
       bookmark.attributes['href'] if bookmark.respond_to? :attributes
     end
 
+    def extract_license(doc)
+      license = doc.at("[@rel=license]") rescue nil
+      license.attributes['href'] if license.respond_to? :attributes
+    end
+
     def extract_tags(doc)
       return unless (tags = doc.search("[@rel=tag]")).size.nonzero?
       tags.inject([]) { |array, tag| array + [tag.innerText] }

data/lib/mofo/hentry.rb

@@ -5,9 +5,9 @@ require 'mofo/rel_tag'
 
 class HEntry < Microformat
   one :entry_title!, :entry_summary, :updated, :published,
-      :author => HCard, :tags => RelTag 
+      :author => HCard
 
-  many :entry_content
+  many :entry_content, :tags => RelTag 
 
   after_find do
     @updated = @published unless @updated if @published

metadata

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