mechanize 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540e567d390aebe104b22b2c11c726c9bceef098
-  data.tar.gz: c86f1051ac42694d9390856a53724a1b76019a35
+  metadata.gz: c12fbfdafc2cf8b5e94edf3db704c3ed421331f9
+  data.tar.gz: 0993d3a38d4241baa07167ba77a74cdd378e58fd
 SHA512:
-  metadata.gz: 949355d69adf7c58dfa355508e25044535f2880f7a7640d29ee8177d354850fb972dc625c4fac32c7b7e7496d5ca9eae94ad3fb47fc4ee37a45ad9d19f3a10d7
-  data.tar.gz: c0a04825b124542b1d5eee4749402bfe64de7ba49b52952054f1fe92cd2d6607628174e76d8d2ca3f8be90b0da46871cb26db55be0fc3bf388ff0c266daf82f7
+  metadata.gz: 3f07973adedd7639b1dd91e37c91ec7d74a1d5ad85ff87b2668f7ecedd30c0e12d6a954b3fe3634764a29f745cec6084eb83b795fd9ee46203d8b8653d0f3cb1
+  data.tar.gz: a89b922deb0fd98ba15d35a7a130e28b373082d3a9505885594bb8c4689b5014cbf6a46238385bd9d046ce8f6ba42abc552c2cf97f90acc2b6521722463f3b3e

data/CHANGELOG.rdoc

@@ -1,5 +1,16 @@
 = Mechanize CHANGELOG
 
