Ticket #11: tarantula_hpricot_with_tests2.patch.txt

diff -Naru --exclude=.svn --exclude='*~' tarantula.orig/lib/relevance/tarantula/form.rb tarantula.hpricot/lib/relevance/tarantula/form.rb
--- tarantula.orig/lib/relevance/tarantula/form.rb      2008-05-03 18:49:16.000000000 -0400
+++ tarantula.hpricot/lib/relevance/tarantula/form.rb   2008-05-03 23:47:25.000000000 -0400
@@ -1,6 +1,6 @@
 class Relevance::Tarantula::Form
   extend Forwardable
-  def_delegators("@tag", :find_all)
+  def_delegators("@tag", :search)
   
   def initialize(tag)
     @tag = tag
@@ -15,7 +15,7 @@
   end
   
   def rails_method_hack
-    (tag = @tag.find(:tag => 'input', :attributes => { :name => '_method'})) && tag["value"]
+    (tag = @tag.at('input[@name="_method"]')) && tag["value"]
   end
 
 end
diff -Naru --exclude=.svn --exclude='*~' tarantula.orig/lib/relevance/tarantula/form_submission.rb tarantula.hpricot/lib/relevance/tarantula/form_submission.rb
--- tarantula.orig/lib/relevance/tarantula/form_submission.rb   2008-05-03 18:49:16.000000000 -0400
+++ tarantula.hpricot/lib/relevance/tarantula/form_submission.rb        2008-05-03 23:47:25.000000000 -0400
@@ -17,7 +17,7 @@
   end
   
   def create_random_data_for(form, tag_selector)
-    form.find_all(tag_selector).inject({}) do |form_args, input|
+    form.search(tag_selector).inject({}) do |form_args, input|
       # TODO: test
       form_args[input['name']] = random_data(input) if input['name']
       form_args
@@ -25,16 +25,16 @@
   end
 
   def mutate_inputs(form)
-    create_random_data_for(form, :tag => 'input')
+    create_random_data_for(form, 'input')
   end
 
   def mutate_text_areas(form)
-    create_random_data_for(form, :tag => 'textarea')
+    create_random_data_for(form, 'textarea')
   end
   
   def mutate_selects(form)
-    form.find_all(:tag => 'select').inject({}) do |form_args, select|
-      options = select.find_all(:tag => 'option')
+    form.search('select').inject({}) do |form_args, select|
+      options = select.search('option')
       option = options.rand
       form_args[select['name']] = option['value'] 
       form_args
@@ -46,6 +46,7 @@
       when /amount/         : random_int
       when /_id$/           : random_whole_number
       when /uploaded_data/  : nil
+      when /^_method$/      : input['value']
       when nil              : input['value']
       else                    random_int
     end
diff -Naru --exclude=.svn --exclude='*~' tarantula.orig/lib/relevance/tarantula/html_document_handler.rb tarantula.hpricot/lib/relevance/tarantula/html_document_handler.rb
--- tarantula.orig/lib/relevance/tarantula/html_document_handler.rb     2008-05-03 18:49:16.000000000 -0400
+++ tarantula.hpricot/lib/relevance/tarantula/html_document_handler.rb  2008-05-03 23:49:03.000000000 -0400
@@ -1,3 +1,5 @@
+require 'hpricot'
+
 class Relevance::Tarantula::HtmlDocumentHandler 
   extend Forwardable
   def_delegators("@crawler", :queue_link, :queue_form)
@@ -10,7 +12,7 @@
   def html_doc_without_stderr_noise(html)  
     body = nil
     Recording.stderr do
-      body = HTML::Document.new html
+      body = Hpricot html
     end       
     body
   end
@@ -19,14 +21,14 @@
     url = result.url
     return unless response.html?
     body = html_doc_without_stderr_noise(response.body)
-    body.find_all(:tag=>'a').each do |tag|
+    body.search('a').each do |tag|
       queue_link(tag['href'], url)
     end
-    body.find_all(:tag=>'link').each do |tag|
+    body.search('link').each do |tag|
       queue_link(tag['href'], url)
     end
-    body.find_all(:tag =>'form').each do |form|
-      form.attributes['action'] = url unless form.attributes['action']
+    body.search('form').each do |form|
+      form['action'] = url unless form['action']
       queue_form(form, url)
     end
     nil
diff -Naru --exclude=.svn --exclude='*~' tarantula.orig/test/relevance/tarantula/crawler_test.rb tarantula.hpricot/test/relevance/tarantula/crawler_test.rb
--- tarantula.orig/test/relevance/tarantula/crawler_test.rb     2008-05-03 18:49:16.000000000 -0400
+++ tarantula.hpricot/test/relevance/tarantula/crawler_test.rb  2008-05-03 23:49:38.000000000 -0400
@@ -82,7 +82,7 @@
   
   it 'queues and remembers forms' do
     crawler = Crawler.new
-    form = HTML::Document.new('<form action="/action" method="post"/>').find(:tag =>'form')
+    form = Hpricot('<form action="/action" method="post"/>').at('form')
     signature = FormSubmission.new(Form.new(form)).signature
     crawler.queue_form(form)
     crawler.forms_to_crawl.size.should == 1
@@ -286,4 +286,4 @@
     crawler = Crawler.new
     lambda{crawler.foo}.should.raise(NoMethodError)
   end
