Permalink
Commits on Jul 23, 2010
Commits on Jul 21, 2010
  1. Merge branch 'proxy'

    Conflicts:
    	lib/em-http/mock.rb
    igrigorik committed Jul 21, 2010
  2. Manually fix rebasing 95d6872 onto proxy branch.

    The patch didn't take cleanly in request_spec, but the spirit of it is to use the
    X_THE_REQUESTED_URI set by the direct test proxy in a spec.
    phs committed with igrigorik Jul 20, 2010
  3. Include proxy headers (including authorization) for all non-websocket…

    … requests, not just for CONNECT requests in the :response_proxy state.
    phs committed with igrigorik Jul 14, 2010
  4. The spec passes.

    phs committed with igrigorik Jul 14, 2010
  5. Ditch the predicates, given that the mock needs to call encode_query,…

    … there's no good place to put them.
    
    Instead #encode_query takes the @options[:proxy] option directly.
    phs committed with igrigorik Jul 14, 2010
  6. Change #encode_query's signature to take just a uri and extra query p…

    …arams, like #encode_request
    phs committed with igrigorik Jul 13, 2010
  7. Add two predicates: #proxy? holds if @options[:proxy] is present, #tu…

    …nneling_proxy? holds for proxies where @options[:proxy][:tunnel] is not false.
    
    Note #tunneling_proxy? holds when :tunnel is not specified, making it the default.
    phs committed with igrigorik Jul 13, 2010
  8. Change the signature of HttpEncoding#encode_request to take the reque…

    …st uri directly.
    phs committed with igrigorik Jul 13, 2010
  9. Merge branch 'proxy'

    Conflicts:
    	lib/em-http/mock.rb
    igrigorik committed Jul 21, 2010
  10. webmock link in the readme

    igrigorik committed Jul 21, 2010
Commits on Jul 20, 2010
  1. readme update

    igrigorik committed Jul 20, 2010
  2. Manually fix rebasing 95d6872 onto proxy branch.

    The patch didn't take cleanly in request_spec, but the spirit of it is to use the
    X_THE_REQUESTED_URI set by the direct test proxy in a spec.
    phs committed Jul 20, 2010
Commits on Jul 19, 2010
  1. better mock api, docs

    joshbuddy committed Jul 19, 2010
Commits on Jul 18, 2010
Commits on Jul 17, 2010
Commits on Jul 16, 2010
Commits on Jul 14, 2010
  1. Include proxy headers (including authorization) for all non-websocket…

    … requests, not just for CONNECT requests in the :response_proxy state.
    phs committed Jul 14, 2010
  2. The spec passes.

    phs committed Jul 14, 2010
  3. Ditch the predicates, given that the mock needs to call encode_query,…

    … there's no good place to put them.
    
    Instead #encode_query takes the @options[:proxy] option directly.
    phs committed Jul 14, 2010
Commits on Jul 13, 2010
  1. Change #encode_query's signature to take just a uri and extra query p…

    …arams, like #encode_request
    phs committed Jul 13, 2010
  2. Add two predicates: #proxy? holds if @options[:proxy] is present, #tu…

    …nneling_proxy? holds for proxies where @options[:proxy][:tunnel] is not false.
    
    Note #tunneling_proxy? holds when :tunnel is not specified, making it the default.
    phs committed Jul 13, 2010