frameworks-capybara 0.2.34 → 0.3.0.rc1

data/spec/frameworks_cucumber_spec.rb

@@ -14,64 +14,39 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'sandbox'
       generate_base_urls
       @base_url.should == 'http://pal.sandbox.dev.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.co.uk'
       @static_base_url.should == 'http://static.sandbox.dev.bbc.co.uk'
-      @m_base_url.should == 'http://m.sandbox.dev.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.co.uk'
-    end
-
-    it "should be able to set a local system6 url" do
-      ENV['ENVIRONMENT'] = 'sandbox6'
-      generate_base_urls
-      @base_url.should == 'http://sandbox.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.sandbox.bbc.co.uk'
-      @static_base_url.should == 'http://static.sandbox.bbc.co.uk'
-      @m_base_url.should == 'http://m.sandbox.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.sandbox.bbc.co.uk'
     end
 
     it "should be able to set a base url" do
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
       @base_url.should == 'http://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'http://static.foo.bbci.co.uk'
       @open_base_url.should == 'http://open.foo.bbc.co.uk'
-      @m_base_url.should == 'http://m.foo.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
     end
 
     it "should set correct static base for www.live.bbc.co.uk" do
       ENV['ENVIRONMENT'] = 'live'
       generate_base_urls
       @base_url.should == 'http://www.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
     end
 
     it "should be able to set a base url and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'fOo'
       generate_base_urls
       @base_url.should == 'http://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'http://static.foo.bbci.co.uk'
       @open_base_url.should == 'http://open.foo.bbc.co.uk'
-      @m_base_url.should == 'http://m.foo.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
     end
 
     it "should set correct static base for www.live.bbc.co.uk and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'LiVe'
       generate_base_urls
       @base_url.should == 'http://www.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
     end
 
 
@@ -80,172 +55,40 @@ describe Frameworks::EnvHelper do
       ENV['WWW_LIVE'] = 'false' 
       generate_base_urls
       @base_url.should == 'http://www.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.co.uk'
-      @m_base_url.should == 'http://m.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
-    end
-
-    it "should be able to set pal url and not be case sensitive" do
-      ENV['ENVIRONMENT'] = 'Live'
-      generate_base_urls
-      @base_url.should == 'http://www.live.bbc.co.uk'
-      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.live.bbc.co.uk'
-      @m_base_url.should == 'http://m.live.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
-    end
-
-    it "pal url should still have environment even if asking for classic live url" do
-      ENV['ENVIRONMENT'] = 'Live'
-      ENV['WWW_LIVE'] = 'false' 
-      generate_base_urls
-      @base_url.should == 'http://www.bbc.co.uk'
-      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.bbc.co.uk'
-      @m_base_url.should == 'http://m.bbc.co.uk'
-      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
     end
 
-
-
     it "should be able to set scheme to ssl" do
       ENV['SCHEME'] = 'https'
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
       @base_url.should == 'https://www.foo.bbc.co.uk'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'https://static.foo.bbci.co.uk'
       @open_base_url.should == 'https://open.foo.bbc.co.uk'
     end
 
-    it "should be able to set proxy host and port correctly to use in tests using HTTP_PROXY env variable" do
+    it "should be able to set proxy host correctly to use in tests using HTTP_PROXY env variable" do
       ENV['ENVIRONMENT'] = 'foo'
-      ENV['HTTP_PROXY'] = 'http://mycache.co.uk:8080'
+      ENV['HTTP_PROXY'] = 'http://mycache.co.uk:80'
       generate_base_urls
       @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "8080"
     end
 
     it "should be able to set proxy host correctly to use in tests using http_proxy env variable" do
       ENV['ENVIRONMENT'] = 'foo'
-      ENV['http_proxy'] = 'http://mycache.co.uk:8080'
-      generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "8080"
-    end
-
-    it "should be able to use 80 as default proxy port when none specified" do
-      ENV['ENVIRONMENT'] = 'foo'
-      ENV['http_proxy'] = 'http://mycache.co.uk'
-      generate_base_urls
-      @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "80"
-    end
-
-    it "should be able to handle an environment variable which doesn't have the protocol" do
-      ENV['ENVIRONMENT'] = 'foo'
-      ENV['http_proxy'] = 'mycache.co.uk'
+      ENV['http_proxy'] = 'http://mycache.co.uk:80'
       generate_base_urls
       @proxy_host.should == "mycache.co.uk"
-      @proxy_port.should == "80"
-    end
-
-    it "should be able to have an empty http_proxy environment variable" do
-      ENV['ENVIRONMENT'] = 'foo'
-      ENV['http_proxy'] = ''
-      generate_base_urls
-      @proxy_host.should be_nil
-      @proxy_port.should be_nil
-    end
-
-    it "should be able to set a local url with expected domain" do
-      ENV['ENVIRONMENT'] = 'sandbox'
-      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
-      generate_base_urls
-      @base_url.should == 'http://pal.sandbox.dev.bbc.com'
-      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.com'
-      @static_base_url.should == 'http://static.sandbox.dev.bbc.com'
-      @m_base_url.should == 'http://m.sandbox.dev.bbc.com'
-      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.com'
-    end
-
-    it "should be able to set a local system6 url with expected domain" do
-      ENV['ENVIRONMENT'] = 'sandbox6'
-      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
-      generate_base_urls
-      @base_url.should == 'http://sandbox.bbc.com'
-      @ssl_base_url.should == 'https://ssl.sandbox.bbc.com'
-      @static_base_url.should == 'http://static.sandbox.bbc.com'
-      @m_base_url.should == 'http://m.sandbox.bbc.com'
-      @mobile_base_url.should == 'http://mobile.sandbox.bbc.com'
-    end
-
-    it "should be able to set a base url with expected domain" do
-      ENV['ENVIRONMENT'] = 'foo'
-      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
-      generate_base_urls
-      @base_url.should == 'http://www.foo.bbc.com'
-      @ssl_base_url.should == 'https://ssl.foo.bbc.com'
-      @static_base_url.should == 'http://static.foo.bbci.co.uk'
-      @open_base_url.should == 'http://open.foo.bbc.com'
-      @m_base_url.should == 'http://m.foo.bbc.com'
-      @mobile_base_url.should == 'http://mobile.foo.bbc.com'
-    end
-
-    it "should set public facing live domain" do
-      ENV['ENVIRONMENT'] = 'live'
-      ENV['WWW_LIVE'] = 'false'
-      ENV['FW_BBC_DOMAIN'] = 'bbc.com'
-      generate_base_urls
-      @base_url.should == 'http://www.bbc.com'
-      @ssl_base_url.should == 'https://ssl.bbc.com'
-      @static_base_url.should == 'http://static.bbci.co.uk'
-      @open_base_url.should == 'http://open.bbc.com'
-      @m_base_url.should == 'http://m.bbc.com'
-      @mobile_base_url.should == 'http://mobile.bbc.com'
     end
 
 =begin
 #don't want to push proxy addr online
     it "should be able to validate xhtml online" do
       @proxy_host = ''
-      @proxy_port = ''
       xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>a</title></head><body><p>a</p></body></html>'
       validate_online(xhtml)
     end
-
-    it "should be able to report errors for invalid markup" do
-      @proxy_host = ''
-      @proxy_port = ''
-      xhtml = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><nosuchelement><title>a</title></head><body><p>a</p></body></html>'
-      expect {
-        validate_online(xhtml)
-      }.to raise_error(RuntimeError)
-    end
 =end
-  end
-
-    describe "independent mechanize agent" do
-    include Frameworks::EnvHelper
-
-    it "should allow you to create an independent, configured mechanize object" do
-      ENV['HTTP_PROXY'] = 'http://mycache.co.uk:80'
-      agent = new_mechanize
-      agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should == 'mycache.co.uk'
-    end
-
-    it "the proxy should be separately configurable" do
-      agent = new_mechanize(http_proxy='http://mycache.co.uk:80')
-      agent.should be_a_kind_of Mechanize
-      agent.proxy_addr.should == 'mycache.co.uk'
-    end
-
   end
 end

data/spec/spec_helper.rb

@@ -13,5 +13,3 @@ Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new) #Need to load Cucumbe
 
 require 'frameworks/capybara'
 require 'frameworks/cucumber'
-require 'monkey-patches/capybara-mechanize-patches'
-require 'unit_test_monkeypatches.rb'

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 83
-  prerelease: false
+  hash: 15424039
+  prerelease: 6
   segments: 
   - 0
-  - 2
-  - 34
-  version: 0.2.34
+  - 3
+  - 0
+  - rc
+  - 1
+  version: 0.3.0.rc1
 platform: ruby
 authors: 
 - matt robbins
@@ -15,106 +17,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-23 00:00:00 +00:00
+date: 2012-04-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 1
-        - 25
-        version: "1.25"
-  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: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
         - 1
-        - 5
-        - 10
-        version: 1.5.10
-  name: nokogiri
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
         - 0
-        - 9
-        - 9
-        version: 0.9.9
-  name: rubyzip
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
         - 0
-        version: "0"
-  name: selenium-webdriver
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
+        version: 1.0.0
   name: capybara
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+  version_requirements: *id001
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 7
-        - 2
-        version: 2.7.2
-  name: mechanize
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,48 +49,12 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
   name: capybara-mechanize
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+  version_requirements: *id002
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: json
-  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: headless
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,11 +64,11 @@ dependencies:
         - 0
         version: "0"
   name: capybara-celerity
-  requirement: *id010
+  version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,11 +78,11 @@ dependencies:
         - 0
         version: "0"
   name: w3c_validators
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+  version_requirements: *id004
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -206,11 +94,11 @@ dependencies:
         - 5
         version: 0.10.5
   name: cucumber
-  requirement: *id012
+  version_requirements: *id005
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -220,11 +108,11 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  requirement: *id013
+  version_requirements: *id006
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -236,7 +124,8 @@ dependencies:
         - 0
         version: 1.0.0
   name: rspec
-  requirement: *id014
+  version_requirements: *id007
+  prerelease: false
 description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
 email: 
 - mcrobbins@gmail.com
@@ -250,8 +139,6 @@ files:
 - .document
 - .gitignore
 - .rspec
-- .travis.yml
-- CHANGES
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -265,18 +152,13 @@ files:
 - lib/monkey-patches/capybara-patches.rb
 - lib/monkey-patches/cucumber-patches.rb
 - lib/monkey-patches/mechanize-patches.rb
-- lib/monkey-patches/net-http-persistent-patches.rb
 - lib/monkey-patches/send-keys.rb
 - lib/monkey-patches/webdriver-patches.rb
 - lib/tasks/frameworks-tasks.rb
 - lib/version.rb
-- spec/capybara_mechanize_patches_spec.rb
 - spec/frameworks_capybara_spec.rb
 - spec/frameworks_cucumber_spec.rb
-- spec/mock.default/prefs.js
-- spec/profiles.ini
 - spec/spec_helper.rb
-- spec/unit_test_monkeypatches.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -298,16 +180,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches

data/.travis.yml

@@ -1,8 +0,0 @@
-before_install:
- - sudo apt-get update
- - sudo apt-get install xvfb
-language: ruby
-rvm:
-- 1.8.7
-- 1.9.2
-- 1.9.3

data/CHANGES

