httmultiparty 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7265a5ad4092d1a872cea3823d462b75764e9f85
-  data.tar.gz: 1c7eec14921066090bf04cf89eda9b1b54e3a4b7
+  metadata.gz: d51b5bba819375cac324f6aa836a364abb920d8e
+  data.tar.gz: 39ca6dc2aa4af46b7cbb7644608f0eaff75b998f
 SHA512:
-  metadata.gz: e298e0321f63f95608f7e99bbe9eebedb034c38ea4c0d81ab346d4b8272a11aedb4c9c36d505437d1a71b7e43658f1006d0968d82defa6832522e12ce58b4645
-  data.tar.gz: e8b5a16b4cc021bd39f6537a8d25e7a816c8ddee59a142e84486eea6a4e4544d1d0d518f6e3a9b76a598b40695253f7ff447a77c7fa9e3918bdae23fa4d38fa1
+  metadata.gz: 358c2e129b448b3fdffa3a8412cfab71d40631dbdc306836d7a847e093ee36c9bf66c24931211a012e3f323960e81e74d22c0ccdeaf5935c3c90651cd48516d4
+  data.tar.gz: d0cb5958a10ceb7ae82ec2e4e08a5a9aaa6958ffb5945fa673c1ff3b3a83d5eb82d374ede5f993bb9625417aa239a47b35a97b0fd913f86e635914d5cdd2a0d0

data/lib/httmultiparty.rb

@@ -1,5 +1,3 @@
-gem 'httparty'
-gem 'multipart-post'
 require 'tempfile'
 require 'httparty'
 require 'net/http/post/multipart'
@@ -25,8 +23,9 @@ module HTTMultiParty
     detect_mime_type = options.fetch(:detect_mime_type, false)
     Proc.new do |params|
       HTTMultiParty.flatten_params(params).map do |(k,v)|
-        if file_present_in_params?(params)
-          [k, v.respond_to?(:read) ? HTTMultiParty.file_to_upload_io(v, detect_mime_type) : v]
+        if file_present?(params)
+          v = prepare_value!(v,detect_mime_type)
+          [k, v]
         else
           "#{k}=#{v}"
         end
@@ -52,6 +51,11 @@ module HTTMultiParty
     flattened
   end
 
+  def self.prepare_value!(value, detect_mime_type)
+    return value if does_not_need_conversion?(value)
+    HTTMultiParty.file_to_upload_io(value, detect_mime_type)
+  end
+
   def self.get(*args)
     Basement.get(*args)
   end
@@ -78,50 +82,64 @@ module HTTMultiParty
 
   private
 
-  def self.file_present_in_params?(params)
-    params.values.any? do |v|
-      if v.is_a? Array
-        v.any? { |vv| file_present?(vv) }
-      elsif v.is_a? Hash
-        v.values.any? { |vv| file_present?(vv) }
-      else
-        file_present?(v)
-      end
+  def self.file_present?(params)
+    if params.is_a? Array
+      file_present_in_array?(params)
+    elsif params.is_a? Hash
+      file_present_in_array?(params.values)
+    else
+      file?(params)
     end
   end
 
-  def self.file_present?(value)
+  def self.file_present_in_array?(ary)
+    ary.any? { |a| file_present?(a) }
+  end
+
+  def self.file?(value)
     value.respond_to?(:read)
   end
 
-   module ClassMethods
-     def post(path, options={})
-       method = Net::HTTP::Post
-       options[:body] ||= options.delete(:query)
-       if hash_contains_files?(options[:body])
-         method = MultipartPost
-         options[:query_string_normalizer] = HTTMultiParty.query_string_normalizer(options)
-       end
-       perform_request method, path, options
-     end
-
-     def put(path, options={})
-       method = Net::HTTP::Put
-       options[:body] ||= options.delete(:query)
-       if hash_contains_files?(options[:body])
-         method = MultipartPut
-         options[:query_string_normalizer] = HTTMultiParty.query_string_normalizer(options)
-       end
-       perform_request method, path, options
-     end
+  def self.not_a_file?(value)
+    !file?(value)
+  end
 
-    private
-      def hash_contains_files?(hash)
-        hash.is_a?(Hash) && HTTMultiParty.flatten_params(hash).select do |_,v|
-          HTTMultiParty.file_present?(v)
-        end.size > 0
+  def self.upload_io?(value)
+    value.is_a?(UploadIO)
+  end
+
+  def self.does_not_need_conversion?(value)
+    not_a_file?(value) ||
+      upload_io?(value)
+  end
+
+  module ClassMethods
+    def post(path, options={})
+      method = Net::HTTP::Post
+      options[:body] ||= options.delete(:query)
+      if hash_contains_files?(options[:body])
+        method = MultipartPost
+        options[:query_string_normalizer] = HTTMultiParty.query_string_normalizer(options)
+      end
+      perform_request method, path, options
+    end
+
+    def put(path, options={})
+      method = Net::HTTP::Put
+      options[:body] ||= options.delete(:query)
+      if hash_contains_files?(options[:body])
+        method = MultipartPut
+        options[:query_string_normalizer] = HTTMultiParty.query_string_normalizer(options)
       end
-   end
+      perform_request method, path, options
+    end
+
+    private
+
+    def hash_contains_files?(hash)
+      HTTMultiParty.file_present?(hash)
+    end
+  end
 
   class Basement
     include HTTMultiParty

data/lib/httmultiparty/version.rb

@@ -1,3 +1,3 @@
 module HTTMultiParty
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httmultiparty
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Johannes Wagener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -133,3 +133,4 @@ signing_key:
 specification_version: 4
 summary: HTTMultiParty is a thin wrapper around HTTParty to provide multipart uploads.
 test_files: []
+has_rdoc: