httmultiparty 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a6249dabc233910c10ce5fc1b9d08a6ab27e76
-  data.tar.gz: 27827777b772dc0743bd9f40e8264cf032d04ffa
+  metadata.gz: 16afaa58ffab652e8ce6ab718d2f82085cc82aee
+  data.tar.gz: 75bd0c5c38ae5d776cf5d4497585035365bb15df
 SHA512:
-  metadata.gz: a74621476633dc10b0ee9915bdf2cbb4024d735e6adc3056d1f488e8e22727e645c14ac5a11c0a2da394b4b6dab5dabbaa0496c0f142f0f58966011218bb7264
-  data.tar.gz: 4dacd09613d1fc06604613348d9a66acb69dae6b1d2e9607e1f2158bfba082b470a53e0f48a9f2912adaf168db1ae6dc00199fd38cfdbff2b439ccc4a684668d
+  metadata.gz: 5058bff9591159ffdfa722b72874c3ae4fb9904088f43121819af0395cc70746d68cd80616cf6e0c1ab97782832ca2cfbc59b4b98a161df9f792f090f8f88d61
+  data.tar.gz: 4c3401cacf0ae2a10fcc147fa2ac082a4fb7094f479d3b865ebee8c400e08c4d8157030053fbede184e610028468adbceac601c1b9584c8aa2d5560864b9df75

data/lib/httmultiparty.rb

@@ -27,8 +27,8 @@ module HTTMultiParty
     detect_mime_type = options.fetch(:detect_mime_type, false)
     Proc.new do |params|
       HTTMultiParty.flatten_params(params).map do |(k,v)|
-        if TRANSFORMABLE_TYPES.include?(v.class)
-          [k, HTTMultiParty.file_to_upload_io(v, detect_mime_type)]
+        if file_present_in_params?(params)
+          [k, TRANSFORMABLE_TYPES.include?(v.class) ? HTTMultiParty.file_to_upload_io(v, detect_mime_type) : v]
         else
           "#{k}=#{v}"
         end
@@ -78,6 +78,20 @@ module HTTMultiParty
     Basement.options(*args)
   end
 
+  private
+
+  def self.file_present_in_params?(params)
+    params.values.any? do |v|
+      if v.is_a? Array
+        v.any? { |vv| TRANSFORMABLE_TYPES.include?(vv.class) || vv.is_a?(UploadIO) }
+      elsif v.is_a? Hash
+        v.values.any? { |vv| TRANSFORMABLE_TYPES.include?(vv.class) || vv.is_a?(UploadIO) }
+      else
+        TRANSFORMABLE_TYPES.include?(v.class) || v.is_a?(UploadIO)
+      end
+    end
+  end
+
    module ClassMethods
      def post(path, options={})
        method = Net::HTTP::Post
@@ -101,7 +115,7 @@ module HTTMultiParty
 
     private
       def hash_contains_files?(hash)
-        hash.is_a?(Hash) && HTTMultiParty.flatten_params(hash).select do |(k,v)| 
+        hash.is_a?(Hash) && HTTMultiParty.flatten_params(hash).select do |(k,v)|
           TRANSFORMABLE_TYPES.include?(v.class) || v.is_a?(UploadIO)
         end.size > 0
       end

data/lib/httmultiparty/version.rb

@@ -1,3 +1,3 @@
 module HTTMultiParty
-  VERSION = '0.3.13'
+  VERSION = '0.3.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httmultiparty
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Johannes Wagener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty