httmultiparty 0.3.5 → 0.3.6

data/lib/httmultiparty.rb

@@ -43,7 +43,7 @@ module HTTMultiParty
      def post(path, options={})
        method = Net::HTTP::Post
        options[:body] ||= options.delete(:query)
-       if query_contains_files?(options[:body])
+       if hash_contains_files?(options[:body])
          method = MultipartPost
          options[:query_string_normalizer] = HTTMultiParty::QUERY_STRING_NORMALIZER
        end
@@ -53,7 +53,7 @@ module HTTMultiParty
      def put(path, options={})
        method = Net::HTTP::Put
        options[:body] ||= options.delete(:query)
-       if query_contains_files?(options[:body])
+       if hash_contains_files?(options[:body])
          method = MultipartPut
          options[:query_string_normalizer] = HTTMultiParty::QUERY_STRING_NORMALIZER
        end
@@ -61,12 +61,15 @@ module HTTMultiParty
      end
 
     private
-      def query_contains_files?(query)
-        query.is_a?(Hash) && query.select { |k,v| v.is_a?(Hash) ? query_contains_files?(v) : (v.is_a?(File) || v.is_a?(UploadIO)) }.length > 0
+      def hash_contains_files?(hash)
+        hash.is_a?(Hash) && HTTMultiParty.flatten_params(hash).select do |(k,v)| 
+          v.is_a?(File) || v.is_a?(UploadIO)
+        end.size > 0
       end
    end
 end
 
+require 'httmultiparty/version'
 require 'httmultiparty/multipartable'
 require 'httmultiparty/multipart_post'
 require 'httmultiparty/multipart_put'

data/lib/httmultiparty/version.rb

@@ -1,3 +1,3 @@
 module HTTMultiParty
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -2,7 +2,7 @@
 name: httmultiparty
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +02:00
+date: 2011-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency