Permalink
Commits on Jul 23, 2012
  1. Bump version to 1.8.8

    bblimke committed Jul 23, 2012
  2. Merge pull request #190 from bblimke/nil_response_body

    Fix Net::HTTP adapter so that it returns `nil` for an empty body response.
    bblimke committed Jul 23, 2012
  3. Revert "Merge pull request #178 from HendrikW/master"

    This reverts commit 36aff46, reversing
    changes made to 1e61a8c.
    bblimke committed Jul 23, 2012
  4. Merge pull request #189 from i0rek/typhoeus

    Fix typhoeus 0.4.0 issues.
    bblimke committed Jul 23, 2012
  5. Merge pull request #178 from HendrikW/master

    Net:HTTP adapter tries to close connection two times and throws error
    bblimke committed Jul 23, 2012
  6. Merge pull request #194 from kjg/request_pattern_charset

    request_pattern should handle content_types that specify a charset
    bblimke committed Jul 23, 2012
  7. Merge pull request #192 from chatgris/em-http-proxy

    Fix EventMachine::HttpRequest on proxy method.
    bblimke committed Jul 23, 2012
  8. Merge pull request #191 from ryansch/fix-travis-image

    Fixing travis-ci image to report master's status
    bblimke committed Jul 23, 2012
  9. Merge pull request #196 from jonleighton/fix_em_http_callbacks

    Fix em-http-request callback triggering
    bblimke committed Jul 23, 2012
  10. Fix em-http-request callback triggering

    Previously, if there were other EM::Deferred callbacks registered, they
    might execute before WebMock's callback and raise an exception. This
    would prevent the WebMock callback ever running, even though there was a
    successful request.
    
    Overriding set_deferred_status prevents this by triggering WebMock's
    callbacks before running any of the EM::Deferred callbacks.
    
    Sorry, I have no idea how to test this.
    jonleighton committed Jul 23, 2012
Commits on Jul 12, 2012
Commits on Jul 11, 2012
  1. Fix EventMachine::HttpRequest on proxy method.

    Caused by
    igrigorik/em-http-request@7d5752d
    
    Signed-off-by: chatgris <jboyer@af83.com>
    chatgris committed Jul 11, 2012
Commits on Jul 5, 2012
Commits on Jun 12, 2012
  1. Fix Net::HTTP adapter so that it returns `nil` for an empty body resp…

    …onse.
    
    This mirrors the real behavior of Net::HTTP and is the source of myronmarston/vcr#173.
    
    A couple things to note:
    
    - Rather than hitting an external URL (httpstat.us/204), this should probably
      hit the local webmock server; however, I can't figure out how to make the
      webmock server return a different response for different requests since it's
      writing directly to the socket w/o any request context available. Maybe it
      should be refactored to use rack or sinatra?
    - I have no idea why, but Curb is returning a 400 Bad Request response for
      the request. Weird. Not sure why or how to fix it.
    myronmarston committed Jun 12, 2012
Commits on Jun 6, 2012
  1. Fix typhoeus 0.4.0 issues.

    i0rek committed Jun 6, 2012
Commits on May 21, 2012
  1. Merge pull request #184 from jonleighton/dont_mutate_uri

    Clone the URI before mutating it.
    bblimke committed May 21, 2012
Commits on May 17, 2012
  1. Clone the URI before mutating it.

    The #build_request_signature method was mutating the URI if there were
    any @req.query options. This means that if the request does actually get
    sent, em-http-request appends the query to the URI a second time, and
    the parameters are repeated.
    
    For example:
    
    EventMachine::HttpRequest.new('http://example.com/').get(:query => { :a => '1' })
    
    would result in the follow URI being used for a live request:
    
    http://example.com/?a=1&a=1
    jonleighton committed May 17, 2012
Commits on May 12, 2012
  1. Bump to version 1.8.7

    bblimke committed May 12, 2012
  2. webmock/rspec checks whether rspec/expectations is already loaded by …

    …checking if RSpec::Expectations::ExpectationNotMetError is defined. This is required for compatibility with RSpec 2.10.0.
    bblimke committed May 12, 2012
Commits on Apr 28, 2012
  1. Merge pull request #176 from oestrich/master

    Add missing required rack environment key
    bblimke committed Apr 28, 2012
  2. Merge pull request #175 from bleything/warnings

    refix @query_params warning
    bblimke committed Apr 28, 2012
Commits on Apr 26, 2012
  1. called start_with_request without a block, because as Net:HTTP's star…

    …t method description says, it will open AND close a connection if start is called with a block. In this case Net:HTTP then later tries to close that same connection again if the server's response has "Connection: close" in its header. In that case Net:HTTP will throw an IOError.
    HendrikW committed Apr 26, 2012
Commits on Apr 24, 2012
Commits on Apr 23, 2012
Commits on Apr 4, 2012
  1. Bump version to 1.8.6

    bblimke committed Apr 4, 2012
  2. Merge pull request #172 from oestrich/fix_to_rack_port

    Pass through SERVER_PORT when stubbing to rack
    bblimke committed Apr 4, 2012
Commits on Apr 2, 2012
  1. Pass through SERVER_PORT when stubbing to rack

    If the server verifies a signature that includes 
    the port, the webmock stub would otherwise make 
    the request invalid
    oestrich committed Apr 2, 2012
Commits on Mar 30, 2012
  1. Bump to version 1.8.5

    bblimke committed Mar 30, 2012