mechanize 2.6.0 → 2.7.0

data/test/test_mechanize_http_agent.rb

@@ -39,7 +39,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
       input_io.write '12345'
       input_io.rewind
 
-      out_io = @agent.auto_io __name__, 1024, input_io
+      out_io = @agent.auto_io @NAME, 1024, input_io
 
       assert_equal '12345', out_io.string
 
@@ -56,7 +56,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
       input_io.write '12345'
       input_io.rewind
 
-      @agent.auto_io __name__, 1, input_io do |chunk|
+      @agent.auto_io @NAME, 1, input_io do |chunk|
         chunks << chunk
       end
 
@@ -72,7 +72,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
       input_io.write '12345'
       input_io.rewind
 
-      out_io = @agent.auto_io __name__, 1, input_io
+      out_io = @agent.auto_io @NAME, 1, input_io
 
       result = out_io.read
       assert_equal '12345', result
@@ -88,7 +88,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
       input_io.write '12345'
       input_io.rewind
 
-      out_io = @agent.auto_io __name__, 1024, input_io do |chunk|
+      out_io = @agent.auto_io @NAME, 1024, input_io do |chunk|
         "x#{chunk}"
       end
 
@@ -511,26 +511,22 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
 
   def test_request_cookies
     uri = URI.parse 'http://host.example.com'
-    Mechanize::Cookie.parse uri, 'hello=world domain=.example.com' do |cookie|
-      @agent.cookie_jar.add uri, cookie
-    end
+    @agent.cookie_jar.parse 'hello=world domain=.example.com', uri
 
     @agent.request_cookies @req, uri
 
-    assert_equal 'hello=world domain=.example.com', @req['Cookie']
+    assert_equal 'hello="world domain=.example.com"', @req['Cookie']
   end
 
   def test_request_cookies_many
     uri = URI.parse 'http://host.example.com'
     cookie_str = 'a=b domain=.example.com, c=d domain=.example.com'
-    Mechanize::Cookie.parse uri, cookie_str do |cookie|
-      @agent.cookie_jar.add uri, cookie
-    end
+    @agent.cookie_jar.parse cookie_str, uri
 
     @agent.request_cookies @req, uri
 
-    expected_variant1 = 'a=b domain=\.example\.com; c=d domain=\.example\.com'
-    expected_variant2 = 'c=d domain=\.example\.com; a=b domain=\.example\.com'
+    expected_variant1 = /a="b domain=\.example\.com"; c="d domain=\.example\.com"/
+    expected_variant2 = /c="d domain=\.example\.com"; a="b domain=\.example\.com"/
 
     assert_match(/^(#{expected_variant1}|#{expected_variant2})$/, @req['Cookie'])
   end
@@ -543,9 +539,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
 
   def test_request_cookies_wrong_domain
     uri = URI.parse 'http://host.example.com'
-    Mechanize::Cookie.parse uri, 'hello=world domain=.example.com' do |cookie|
-      @agent.cookie_jar.add uri, cookie
-    end
+    @agent.cookie_jar.parse 'hello=world domain=.example.com', uri
 
     @agent.request_cookies @req, @uri
 
@@ -703,6 +697,15 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_nil params
   end
 
+  def test_resolve_slashes
+    page = Mechanize::Page.new URI('http://example/foo/'), nil, '', 200, @mech
+    uri = '/bar/http://example/test/'
+
+    resolved = @agent.resolve uri, page
+
+    assert_equal 'http://example/bar/http://example/test/', resolved.to_s
+  end
+
   def test_response_authenticate
     @agent.add_auth @uri, 'user', 'password'
 
@@ -1017,6 +1020,14 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'part', body.read
   end
 
+  def test_response_content_encoding_empty_string
+    @res.instance_variable_set :@header, 'content-encoding' => %w[]
+
+    body = @agent.response_content_encoding @res, StringIO.new('part')
+
+    assert_equal 'part', body.read
+  end
+
   def test_response_content_encoding_tempfile_7_bit
     body_io = tempfile 'part'
 
@@ -1028,7 +1039,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     refute body_io.closed?
   ensure
     begin
-      body_io.close! unless body_io.closed?
+      body_io.close! if body_io and not body_io.closed?
     rescue IOError
       # HACK for ruby 1.8
     end
@@ -1043,7 +1054,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'part', body.read
     assert body_io.closed?
   ensure
-    body_io.close! unless body_io.closed?
+    body_io.close! if body_io and not body_io.closed?
   end
 
   def test_response_content_encoding_unknown
@@ -1077,7 +1088,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
 
     @agent.response_cookies @res, uri, page
 
-    assert_equal ['a=b domain=.example.com'],
+    assert_equal ['a="b domain=.example.com"'],
                  @agent.cookie_jar.cookies(uri).map { |c| c.to_s }
   end
 
@@ -1096,7 +1107,10 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     cookies_from_jar = @agent.cookie_jar.cookies(uri)
 
     assert_equal 2, cookies_from_jar.length
-    cookies_from_jar.each { |cookie| assert cookies.include? cookie.to_s }
+    assert_equal [
+      'a="b domain=.example.com"',
+      'c="d domain=.example.com"',
+    ], cookies_from_jar.sort_by { |c| c.name }.map(&:to_s)
   end
 
   def test_response_cookies_meta
@@ -1115,7 +1129,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
 
     @agent.response_cookies @res, uri, page
 
-    assert_equal ['a=b domain=.example.com'],
+    assert_equal ['a="b domain=.example.com"'],
                  @agent.cookie_jar.cookies(uri).map { |c| c.to_s }
   end
 
@@ -1302,12 +1316,12 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     def @res.content_length() 5 end
     def @res.read_body() yield 'part' end
 
-    e = assert_raises EOFError do
+    e = assert_raises Mechanize::ResponseReadError do
       @agent.response_read @res, @req, @uri
     end
 
-    assert_equal 'Content-Length (5) does not match response body length (4)',
-                 e.message
+    assert_equal 'Content-Length (5) does not match response body length (4)' \
+      ' (Mechanize::ResponseReadError)', e.message
   end
 
   def test_response_read_content_length_redirect

data/test/test_mechanize_page_image.rb

@@ -54,6 +54,7 @@ class TestMechanizePageImage < Mechanize::TestCase
   def test_url
     assert_equal ".jpg", img('src' => @src).extname
     assert_equal "http://example/a.jpg", img('src' => @src).url.to_s
+    assert_equal "http://example/a%20.jpg", img('src' => 'http://example/a .jpg' ).url.to_s
   end
 
   def test_url_base

data/test/test_mechanize_xml_file.rb

@@ -23,7 +23,7 @@ class TestMechanizeXmlFile < Mechanize::TestCase
   end
 
   def test_at
-    assert_equal 'Perl', @xml.at('language[2]').text
+    assert_equal 'Perl', @xml.at('//language[2]').text
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mechanize
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Eric Hodel
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
@@ -74,6 +74,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.17.2
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -154,42 +168,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 description: |-
   The Mechanize library is used for automating interaction with websites.
   Mechanize automatically stores and sends cookies, follows redirects,
@@ -276,6 +290,7 @@ files:
 - lib/mechanize/page/meta_refresh.rb
 - lib/mechanize/parser.rb
 - lib/mechanize/pluggable_parsers.rb
+- lib/mechanize/prependable.rb
 - lib/mechanize/redirect_limit_reached_error.rb
 - lib/mechanize/redirect_not_get_or_head_error.rb
 - lib/mechanize/response_code_error.rb