mofo 0.2.8 → 0.2.9

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-version = '0.2.8'
+version = '0.2.9'
 
 ENV['RUBY_FLAGS'] = ""
 

data/lib/microformat.rb

@@ -16,7 +16,7 @@ class Microformat
       @options ||= target.is_a?(Hash) ? target : {}
       [:first, :all].each { |key| target = @options[key] if @options[key] }
 
-      extract_base_url! target, @options
+      extract_base_url! target
       
       @doc = build_doc(@options[:text] ? @options : target)
 
@@ -270,7 +270,7 @@ class Microformat
         when 'a'      then element['href']
         when 'object' then element['value']
         end
-        url[/^http/] ? url : @base_url.to_s + url if url.respond_to?(:[])
+        url[/^http/] ? url : @options[:base_url].to_s + url if url.respond_to?(:[])
       elsif target.is_a? Array
         target.inject(nil) do |found, klass|
           klass = klass.respond_to?(:find) ? klass : nil
@@ -278,7 +278,7 @@ class Microformat
           found || parse_element(element, klass)
         end 
       elsif target.is_a? Class
-        target.find({:first => element}.merge(@options))
+        target.find(@options.merge(:first => element))
       else
         value = case element.name
         when 'abbr' then element['title']
@@ -293,10 +293,9 @@ class Microformat
       value.is_a?(Hash) ? OpenStruct.new(value) : value
     end
 
-    def extract_base_url!(target, options)
-      @base_url = nil
-      @base_url ||= options[:base] || options[:url]
-      @base_url ||= target[/^(http:\/\/[^\/]+)/] if target.respond_to?(:scan) 
+    def extract_base_url!(target)
+      @options[:base_url] ||= @options[:base] || @options[:url]
+      @options[:base_url] ||= target[/^(http:\/\/[^\/]+)/] if target.respond_to?(:scan) 
     end
   end
 

data/lib/microformat/simple.rb

@@ -9,11 +9,11 @@ class Microformat
     end
 
     def self.find_occurences(doc)
-      @from ? doc/from_as_xpath : super(doc)
+      @from ? doc/from_as_xpath : super
     end
 
     def self.build_class(tag)
-      new(tag.innerText) 
+      new(tag.innerText || '')
     end
 
     def self.from(options)

data/lib/mofo/adr.rb

@@ -1,9 +1,10 @@
 # => http://microformats.org/wiki/adr
 require 'microformat'
+require 'microformat/simple'
 
 class Adr < Microformat
   one :post_office_box, :extended_address, :street_address,
-      :locality, :region, :postal_code, :country_name, :value
+      :locality, :region, :country_name, :value, :postal_code => Simple
 
   many :type
 end

data/test/fixtures/bob.html

@@ -58,6 +58,9 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   Cell: <span class="tel"><span class="type" style="display:none;">cell</span> <span class="value">707-555-4756</span></span><br>
 
 
+  <div class="adr">
+    Zip: <span class="postal-code">01234</span>
+  </div>
 
 
 </div><!-- /vcard -->

data/test/hcard_test.rb

@@ -102,6 +102,10 @@ context "The parsed Bob hCard object" do
     $bob.n.family_name.should.equal 'Smith'
   end
 
+  specify "should have a valid postal code" do
+    $bob.adr.postal_code.should.equal '01234'
+  end
+
   specify "should have a valid url" do
     $bob.url.should.equal "http://nubhub.com/bob"
   end

metadata

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