mechanize 0.7.7 → 0.7.8

data/History.txt

@@ -1,5 +1,13 @@
 = Mechanize CHANGELOG
 
+=== 0.7.8
+
+* Bug Fixes:
+  * Fixed bug when receiving a 304 response (HTTPNotModified) on a page not
+    cached in history.
+  * #21428 Default to HTML parser for 'application/xhtml+xml' content-type.
+  * Fixed an issue where redirects were resending posted data
+
 === 0.7.7
 
 * New Features:

data/Manifest.txt

@@ -43,6 +43,7 @@ lib/www/mechanize/pluggable_parsers.rb
 lib/www/mechanize/redirect_limit_reached_error.rb
 lib/www/mechanize/response_code_error.rb
 lib/www/mechanize/unsupported_scheme_error.rb
+mechanize.gemspec
 test/data/htpasswd
 test/data/server.crt
 test/data/server.csr
@@ -94,6 +95,7 @@ test/test_authenticate.rb
 test/test_bad_links.rb
 test/test_blank_form.rb
 test/test_checkboxes.rb
+test/test_content_type.rb
 test/test_cookie_class.rb
 test/test_cookie_jar.rb
 test/test_cookies.rb

data/Rakefile

@@ -4,24 +4,7 @@ require 'hoe'
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 require 'mechanize'
 
-class MechHoe < Hoe
-  def define_tasks
-    super
-    desc "Update SSL Certificate"
-    Rake::Task.define_task('ssl_cert') do |p|
-      sh "openssl genrsa -des3 -out server.key 1024"
-      sh "openssl req -new -key server.key -out server.csr"
-      sh "cp server.key server.key.org"
-      sh "openssl rsa -in server.key.org -out server.key"
-      sh "openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt"
-      sh "cp server.key server.pem"
-      sh "mv server.key server.csr server.crt server.pem test/data/"
-      sh "rm server.key.org"
-    end
-  end
-end
-
-MechHoe.new('mechanize', WWW::Mechanize::VERSION) do |p|
+HOE = Hoe.new('mechanize', WWW::Mechanize::VERSION) do |p|
   p.rubyforge_name  = 'mechanize'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'
@@ -29,3 +12,24 @@ MechHoe.new('mechanize', WWW::Mechanize::VERSION) do |p|
   p.extra_deps      = [['hpricot', '>= 0.5.0']]
 end
 
+desc "Update SSL Certificate"
+task('ssl_cert') do |p|
+  sh "openssl genrsa -des3 -out server.key 1024"
+  sh "openssl req -new -key server.key -out server.csr"
+  sh "cp server.key server.key.org"
+  sh "openssl rsa -in server.key.org -out server.key"
+  sh "openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt"
+  sh "cp server.key server.pem"
+  sh "mv server.key server.csr server.crt server.pem test/data/"
+  sh "rm server.key.org"
+end
+
+namespace :gem do
+  desc 'Generate a gem spec'
+  task :spec do
+    File.open("#{HOE.name}.gemspec", 'w') do |f|
+      HOE.spec.version = "#{HOE.version}.#{Time.now.strftime("%Y%m%d%H%M%S")}"
+      f.write(HOE.spec.to_ruby)
+    end
+  end
+end

data/lib/www/mechanize.rb

@@ -43,7 +43,7 @@ module WWW
   class Mechanize
     ##
     # The version of Mechanize you are using.
-    VERSION = '0.7.7'
+    VERSION = '0.7.8'
   
     ##
     # User Agent aliases
@@ -716,14 +716,14 @@ module WWW
   
       if res_klass == Net::HTTPNotModified
         log.debug("Got cached page") if log
-        return visited_page(uri)
+        return visited_page(uri) || page
       elsif res_klass <= Net::HTTPRedirection
         return page unless follow_redirect?
         log.info("follow redirect to: #{ response['Location'] }") if log
         from_uri  = page.uri
         abs_uri   = to_absolute_uri(response['Location'].to_s, page)
         raise RedirectLimitReachedError.new(page, redirects) if redirects + 1 > redirection_limit
