mechanize 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a97a6fd7fb8b0c358b45a7f457fb0e6fa3878e41
-  data.tar.gz: 4476cd31d79931fe29635bdd34491b2b90ae1663
+  metadata.gz: 540e567d390aebe104b22b2c11c726c9bceef098
+  data.tar.gz: c86f1051ac42694d9390856a53724a1b76019a35
 SHA512:
-  metadata.gz: cb4c0755690791b5747e2ff4b44bd063088ee7481cced3ae15a4f7dbe19f70ed74837a5c0e90bb4da387be85012169455374dd00b5b3f0464134aad7ff3aa08d
-  data.tar.gz: de0b415c13d960df9bc6fb732a7eecd85b188e081b0123e61edfec37c868ef6a029a69f8dc394c4aa679d9becf29e3c0a50d557b3ba0a08e5d7c7407dfb54dd8
+  metadata.gz: 949355d69adf7c58dfa355508e25044535f2880f7a7640d29ee8177d354850fb972dc625c4fac32c7b7e7496d5ca9eae94ad3fb47fc4ee37a45ad9d19f3a10d7
+  data.tar.gz: c0a04825b124542b1d5eee4749402bfe64de7ba49b52952054f1fe92cd2d6607628174e76d8d2ca3f8be90b0da46871cb26db55be0fc3bf388ff0c266daf82f7

data/.travis.yml

@@ -11,7 +11,6 @@ notifications:
   - ljjarvis@gmail.com
   - knu@idaemons.org
 rvm:
-- 1.9.2
 - 1.9.3
 - 2.0.0
 - ruby-head

data/CHANGELOG.rdoc

@@ -1,9 +1,17 @@
 = Mechanize CHANGELOG
 
+=== 2.7.2
+
+* Bug fix
+  * API compatibility issues with Mechanize::CookieJar cookies has been
+    addressed.  https://github.com/sparklemotion/http-cookie/issues/2 #326
+
 === 2.7.1
 
 * Bug fix
   * Ensure images with no "src" attribute still return correct URLs. #317
+  * Fixes Mechanize::Parser#extract_filename where an empty string filename
+    in the response caused unhandled exception. #318
 
 === 2.7.0
 

data/lib/mechanize.rb

@@ -73,7 +73,7 @@ class Mechanize
   ##
   # The version of Mechanize you are using.
 
-  VERSION = '2.7.1'
+  VERSION = '2.7.2'
 
   ##
   # Base mechanize error class
@@ -123,6 +123,7 @@ class Mechanize
     'Mac Mozilla' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.4a) Gecko/20030401',
     'Mac Safari 4' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; de-at) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10',
     'Mac Safari' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/534.51.22 (KHTML, like Gecko) Version/5.1.1 Safari/534.51.22',
+    'Windows Chrome' => 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.32 Safari/537.36',
     'Windows IE 6' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)',
     'Windows IE 7' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)',
     'Windows IE 8' => 'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727)',

data/lib/mechanize/cookie_jar.rb

@@ -48,10 +48,25 @@ class Mechanize
       __deprecated__ :store
       @store.instance_variable_get(:@jar)
     end
+
+    # See HTTP::CookieJar#load.
+    def load_cookiestxt(io)
+      __deprecated__ :load
+      load(io, :cookiestxt)
+    end
+
+    # See HTTP::CookieJar#save.
+    def dump_cookiestxt(io)
+      __deprecated__ :save
+      save(io, :cookiestxt)
+    end
   end
 
   class CookieJar < ::HTTP::CookieJar
-    def save(filename, *options)
+    def save(output, *options)
+      output.respond_to?(:write) or
+        return open(output, 'w') { |io| save(io, *options) }
+
       opthash = {
         :format => :yaml,
         :session => false,
@@ -72,7 +87,7 @@ class Mechanize
         raise ArgumentError, 'wrong number of arguments (%d for 1-3)' % (1 + options.size)
       end
 
-      return super if opthash[:format] != :yaml
+      return super(output, opthash) if opthash[:format] != :yaml
 
       session = opthash[:session]
       nstore = HashStore.new
@@ -97,43 +112,66 @@ class Mechanize
         $1 + ($2 ? Time.parse($2).httpdate : '')
       }
 
-      open(filename, 'w') { |io|
-        io.write yaml
-      }
+      output.write yaml
 
       self
     end
 
-    def load(filename, format = :yaml)
-      return super if format != :yaml
+    def load(input, *options)
+      input.respond_to?(:write) or
+        return open(input, 'r') { |io| load(io, *options) }
 
