httmultiparty 0.1 → 0.2

data/lib/httmultiparty.rb

@@ -4,17 +4,48 @@ require 'httparty'
 require 'net/http/post/multipart'
 
 module HTTMultiParty
+  QUERY_STRING_NORMALIZER = Proc.new do |params|
+    HTTMultiParty.flatten_params(params).map do |(k,v)|
+      [k, v.is_a?(File) ? HTTMultiParty.file_to_upload_io(v) : v]
+    end
+  end
+
   def self.included(base)
     base.send :include, HTTParty
     base.extend ClassMethods
   end
 
+  def self.file_to_upload_io(file)
+    filename =  File.split(file.path).last
+    content_type = 'application/octet-stream'
+    UploadIO.new(file, content_type, filename)
+  end
+
+  def self.flatten_params(params={}, prefix='')
+    flattened = []
+    params.each do |(k,v)|
+      if params.is_a?(Array)
+        v = k
+        k = ""
+      end
+
+      flattened_key = prefix == "" ? "#{k}" : "#{prefix}[#{k}]"
+      if v.is_a?(Hash) || v.is_a?(Array)
+        flattened += flatten_params(v, flattened_key)
+      else
+        flattened << [flattened_key, v]
+      end
+    end
+    flattened
+  end
+
    module ClassMethods
      def post(path, options={})
        method = Net::HTTP::Post
        if query_contains_files?(options[:query])
          method = MultipartPost
-         options[:body] = map_files_to_upload_io(options.delete(:query))
+         options[:body] = options.delete(:query)
+         options[:query_string_normalizer] = HTTMultiParty::QUERY_STRING_NORMALIZER
        end
        perform_request method, path, options
      end
@@ -23,34 +54,20 @@ module HTTMultiParty
        method = Net::HTTP::Put
        if query_contains_files?(options[:query])
          method = MultipartPut
-         options[:body] = map_files_to_upload_io(options.delete(:query))
+         options[:body] = options.delete(:query)
+         options[:query_string_normalizer] = HTTMultiParty::QUERY_STRING_NORMALIZER
        end
        perform_request method, path, options
      end
 
     private
       def query_contains_files?(query)
-        query.is_a?(Hash) && query.select { |k,v| v.is_a?(File) }.length > 0
-      end
-
-      def map_files_to_upload_io(hash)
-        new_special_hash = SpecialHash.new
-        hash.each do |k,v|
-          new_special_hash[k] = v.is_a?(File) ? file_to_upload_io(v) : v
-        end
-        new_special_hash
-      end
-
-      def file_to_upload_io(file)
-        filename =  File.split(file.path).last
-        content_type = 'application/octet-stream'
-        UploadIO.new(file, content_type, filename)
+        query.is_a?(Hash) && query.select { |k,v| v.is_a?(Hash) ? query_contains_files?(v) : v.is_a?(File) }.length > 0
       end
    end
 end
 
 dir = Pathname(__FILE__).dirname.expand_path
 require dir + 'httmultiparty/multipartable'
-require dir + 'httmultiparty/special_hash'
 require dir + 'httmultiparty/multipart_post'
 require dir + 'httmultiparty/multipart_put'

data/lib/httmultiparty/multipartable.rb

@@ -6,9 +6,8 @@ module HTTMultiParty::Multipartable
   end
 
   def body=(value)
-    raise RuntimeError.new('body needs to be a SpecialHash') unless value.is_a?(HTTMultiParty::SpecialHash)
     boundary = DEFAULT_BOUNDARY
-    parts = value.map {|k,v| Parts::Part.new(boundary, k, v)}
+    parts = value.map {|(k,v)| Parts::Part.new(boundary, k, v)}
     parts << Parts::EpiloguePart.new(boundary)
     self.set_content_type("multipart/form-data", { "boundary" => boundary })
     self.content_length = parts.inject(0) {|sum,i| sum + i.length }

data/lib/httmultiparty/version.rb

@@ -1,3 +1,3 @@
 module HTTMultiParty
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: httmultiparty
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -08:00
+date: 2011-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 3
+        version: 0.7.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -86,7 +88,6 @@ files:
 - lib/httmultiparty/multipart_post.rb
 - lib/httmultiparty/multipart_put.rb
 - lib/httmultiparty/multipartable.rb
-- lib/httmultiparty/special_hash.rb
 - lib/httmultiparty/version.rb
 - lib/httmultiparty.rb
 - README.md

data/lib/httmultiparty/special_hash.rb

@@ -1,8 +0,0 @@
-# SpecialHash is a hash that is pretending to be not a Hash.
-# its just a cheap way to get around the query normalization
-# happening in HTTParty::Request#body in lib/httparty/request.rb:118
-class HTTMultiParty::SpecialHash < Hash
-  def is_a?(klass)
-    klass == ::Hash ? false : super
-  end
-end