typhoeus 0.2.4 → 0.3.2

data/spec/typhoeus/request_spec.rb

@@ -31,6 +31,52 @@ describe Typhoeus::Request do
     end
   end
 
+  context "marshalling" do
+
+    let(:request) do
+      Typhoeus::Request.new("http://google.com")
+    end
+
+    describe "#marshal_dump" do
+      context "when an on_complete handler is defined" do
+
+        before do
+          request.on_complete {}
+        end
+
+        it "does not raise an error" do
+          lambda { Marshal.dump(request) }.should_not raise_error(TypeError)
+        end
+
+      end
+
+      context "when an after_complete handler is defined" do
+
+        before do
+          request.after_complete {}
+        end
+
+        it "does not raise an error" do
+          lambda { Marshal.dump(request) }.should_not raise_error(TypeError)
+        end
+
+      end
+
+    end
+
+    it "is reversible but exclude handlers" do
+      request.on_complete {}
+      request.after_complete {}
+
+      new_request = Marshal.load(Marshal.dump(request))
+
+      new_request.url.should == request.url
+      new_request.on_complete.should be_nil
+      new_request.after_complete.should be_nil
+    end
+
+  end
+
   describe "#localhost?" do
     %w(localhost 127.0.0.1 0.0.0.0).each do |host|
       it "should be true for the #{host} host" do
@@ -74,6 +120,14 @@ describe Typhoeus::Request do
                                       :params => {
                                         :a => ['789','2434']
                                       })
+      request.params_string.should == "a=789&a=2434"
+    end
+
+    it "should allow the newer bracket notation for array params" do
+      request = Typhoeus::Request.new('http://google.com',
+                                      :params => {
+                                        "a[]" => ['789','2434']
+                                      })
       request.params_string.should == "a%5B%5D=789&a%5B%5D=2434"
     end
 
@@ -82,7 +136,7 @@ describe Typhoeus::Request do
                                       :params => {
                                         :a => { :b => { :c => ['d','e'] } }
                                       })
-      request.params_string.should == "a%5Bb%5D%5Bc%5D%5B%5D=d&a%5Bb%5D%5Bc%5D%5B%5D=e"
+      request.params_string.should == "a%5Bb%5D%5Bc%5D=d&a%5Bb%5D%5Bc%5D=e"
     end
 
     it "should translate nested params correctly" do
@@ -104,9 +158,10 @@ describe Typhoeus::Request do
     it "can run a POST synchronously" do
       response = Typhoeus::Request.post("http://localhost:3000", :params => {:q => { :a => "hi" } }, :headers => {:foo => "bar"})
       response.code.should == 200
+
       json = JSON.parse(response.body)
       json["REQUEST_METHOD"].should == "POST"
-      json["rack.request.query_hash"]["q"]["a"].should == "hi"
+      json["rack.request.form_hash"]["q"]["a"].should == "hi"
     end
 
     it "can run a PUT synchronously" do
@@ -154,10 +209,50 @@ describe Typhoeus::Request do
     Typhoeus::Request.new("http://localhost:3000", :timeout => 10).timeout.should == 10
   end
 
+  it "accepts a string for the timeout option" do
+    Typhoeus::Request.new("http://localhost:3000", :timeout => "150").timeout.should == 150
+  end
+
+  it "doesn't convert a nil timeout to an integer" do
+    Typhoeus::Request.new("http://localhost:3000", :timeout => nil).timeout.should_not == nil.to_i
+  end
+
+  it "doesn't convert an empty timeout to an integer" do
+    Typhoeus::Request.new("http://localhost:3000", :timeout => "").timeout.should_not == "".to_i
+  end
+
+  it "takes connect_timeout as an option" do
+    Typhoeus::Request.new("http://localhost:3000", :connect_timeout => 14).connect_timeout.should == 14
+  end
+
+  it "accepts a string for the connect_timeout option" do
+    Typhoeus::Request.new("http://localhost:3000", :connect_timeout => "420").connect_timeout.should == 420
+  end
+
+  it "doesn't convert a nil connect_timeout to an integer" do
+    Typhoeus::Request.new("http://localhost:3000", :connect_timeout => nil).connect_timeout.should_not == nil.to_i
+  end
+
+  it "doesn't convert an empty connect_timeout to an integer" do
+    Typhoeus::Request.new("http://localhost:3000", :connect_timeout => "").connect_timeout.should_not == "".to_i
+  end
+
   it "takes cache_timeout as an option" do
     Typhoeus::Request.new("http://localhost:3000", :cache_timeout => 60).cache_timeout.should == 60
   end
 
+  it "accepts a string for the cache_timeout option" do
+    Typhoeus::Request.new("http://localhost:3000", :cache_timeout => "42").cache_timeout.should == 42
+  end
+
+  it "doesn't convert a nil cache_timeout to an integer" do
+    Typhoeus::Request.new("http://localhost:3000", :cache_timeout => nil).cache_timeout.should_not == nil.to_i
+  end
+
+  it "doesn't convert an empty cache_timeout to an integer" do
+    Typhoeus::Request.new("http://localhost:3000", :cache_timeout => "").cache_timeout.should_not == "".to_i
+  end
+
   it "takes follow_location as an option" do
     Typhoeus::Request.new("http://localhost:3000", :follow_location => true).follow_location.should == true
   end

data/spec/typhoeus/response_spec.rb

@@ -36,6 +36,10 @@ describe Typhoeus::Response do
       Typhoeus::Response.new.status_message.should be_nil
     end
 
+    it "should return nil for status_message if a message-less header is given" do
+      Typhoeus::Response.new(:headers => "HTTP/1.1 200\r\n").status_message.should == nil
+    end
+
     it "should store http_version" do
       Typhoeus::Response.new(:http_version => '1.1').http_version.should == '1.1'
     end
@@ -44,6 +48,10 @@ describe Typhoeus::Response do
       Typhoeus::Response.new.http_version.should be_nil
     end
     
+    it "should return nil for http version if an invalid or incomplete header is given" do
+      Typhoeus::Response.new(:headers => "HTTP foo/bar 200 OK\r\n").http_version.should == nil
+    end
+
     it "should store response_headers" do
       Typhoeus::Response.new(:headers => "a header!").headers.should == "a header!"
     end
@@ -89,6 +97,39 @@ describe Typhoeus::Response do
       response = Typhoeus::Response.new.headers_hash.should == {}
     end
 
+    context 'when the headers_hash is stubbed' do
+      after(:each) { Typhoeus::Hydra.clear_stubs }
+      let!(:orig_response) { Typhoeus::Request.get("http://localhost:3000/multiple-headers") }
+
+      it 'returns a properly formatted string built from the headers_hash, code, status_message and http_version' do
+        stub_response = Typhoeus::Response.new(
+          :code           => orig_response.code,
+          :headers_hash   => orig_response.headers_hash,
+          :status_message => orig_response.status_message,
+          :http_version   => orig_response.http_version
+        )
+
+        stub_response.headers.size.should == orig_response.headers.size
+
+        orig_header_lines = orig_response.headers.split("\n")
+        stub_header_lines = stub_response.headers.split("\n")
+
+        # HTTP version/status line should be identical
+        orig_header_lines.shift.should == stub_header_lines.shift
+
+        # "XSS" gets downcased, so we have to fix it here.
+        orig_header_lines.each { |line| line.sub!('XSS', 'Xss') }
+
+        # we can't count on the header order being identical since ruby hashes are not always ordered
+        orig_header_lines.should =~ stub_header_lines
+      end
+
+      it 'returns a valid header string even with the code, status message and http_version are not stubbed' do
+        response = Typhoeus::Response.new(:headers_hash => orig_response.headers_hash)
+        response.headers.should =~ /Content-Type/
+      end
+    end
+
     describe "basic parsing" do
       before(:all) do
         @response = Typhoeus::Response.new(:headers => "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\nStatus: 200\r\nX-Powered-By: Phusion Passenger (mod_rails/mod_rack) 2.2.9\r\nX-Cache: miss\r\nX-Runtime: 184\r\nETag: e001d08d9354ab7bc7c27a00163a3afa\r\nCache-Control: private, max-age=0, must-revalidate\r\nContent-Length: 4725\r\nSet-Cookie: _some_session=BAh7CDoGciIAOg9zZXNzaW9uX2lkIiU1OTQ2OTcwMjljMWM5ZTQwODU1NjQwYTViMmQxMTkxMjoGcyIKL2NhcnQ%3D--b4c4663932243090c961bb93d4ad5e4327064730; path=/; HttpOnly\r\nServer: nginx/0.6.37 + Phusion Passenger 2.2.4 (mod_rails/mod_rack)\r\nSet-Cookie: foo=bar; path=/;\r\nP3P: CP=\"NOI DSP COR NID ADMa OPTa OUR NOR\"\r\n\r\n")

data/typhoeus.gemspec

@@ -1,141 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
-Gem::Specification.new do |s|
-  s.name = %q{typhoeus}
-  s.version = "0.2.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Paul Dix", "David Balatero"]
-  s.date = %q{2011-02-24}
-  s.description = %q{Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.}
-  s.email = %q{dbalatero@gmail.com}
-  s.extensions = ["ext/typhoeus/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.textile"
-  ]
-  s.files = [
-    "CHANGELOG.markdown",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "benchmarks/profile.rb",
-    "benchmarks/vs_nethttp.rb",
-    "examples/file.rb",
-    "examples/times.rb",
-    "examples/twitter.rb",
-    "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",
-    "lib/typhoeus/easy.rb",
-    "lib/typhoeus/filter.rb",
-    "lib/typhoeus/form.rb",
-    "lib/typhoeus/hydra.rb",
-    "lib/typhoeus/hydra/callbacks.rb",
-    "lib/typhoeus/hydra/connect_options.rb",
-    "lib/typhoeus/hydra/stubbing.rb",
-    "lib/typhoeus/hydra_mock.rb",
-    "lib/typhoeus/multi.rb",
-    "lib/typhoeus/normalized_header_hash.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",
-    "profilers/valgrind.rb",
-    "spec/fixtures/placeholder.gif",
-    "spec/fixtures/placeholder.txt",
-    "spec/fixtures/placeholder.ukn",
-    "spec/fixtures/result_set.xml",
-    "spec/servers/app.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.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",
-    "typhoeus.gemspec"
-  ]
-  s.homepage = %q{http://github.com/dbalatero/typhoeus}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A library for interacting with web services (and building SOAs) at blinding speed.}
-  s.test_files = [
-    "examples/file.rb",
-    "examples/times.rb",
-    "examples/twitter.rb",
-    "spec/servers/app.rb",
-    "spec/spec_helper.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"
-  ]
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'typhoeus/version'
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+Gem::Specification.new do |s|
+  s.name         = "typhoeus"
+  s.version      = Typhoeus::VERSION
+  s.authors      = ["David Balatero", "Paul Dix"]
+  s.email        = "dbalatero@gmail.com"
+  s.homepage     = "https://github.com/dbalatero/typhoeus"
+  s.summary      = "Parallel HTTP library on top of libcurl multi."
+  s.description  = %q{Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.}
+  s.extensions   = ["ext/typhoeus/extconf.rb"]
+  s.files        = (`git ls-files ext lib spec`.split("\n")) + [
+                     'CHANGELOG.markdown',
+                     'Gemfile',
+                     'Gemfile.lock',
+                     'LICENSE',
+                     'Rakefile',
+                     'typhoeus.gemspec'
+                   ]
+  s.platform     = Gem::Platform::RUBY
+  s.require_path = 'lib'
+  s.rubyforge_project = '[none]'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_development_dependency(%q<sinatra>, [">= 0"])
-      s.add_development_dependency(%q<json>, [">= 0"])
-    else
-      s.add_dependency(%q<mime-types>, [">= 0"])
-      s.add_dependency(%q<mime-types>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mime-types>, [">= 0"])
-    s.add_dependency(%q<mime-types>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-  end
+  s.add_runtime_dependency 'mime-types', ['>= 0']
+  s.add_development_dependency 'rspec', ["~> 2.6"]
+  s.add_development_dependency 'diff-lcs', [">= 0"]
+  s.add_development_dependency 'sinatra', [">= 0"]
+  s.add_development_dependency 'json', [">= 0"]
 end
-

metadata

@@ -1,42 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: typhoeus
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
+  - 3
   - 2
-  - 4
-  version: 0.2.4
+  version: 0.3.2
 platform: ruby
 authors: 
-- Paul Dix
 - David Balatero
+- Paul Dix
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -08:00
-default_executable: 
+date: 2011-10-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   name: mime-types
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,40 +30,27 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mime-types
-  requirement: *id002
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   name: rspec
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+        - 2
+        - 6
+        version: "2.6"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: diff-lcs
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +73,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sinatra
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,30 +87,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
-  requirement: *id007
+  type: :development
+  version_requirements: *id005
 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
 executables: []
 
 extensions: 
 - ext/typhoeus/extconf.rb
-extra_rdoc_files: 
-- LICENSE
-- README.textile
+extra_rdoc_files: []
+
 files: 
-- CHANGELOG.markdown
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.textile
-- Rakefile
-- VERSION
-- benchmarks/profile.rb
-- benchmarks/vs_nethttp.rb
-- examples/file.rb
-- examples/times.rb
-- examples/twitter.rb
 - ext/typhoeus/.gitignore
 - ext/typhoeus/extconf.rb
 - ext/typhoeus/native.c
@@ -168,13 +127,12 @@ files:
 - lib/typhoeus/response.rb
 - lib/typhoeus/service.rb
 - lib/typhoeus/utils.rb
-- profilers/valgrind.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.opts
 - spec/spec_helper.rb
 - spec/typhoeus/easy_spec.rb
 - spec/typhoeus/filter_spec.rb
@@ -189,9 +147,13 @@ files:
 - spec/typhoeus/request_spec.rb
 - spec/typhoeus/response_spec.rb
 - spec/typhoeus/utils_spec.rb
+- CHANGELOG.markdown
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- Rakefile
 - typhoeus.gemspec
-has_rdoc: true
-homepage: http://github.com/dbalatero/typhoeus
+homepage: https://github.com/dbalatero/typhoeus
 licenses: []
 
 post_install_message: 
@@ -219,27 +181,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: "[none]"
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A library for interacting with web services (and building SOAs) at blinding speed.
-test_files: 
-- examples/file.rb
-- examples/times.rb
-- examples/twitter.rb
-- spec/servers/app.rb
-- spec/spec_helper.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
+summary: Parallel HTTP library on top of libcurl multi.
+test_files: []
+