Merge pull request #433 from pvande/fix/argument-error-on-parse

Avoid calling String#strip on invalid Strings

lib/httparty/parser.rb

@@ -98,7 +98,9 @@ module HTTParty
     # @return [Object] the parsed body
     # @return [nil] when the response body is nil, an empty string, spaces only or "null"
     def parse
-      return nil if body.nil? || body.strip.empty? || body == "null"
+      return nil if body.nil?
+      return nil if body == "null"
+      return nil if body.valid_encoding? && body.strip.empty?
       if supports_format?
         parse_supported_format
       else

spec/httparty/parser_spec.rb

@@ -97,6 +97,12 @@ RSpec.describe HTTParty::Parser do
       allow(@parser).to receive_messages(body: "   ")
       expect(@parser.parse).to be_nil
     end
+
+    it "does not raise exceptions for bodies with invalid encodings" do
+      allow(@parser).to receive_messages(body: "\x80")
+      allow(@parser).to receive_messages(supports_format?: false)
+      expect(@parser.parse).to_not be_nil
+    end
   end
 
   describe "#supports_format?" do