webmock 1.20.4 → 1.21.0

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.1
   - ruby-head
   - ree
   - jruby-18mode

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.21.0
+
+  * Support for http.rb >= 0.8.0
+
+      Thanks to [Zachary Anker](https://github.com/zanker), [Aleksey V. Zapparov](https://github.com/ixti)
+
+  * Support for http.rb 0.7.0
+
+      Thanks to [Mattias Putman](https://github.com/challengee)
+
+  * Added support for RSpec3-like `and_return`, `and_raise`, `and_timeout` sytnax.
+
+      Thanks to [Franky Wahl](https://github.com/frankywahl)
+
+  * Restricted Curb support up to version 0.8.6. WebMock specs fail with Curb 0.8.7.
+
 ## 1.20.4
 
   * Fixed support for `hash_including` matcher in RSpec 3

data/README.md

@@ -36,11 +36,12 @@ Supported Ruby Interpreters
 * MRI 1.9.3
 * MRI 2.0.0
 * MRI 2.1
+* MRI 2.2
 * REE 1.8.7
 * JRuby
 * Rubinius
 
-##Installation
+## Installation
 
     gem install webmock
 
@@ -109,7 +110,8 @@ Net::HTTP.get("www.example.com", "/")    # ===> Success
 ### Stubbing requests based on method, uri, body and headers
 
 ```ruby
-stub_request(:post, "www.example.com").with(:body => "abc", :headers => { 'Content-Length' => 3 })
+stub_request(:post, "www.example.com").
+  with(:body => "abc", :headers => { 'Content-Length' => 3 })
 
 uri = URI.parse("http://www.example.com/")
 req = Net::HTTP::Post.new(uri.path)
@@ -124,7 +126,8 @@ end    # ===> Success
 
 ```ruby
 stub_request(:post, "www.example.com").
-  with(:body => /^.*world$/, :headers => {"Content-Type" => /image\/.+/}).to_return(:body => "abc")
+  with(:body => /^.*world$/, :headers => {"Content-Type" => /image\/.+/}).
+  to_return(:body => "abc")
 
 uri = URI.parse('http://www.example.com/')
 req = Net::HTTP::Post.new(uri.path)
@@ -164,7 +167,8 @@ RestClient.post('www.example.com', "data[a]=1&data[b]=five&x=1",
 ### Matching custom request headers
 
 ```ruby
-stub_request(:any, "www.example.com").with(:headers=>{ 'Header-Name' => 'Header-Value' })
+stub_request(:any, "www.example.com").
+  with(:headers=>{ 'Header-Name' => 'Header-Value' })
 
 uri = URI.parse('http://www.example.com/')
 req = Net::HTTP::Post.new(uri.path)
@@ -178,7 +182,8 @@ end    # ===> Success
 ### Matching multiple headers with the same name
 
 ```ruby
-stub_request(:get, 'www.example.com').with(:headers => {'Accept' => ['image/jpeg', 'image/png'] })
+stub_request(:get, 'www.example.com').
+  with(:headers => {'Accept' => ['image/jpeg', 'image/png'] })
 
 req = Net::HTTP::Get.new("/")
 req['Accept'] = ['image/png']
@@ -198,11 +203,11 @@ RestClient.post('www.example.com', 'abc')    # ===> Success
 ```ruby
 stub_request(:get, "user:pass@www.example.com")
 
-Net::HTTP.start('www.example.com') {|http|
+Net::HTTP.start('www.example.com') do |http|
   req = Net::HTTP::Get.new('/')
   req.basic_auth 'user', 'pass'
   http.request(req)
-}    # ===> Success
+end    # ===> Success
 ```
 
 ### Matching uris using regular expressions
@@ -225,10 +230,12 @@ Net::HTTP.get('www.example.com', '/webmock/')    # ===> Success
 ### Matching uris using RFC 6570 - Advanced Example
 
 ```ruby
-uri_template = Addressable::Template.new "www.example.com/thing/{id}.json{?x,y,z}{&other*}"
+uri_template =
+  Addressable::Template.new "www.example.com/thing/{id}.json{?x,y,z}{&other*}"
 stub_request(:any, uri_template)
 
-Net::HTTP.get('www.example.com', '/thing/5.json?x=1&y=2&z=3&anyParam=4')    # ===> Success
+Net::HTTP.get('www.example.com',
+  '/thing/5.json?x=1&y=2&z=3&anyParam=4')    # ===> Success
 ```
 
 ### Matching query params using hash
@@ -242,7 +249,8 @@ RestClient.get("http://www.example.com/?a[]=b&a[]=c")    # ===> Success
 ### Matching partial query params using hash
 
 ```ruby
-stub_request(:get, "www.example.com").with(:query => hash_including({"a" => ["b", "c"]}))
+stub_request(:get, "www.example.com").
+  with(:query => hash_including({"a" => ["b", "c"]}))
 
 RestClient.get("http://www.example.com/?a[]=b&a[]=c&x=1")    # ===> Success
 ```
@@ -251,7 +259,8 @@ RestClient.get("http://www.example.com/?a[]=b&a[]=c&x=1")    # ===> Success
 
 ```ruby
 stub_request(:any, "www.example.com").
-  to_return(:body => "abc", :status => 200, :headers => { 'Content-Length' => 3 })
+  to_return(:body => "abc", :status => 200,
+    :headers => { 'Content-Length' => 3 })
 
 Net::HTTP.get("www.example.com", '/')    # ===> "abc"
 ```
@@ -270,10 +279,12 @@ Net::HTTP.get('www.example.com', '/')    # ===> "abc\n"
 ### Response with custom status message
 
 ```ruby
-stub_request(:any, "www.example.com").to_return(:status => [500, "Internal Server Error"])
+stub_request(:any, "www.example.com").
+  to_return(:status => [500, "Internal Server Error"])
 
 req = Net::HTTP::Get.new("/")
-Net::HTTP.start("www.example.com") {|http| http.request(req)}.message    # ===> "Internal Server Error"
+Net::HTTP.start("www.example.com") { |http| http.request(req) }.
+  message    # ===> "Internal Server Error"
 ```
 
 ### Replaying raw responses recorded with `curl -is`
@@ -380,7 +391,8 @@ RestClient.post('www.example.net', 'abc')    # ===> RestClient::RequestTimeout
 ### Multiple responses for repeated requests
 
 ```ruby
-stub_request(:get, "www.example.com").to_return({:body => "abc"}, {:body => "def"})
+stub_request(:get, "www.example.com").
+  to_return({:body => "abc"}, {:body => "def"})
 Net::HTTP.get('www.example.com', '/')    # ===> "abc\n"
 Net::HTTP.get('www.example.com', '/')    # ===> "def\n"
 
@@ -504,11 +516,13 @@ res = Net::HTTP.start(uri.host, uri.port) do |http|
 end
 
 assert_requested :post, "http://www.example.com",
-  :headers => {'Content-Length' => 3}, :body => "abc", :times => 1    # ===> Success
+  :headers => {'Content-Length' => 3}, :body => "abc",
+  :times => 1    # ===> Success
 
 assert_not_requested :get, "http://www.something.com"    # ===> Success
 
-assert_requested(:post, "http://www.example.com", :times => 1) { |req| req.body == "abc" }
+assert_requested(:post, "http://www.example.com",
+  :times => 1) { |req| req.body == "abc" }
 ```
 
 ### Expecting real (not stubbed) requests
@@ -535,7 +549,7 @@ assert_not_requested(stub_post)
 
 
 ### Setting expectations in RSpec on `WebMock` module
- This style is borrowed from [fakeweb-matcher](http://github.com/freelancing-god/fakeweb-matcher)
+ This style is borrowed from [fakeweb-matcher](http://github.com/pat/fakeweb-matcher)
 
 ```ruby
 require 'webmock/rspec'
@@ -545,30 +559,35 @@ expect(WebMock).to have_requested(:get, "www.example.com").
 
 expect(WebMock).not_to have_requested(:get, "www.something.com")
 
-expect(WebMock).to have_requested(:post, "www.example.com").with { |req| req.body == "abc" }
+expect(WebMock).to have_requested(:post, "www.example.com").
+  with { |req| req.body == "abc" }
 # Note that the block with `do ... end` instead of curly brackets won't work!
 # Why? See this comment https://github.com/bblimke/webmock/issues/174#issuecomment-34908908
 
-expect(WebMock).to have_requested(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})
+expect(WebMock).to have_requested(:get, "www.example.com").
+  with(:query => {"a" => ["b", "c"]})
 
 expect(WebMock).to have_requested(:get, "www.example.com").
   with(:query => hash_including({"a" => ["b", "c"]}))
 
 expect(WebMock).to have_requested(:get, "www.example.com").
-  with(:body => {"a" => ["b", "c"]}, :headers => {'Content-Type' => 'application/json'})
+  with(:body => {"a" => ["b", "c"]},
+    :headers => {'Content-Type' => 'application/json'})
 ```
 
 ### Setting expectations in RSpec with `a_request`
 
 ```ruby
 expect(a_request(:post, "www.example.com").
-  with(:body => "abc", :headers => {'Content-Length' => 3})).to have_been_made.once
+  with(:body => "abc", :headers => {'Content-Length' => 3})).
+  to have_been_made.once
 
 expect(a_request(:post, "www.something.com")).to have_been_made.times(3)
 
 expect(a_request(:post, "www.something.com")).to have_been_made.at_least_once
 
-expect(a_request(:post, "www.something.com")).to have_been_made.at_least_times(3)
+expect(a_request(:post, "www.something.com")).
+  to have_been_made.at_least_times(3)
 
 expect(a_request(:post, "www.something.com")).to have_been_made.at_most_twice
 
@@ -576,15 +595,18 @@ expect(a_request(:post, "www.something.com")).to have_been_made.at_most_times(3)
 
 expect(a_request(:any, "www.example.com")).not_to have_been_made
 
-expect(a_request(:post, "www.example.com").with { |req| req.body == "abc" }).to have_been_made
+expect(a_request(:post, "www.example.com").with { |req| req.body == "abc" }).
+  to have_been_made
 
-expect(a_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})).to have_been_made
+expect(a_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})).
+  to have_been_made
 
 expect(a_request(:get, "www.example.com").
   with(:query => hash_including({"a" => ["b", "c"]}))).to have_been_made
 
 expect(a_request(:post, "www.example.com").
-  with(:body => {"a" => ["b", "c"]}, :headers => {'Content-Type' => 'application/json'})).to have_been_made
+  with(:body => {"a" => ["b", "c"]},
+    :headers => {'Content-Type' => 'application/json'})).to have_been_made
 ```
 
 ### Setting expectations in RSpec on the stub
@@ -614,21 +636,28 @@ assert_not_requested :get, "www.example.com"    # ===> Success
 ## Disabling and enabling WebMock or only some http client adapters
 
 ```ruby
-WebMock.disable!                         #disable WebMock (all adapters)
-WebMock.disable!(:except => [:net_http]) #disable WebMock for all libs except Net::HTTP
-WebMock.enable!                          #enable WebMock (all adapters)
-WebMock.enable!(:except => [:patron])    #enable WebMock for all libs except Patron
+# Disable WebMock (all adapters)
+WebMock.disable!
+
+# Disable WebMock for all libs except Net::HTTP
+WebMock.disable!(:except => [:net_http])
+
+# Enable WebMock (all adapters)
+WebMock.enable!
+
+# Enable WebMock for all libs except Patron
+WebMock.enable!(:except => [:patron])
 ```
 
 ## Matching requests
 
 An executed request matches stubbed request if it passes following criteria:
 
-  When request URI matches stubbed request URI string, Regexp pattern or RFC 6570 URI Template<br/>
-  And request method is the same as stubbed request method or stubbed request method is :any<br/>
-  And request body is the same as stubbed request body or stubbed request body is not specified<br/>
-  And request headers match stubbed request headers, or stubbed request headers match a subset of request headers, or stubbed request headers are not specified<br/>
-  And request matches provided block or block is not provided
+- When request URI matches stubbed request URI string, Regexp pattern or RFC 6570 URI Template
+- And request method is the same as stubbed request method or stubbed request method is :any
+- And request body is the same as stubbed request body or stubbed request body is not specified
+- And request headers match stubbed request headers, or stubbed request headers match a subset of request headers, or stubbed request headers are not specified
+- And request matches provided block or block is not provided
 
 ## Precedence of stubs
 
@@ -694,7 +723,7 @@ or these
 
 If you provide Regexp to match URI, WebMock will try to match it against every valid form of the same url.
 
-I.e `/.*my param.*/` will match `www.example.com/my%20path` because it is equivalent of `www.example.com/my path`
+I.e `/.*my path.*/` will match `www.example.com/my%20path` because it is equivalent of `www.example.com/my path`
 
 ## Matching with URI Templates
 
@@ -728,7 +757,7 @@ To record your application's real HTTP interactions and replay them later in tes
 
 ## Request callbacks
 
-####WebMock can invoke callbacks stubbed or real requests:
+#### WebMock can invoke callbacks stubbed or real requests:
 
 ```ruby
 WebMock.after_request do |request_signature, response|
@@ -739,7 +768,8 @@ end
 #### invoke callbacks for real requests only and except requests made with Patron
 
 ```ruby
-WebMock.after_request(:except => [:patron], :real_requests_only => true) do |req_signature, response|
+WebMock.after_request(:except => [:patron],
+                      :real_requests_only => true) do |req_signature, response|
   puts "Request #{req_signature} was made and #{response} was returned"
 end
 ```
@@ -934,6 +964,15 @@ People who submitted patches and new features or suggested improvements. Many th
 * Dan Buettner
 * Sven Riedel
 * Mark Lorenz
+* Dávid Kovács
+* fishermand46
+* Franky Wahl
+* ChaYoung You
+* Simon Russell
+* Steve Mitchell
+* Mattias Putman
+* Zachary Anker
+
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock.rb

@@ -40,7 +40,7 @@ require 'webmock/api'
 require 'webmock/http_lib_adapters/http_lib_adapter_registry'
 require 'webmock/http_lib_adapters/http_lib_adapter'
 require 'webmock/http_lib_adapters/net_http'
-require 'webmock/http_lib_adapters/http_gem_adapter'
+require 'webmock/http_lib_adapters/http_rb_adapter'
 require 'webmock/http_lib_adapters/httpclient_adapter'
 require 'webmock/http_lib_adapters/patron_adapter'
 require 'webmock/http_lib_adapters/curb_adapter'

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -5,7 +5,7 @@ rescue LoadError
 end
 
 if defined?(Curl)
-  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16').check_version!
+  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16', '0.8.7').check_version!
 
   module WebMock
     module HttpLibAdapters

data/lib/webmock/http_lib_adapters/{http_gem → http_rb}/client.rb

@@ -8,7 +8,7 @@ module HTTP
     end
 
     def webmock_enabled?
-      ::WebMock::HttpLibAdapters::HttpGemAdapter.enabled?
+      ::WebMock::HttpLibAdapters::HttpRbAdapter.enabled?
     end
   end
 end

data/lib/webmock/http_lib_adapters/{http_gem → http_rb}/response.rb

@@ -3,7 +3,7 @@ module HTTP
     def to_webmock
       webmock_response = ::WebMock::Response.new
 
-      webmock_response.status  = [status, reason]
+      webmock_response.status  = [status.to_i, reason]
       webmock_response.body    = body.to_s
       webmock_response.headers = headers.to_h
 
@@ -11,7 +11,7 @@ module HTTP
     end
 
     def self.from_webmock(webmock_response, request_signature = nil)
-      status  = webmock_response.status.first
+      status  = Status.new(webmock_response.status.first)
       headers = webmock_response.headers || {}
       body    = Body.new Streamer.new webmock_response.body
       uri     = URI request_signature.uri.to_s if request_signature

data/lib/webmock/http_lib_adapters/http_rb/streamer.rb

@@ -0,0 +1,25 @@
+module HTTP
+  class Response
+    class Streamer
+      def initialize(str)
+        @io = StringIO.new str
+      end
+
+      def readpartial(size = nil)
+        unless size
+          if defined?(HTTP::Client::BUFFER_SIZE)
+            size = HTTP::Client::BUFFER_SIZE
+          elsif defined?(HTTP::Connection::BUFFER_SIZE)
+            size = HTTP::Connection::BUFFER_SIZE
+          end
+        end
+
+        @io.read size
+      end
+
+      def sequence_id
+        -1
+      end
+    end
+  end
+end

data/lib/webmock/http_lib_adapters/{http_gem → http_rb}/webmock.rb

@@ -53,7 +53,7 @@ module HTTP
 
     def invoke_callbacks(webmock_response, options = {})
       ::WebMock::CallbackRegistry.invoke_callbacks(
-        options.merge({ :lib => :http_gem }),
+        options.merge({ :lib => :http_rb }),
         request_signature,
         webmock_response
       )

data/lib/webmock/http_lib_adapters/http_rb_adapter.rb

@@ -0,0 +1,37 @@
+begin
+  require "http"
+rescue LoadError
+  # HTTP gem not found
+end
+
+if defined?(HTTP) && defined?(HTTP::VERSION)
+  WebMock::VersionChecker.new("HTTP Gem", HTTP::VERSION, "0.6.0").check_version!
+
+  module WebMock
+    module HttpLibAdapters
+      class HttpRbAdapter < HttpLibAdapter
+        adapter_for :http_rb
+
+        class << self
+          def enable!
+            @enabled = true
+          end
+
+          def disable!
+            @enabled = false
+          end
+
+          def enabled?
+            @enabled
+          end
+        end
+      end
+    end
+  end
+
+  require "webmock/http_lib_adapters/http_rb/client"
+  require "webmock/http_lib_adapters/http_rb/request"
+  require "webmock/http_lib_adapters/http_rb/response"
+  require "webmock/http_lib_adapters/http_rb/streamer"
+  require "webmock/http_lib_adapters/http_rb/webmock"
+end

data/lib/webmock/request_pattern.rb

@@ -137,7 +137,7 @@ module WebMock
       else
         # WebMock checks the query, Addressable checks everything else
         WebMock::Util::URI.variations_of_uri_as_strings(uri.omit(:query)).any? { |u| @pattern.match(u) } &&
-        (@query_params.nil? || @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query))
+          @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query)
       end
     end
 

data/lib/webmock/request_stub.rb

@@ -22,6 +22,7 @@ module WebMock
       end
       self
     end
+    alias_method :and_return, :to_return
 
     def to_rack(app, options={})
       @responses_sequences << ResponsesSequence.new([RackResponse.new(app)])
@@ -33,11 +34,13 @@ module WebMock
       })
       self
     end
+    alias_method :and_raise, :to_raise
 
     def to_timeout
       @responses_sequences << ResponsesSequence.new([ResponseFactory.response_for(:should_timeout => true)])
       self
     end
+    alias_method :and_timeout, :to_timeout
 
     def response
       if @responses_sequences.empty?

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.20.4' unless defined?(::WebMock::VERSION)
+  VERSION = '1.21.0' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/{http_gem/http_gem_spec.rb → http_rb/http_rb_spec.rb}

@@ -2,10 +2,10 @@
 
 require "spec_helper"
 require "acceptance/webmock_shared"
-require "acceptance/http_gem/http_gem_spec_helper"
+require "acceptance/http_rb/http_rb_spec_helper"
 
-describe "HTTP Gem" do
-  include HttpGemSpecHelper
+describe "HTTP.rb" do
+  include HttpRbSpecHelper
 
   include_examples "with WebMock", :no_status_message
 

data/spec/acceptance/{http_gem/http_gem_spec_helper.rb → http_rb/http_rb_spec_helper.rb}

@@ -1,6 +1,6 @@
 require "ostruct"
 
-module HttpGemSpecHelper
+module HttpRbSpecHelper
   def http_request(method, uri, options = {})
     response = HTTP.request(method, normalize_uri(uri), options)
 
@@ -21,7 +21,7 @@ module HttpGemSpecHelper
   end
 
   def http_library
-    :http_gem
+    :http_rb
   end
 
   def normalize_uri(uri)

data/webmock.gemspec

@@ -18,13 +18,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '>= 2.3.6'
   s.add_dependency 'crack', '>=0.3.2'
 
+  patron_version = (RUBY_VERSION <= '1.8.7') ? '0.4.18' : '>= 0.4.18'
+
   s.add_development_dependency 'rspec',           '>= 3.1.0'
   s.add_development_dependency 'http',            '>= 0.6.0'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'
-  s.add_development_dependency 'patron',          '>= 0.4.18' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency('patron',          patron_version) unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'em-http-request', '>= 1.0.2'
   s.add_development_dependency 'em-synchrony',    '>= 1.0.0' if RUBY_VERSION >= "1.9"
-  s.add_development_dependency 'curb',            '>= 0.8.0' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'curb',            '<= 0.8.6' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'typhoeus',        '>= 0.5.0' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'excon',           '>= 0.27.5'
   s.add_development_dependency 'minitest',        '~> 5.0.0'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 67
   prerelease: 
   segments: 
   - 1
-  - 20
-  - 4
-  version: 1.20.4
+  - 21
+  - 0
+  version: 1.21.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-09 00:00:00 +01:00
+date: 2015-03-28 23:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,7 +103,7 @@ dependencies:
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 43
         segments: 
@@ -135,14 +135,14 @@ dependencies:
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 51
         segments: 
         - 0
         - 8
-        - 0
-        version: 0.8.0
+        - 6
+        version: 0.8.6
   prerelease: false
   requirement: *id008
   name: curb
@@ -242,14 +242,14 @@ files:
 - lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
 - lib/webmock/http_lib_adapters/em_http_request_adapter.rb
 - lib/webmock/http_lib_adapters/excon_adapter.rb
-- lib/webmock/http_lib_adapters/http_gem/client.rb
-- lib/webmock/http_lib_adapters/http_gem/request.rb
-- lib/webmock/http_lib_adapters/http_gem/response.rb
-- lib/webmock/http_lib_adapters/http_gem/streamer.rb
-- lib/webmock/http_lib_adapters/http_gem/webmock.rb
-- lib/webmock/http_lib_adapters/http_gem_adapter.rb
 - lib/webmock/http_lib_adapters/http_lib_adapter.rb
 - lib/webmock/http_lib_adapters/http_lib_adapter_registry.rb
+- lib/webmock/http_lib_adapters/http_rb/client.rb
+- lib/webmock/http_lib_adapters/http_rb/request.rb
+- lib/webmock/http_lib_adapters/http_rb/response.rb
+- lib/webmock/http_lib_adapters/http_rb/streamer.rb
+- lib/webmock/http_lib_adapters/http_rb/webmock.rb
+- lib/webmock/http_lib_adapters/http_rb_adapter.rb
 - lib/webmock/http_lib_adapters/httpclient_adapter.rb
 - lib/webmock/http_lib_adapters/net_http.rb
 - lib/webmock/http_lib_adapters/net_http_response.rb
@@ -291,8 +291,8 @@ files:
 - spec/acceptance/em_http_request/em_http_request_spec_helper.rb
 - spec/acceptance/excon/excon_spec.rb
 - spec/acceptance/excon/excon_spec_helper.rb
-- spec/acceptance/http_gem/http_gem_spec.rb
-- spec/acceptance/http_gem/http_gem_spec_helper.rb
+- spec/acceptance/http_rb/http_rb_spec.rb
+- spec/acceptance/http_rb/http_rb_spec_helper.rb
 - spec/acceptance/httpclient/httpclient_spec.rb
 - spec/acceptance/httpclient/httpclient_spec_helper.rb
 - spec/acceptance/net_http/net_http_shared.rb
@@ -386,8 +386,8 @@ test_files:
 - spec/acceptance/em_http_request/em_http_request_spec_helper.rb
 - spec/acceptance/excon/excon_spec.rb
 - spec/acceptance/excon/excon_spec_helper.rb
-- spec/acceptance/http_gem/http_gem_spec.rb
-- spec/acceptance/http_gem/http_gem_spec_helper.rb
+- spec/acceptance/http_rb/http_rb_spec.rb
+- spec/acceptance/http_rb/http_rb_spec_helper.rb
 - spec/acceptance/httpclient/httpclient_spec.rb
 - spec/acceptance/httpclient/httpclient_spec_helper.rb
 - spec/acceptance/net_http/net_http_shared.rb

data/lib/webmock/http_lib_adapters/http_gem/streamer.rb

@@ -1,13 +0,0 @@
-module HTTP
-  class Response
-    class Streamer
-      def initialize(str)
-        @io = StringIO.new str
-      end
-
-      def readpartial(size = HTTP::Client::BUFFER_SIZE)
-        @io.read size
-      end
-    end
-  end
-end

data/lib/webmock/http_lib_adapters/http_gem_adapter.rb

@@ -1,38 +0,0 @@
-begin
-  require "http"
-  __http_gem_found__ = true
-rescue LoadError
-  __http_gem_found__ = false
-end
-
-if __http_gem_found__
-  WebMock::VersionChecker.new("HTTP Gem", HTTP::VERSION, "0.6.0").check_version!
-
-  module WebMock
-    module HttpLibAdapters
-      class HttpGemAdapter < HttpLibAdapter
-        adapter_for :http_gem
-
-        class << self
-          def enable!
-            @enabled = true
-          end
-
-          def disable!
-            @enabled = false
-          end
-
-          def enabled?
-            @enabled
-          end
-        end
-      end
-    end
-  end
-
-  require "webmock/http_lib_adapters/http_gem/client"
-  require "webmock/http_lib_adapters/http_gem/request"
-  require "webmock/http_lib_adapters/http_gem/response"
-  require "webmock/http_lib_adapters/http_gem/streamer"
-  require "webmock/http_lib_adapters/http_gem/webmock"
-end