@@ -1,47 +0,0 @@
-0.2.34
-Improved validate_online method to disregard system/OS errors.
-
-0.2.33
-Specify different runtime dependencies depending on the ruby version.
-
-0.2.32
-Fix Ruby 1.9 RSpec test failures introduced in release 0.2.31
-
-0.2.31
-Added Firefox profile certificate handling via the FIREFOX_CERT_PATH and FIREFOX_CERT_PREFIX variables.
-
-0.2.30
-Fixed rake profiles listings to work with Ruby 1.9+
-
-0.2.29
-Updated add_cookie patch to use new http_cookie API, following Mechanize changes (see http://bit.ly/12Do1l7)
-
-0.2.28
-Updated Mechanize::CookieJar add patch to work with latest capybara-mechanize.
-Added support for httpOnly cookie flag to capybara mechanize patch
-
-0.2.27
-Can now specify arguments passed to the browser via the BROWSER_CLI_ARGS environment variable. 
-
-0.2.25
-Modified cucumber html report monkey patch to work with cucumber >= 1.3.0
-
-0.2.24
-Added FW_BBC_DOMAIN param in order to set the top level domain used for requests.
-
-0.2.23
-Updated capybara-mechanize patch to send referer header.
-
-0.2.22
-Update Centos6 sandbox DNS to sandbox.bbc.co.uk.
-
-0.2.21
-Add support for Centos6 sandbox.
-Update Gemfile.lock to latest gem versions.
-
-0.2.20
-validate_online() now takes optional hash of parameters to pass to MarkupValidator.
-Updated proxy handling to pick up port and to work without protocol or port. 
-
-0.2.19
-Present production release.

data/lib/monkey-patches/net-http-persistent-patches.rb

@@ -1,72 +0,0 @@
-#Adding no_proxy_host logic for Mechanize2 which uses this
-#gem for it's HTTP client logic
-#TODO: Grab from envirnment variable optionally, or provide list
-class Net::HTTP::Persistent
-
-  ##
-  # Creates a new connection for +uri+
-  def connection_for uri
-    Thread.current[@generation_key]     ||= Hash.new { |h,k| h[k] = {} }
-    Thread.current[@ssl_generation_key] ||= Hash.new { |h,k| h[k] = {} }
-    Thread.current[@request_key]        ||= Hash.new 0
-    Thread.current[@timeout_key]        ||= Hash.new EPOCH
-
-    use_ssl = uri.scheme.downcase == 'https'
-
-    if use_ssl then
-      ssl_generation = @ssl_generation
-
-      ssl_cleanup ssl_generation
-
-      connections = Thread.current[@ssl_generation_key][ssl_generation]
-    else
-      generation = @generation
-
-      cleanup generation
-
-      connections = Thread.current[@generation_key][generation]
-    end
-
-    net_http_args = [uri.host, uri.port]
-    connection_id = net_http_args.join ':'
-    #
-    #Frameworks patch (and condition)
-    if @proxy_uri and !uri.host.include? 'sandbox' then
-      connection_id << @proxy_connection_id
-      net_http_args.concat @proxy_args
-    end
-
-    connection = connections[connection_id]
-
-    unless connection = connections[connection_id] then
-      connections[connection_id] = http_class.new(*net_http_args)
-      connection = connections[connection_id]
-      ssl connection if use_ssl
-    else
-      reset connection if expired? connection
-    end
-
-    unless connection.started? then
-      connection.set_debug_output @debug_output if @debug_output
-      connection.open_timeout = @open_timeout if @open_timeout
-      connection.read_timeout = @read_timeout if @read_timeout
-
-      connection.start
-
-      socket = connection.instance_variable_get :@socket
-
-      if socket then # for fakeweb
-        @socket_options.each do |option|
-          socket.io.setsockopt(*option)
-        end
-      end
-    end
-
-    connection
-  rescue Errno::ECONNREFUSED
-    raise Error, "connection refused: #{connection.address}:#{connection.port}"
-  rescue Errno::EHOSTDOWN
-    raise Error, "host down: #{connection.address}:#{connection.port}"
-  end
-end
-