mechanize 0.7.2 → 0.7.3

data/CHANGELOG.txt

@@ -1,5 +1,12 @@
 = Mechanize CHANGELOG
 
+== 0.7.3
+
+* Pages are now yielded to a blocks given to WWW::Mechanize#get
+* WWW::Mechanize#get now takes hash arguments for uri parameters.
+* WWW::Mechanize#post takes an IO object as a parameter and posts correctly.
+* Fixing a strange zlib inflate problem on windows
+
 == 0.7.2
 
 * Handling gzipped responses with no Content-Length header

data/lib/www/mechanize/form.rb

@@ -26,7 +26,7 @@ module WWW
       attr_accessor :method, :action, :name
     
       attr_reader :fields, :buttons, :file_uploads, :radiobuttons, :checkboxes
-      attr_reader :enctype
+      attr_accessor :enctype
 
       alias :elements :fields
     

data/lib/www/mechanize.rb

@@ -38,7 +38,7 @@ module WWW
   class Mechanize
     ##
     # The version of Mechanize you are using.
-    VERSION = '0.7.2'
+    VERSION = '0.7.3'
   
     ##
     # User Agent aliases
@@ -157,15 +157,35 @@ module WWW
     end
   
     # Fetches the URL passed in and returns a page.
-    def get(url, referer=nil, &block)
-      cur_page = referer || current_page ||
-                      Page.new( nil, {'content-type'=>'text/html'})
-  
+    def get(url, parameters = [], referer = nil)
+      unless parameters.respond_to?(:each) # FIXME: Remove this in 0.8.0
+        referer = parameters
+        parameters = []
+      end
+
+      referer ||= current_page || Page.new(nil, {'content-type'=>'text/html'})
+
+      # FIXME: Huge hack so that using a URI as a referer works.  I need to
+      # refactor everything to pass around URIs but still support
+      # WWW::Mechanize::Page#base
+      unless referer.is_a?(Page)
+        referer = referer.is_a?(String) ?
+          Page.new(URI.parse(referer), {'content-type' => 'text/html'}) :
+          Page.new(referer, {'content-type' => 'text/html'})
+      end
+      abs_uri = to_absolute_uri(url, referer)
+
+      if parameters.length > 0
+        abs_uri.query ||= ''
+        abs_uri.query << '&' if abs_uri.query.length > 0
+        abs_uri.query << self.class.build_query_string(parameters)
+      end
+
       # fetch the page
-      abs_uri = to_absolute_uri(url, cur_page)
       request = fetch_request(abs_uri)
-      page = fetch_page(abs_uri, request, cur_page, &block)
+      page = fetch_page(abs_uri, request, referer)
       add_to_history(page)
+      yield page if block_given?
       page
     end
   
@@ -210,7 +230,14 @@ module WWW
   
       form = Form.new(node)
       query.each { |k,v|
-        form.fields << Form::Field.new(k,v)
+        if v.is_a?(IO)
+          form.enctype = 'multipart/form-data'
+          ul = Form::FileUpload.new(k.to_s,::File.basename(v.path))
+          ul.file_data = v.read
+          form.file_uploads << ul
+        else
+          form.fields << Form::Field.new(k.to_s,v)
+        end
       }
       post_form(url, form)
     end
@@ -537,7 +564,14 @@ module WWW
             when 'gzip'
               log.debug('gunzip body') if log
               if response['Content-Length'].to_i > 0 || body.length > 0
-                Zlib::GzipReader.new(body).read
+                begin
+                  Zlib::GzipReader.new(body).read
+                rescue Zlib::BufError => e
+                  log.error('Caught a Zlib::BufError')
+                  body.rewind
+                  body.read(10)
+                  Zlib::Inflate.new(-Zlib::MAX_WBITS).inflate(body.read)
+                end
               else
                 ''
               end
@@ -633,7 +667,7 @@ module WWW
       parameters.each { |k,v|
         next if k.nil?
         vals <<
-        [WEBrick::HTTPUtils.escape_form(k), 
+        [WEBrick::HTTPUtils.escape_form(k.to_s),
          WEBrick::HTTPUtils.escape_form(v.to_s)].join("=")
       }
   

data/test/tc_mech.rb

@@ -5,6 +5,27 @@ class TestMechMethods < Test::Unit::TestCase
     @agent = WWW::Mechanize.new
   end
 
+  def test_get_with_params
+    page = @agent.get('http://localhost/', { :q => 'hello' })
+    assert_equal('http://localhost/?q=hello', page.uri.to_s)
+  end
+
+  def test_get_with_referer
+    class << @agent
+      attr_reader :request
+      alias :old_set_headers :set_headers
+      def set_headers(u, request, cur_page)
+        old_set_headers(u, request, cur_page)
+        @request = request
+      end
+    end
+    @agent.get('http://localhost/', URI.parse('http://google.com/'))
+    assert_equal 'http://google.com/', @agent.request['Referer']
+
+    @agent.get('http://localhost/', [], 'http://tenderlovemaking.com/')
+    assert_equal 'http://tenderlovemaking.com/', @agent.request['Referer']
+  end
+
   def test_weird_url
     assert_nothing_raised {
       @agent.get('http://localhost/?action=bing&bang=boom=1|a=|b=|c=')

data/test/tc_page.rb

@@ -5,6 +5,15 @@ class TestPage < Test::Unit::TestCase
     @agent = WWW::Mechanize.new
   end
 
+  def test_page_gets_yielded
+    pages = nil
+    @agent.get("http://localhost/file_upload.html") { |page|
+      pages = page
+    }
+    assert pages
+    assert_equal('File Upload Form', pages.title)
+  end
+
   def test_title
     page = @agent.get("http://localhost/file_upload.html")
     assert_equal('File Upload Form', page.title)

data/test/tc_upload.rb

@@ -6,6 +6,18 @@ class UploadMechTest < Test::Unit::TestCase
     @page = @agent.get("http://localhost/file_upload.html")
   end
 
+  def test_upload_with_post_param
+    page = @agent.post('http://localhost/file_upload', {
+      :name       => 'Some file',
+      :userfile1  => File.open(__FILE__)
+    })
+    assert_match(
+      "Content-Disposition: form-data; name=\"userfile1\"; filename=\"#{File.basename(__FILE__)}\"",
+      page.body
+    )
+    assert page.body.length > File.read(__FILE__).length
+  end
+
   def test_form_enctype
     assert_equal('multipart/form-data', @page.forms[0].enctype)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-06 00:00:00 -08:00
+date: 2008-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency