typhoeus 0.3.3 → 0.4.0

data/lib/typhoeus/utils.rb

@@ -1,5 +1,3 @@
-require 'tempfile'
-
 module Typhoeus
   module Utils
     # Taken from Rack::Utils, 1.2.1 to remove Rack dependency.
@@ -12,31 +10,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
-        case hash[key]
-        when Hash
-          traverse_params_hash(hash[key], result, new_key)
-        when Array
-          hash[key].each do |v|
-            result[:params] << [new_key, v.to_s]
-          end
-        when File, Tempfile
-          filename = File.basename(hash[key].path)
-          types = MIME::Types.type_for(filename)
-          result[:files] << [
-            new_key,
-            filename,
-            types.empty? ? 'application/octet-stream' : types[0].to_s,
-            File.expand_path(hash[key].path)
-          ]
-        else
-          result[:params] << [new_key, hash[key].to_s]
-        end
-      end
-      result
+      result = ParamProcessor.traverse_params_hash hash, result, current_key
     end
     module_function :traverse_params_hash
 
@@ -59,5 +33,18 @@ module Typhoeus
       end
     end
     module_function :bytesize
+
+    # Return a byteslice from a string; uses String#[] under Ruby 1.8 and
+    # String#byteslice under 1.9.
+    if ''.respond_to?(:byteslice)
+      def byteslice(string, *args)
+        string.byteslice(*args)
+      end
+    else
+      def byteslice(string, *args)
+        string[*args]
+      end
+    end
+    module_function :byteslice
   end
 end

data/lib/typhoeus/version.rb

@@ -1,3 +1,3 @@
 module Typhoeus
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,205 +1,208 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: typhoeus
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - David Balatero
 - Paul Dix
+- Hans Hasselberg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mime-types
+date: 2012-06-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.18'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id006
-description: Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
-email: dbalatero@gmail.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+description: Like a modern code version of the mythical beast with 100 serpent heads,
+  Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
+email:
+- hans.hasselberg@gmail.com
 executables: []
-
-extensions: 
-- ext/typhoeus/extconf.rb
+extensions: []
 extra_rdoc_files: []
-
-files: 
-- ext/typhoeus/.gitignore
-- ext/typhoeus/extconf.rb
-- ext/typhoeus/native.c
-- ext/typhoeus/native.h
-- ext/typhoeus/typhoeus_easy.c
-- ext/typhoeus/typhoeus_easy.h
-- ext/typhoeus/typhoeus_form.c
-- ext/typhoeus/typhoeus_form.h
-- ext/typhoeus/typhoeus_multi.c
-- ext/typhoeus/typhoeus_multi.h
-- lib/typhoeus.rb
-- lib/typhoeus/.gitignore
+files:
+- lib/typhoeus/curl.rb
+- lib/typhoeus/easy/auth.rb
+- lib/typhoeus/easy/callbacks.rb
+- lib/typhoeus/easy/ffi_helper.rb
+- lib/typhoeus/easy/infos.rb
+- lib/typhoeus/easy/options.rb
+- lib/typhoeus/easy/proxy.rb
+- lib/typhoeus/easy/ssl.rb
 - lib/typhoeus/easy.rb
 - lib/typhoeus/filter.rb
 - lib/typhoeus/form.rb
-- lib/typhoeus/hydra.rb
+- lib/typhoeus/header.rb
 - lib/typhoeus/hydra/callbacks.rb
 - lib/typhoeus/hydra/connect_options.rb
 - lib/typhoeus/hydra/stubbing.rb
+- lib/typhoeus/hydra.rb
 - 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
 - lib/typhoeus/request.rb
 - lib/typhoeus/response.rb
-- lib/typhoeus/service.rb
 - lib/typhoeus/utils.rb
 - lib/typhoeus/version.rb
-- spec/fixtures/placeholder.gif
-- spec/fixtures/placeholder.txt
-- spec/fixtures/placeholder.ukn
-- spec/fixtures/result_set.xml
-- spec/servers/app.rb
-- spec/spec_helper.rb
-- spec/support/typhoeus_localhost_server.rb
-- spec/typhoeus/easy_spec.rb
-- spec/typhoeus/filter_spec.rb
-- spec/typhoeus/form_spec.rb
-- spec/typhoeus/hydra_mock_spec.rb
-- spec/typhoeus/hydra_spec.rb
-- spec/typhoeus/multi_spec.rb
-- spec/typhoeus/normalized_header_hash_spec.rb
-- spec/typhoeus/remote_method_spec.rb
-- spec/typhoeus/remote_proxy_object_spec.rb
-- spec/typhoeus/remote_spec.rb
-- spec/typhoeus/request_spec.rb
-- spec/typhoeus/response_spec.rb
-- spec/typhoeus/utils_spec.rb
-- CHANGELOG.markdown
+- lib/typhoeus.rb
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
+- README.md
 - Rakefile
-- typhoeus.gemspec
-homepage: https://github.com/dbalatero/typhoeus
+homepage: https://github.com/typhoeus/typhoeus
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-
-rubyforge_project: "[none]"
-rubygems_version: 1.8.10
+rubyforge_project: ! '[none]'
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Parallel HTTP library on top of libcurl multi.
 test_files: []
-

data/Gemfile.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: .
-  specs:
-    typhoeus (0.3.2)
-      mime-types
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    json (1.5.3)
-    mime-types (1.16)
-    rack (1.3.0)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    tilt (1.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  diff-lcs
-  json
-  rake
-  rspec (~> 2.6)
-  sinatra
-  typhoeus!