typhoeus 0.1.31 → 0.2.0

data/spec/typhoeus/utils_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Typhoeus::Utils do
+  # Taken from Rack 1.2.1
+  describe "#escape" do
+    it "should escape correctly" do
+      Typhoeus::Utils.escape("fo<o>bar").should == "fo%3Co%3Ebar"
+      Typhoeus::Utils.escape("a space").should == "a+space"
+      Typhoeus::Utils.escape("q1!2\"'w$5&7/z8)?\\").
+        should == "q1%212%22%27w%245%267%2Fz8%29%3F%5C"
+    end
+
+    it "should escape correctly for multibyte characters" do
+      matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
+      matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+      Typhoeus::Utils.escape(matz_name).should == '%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8'
+      matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
+      matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+      Typhoeus::Utils.escape(matz_name_sep).should == '%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8'
+    end
+  end
+end

data/typhoeus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typhoeus}
-  s.version = "0.1.31"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Dix"]
-  s.date = %q{2010-07-16}
+  s.date = %q{2010-11-11}
   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{paul@pauldix.net}
   s.extensions = ["ext/typhoeus/extconf.rb"]
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "CHANGELOG.markdown",
+     "Gemfile",
+     "Gemfile.lock",
      "README.textile",
      "Rakefile",
      "VERSION",
@@ -26,7 +28,6 @@ Gem::Specification.new do |s|
      "benchmarks/vs_nethttp.rb",
      "examples/twitter.rb",
      "ext/typhoeus/.gitignore",
-     "ext/typhoeus/Makefile",
      "ext/typhoeus/extconf.rb",
      "ext/typhoeus/native.c",
      "ext/typhoeus/native.h",
@@ -39,13 +40,19 @@ Gem::Specification.new do |s|
      "lib/typhoeus/easy.rb",
      "lib/typhoeus/filter.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/result_set.xml",
      "spec/servers/app.rb",
@@ -53,32 +60,38 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb",
      "spec/typhoeus/easy_spec.rb",
      "spec/typhoeus/filter_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/pauldix/typhoeus}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  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 = [
     "spec/servers/app.rb",
      "spec/spec_helper.rb",
      "spec/typhoeus/easy_spec.rb",
      "spec/typhoeus/filter_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",
      "examples/twitter.rb"
   ]
 
@@ -86,15 +99,13 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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<rack>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<diff-lcs>, [">= 0"])
@@ -102,7 +113,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<diff-lcs>, [">= 0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typhoeus
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 31
-  version: 0.1.31
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Paul Dix
@@ -14,81 +15,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -07:00
+date: 2010-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: jeweler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: diff-lcs
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: diff-lcs
+  name: sinatra
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  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: paul@pauldix.net
 executables: []
@@ -100,6 +99,8 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - CHANGELOG.markdown
+- Gemfile
+- Gemfile.lock
 - README.textile
 - Rakefile
 - VERSION
@@ -107,7 +108,6 @@ files:
 - benchmarks/vs_nethttp.rb
 - examples/twitter.rb
 - ext/typhoeus/.gitignore
-- ext/typhoeus/Makefile
 - ext/typhoeus/extconf.rb
 - ext/typhoeus/native.c
 - ext/typhoeus/native.h
@@ -120,13 +120,19 @@ files:
 - lib/typhoeus/easy.rb
 - lib/typhoeus/filter.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/result_set.xml
 - spec/servers/app.rb
@@ -134,13 +140,16 @@ files:
 - spec/spec_helper.rb
 - spec/typhoeus/easy_spec.rb
 - spec/typhoeus/filter_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
 has_rdoc: true
 homepage: http://github.com/pauldix/typhoeus
@@ -152,23 +161,27 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A library for interacting with web services (and building SOAs) at blinding speed.
@@ -177,11 +190,14 @@ test_files:
 - spec/spec_helper.rb
 - spec/typhoeus/easy_spec.rb
 - spec/typhoeus/filter_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
 - examples/twitter.rb

data/ext/typhoeus/Makefile

@@ -1,157 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /usr/local/lib/ruby/1.8/i686-darwin9.6.0
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-exec_prefix = $(prefix)
-prefix = $(DESTDIR)/usr/local
-sharedstatedir = $(prefix)/com
-mandir = $(datarootdir)/man
-psdir = $(docdir)
-oldincludedir = $(DESTDIR)/usr/include
-localedir = $(datarootdir)/locale
-bindir = $(exec_prefix)/bin
-libexecdir = $(exec_prefix)/libexec
-sitedir = $(libdir)/ruby/site_ruby
-htmldir = $(docdir)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-includedir = $(prefix)/include
-infodir = $(datarootdir)/info
-vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(prefix)/etc
-libdir = $(exec_prefix)/lib
-sbindir = $(exec_prefix)/sbin
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-vendordir = $(libdir)/ruby/vendor_ruby
-datarootdir = $(prefix)/share
-pdfdir = $(docdir)
-archdir = $(rubylibdir)/$(arch)
-sitearchdir = $(sitelibdir)/$(sitearch)
-datadir = $(datarootdir)
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_A)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -g -O2 -pipe -fno-common $(cflags)  -g -DXP_UNIX -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline 
-INCFLAGS = -I. -I. -I/usr/local/lib/ruby/1.8/i686-darwin9.6.0 -I.
-DEFS     = 
-CPPFLAGS =   -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE  
-CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. 
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-darwin9.6.0
-sitearch = i686-darwin9.6.0
-ruby_version = 1.8
-ruby = /usr/local/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir) /opt/local/lib
-LIBPATH =  -L. -L$(libdir) -L/opt/local/lib
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = /typhoeus
-LOCAL_LIBS = 
-LIBS =  -lcurl  -ldl -lobjc  
-SRCS = native.c typhoeus_easy.c typhoeus_multi.c
-OBJS = native.o typhoeus_easy.o typhoeus_multi.o
-TARGET = native
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h