-end
\ No newline at end of file
+end
diff -Naru --exclude=.svn --exclude='*~' tarantula.orig/test/relevance/tarantula/form_submission_test.rb tarantula.hpricot/test/relevance/tarantula/form_submission_test.rb
--- tarantula.orig/test/relevance/tarantula/form_submission_test.rb     2008-05-03 18:49:16.000000000 -0400
+++ tarantula.hpricot/test/relevance/tarantula/form_submission_test.rb  2008-05-03 23:47:25.000000000 -0400
@@ -4,7 +4,7 @@
   
   # TODO: add more from field types to this example form as needed
   before do
-    @tag = HTML::Document.new(<<END)
+    @tag = Hpricot(<<END)
 <form action="/session" method="post">
   <input id="email" name="email" size="30" type="text" />
   <textarea id="comment" name="comment"value="1" />
@@ -16,7 +16,7 @@
   </select> 
 </form>
 END
-    @form = Relevance::Tarantula::Form.new(@tag.find(:tag => 'form'))
+    @form = Relevance::Tarantula::Form.new(@tag.at('form'))
     @fs = Relevance::Tarantula::FormSubmission.new(@form)
   end
   
@@ -26,7 +26,7 @@
   end
   
   it "can mutate selects" do
-    Array.any_instance.stubs(:rand).returns(stub(:[] => "2006-stub"))
+    Hpricot::Elements.any_instance.stubs(:rand).returns(stub(:[] => "2006-stub"))
     @fs.mutate_selects(@form).should == {"foo[opened_on(1i)]" => "2006-stub"}
   end
   
@@ -56,12 +56,12 @@
 
 describe "Relevance::Tarantula::FormSubmission for a crummy form" do
   before do
-    @tag = HTML::Document.new(<<END)
+    @tag = Hpricot(<<END)
 <form action="/session" method="post">
   <input value="no_name" />
 </form>
 END
-    @form = Relevance::Tarantula::Form.new(@tag.find(:tag => 'form'))
+    @form = Relevance::Tarantula::Form.new(@tag.at('form'))
     @fs = Relevance::Tarantula::FormSubmission.new(@form)
   end
   
diff -Naru --exclude=.svn --exclude='*~' tarantula.orig/test/relevance/tarantula/form_test.rb tarantula.hpricot/test/relevance/tarantula/form_test.rb
--- tarantula.orig/test/relevance/tarantula/form_test.rb        2008-05-03 18:49:16.000000000 -0400
+++ tarantula.hpricot/test/relevance/tarantula/form_test.rb     2008-05-03 23:47:25.000000000 -0400
@@ -2,7 +2,7 @@
 
 describe "Relevance::Tarantula::Form large example" do
   before do
-    @tag = HTML::Document.new(<<END)
+    @tag = Hpricot(<<END)
 <form action="/session" method="post">
   <input name="authenticity_token" type="hidden" value="1be0d07c6e13669a87b8f52a3c7e1d1ffa77708d" />
   <input id="email" name="email" size="30" type="text" />
@@ -11,7 +11,7 @@
   <input name="commit" type="submit" value="Log in" />
 </form>
 END
-    @form = Relevance::Tarantula::Form.new(@tag.find(:tag => 'form'))
+    @form = Relevance::Tarantula::Form.new(@tag.at('form'))
   end
   
   it "has an action" do
@@ -26,21 +26,21 @@
 
 describe "A Relevance::Tarantula::Form" do
   it "defaults method to 'get'" do
-    @tag = HTML::Document.new("<form/>")
-    @form = Relevance::Tarantula::Form.new(@tag.find(:tag => 'form'))
+    @tag = Hpricot("<form/>")
+    @form = Relevance::Tarantula::Form.new(@tag.at('form'))
     @form.method.should == 'get'
   end
 end
 
 describe "A Relevance::Tarantula::Form with a hacked _method" do
   before do
-    @tag = HTML::Document.new(<<END)
+    @tag = Hpricot(<<END)
 <form action="/foo">
   <input name="authenticity_token" type="hidden" value="1be0d07c6e13669a87b8f52a3c7e1d1ffa77708d" />
   <input id="_method" name="_method" size="30" type="text" value="PUT"/>
 </form>
 END
-    @form = Relevance::Tarantula::Form.new(@tag.find(:tag => 'form'))
+    @form = Relevance::Tarantula::Form.new(@tag.at('form'))
   end
 
   it "has a method" do
diff -Naru --exclude=.svn --exclude='*~' tarantula.orig/test/relevance/tarantula/html_document_handler_test.rb tarantula.hpricot/test/relevance/tarantula/html_document_handler_test.rb
--- tarantula.orig/test/relevance/tarantula/html_document_handler_test.rb       2008-05-03 18:49:16.000000000 -0400
+++ tarantula.hpricot/test/relevance/tarantula/html_document_handler_test.rb    2008-05-03 23:53:38.000000000 -0400
@@ -30,7 +30,7 @@
   end
   
   it "queues forms" do
-    @handler.expects(:queue_form).with{|tag,referrer| HTML::Tag === tag}
+    @handler.expects(:queue_form).with{|tag,referrer| Hpricot::Elem === tag}
     @handler.handle(Result.new(:response => stub(:html? => true, :body => '<form>stuff</form>')))
   end