-      open(filename) { |io|
-        begin
-          data = YAML.load(io)
-        rescue ArgumentError
-          @logger.warn "unloadable YAML cookie data discarded" if @logger
-          return
+      opthash = {
+        :format => :yaml,
+        :session => false,
+      }
+      case options.size
+      when 0
+      when 1
+        case options = options.first
+        when Symbol
+          opthash[:format] = options
+        else
+          if hash = Hash.try_convert(options)
+            opthash.update(hash)
+          end
         end
+      when 2
+        opthash[:format], options = options
+        if hash = Hash.try_convert(options)
+          opthash.update(hash)
+        end
+      else
+        raise ArgumentError, 'wrong number of arguments (%d for 1-3)' % (1 + options.size)
+      end
 
-        case data
-        when Array
-          # Forward compatibility
-          data.each { |cookie|
-            add(cookie)
-          }
-        when Hash
-          data.each { |domain, paths|
-            paths.each { |path, names|
-              names.each { |cookie_name, cookie|
-                add(cookie)
-              }
+      return super(input, opthash) if opthash[:format] != :yaml
+
+      begin
+        data = YAML.load(input)
+      rescue ArgumentError
+        @logger.warn "unloadable YAML cookie data discarded" if @logger
+        return self
+      end
+
+      case data
+      when Array
+        # Forward compatibility
+        data.each { |cookie|
+          add(cookie)
+        }
+      when Hash
+        data.each { |domain, paths|
+          paths.each { |path, names|
+            names.each { |cookie_name, cookie|
+              add(cookie)
             }
           }
-        else
-          @logger.warn "incompatible YAML cookie data discarded" if @logger
-          return
-        end
-      }
+        }
+      else
+        @logger.warn "incompatible YAML cookie data discarded" if @logger
+        return self
+      end
     end
   end
 

data/lib/mechanize/form/check_box.rb

@@ -7,6 +7,13 @@ class Mechanize::Form::CheckBox < Mechanize::Form::RadioButton
   def query_value
     [[@name, @value || "on"]]
   end
+  
+  def inspect # :nodoc:
+    "[%s:0x%x type: %s name: %s value: %s]" % [
+      self.class.name.sub(/Mechanize::Form::/, '').downcase,
+      object_id, type, name, checked
+    ]
+  end
 
 end
 

data/lib/mechanize/parser.rb

@@ -122,7 +122,7 @@ module Mechanize::Parser
       content_disposition =
         Mechanize::HTTP::ContentDispositionParser.parse disposition
 
-      if content_disposition && content_disposition.filename then
+      if content_disposition && content_disposition.filename && content_disposition.filename != '' then
         filename = content_disposition.filename
         filename = filename.split(/[\\\/]/).last
         handled = true

data/test/test_mechanize_cookie_jar.rb

@@ -336,11 +336,23 @@ class TestMechanizeCookieJar < Mechanize::TestCase
     in_tmpdir do
       @jar.save_as("cookies.txt", :cookiestxt)
 
+      assert_match(/\A# (?:Netscape )?HTTP Cookie File$/, File.read("cookies.txt"))
+
       jar = Mechanize::CookieJar.new
-      jar.load("cookies.txt", :cookiestxt) # HACK test the format
+      jar.load("cookies.txt", :cookiestxt)
       assert_equal(2, jar.cookies(url).length)
     end
 
+    in_tmpdir do
+      @jar.save_as("cookies.txt", :cookiestxt, :session => true)
+
+      assert_match(/\A# (?:Netscape )?HTTP Cookie File$/, File.read("cookies.txt"))
+
+      jar = Mechanize::CookieJar.new
+      jar.load("cookies.txt", :cookiestxt)
+      assert_equal(3, jar.cookies(url).length)
+    end
+
     assert_equal(3, @jar.cookies(url).length)
   end
 

data/test/test_mechanize_parser.rb

@@ -45,6 +45,12 @@ class TestMechanizeParser < Mechanize::TestCase
     }
 
     assert_equal 'foo.html', @parser.extract_filename
+
+    @parser.response = {
+      'content-disposition' => "inline; filename=\"\""
+    }
+
+    assert_equal 'foo.html', @parser.extract_filename
   end
 
   def test_extract_filename_content_disposition_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mechanize
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Eric Hodel
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
@@ -196,14 +196,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 description: |-
   The Mechanize library is used for automating interaction with websites.
   Mechanize automatically stores and sends cookies, follows redirects,
@@ -431,7 +431,8 @@ files:
 - test/test_multi_select.rb
 - .gemtest
 homepage: http://mechanize.rubyforge.org
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -451,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mechanize
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: The Mechanize library is used for automating interaction with websites