-        page = fetch_page(abs_uri, fetch_request(abs_uri), page, request_data, redirects + 1)
+        page = fetch_page(abs_uri, fetch_request(abs_uri), page, [], redirects + 1)
         @history.push(page, from_uri)
         return page
       elsif res_klass <= Net::HTTPUnauthorized

data/lib/www/mechanize/page.rb

@@ -27,7 +27,7 @@ module WWW
         @mech           ||= mech
 
         raise Mechanize::ContentTypeError.new(response['content-type']) unless
-            content_type() =~ /^text\/html/ 
+            content_type() =~ /^(text\/html)|(application\/xhtml\+xml)/ 
 
         @parser = @links = @forms = @meta = @bases = @frames = @iframes = nil
       end

data/lib/www/mechanize/pluggable_parsers.rb

@@ -45,6 +45,7 @@ module WWW
     class PluggableParser
       CONTENT_TYPES = {
         :html => 'text/html',
+        :xhtml => 'application/xhtml+xml',
         :pdf  => 'application/pdf',
         :csv  => 'text/csv',
         :xml  => 'text/xml',
@@ -53,7 +54,8 @@ module WWW
       attr_accessor :default
 
       def initialize
-        @parsers = { CONTENT_TYPES[:html] => Page }
+        @parsers = { CONTENT_TYPES[:html] => Page,
+                     CONTENT_TYPES[:xhtml] => Page }
         @default = File
       end
 
@@ -67,6 +69,11 @@ module WWW
 
       def html=(klass)
         register_parser(CONTENT_TYPES[:html], klass)
+        register_parser(CONTENT_TYPES[:xhtml], klass)
+      end
+
+      def xhtml=(klass)
+        register_parser(CONTENT_TYPES[:xhtml], klass)
       end
 
       def pdf=(klass)

data/mechanize.gemspec

@@ -0,0 +1,36 @@
+Gem::Specification.new do |s|
+  s.name = %q{mechanize}
+  s.version = "0.7.7.20080826145538"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Aaron Patterson"]
+  s.date = %q{2008-08-26}
+  s.description = %q{The Mechanize library is used for automating interaction with websites.  Mechanize automatically stores and sends cookies, follows redirects, can follow links, and submit forms.  Form fields can be populated and submitted.  Mechanize also keeps track of the sites that you have visited as a history.}
+  s.email = %q{aaronp@rubyforge.org}
+  s.extra_rdoc_files = ["EXAMPLES.txt", "FAQ.txt", "GUIDE.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "NOTES.txt", "README.txt"]
+  s.files = ["EXAMPLES.txt", "FAQ.txt", "GUIDE.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "NOTES.txt", "README.txt", "Rakefile", "eg/flickr_upload.rb", "eg/mech-dump.rb", "eg/proxy_req.rb", "eg/rubyforge.rb", "eg/spider.rb", "lib/mechanize.rb", "lib/www/mechanize.rb", "lib/www/mechanize/content_type_error.rb", "lib/www/mechanize/cookie.rb", "lib/www/mechanize/cookie_jar.rb", "lib/www/mechanize/file.rb", "lib/www/mechanize/file_saver.rb", "lib/www/mechanize/form.rb", "lib/www/mechanize/form/button.rb", "lib/www/mechanize/form/check_box.rb", "lib/www/mechanize/form/field.rb", "lib/www/mechanize/form/file_upload.rb", "lib/www/mechanize/form/image_button.rb", "lib/www/mechanize/form/multi_select_list.rb", "lib/www/mechanize/form/option.rb", "lib/www/mechanize/form/radio_button.rb", "lib/www/mechanize/form/select_list.rb", "lib/www/mechanize/headers.rb", "lib/www/mechanize/history.rb", "lib/www/mechanize/inspect.rb", "lib/www/mechanize/list.rb", "lib/www/mechanize/monkey_patch.rb", "lib/www/mechanize/page.rb", "lib/www/mechanize/page/base.rb", "lib/www/mechanize/page/frame.rb", "lib/www/mechanize/page/link.rb", "lib/www/mechanize/page/meta.rb", "lib/www/mechanize/pluggable_parsers.rb", "lib/www/mechanize/redirect_limit_reached_error.rb", "lib/www/mechanize/response_code_error.rb", "lib/www/mechanize/unsupported_scheme_error.rb", "mechanize.gemspec", "test/data/htpasswd", "test/data/server.crt", "test/data/server.csr", "test/data/server.key", "test/data/server.pem", "test/helper.rb", "test/htdocs/alt_text.html", "test/htdocs/bad_form_test.html", "test/htdocs/button.jpg", "test/htdocs/empty_form.html", "test/htdocs/file_upload.html", "test/htdocs/find_link.html", "test/htdocs/form_multi_select.html", "test/htdocs/form_multival.html", "test/htdocs/form_no_action.html", "test/htdocs/form_no_input_name.html", "test/htdocs/form_select.html", "test/htdocs/form_select_all.html", "test/htdocs/form_select_none.html", "test/htdocs/form_select_noopts.html", "test/htdocs/form_set_fields.html", "test/htdocs/form_test.html", "test/htdocs/frame_test.html", "test/htdocs/google.html", "test/htdocs/iframe_test.html", "test/htdocs/index.html", "test/htdocs/link with space.html", "test/htdocs/meta_cookie.html", "test/htdocs/no_title_test.html", "test/htdocs/relative/tc_relative_links.html", "test/htdocs/tc_bad_links.html", "test/htdocs/tc_base_link.html", "test/htdocs/tc_blank_form.html", "test/htdocs/tc_checkboxes.html", "test/htdocs/tc_encoded_links.html", "test/htdocs/tc_follow_meta.html", "test/htdocs/tc_form_action.html", "test/htdocs/tc_links.html", "test/htdocs/tc_no_attributes.html", "test/htdocs/tc_pretty_print.html", "test/htdocs/tc_radiobuttons.html", "test/htdocs/tc_referer.html", "test/htdocs/tc_relative_links.html", "test/htdocs/tc_textarea.html", "test/htdocs/unusual______.html", "test/servlets.rb", "test/ssl_server.rb", "test/test_authenticate.rb", "test/test_bad_links.rb", "test/test_blank_form.rb", "test/test_checkboxes.rb", "test/test_content_type.rb", "test/test_cookie_class.rb", "test/test_cookie_jar.rb", "test/test_cookies.rb", "test/test_encoded_links.rb", "test/test_errors.rb", "test/test_follow_meta.rb", "test/test_form_action.rb", "test/test_form_as_hash.rb", "test/test_form_button.rb", "test/test_form_no_inputname.rb", "test/test_forms.rb", "test/test_frames.rb", "test/test_get_headers.rb", "test/test_gzipping.rb", "test/test_hash_api.rb", "test/test_history.rb", "test/test_history_added.rb", "test/test_html_unscape_forms.rb", "test/test_if_modified_since.rb", "test/test_keep_alive.rb", "test/test_links.rb", "test/test_mech.rb", "test/test_mechanize_file.rb", "test/test_multi_select.rb", "test/test_no_attributes.rb", "test/test_option.rb", "test/test_page.rb", "test/test_pluggable_parser.rb", "test/test_post_form.rb", "test/test_pretty_print.rb", "test/test_radiobutton.rb", "test/test_redirect_limit_reached.rb", "test/test_referer.rb", "test/test_relative_links.rb", "test/test_response_code.rb", "test/test_save_file.rb", "test/test_select.rb", "test/test_select_all.rb", "test/test_select_none.rb", "test/test_select_noopts.rb", "test/test_set_fields.rb", "test/test_ssl_server.rb", "test/test_subclass.rb", "test/test_textarea.rb", "test/test_upload.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{  http://mechanize.rubyforge.org/}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{mechanize}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{Mechanize provides automated web-browsing}
+  s.test_files = ["test/test_authenticate.rb", "test/test_bad_links.rb", "test/test_blank_form.rb", "test/test_checkboxes.rb", "test/test_content_type.rb", "test/test_cookie_class.rb", "test/test_cookie_jar.rb", "test/test_cookies.rb", "test/test_encoded_links.rb", "test/test_errors.rb", "test/test_follow_meta.rb", "test/test_form_action.rb", "test/test_form_as_hash.rb", "test/test_form_button.rb", "test/test_form_no_inputname.rb", "test/test_forms.rb", "test/test_frames.rb", "test/test_get_headers.rb", "test/test_gzipping.rb", "test/test_hash_api.rb", "test/test_history.rb", "test/test_history_added.rb", "test/test_html_unscape_forms.rb", "test/test_if_modified_since.rb", "test/test_keep_alive.rb", "test/test_links.rb", "test/test_mech.rb", "test/test_mechanize_file.rb", "test/test_multi_select.rb", "test/test_no_attributes.rb", "test/test_option.rb", "test/test_page.rb", "test/test_pluggable_parser.rb", "test/test_post_form.rb", "test/test_pretty_print.rb", "test/test_radiobutton.rb", "test/test_redirect_limit_reached.rb", "test/test_referer.rb", "test/test_relative_links.rb", "test/test_response_code.rb", "test/test_save_file.rb", "test/test_select.rb", "test/test_select_all.rb", "test/test_select_none.rb", "test/test_select_noopts.rb", "test/test_set_fields.rb", "test/test_ssl_server.rb", "test/test_subclass.rb", "test/test_textarea.rb", "test/test_upload.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<hpricot>, [">= 0.5.0"])
+      s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
+    else
+      s.add_dependency(%q<hpricot>, [">= 0.5.0"])
+      s.add_dependency(%q<hoe>, [">= 1.7.0"])
+    end
+  else
+    s.add_dependency(%q<hpricot>, [">= 0.5.0"])
+    s.add_dependency(%q<hoe>, [">= 1.7.0"])
+  end
+end

data/test/test_content_type.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + "/helper"
+
+class TestContentType < Test::Unit::TestCase
+  def setup
+    @agent = WWW::Mechanize.new
+  end
+
+  def test_application_xhtml_xml
+    url = 'http://localhost/content_type_test?ct=application/xhtml%2Bxml'
+    page = @agent.get url
+    assert_equal WWW::Mechanize::Page, page.class, "xhtml docs should return a Page"
+  end
+end

data/test/test_get_headers.rb

@@ -22,11 +22,18 @@ class TestGetHeaders < Test::Unit::TestCase
   end
 
   def test_if_modified_since_header
-    value = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+    value = (Time.now - 600).strftime("%a, %d %b %Y %H:%M:%S %z")
     page = @agent.get(:url => 'http://localhost/http_headers', :headers => { :if_modified_since => value})
     assert_header(page, 'if-modified-since' => value)
   end
 
+  def test_if_modified_since_response
+    value = (Time.now - 600).strftime("%a, %d %b %Y %H:%M:%S %z")
+    page = @agent.get(:url => 'http://localhost/if_modified_since', :headers => { :if_modified_since => value})
+    assert_equal "304", page.code
+    assert_equal "0", page.header['content-length']
+  end
+
   def test_string_header
     page = @agent.get(:url => 'http://localhost/http_headers', :headers => { "X-BS-French-Header" => 'Ou est la bibliotheque?'})
     assert_header(page, 'x-bs-french-header' => 'Ou est la bibliotheque?')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-25 00:00:00 -07:00
+date: 2008-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - lib/www/mechanize/redirect_limit_reached_error.rb
 - lib/www/mechanize/response_code_error.rb
 - lib/www/mechanize/unsupported_scheme_error.rb
+- mechanize.gemspec
 - test/data/htpasswd
 - test/data/server.crt
 - test/data/server.csr
@@ -144,6 +145,7 @@ files:
 - test/test_bad_links.rb
 - test/test_blank_form.rb
 - test/test_checkboxes.rb
+- test/test_content_type.rb
 - test/test_cookie_class.rb
 - test/test_cookie_jar.rb
 - test/test_cookies.rb
@@ -221,6 +223,7 @@ test_files:
 - test/test_bad_links.rb
 - test/test_blank_form.rb
 - test/test_checkboxes.rb
+- test/test_content_type.rb
 - test/test_cookie_class.rb
 - test/test_cookie_jar.rb
 - test/test_cookies.rb