Merge pull request sparklemotion#220 from LessonPlanet/master

Fixed handling a quoted content-disposition size parameter
doubleotoo · May 1, 2012 · 4e0321a · 4e0321a
2 parents 0e8f0c5 + 9fbd125
commit 4e0321a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/mechanize/http/content_disposition_parser.rb b/lib/mechanize/http/content_disposition_parser.rb
@@ -95,7 +95,7 @@ def parse_parameters
               when /^(creation|modification|read)-date$/ then
                 Time.rfc822 rfc_2045_quoted_string
               when /^size$/ then
-                @scanner.scan(/\d+/).to_i(10)
+                rfc_2045_value.to_i(10)
               else
                 rfc_2045_value
               end

diff --git a/test/test_mechanize_http_content_disposition_parser.rb b/test/test_mechanize_http_content_disposition_parser.rb
@@ -52,6 +52,12 @@ def test_parse_semicolons
     assert_equal 'value',      content_disposition.filename
   end
 
+  def test_parse_quoted_size
+    content_disposition = @parser.parse 'size="5"'
+
+    assert_equal 5, content_disposition.size
+  end
+
   def test_rfc_2045_quoted_string
     @parser.scanner = StringScanner.new '"text"'