+=== 2.7.3
+
+* New Features
+  * Allow net-http-persistent instance to be named. #324, John Weir.
+  * #save and #save! return filename #340
+  * Updated mime-types requirement to 2.x versions.  #348 by Jeff Nyman.
+
+* Bug fix
+  * Ensure Download#save! defaults back to original filename if
+    none is provided (#300)
+
 === 2.7.2
 
 * Bug fix

data/Manifest.txt

@@ -21,6 +21,7 @@ lib/mechanize/cookie_jar.rb
 lib/mechanize/directory_saver.rb
 lib/mechanize/download.rb
 lib/mechanize/element_matcher.rb
+lib/mechanize/element_not_found_error.rb
 lib/mechanize/file.rb
 lib/mechanize/file_connection.rb
 lib/mechanize/file_request.rb
@@ -159,6 +160,7 @@ test/test_mechanize_cookie.rb
 test/test_mechanize_cookie_jar.rb
 test/test_mechanize_directory_saver.rb
 test/test_mechanize_download.rb
+test/test_mechanize_element_not_found_error.rb
 test/test_mechanize_file.rb
 test/test_mechanize_file_connection.rb
 test/test_mechanize_file_request.rb

data/Rakefile

@@ -20,8 +20,8 @@ hoe = Hoe.spec 'mechanize' do
 
   self.extra_deps << ['net-http-digest_auth', '~> 1.1', '>= 1.1.1']
   self.extra_deps << ['net-http-persistent',  '~> 2.5', '>= 2.5.2']
-  self.extra_deps << ['mime-types',           '~> 1.17', '>= 1.17.2']
-  self.extra_deps << ['http-cookie',          '~> 1.0.0']
+  self.extra_deps << ['mime-types',           '~> 2.0']
+  self.extra_deps << ['http-cookie',          '~> 1.0']
   self.extra_deps << ['nokogiri',             '~> 1.4']
   self.extra_deps << ['ntlm-http',            '~> 0.1', '>= 0.1.1']
   self.extra_deps << ['webrobots',            '<  0.2', '>= 0.0.9']

data/lib/mechanize.rb

@@ -73,7 +73,7 @@ class Mechanize
   ##
   # The version of Mechanize you are using.
 
-  VERSION = '2.7.2'
+  VERSION = '2.7.3'
 
   ##
   # Base mechanize error class
@@ -169,9 +169,17 @@ class Mechanize
   #     a.proxy_host = 'proxy.example'
   #     a.proxy_port = 8080
   #   end
+  #
+  # If you need segregated SSL connections give each agent a unique
+  # name.  Otherwise the connections will be shared.  This is
+  # particularly important if you are using certifcates.
+  #
+  #    agent_1 = Mechanize.new 'conn1'
+  #    agent_2 = Mechanize.new 'conn2'
+  #
 
-  def initialize
-    @agent = Mechanize::HTTP::Agent.new
+  def initialize(connection_name = 'mechanize')
+    @agent = Mechanize::HTTP::Agent.new(connection_name)
     @agent.context = self
     @log = nil
 
@@ -1285,6 +1293,7 @@ Use of #auth and #basic_auth are deprecated due to a security vulnerability.
 
 end
 
+require 'mechanize/element_not_found_error'
 require 'mechanize/response_read_error'
 require 'mechanize/chunked_termination_error'
 require 'mechanize/content_type_error'

data/lib/mechanize/download.rb

@@ -51,6 +51,7 @@ class Mechanize::Download
 
   ##
   # Saves a copy of the body_io to +filename+
+  # returns the filename
 
   def save filename = nil
     filename = find_free_name filename
@@ -63,8 +64,10 @@ class Mechanize::Download
   # Use this method to save the content of body_io to +filename+.
   # This method will overwrite any existing filename that exists with the
   # same name.
+  # returns the filename
 
   def save! filename = nil
+    filename ||= @filename
     dirname = File.dirname filename
     FileUtils.mkdir_p dirname
 
@@ -73,6 +76,8 @@ class Mechanize::Download
         io.write @body_io.read 16384
       end
     end
+
+    filename
   end
 
 end

data/lib/mechanize/element_matcher.rb

@@ -28,6 +28,13 @@ module Mechanize::ElementMatcher
         f
       end
 
+      def #{singular}_with! criteria = {}
+        f = #{singular}_with(criteria)
+        raise Mechanize::ElementNotFoundError.new(self, :#{singular}, criteria) if f.nil?
+        yield f if block_given?
+        f
+      end
+
       def select_#{plural} selector
         if selector.nil? then
           #{plural}

data/lib/mechanize/element_not_found_error.rb

@@ -0,0 +1,19 @@
+##
+# Raised when an an element was not found on the Page
+
+class Mechanize::ElementNotFoundError < Mechanize::Error
+
+  attr_reader :source
+  attr_reader :element
+  attr_reader :conditions
+
+  def initialize source, element, conditions
+    @source     = source
+    @element    = element 
+    @conditions = conditions
+
+    super "Element #{element} with conditions #{conditions} was not found"
+  end
+  
+end
+

data/lib/mechanize/file.rb

@@ -50,10 +50,15 @@ class Mechanize::File
 
   ##
   # Use this method to save the content of this object to +filename+.
+  # returns the filename
   #
   #   file.save 'index.html'
-  #   file.save 'index.html' # saves index.html.1
-  #   file.save 'index.html'
+  #   file.save 'index.html' # saves to index.html.1
+  #
+  #   uri = URI 'http://localhost/test.html'
+  #   file = Mechanize::File.new uri, nil, ''
+  #   filename = file.save  # saves to test.html
+  #   puts filename         # test.html
 
   def save filename = nil
     filename = find_free_name filename
@@ -66,17 +71,22 @@ class Mechanize::File
   # Use this method to save the content of this object to +filename+.
   # This method will overwrite any existing filename that exists with the
   # same name.
+  # returns the filename
   #
   #   file.save 'index.html'
   #   file.save! 'index.html' # overwrite original file
+  #   filename = file.save! 'index.html' # overwrite original file with filename 'index.html'
 
   def save! filename = nil
+    filename ||= @filename
     dirname = File.dirname filename
     FileUtils.mkdir_p dirname
 
     open filename, 'wb' do |f|
       f.write body
     end
+
+    filename
   end
 
 end

data/lib/mechanize/form.rb

@@ -369,6 +369,12 @@ class Mechanize::Form
   # Example:
   #   form.field_with(:id => "exact_field_id").value = 'hello'
 
+  ##
+  # :method: field_with!(criteria)
+  #
+  # Same as +field_with+ but raises an ElementNotFoundError if no field matches
+  # +criteria+
+
   ##
   # :method: fields_with(criteria)
   #
@@ -387,6 +393,12 @@ class Mechanize::Form
   # Example:
   #   form.button_with(:value => /submit/).value = 'hello'
 
+  ##
+  # :method: button_with!(criteria)
+  #
+  # Same as +button_with+ but raises an ElementNotFoundError if no button
+  # matches +criteria+
+
   ##
   # :method: buttons_with(criteria)
   #
@@ -405,6 +417,12 @@ class Mechanize::Form
   # Example:
   #   form.file_upload_with(:file_name => /picture/).value = 'foo'
 
+  ##
+  # :mehtod: file_upload_with!(criteria)
+  #
+  # Same as +file_upload_with+ but raises an ElementNotFoundError if no button
+  # matches +criteria+
+
   ##
   # :method: file_uploads_with(criteria)
   #
@@ -423,6 +441,12 @@ class Mechanize::Form
   # Example:
   #   form.radiobutton_with(:name => /woo/).check
 
+  ##
+  # :mehtod: radiobutton_with!(criteria)
+  #
+  # Same as +radiobutton_with+ but raises an ElementNotFoundError if no button
+  # matches +criteria+
+
   ##
   # :method: radiobuttons_with(criteria)
   #
@@ -441,6 +465,12 @@ class Mechanize::Form
   # Example:
   #   form.checkbox_with(:name => /woo/).check
 
+  ##
+  # :mehtod: checkbox_with!(criteria)
+  #
+  # Same as +checkbox_with+ but raises an ElementNotFoundError if no button
+  # matches +criteria+
+
   ##
   # :method: checkboxes_with(criteria)
   #

data/lib/mechanize/form/multi_select_list.rb

@@ -38,6 +38,12 @@ class Mechanize::Form::MultiSelectList < Mechanize::Form::Field
   #
   #   select_list.option_with(:value => '1').value = 'foo'
 
+  ##
+  # :mehtod: option_with!(criteria)
+  #
+  # Same as +option_with+ but raises an ElementNotFoundError if no button
+  # matches +criteria+
+
   ##
   # :method: options_with
   #

data/lib/mechanize/http/agent.rb

@@ -125,7 +125,9 @@ class Mechanize::HTTP::Agent
   # Creates a new Mechanize HTTP user agent.  The user agent is an
   # implementation detail of mechanize and its API may change at any time.
 
-  def initialize
+  # The connection_name can be used to segregate SSL connections.
+  # Agents with different names will not share the same persistent connection.
+  def initialize(connection_name = 'mechanize')
     @allowed_error_codes      = []
     @conditional_requests     = true
     @context                  = nil
@@ -174,7 +176,7 @@ class Mechanize::HTTP::Agent
     @scheme_handlers['relative']  = @scheme_handlers['http']
     @scheme_handlers['file']      = @scheme_handlers['http']
 
-    @http = Net::HTTP::Persistent.new 'mechanize'
+    @http = Net::HTTP::Persistent.new connection_name
     @http.idle_timeout = 5
     @http.keep_alive   = 300
   end

data/lib/mechanize/page.rb

@@ -223,6 +223,12 @@ class Mechanize::Page < Mechanize::File
   #     ...
   #   end
 
+  ##
+  # :mehtod: form_with!(criteria)
+  #
+  # Same as +form_with+ but raises an ElementNotFoundError if no button matches
+  # +criteria+
+
   ##
   # :method: forms_with
   #
@@ -245,6 +251,12 @@ class Mechanize::Page < Mechanize::File
   # Example:
   #   page.link_with(:href => /foo/).click
 
+  ##
+  # :mehtod: link_with!(criteria)
+  #
+  # Same as +link_with+ but raises an ElementNotFoundError if no button matches
+  # +criteria+
+
   ##
   # :method: links_with
   #
@@ -268,6 +280,12 @@ class Mechanize::Page < Mechanize::File
   # Example:
   #   page.base_with(:href => /foo/).click
 
+  ##
+  # :mehtod: base_with!(criteria)
+  #
+  # Same as +base_with+ but raises an ElementNotFoundError if no button matches
+  # +criteria+
+
   ##
   # :method: bases_with
   #
@@ -290,6 +308,12 @@ class Mechanize::Page < Mechanize::File
   # Example:
   #   page.frame_with(:src => /foo/).click
 
+  ##
+  # :mehtod: frame_with!(criteria)
+  #
+  # Same as +frame_with+ but raises an ElementNotFoundError if no button matches
+  # +criteria+
+
   ##
   # :method: frames_with
   #
@@ -312,6 +336,12 @@ class Mechanize::Page < Mechanize::File
   # Example:
   #   page.iframe_with(:src => /foo/).click
 
+  ##
+  # :mehtod: iframe_with!(criteria)
+  #
+  # Same as +iframe_with+ but raises an ElementNotFoundError if no button
+  # matches +criteria+
+
   ##
   # :method: iframes_with
   #
@@ -334,6 +364,12 @@ class Mechanize::Page < Mechanize::File
   # Example:
   #   page.image_with(:alt => /main/).fetch.save
 
+  ##
+  # :mehtod: image_with!(criteria)
+  #
+  # Same as +image_with+ but raises an ElementNotFoundError if no button matches
+  # +criteria+
+
   ##
   # :method: images_with
   #

data/lib/mechanize/pluggable_parsers.rb

@@ -99,7 +99,7 @@ class Mechanize::PluggableParser
              @parsers[mime_type.simplified] ||
              @parsers[mime_type.media_type] ||
              default
-  rescue MIME::InvalidContentType
+  rescue MIME::Type::InvalidContentType
     default
   end
 

data/test/test_mechanize.rb

@@ -1293,6 +1293,14 @@ but not <a href="/" rel="me nofollow">this</a>!
     assert @mech.visited?('http://localhost/response_code?code=302')
   end
 
+  def test_no_frames_exists
+    page = @mech.get("http://localhost/empty_form.html");
+    assert_nil page.frame_with(:name => 'noframe')
+    assert_raises Mechanize::ElementNotFoundError do
+      page.frame_with!(:name => 'noframe')
+    end
+  end
+
   def assert_header(page, header)
     headers = {}
 

data/test/test_mechanize_download.rb

@@ -25,9 +25,24 @@ class TestMechanizeDownload < Mechanize::TestCase
     download = @parser.new uri, nil, body_io
 
     in_tmpdir do
-      download.save
+      filename = download.save
 
       assert File.exist? 'foo.html'
+      assert_equal "foo.html", filename
+    end
+  end
+
+  def test_save_bang
+    uri = URI.parse 'http://example/foo.html'
+    body_io = StringIO.new '0123456789'
+
+    download = @parser.new uri, nil, body_io
+
+    in_tmpdir do
+      filename = download.save!
+
+      assert File.exist? 'foo.html'
+      assert_equal "foo.html", filename
     end
   end
 
@@ -43,9 +58,20 @@ class TestMechanizeDownload < Mechanize::TestCase
       download = @parser.new uri, nil, body_io
 
       in_tmpdir do
-        download.save
+        filename = download.save
 
         assert File.exist? 'foo.html'
+        assert_equal "foo.html", filename
+
+        filename = download.save
+
+        assert File.exist? 'foo.html.1'
+        assert_equal "foo.html.1", filename
+
+        filename = download.save
+
+        assert File.exist? 'foo.html.2'
+        assert_equal "foo.html.2", filename
       end
     end
   end

data/test/test_mechanize_element_not_found_error.rb

@@ -0,0 +1,15 @@
+require 'mechanize/test_case'
+
+class TestMechanizeRedirectLimitReachedError < Mechanize::TestCase
+
+  def test_to_s
+    page = fake_page
+
+    error = Mechanize::ElementNotFoundError.new(page, :element, :conditions)
+
+    assert_match(/element/, error.to_s)
+    assert_match(/conditions/, error.to_s)
+  end
+
+end
+

data/test/test_mechanize_file.rb

@@ -14,20 +14,23 @@ class TestMechanizeFile < Mechanize::TestCase
 
     Dir.mktmpdir do |dir|
       Dir.chdir dir do
-        page.save 'test.html'
+        filename = page.save 'test.html'
 
         assert File.exist? 'test.html'
         assert_equal '0123456789', File.read('test.html')
+        assert_equal "test.html", filename
 
-        page.save 'test.html'
+        filename = page.save 'test.html'
 
         assert File.exist? 'test.html.1'
         assert_equal '0123456789', File.read('test.html.1')
+        assert_equal "test.html.1", filename
 
-        page.save 'test.html'
+        filename = page.save 'test.html'
 
         assert File.exist? 'test.html.2'
         assert_equal '0123456789', File.read('test.html.2')
+        assert_equal "test.html.2", filename
       end
     end
   end
@@ -38,17 +41,20 @@ class TestMechanizeFile < Mechanize::TestCase
 
     Dir.mktmpdir do |dir|
       Dir.chdir dir do
-        page.save
+        filename = page.save
 
         assert File.exist? 'test.html'
+        assert_equal "test.html", filename
 
-        page.save
+        filename = page.save
 
         assert File.exist? 'test.html.1'
+        assert_equal "test.html.1", filename
 
-        page.save
+        filename = page.save
 
         assert File.exist? 'test.html.2'
+        assert_equal "test.html.2", filename
       end
     end
   end
@@ -59,11 +65,13 @@ class TestMechanizeFile < Mechanize::TestCase
 
     Dir.mktmpdir do |dir|
       Dir.chdir dir do
-        page.save
+        filename = page.save
         assert File.exist? 'test.html'
+        assert_equal "test.html", filename
 
-        page.save
+        filename = page.save
         assert File.exist? 'test.html.1'
+        assert_equal "test.html.1", filename
       end
     end
   end
@@ -81,14 +89,16 @@ class TestMechanizeFile < Mechanize::TestCase
 
     Dir.mktmpdir do |dir|
       Dir.chdir dir do
-        page.save 'test.html'
+        filename = page.save 'test.html'
 
         assert File.exist? 'test.html'
+        assert_equal "test.html", filename
 
-        page.save! 'test.html'
+        filename = page.save! 'test.html'
 
         assert File.exist? 'test.html'
         refute File.exist? 'test.html.1'
+        assert_equal "test.html", filename
       end
     end
   end

data/test/test_mechanize_form.rb

@@ -484,6 +484,13 @@ class TestMechanizeForm < Mechanize::TestCase
     end.submit
   end
 
+  def test_post_with_bang
+    page = @mech.get("http://localhost/form_test.html")
+    page.form_with!(:name => 'post_form1') do |form|
+      form.first_name = 10
+    end.submit
+  end
+
   def test_post
     page = @mech.get("http://localhost/form_test.html")
     post_form = page.forms.find { |f| f.name == "post_form1" }
@@ -893,6 +900,22 @@ class TestMechanizeForm < Mechanize::TestCase
     assert(form.has_field?('intarweb'))
   end
 
+  def test_fill_unexisting_form
+    page = @mech.get("http://localhost/empty_form.html")
+    assert_raises(NoMethodError) {
+      page.form_with(:name => 'no form') { |f| f.foo = 'bar' }
+    }
+    begin
+      page.form_with!(:name => 'no form') { |f| f.foo = 'bar' }
+    rescue => e
+      assert_instance_of Mechanize::ElementNotFoundError, e
+      assert_kind_of Mechanize::Page, e.source
+      assert_equal :form, e.element
+      assert_kind_of Hash, e.conditions
+      assert_equal 'no form', e.conditions[:name]
+    end
+  end
+
   def test_field_error
     @page = @mech.get('http://localhost/empty_form.html')
     form = @page.forms.first

data/test/test_mechanize_http_agent.rb

@@ -33,6 +33,11 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     realm
   end
 
+  def test_agent_is_named
+    assert_equal 'mechanize', Mechanize::HTTP::Agent.new.http.name
+    assert_equal 'unique', Mechanize::HTTP::Agent.new('unique').http.name
+  end
+
   def test_auto_io
     Tempfile.open 'input' do |input_io|
       input_io.binmode
@@ -1584,6 +1589,11 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'invalid value for port: "nonexistent service"', e.message
   end
 
+  def test_setting_agent_name
+    mech = Mechanize.new 'user-set-name'
+    assert_equal 'user-set-name', mech.agent.http.name
+  end
+
   def test_ssl
     in_tmpdir do
       store = OpenSSL::X509::Store.new

data/test/test_mechanize_link.rb

@@ -12,6 +12,16 @@ class TestMechanizeLink < Mechanize::TestCase
       @mech.history.last.uri.to_s)
   end
 
+  def test_click_bang
+    page = @mech.get("http://localhost/frame_test.html")
+    link = page.link_with!(:text => "Form Test")
+
+    assert_equal('Form Test', link.text)
+    page = link.click
+    assert_equal("http://localhost/form_test.html",
+      @mech.history.last.uri.to_s)
+  end
+
   def test_click_base
     page = @mech.get("http://google.com/tc_base_link.html")
     page = page.links.first.click
@@ -34,6 +44,22 @@ class TestMechanizeLink < Mechanize::TestCase
     # HACK no assertion
   end
 
+  def test_click_unexiting_link
+    page = @mech.get("http://google.com/tc_links.html")
+    assert_raises NoMethodError do
+      page.link_with(:text => 'no link').click
+    end
+    begin
+      page.link_with!(:text => 'no link').click
+    rescue => e
+      assert_instance_of Mechanize::ElementNotFoundError, e
+      assert_kind_of Mechanize::Page, e.source
+      assert_equal :link, e.element
+      assert_kind_of Hash, e.conditions
+      assert_equal 'no link', e.conditions[:text]
+    end
+  end
+
   def test_click_empty_href
     page = @mech.get("http://google.com/tc_links.html?q=test#anchor")
     link = page.link_with(:text => 'empty href')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mechanize
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Eric Hodel
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
@@ -60,34 +60,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.17'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.17'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +243,7 @@ files:
 - lib/mechanize/directory_saver.rb
 - lib/mechanize/download.rb
 - lib/mechanize/element_matcher.rb
+- lib/mechanize/element_not_found_error.rb
 - lib/mechanize/file.rb
 - lib/mechanize/file_connection.rb
 - lib/mechanize/file_request.rb
@@ -387,6 +382,7 @@ files:
 - test/test_mechanize_cookie_jar.rb
 - test/test_mechanize_directory_saver.rb
 - test/test_mechanize_download.rb
+- test/test_mechanize_element_not_found_error.rb
 - test/test_mechanize_file.rb
 - test/test_mechanize_file_connection.rb
 - test/test_mechanize_file_request.rb
@@ -462,6 +458,7 @@ test_files:
 - test/test_mechanize_cookie_jar.rb
 - test/test_mechanize_directory_saver.rb
 - test/test_mechanize_download.rb
+- test/test_mechanize_element_not_found_error.rb
 - test/test_mechanize_file.rb
 - test/test_mechanize_file_connection.rb
 - test/test_mechanize_file_request.rb