Merge pull request #181 from mechiland/master

Fix #179 & #180
Eric-Guo · Mar 17, 2017 · 93bdf5f · 93bdf5f
2 parents 6741a58 + 03ac338
commit 93bdf5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/wechat/http_client.rb b/lib/wechat/http_client.rb
@@ -29,9 +29,10 @@ def post(path, payload, post_header = {})
     def post_file(path, file, post_header = {})
       request(path, post_header) do |url, header|
         params = header.delete(:params)
+        form_file = file.is_a?(HTTP::FormData::File) ? file : HTTP::FormData::File.new(file)
         httprb.headers(header)
           .post(url, params: params,
-                     form: { media: HTTP::FormData::File.new(file),
+                     form: { media: form_file,
                              hack: 'X' }, # Existing here for http-form_data 1.0.1 handle single param improperly
                      ssl_context: ssl_context)
       end

diff --git a/wechat.gemspec b/wechat.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.cert_chain  = ['certs/Eric-Guo.pem']
   s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME.end_with?('gem')
 
-  s.add_runtime_dependency 'activesupport', '>= 3.2', '< 5.1.x'
+  s.add_runtime_dependency 'activesupport', '>= 3.2', '<= 5.2'
   s.add_runtime_dependency 'nokogiri', '>=1.6.0'
   s.add_runtime_dependency 'thor'
   s.add_runtime_dependency 'http', '>= 1.0.4', '< 3'