marnen-typhoeus 0.3.5 → 0.3.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marnen-typhoeus (0.3.4)
+    marnen-typhoeus (0.3.6)
       mime-types
 
 GEM

data/lib/typhoeus.rb

@@ -9,6 +9,7 @@ require 'typhoeus/form'
 require 'typhoeus/multi'
 require 'typhoeus/native'
 require 'typhoeus/filter'
+require 'typhoeus/param_processor'
 require 'typhoeus/remote_method'
 require 'typhoeus/remote'
 require 'typhoeus/remote_proxy_object'

data/lib/typhoeus/param_processor.rb

@@ -0,0 +1,41 @@
+module Typhoeus
+  class ParamProcessor
+    class << self
+      def traverse_params_hash(hash, result = nil, current_key = nil)
+        result ||= { :files => [], :params => [] }
+
+        hash.keys.sort { |a, b| a.to_s <=> b.to_s }.collect do |key|
+          new_key = (current_key ? "#{current_key}[#{key}]" : key).to_s
+          current_value = hash[key]
+          process_value current_value, :result => result, :new_key => new_key
+        end
+        result
+      end
+
+      def process_value(current_value, options)
+        result = options[:result]
+        new_key = options[:new_key]
+
+        case current_value
+        when Hash
+          traverse_params_hash(current_value, result, new_key)
+        when Array
+          current_value.each do |v|
+            result[:params] << [new_key, v.to_s]
+          end
+        when File, Tempfile
+          filename = File.basename(current_value.path)
+          types = MIME::Types.type_for(filename)
+          result[:files] << [
+            new_key,
+            filename,
+            types.empty? ? 'application/octet-stream' : types[0].to_s,
+            File.expand_path(current_value.path)
+          ]
+        else
+          result[:params] << [new_key, current_value.to_s]
+        end
+      end
+    end
+  end
+end

data/lib/typhoeus/utils.rb

@@ -12,14 +12,7 @@ module Typhoeus
 
     # Params are NOT escaped.
     def traverse_params_hash(hash, result = nil, current_key = nil)
-      result ||= { :files => [], :params => [] }
-
-      hash.keys.sort { |a, b| a.to_s <=> b.to_s }.collect do |key|
-        new_key = (current_key ? "#{current_key}[#{key}]" : key).to_s
-        current_value = hash[key]
-        process_value current_value, :result => result, :new_key => new_key
-      end
-      result
+      result = ParamProcessor.traverse_params_hash hash, result, current_key
     end
     module_function :traverse_params_hash
 

data/lib/typhoeus/version.rb

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

data/spec/typhoeus/param_processor_spec.rb

@@ -0,0 +1,85 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module Typhoeus
+  describe ParamProcessor do
+    describe '.process_value' do
+      let(:result) { {:files => [], :params => []} }
+      let(:params) { result[:params] }
+
+      context 'simple values' do
+        it 'should write a key-value pair to result[:params]' do
+          ParamProcessor.process_value 'value', :result => result, :new_key => 'key'
+          params.should == [['key', 'value']]
+        end
+
+        it "should not overwrite what's already in result[:params]" do
+          result[:params] << ['old', '1']
+          ParamProcessor.process_value 2, :result => result, :new_key => 'new'
+          params.should == [['old', '1'], ['new', '2']]
+        end
+      end
+
+      context 'arrays' do
+        it 'should write a value for each array item' do
+          ParamProcessor.process_value [1, 'two', :'3'], :result => result, :new_key => 'array'
+          params.should == [['array', '1'], ['array', 'two'], ['array', '3']]
+        end
+      end
+
+      context 'files' do
+        let(:files) { result[:files] }
+
+        context 'regular files' do
+          let(:temp_directory) { Dir.mktmpdir }
+          let(:file) do
+            file = File.new File.join(temp_directory, 'testfile.txt'), 'w'
+            file.puts 'some text'
+            file
+          end
+
+          after :each do
+            file.close
+            FileUtils.remove_entry_secure temp_directory if temp_directory
+          end
+
+          it 'should write file information to result[:files]' do
+            ParamProcessor.process_value file, :result => result, :new_key => 'file'
+            path = file.path
+            files.should == [['file', File.basename(path), MIME::Types.type_for(path).first, path]]
+          end
+        end
+
+        context 'temporary files' do
+          let(:tempfile) do
+            tempfile = Tempfile.new(['foo', '.txt'])
+            tempfile.puts 'some text'
+            tempfile
+          end
+
+          after :each do
+            tempfile.close
+            tempfile.unlink
+          end
+
+          it 'should write file information to result[:files]' do
+            ParamProcessor.process_value tempfile, :result => result, :new_key => 'tempfile'
+            path = tempfile.path
+            files.should == [['tempfile', File.basename(path), MIME::Types.type_for(path).first, path]]
+          end
+        end
+      end
+
+      context 'hashes' do
+        it 'should nest values under the key' do
+          ParamProcessor.process_value({:one => 1, 'two' => 2}, :result => result, :new_key => 'key')
+          params.should == [['key[one]', '1'], ['key[two]', '2']]
+        end
+
+        it 'should nest values recursively' do
+          ParamProcessor.process_value({:array => [1, 2], :hash => {:key => 'value'}}, :result => result, :new_key => 'outer_key')
+          params.should == [['outer_key[array]', '1'], ['outer_key[array]', '2'], ['outer_key[hash][key]', 'value']]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marnen-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -174,6 +174,7 @@ files:
 - lib/typhoeus/hydra_mock.rb
 - lib/typhoeus/multi.rb
 - lib/typhoeus/normalized_header_hash.rb
+- lib/typhoeus/param_processor.rb
 - lib/typhoeus/remote.rb
 - lib/typhoeus/remote_method.rb
 - lib/typhoeus/remote_proxy_object.rb
@@ -196,6 +197,7 @@ files:
 - spec/typhoeus/hydra_spec.rb
 - spec/typhoeus/multi_spec.rb
 - spec/typhoeus/normalized_header_hash_spec.rb
+- spec/typhoeus/param_processor_spec.rb
 - spec/typhoeus/remote_method_spec.rb
 - spec/typhoeus/remote_proxy_object_spec.rb
 - spec/typhoeus/remote_spec.rb