Merge pull request #822 from rdimartino/rd/fix-821

Fix multipart with files in binary mode and fields including non-ASCII characters

Author: jnunemaker

lib/httparty/request/body.rb

@@ -83,6 +83,7 @@ def normalize_query(query)
       def content_body(object)
         if file?(object)
           object = (file = object).read
+          object.force_encoding(Encoding::UTF_8) if object.respond_to?(:force_encoding)
           file.rewind if file.respond_to?(:rewind)
         end
 

spec/httparty/request/body_spec.rb

@@ -137,6 +137,19 @@
           it { is_expected.to eq multipart_params }
 
         end
+
+        context 'when file is binary data and params contain non-ascii characters' do
+          let(:file) { File.open('spec/fixtures/tiny.gif', 'rb') }
+          let(:params) do
+            {
+              user: "Jöhn Döé",
+              enabled: true,
+              avatar: file,
+            }
+          end
+
+          it { expect { subject }.not_to raise_error }
+        end
       end
     end
   end