mofo 0.2.6 → 0.2.8

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 0.2.7
+  - Added Microformat.timeout = accessor for controlling how long you wanna wait.
+
 = 0.2.6
   - Added rel-license [Mark Murphy]
   - Performance optimization [Mark Murphy]

data/Rakefile

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'rake'
 
-version = '0.2.6'
-svn_repo = 'svn+ssh://chris@errtheblog.com/svn/projects/mofo'
+version = '0.2.8'
+
+ENV['RUBY_FLAGS'] = ""
 
 begin
   require 'echoe'
@@ -22,11 +23,3 @@ rescue LoadError => boom
   puts "You are missing a dependency required for meta-operations on this gem."
   puts "#{boom.to_s.capitalize}."
 end
-
-desc "Tag the current trunk with the current release version"
-task :tag do
-  warn "WARNING: this will tag #{svn_repo}/trunk using the tag REL_#{version.gsub!('.','_')}"
-  warn "If you do not wish to continue, you have 5 seconds to cancel by pressing CTRL-C..."
-  5.times { |i| print "#{5-i} "; $stdout.flush; sleep 1 }
-  system %[svn copy #{svn_repo}/trunk #{svn_repo}/tags/REL_#{version} -m "Tagging the #{version} release"]
-end

data/lib/microformat.rb

@@ -4,6 +4,7 @@ gem 'hpricot', '>=0.4.59'
 class Microformat
   module Base
     @@subclasses = Set.new
+    @@timeout    = 5
 
     ##
     # The Gateway
@@ -58,6 +59,10 @@ class Microformat
       end
     end
 
+    def timeout=(timeout)
+      @@timeout = timeout
+    end
+
   protected
     ##
     # DSL Related
@@ -72,8 +77,11 @@ class Microformat
     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([]))
+      current_container = @container
+      klass.class_eval do
+        @container  = current_container || name.downcase
+        @attributes = Hash.new { |h,k| h[k] = [] }
+      end
     end
 
     def define_cute_class_name(klass)
@@ -130,7 +138,7 @@ class Microformat
       case source
       when String, File, StringIO     
         result = ''
-        Timeout::timeout(3) { result = open(source) }
+        Timeout.timeout(@@timeout) { result = open(source) }
         Hpricot(result)
       when Hpricot, Hpricot::Elements 
         source
@@ -304,6 +312,9 @@ end
 class InvalidMicroformat  < Exception; end
 class MicroformatNotFound < Exception; end
 
+# oh what the hell, let's do it
+Mofo = Microformat
+
 # type & id are used a lot in uformats and deprecated in ruby.  no loss.
 OpenStruct.class_eval { undef :type, :id }
 Symbol.class_eval { def no_bang() to_s.sub('!','').to_sym end }

data/lib/mofo/hentry.rb

@@ -4,7 +4,7 @@ require 'mofo/hcard'
 require 'mofo/rel_tag'
 
 class HEntry < Microformat
-  one :entry_title!, :entry_summary, :updated, :published,
+  one :entry_title, :entry_summary, :updated, :published,
       :author => HCard
 
   many :entry_content, :tags => RelTag 

data/site/index.html

@@ -22,6 +22,7 @@
       <h3>mofo</h3>
 
       <ul class="xoxo">
+        <!-- <li><a href="/try">Try It!</a></li>         -->
         <li><a href="#" onclick="sc('get_started')">Get Started</a></li>
         <li><a href="#" onclick="sc('microwhozit')">Microwhozit?</a></li>
         <li><a href="#" onclick="sc('find')">Mofo#find</a></li>        
@@ -363,16 +364,17 @@ $ ./script/plugin install -x svn://errtheblog.com/svn/projects/mofo
 <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/projects/browser/mofo">http://require.errtheblog.com/projects/browser/mofo</a></li>
-  <li>SVN: svn://errtheblog.com/svn/projects/mofo</li>
+  <li><strong>Google Group:</strong> <a href="http://groups.google.com/group/mofo-rb">http://groups.google.com/group/mofo-rb</a></li>
+  <li><strong>Me:</strong> chris[at]ozmm[dot]org (chris wanstrath)</li>
+  <li><strong>Trac:</strong> <a href="http://require.errtheblog.com/projects/browser/mofo">http://require.errtheblog.com/projects/browser/mofo</a></li>
+  <li><strong>SVN:</strong> svn://errtheblog.com/svn/projects/mofo</li>
 </ul>
     </div>
 
     <div id="footer">
       <hr />
       <p class="left">| <a href="http://jigsaw.w3.org/css-validator/">CSS</a> | <a href="http://validator.w3.org/check?uri=referer">XHTML 1.1</a> |</p>
-      <p class="right">Designed by <a href="mailto:support@syndicateme.net">syndicateme.net</a>.  Hosted by <a href="http://rubyforge.org">Rubyforge</a>.  Birthed by <a href="http://errtheblog.com">Err</a>.</p>
+      <p class="right">Designed by <a href="mailto:support@syndicateme.net">syndicateme.net</a>. Logo'd by <a href="http://seaofclouds.com/">seaofclouds</a>. Hosted by <a href="http://rubyforge.org">Rubyforge</a>. Birthed by <a href="http://errtheblog.com">Err</a>.</p>
       <p>&nbsp;</p>
     </div>
   </div>

data/test/ext_test.rb

@@ -67,3 +67,14 @@ context "Searching a page with multiple uformats using Microformat.find" do
     classes.should.include HCard
   end
 end
+
+context "Mofo's timeout duration" do
+  specify "should be alterable" do
+    Timeout.expects(:timeout).at_least_once.with(5)
+    Microformat.find('random_file.html') 
+
+    Microformat.timeout = 11
+    Timeout.expects(:timeout).at_least_once.with(11)
+    Microformat.find('random_file.html') 
+  end
+end

data/test/subclass_test.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'mofo/hcard'
+
+module Formats
+  class Card < HCard
+  end
+end
+
+context "Subclassing an hCard" do
+  specify "should parse a page with an hcard" do
+    proc { Formats::Card.find(fixture(:fauxtank)) }.should.not.raise MicroformatNotFound
+  end
+
+  specify "should raise an error if no hcard is found in strict mode" do
+    proc { Formats::Card.find(fixture(:fake), :strict => true) }.should.raise MicroformatNotFound
+  end
+
+  specify "should return an empty array if no hcard is found" do
+    Formats::Card.find(fixture(:fake)).should.equal []
+  end
+
+  specify "should return nil if no hcard is found with :first" do
+    Formats::Card.find(:first => fixture(:fake)).should.equal nil
+  end
+
+  specify "should return nil if no hcard is found with :all" do
+    Formats::Card.find(:all => fixture(:fake)).should.equal []
+  end
+
+  specify "should accept a :text option" do
+    Formats::Card.find(:text => open(fixture(:fauxtank)).read).should.not.equal []
+    Formats::Card.find(:text => open(fixture(:fauxtank)).read).should.not.equal nil
+  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.6
-date: 2007-05-07 00:00:00 -07:00
+  version: 0.2.8
+date: 2007-08-03 00:00:00 -07:00
 summary: mofo is a ruby microformat parser
 require_paths: 
 - lib
@@ -94,6 +94,7 @@ test_files:
 - test/hreview_test.rb
 - test/include_pattern_test.rb
 - test/reltag_test.rb
+- test/subclass_test.rb
 - test/xfn_test.rb
 - test/xoxo_test.rb
 rdoc_options: []