ucnv-chainsaw 0.0.2 → 0.0.3

data/ChangeLog

@@ -0,0 +1,8 @@
+== 0.0.3 / 2009-07-02
+
+* Fix some bugs
+
+== 0.0.1 / 2009-02-27
+
+* initial release
+

data/README.rdoc

@@ -32,8 +32,8 @@ A Ruby library for spidering web resources.
 
 == Installation
 
-* gem source -a http://gems.github.com
-* gem install ucnv-chainsaw
+  gem source -a http://gems.github.com
+  gem install ucnv-chainsaw
 
 == Copyright
 

data/lib/chainsaw.rb

@@ -17,7 +17,7 @@ Nokogiri::XML::Element.module_eval do
 end
 
 module Chainsaw
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   
   #
   # Return a instance of the Chainsaw::Browser class.

data/lib/chainsaw/browser.rb

@@ -1,4 +1,5 @@
-
+require 'ostruct'
+require 'tempfile'
 
 module Chainsaw
   
@@ -78,10 +79,10 @@ module Chainsaw
     
     def submit_with(button_name, image_x = -1, image_y = -1)
       uri, form = prepare_next
-      raise TypeError, 'No form found.' unless form
+      raise TypeError, 'No form found.' if form.nil?
       unless button_name
         s = form.xpath('.//input[@type="submit"]')
-        button_name = s.first['name'] if s.length
+        button_name = s.first['name'] if s.length and !s.first.nil?
       end
       query = form.serialize_form(button_name, image_x, image_y)
       method = (form['method'] || 'get').downcase
@@ -108,7 +109,6 @@ module Chainsaw
     end
     
     def back
-      require 'ostruct'
       cleanup
       @history.shift
       back = @history.first
@@ -207,7 +207,7 @@ module Chainsaw
       end
       
       # history
-      set_history uri.to_s, r.contenttype, r.content
+      set_history r.uri.to_s, r.contenttype, r.content
       r
     end
     
@@ -219,9 +219,10 @@ module Chainsaw
       end
       
       set.each_with_index do |e, index|
+        pos = @history.size
         set_next(e)
         with_index ? yield(self, index) : yield(self)
-        back
+        back if @history.size == pos + 1
       end
       self
     end

data/test/test_browser.rb

@@ -144,7 +144,7 @@ class TestBrowser < Test::Unit::TestCase
       assert_equal index, count
       count += 1
       cs.open { |cs|
-        if count == 4
+        if index == 3
           x = YAML.load cs.res.content
           assert_equal TEST_URL + '01.html', x['env']['HTTP_REFERER']
         end
@@ -152,6 +152,53 @@ class TestBrowser < Test::Unit::TestCase
     }
   end
   
+  def test_each_next
+    count = 0
+    Chainsaw.launch(TEST_URL + '01.html').open { |cs|
+      cs.set_next cs.doc.xpath('//a')
+    }.each_with_index { |cs, i|
+      assert_equal i, count
+      count += 1
+      cs.open { |cs|
+        break if i != 3
+        assert_equal i, 3
+        x = YAML.load cs.res.content
+        assert_equal TEST_URL + '01.html', x['env']['HTTP_REFERER']
+      }
+    }
+  end
+  
+  def test_each_next2
+    count = 0
+    Chainsaw.launch(TEST_URL + '01.html').open { |cs|
+      cs.set_next cs.doc.xpath('//a')
+    }.each_with_index { |cs, i|
+      assert_equal i, count
+      count += 1
+      next if i != 3
+      assert_equal i, 3
+      cs.open { |c|
+        x = YAML.load c.res.content
+        assert_equal TEST_URL + '01.html', x['env']['HTTP_REFERER']
+      }
+    }
+  end
+  
+  def test_each_break
+    count = 0
+    Chainsaw.launch(TEST_URL + '01.html').open { |cs|
+      cs.set_next cs.doc.xpath('//a')
+    }.each { |cs|
+      next if count == 0
+      break if count == 1
+      count += 1
+      cs.open {|cs|
+        flunk 'Must not pass here.'
+      }
+    }
+  
+  end
+  
   def test_referer
     Chainsaw.launch(TEST_URL + '01.html').
     open { |cs|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ucnv-chainsaw
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - ucnv
@@ -9,7 +9,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2009-03-07 00:00:00 -08:00
+date: 2009-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency