416 Commits

Author SHA1 Message Date
rick
3a30518104 remove rvmrc, dont force a ruby version on people 2011-12-28 15:27:16 -07:00
rick
d0df9abfb0 merrrrrge 2011-12-28 15:03:40 -07:00
rick
e641735706 Merge branch 'feature/em_synchrony_parallel' of https://github.com/jimeh/faraday into jimeh-feature/em_synchrony_parallel 2011-12-28 14:45:50 -07:00
rick
ed64a91de4 test patron and net/http timeouts 2011-12-28 14:37:38 -07:00
rick
49e47274d5 fix an excon and rack error (headers should be strings, excon likes IPs) 2011-12-28 14:05:23 -07:00
rick
43343e971f remove timeout middleware 2011-12-28 13:53:00 -07:00
rick
a928ee53ad merge readme changes 2011-12-28 13:44:22 -07:00
Erik Michaels-Ober
fea22ff5eb Disable Typhoeus tests on JRuby 2011-12-28 10:47:33 -08:00
Erik Michaels-Ober
7bc86911b9 Relax dependencies 2011-12-28 10:40:34 -08:00
Erik Michaels-Ober
004a43416f Bump typhoeus dependency to ~> 0.3, although this shouldn't make a difference 2011-12-28 10:35:28 -08:00
Erik Michaels-Ober
c926020259 Explicitly require CGI 2011-12-28 10:28:25 -08:00
Erik Michaels-Ober
1842d58246 Include Rubinius 2011-12-28 10:28:18 -08:00
Erik Michaels-Ober
2d4a8789c5 Patron fails to compile on JRuby
NameError: uninitialized constant Patron::Session
2011-12-28 10:18:45 -08:00
Erik Michaels-Ober
58e4276e4b Revert "Remove JRuby support"
This reverts commit 194f06be24d07eb1041acbf70677b0cb3c6f7603.

Conflicts:

	.travis.yml
	README.md
2011-12-28 10:07:04 -08:00
rick
2d8c3619d8 faraday requires itself in tests, rather than the latest gems
It bugs me when libraries load themselves through ruby gems in tests.
I have
to go through the full rake repackage workflow to test my changes,
rather than
simply changing the files.  This also prevents a Faraday lib that's been
loaded outside of ruby gems from reloading the anincompatiblee Faraday
from
rubygems.
2011-12-28 10:58:28 -07:00
rick
790d8d3b18 Merge pull request #98 from PRX/master
like pull request 97 for multipart check failing when there is an array in the request, but recursive
2011-12-28 09:44:18 -08:00
rick
1e53edf46a Merge pull request #80 from whomwah/master
Add support for http_proxy environment variable
2011-12-28 09:26:04 -08:00
rick
b7df22ccde Merge pull request #66 from theflow/master
pass timeouts to patron
2011-12-28 09:13:24 -08:00
Erik Michaels-Ober
b166a80c27 Condense build status and dependency status 2011-12-16 23:19:02 -08:00
kookster
0e4a05242d Add recursive search through request to see if it is multi-part, with test. 2011-12-15 18:19:05 -05:00
Erik Michaels-Ober
86767d2dbd Use HTTPS rubygems source 2011-12-12 07:53:45 -08:00
Erik Michaels-Ober
bbcc7389f4 Remove unnecessary and require 'rubygems' 2011-12-05 08:12:21 -08:00
Erik Michaels-Ober
813ebe709f Make status images more consistent [ci skip] 2011-12-03 20:29:21 -08:00
Erik Michaels-Ober
c28a0ec328 Add Travis-style dependency status image 2011-12-03 19:14:52 -08:00
Erik Michaels-Ober
5520bf4171 Update formatting [ci skip] 2011-12-01 06:12:25 -08:00
Erik Michaels-Ober
70487dc017 Fix test and Typhoeus::Request#user_agent= deprecation warning
Typhoeus no longer sets a User-Agent header by default, so the first
part of this test is no longer necessary.
2011-11-28 03:51:38 -08:00
Erik Michaels-Ober
4524cfafdc Cleanup trailing whitespace 2011-11-28 03:46:27 -08:00
Erik Michaels-Ober
94cbe2e875 Rubinius 2.0 is now the default Rubinius on Travis 2011-11-28 03:36:31 -08:00
rick
4f73743aa0 Merge pull request #94 from radanskoric/fix-rails-gsub
Changed Faraday::Utils#escape to use block parameter instead of $1 to ...
2011-11-23 11:53:54 -08:00
Radan Skorić
ad94eab506 Changed Faraday::Utils#escape to use block parameter instead of $1 to sidestep a bug in ActiveSupport::SafeBuffer#gsub in Rails 3.1 (as described in https://github.com/rails/rails/issues/3496) 2011-11-12 20:50:29 +01:00
rick olson
0aac991a7b ignore .rbx dir 2011-11-06 11:40:44 -06:00
Erik Michaels-Ober
04a698f442 Revert "Test against Rubinius in both Ruby 1.8 and 1.9 mode"
This reverts commit 14e872b4b187341ac9635e60ab97c1e36fc7af99.
2011-11-02 09:51:13 -07:00
Erik Michaels-Ober
14e872b4b1 Test against Rubinius in both Ruby 1.8 and 1.9 mode 2011-11-01 22:33:15 -07:00
rick
5e95e70293 test stubs should support patch/options too 2011-10-30 06:41:33 -06:00
Andrew Kane
3a52825d57 Added options documentation and syntax highlighting to README 2011-10-16 16:42:12 -07:00
Erik Michaels-Ober
b1d9256e7c Merge pull request #87 from mheffner/unescape_basic_auth
Unescape basic authentication username and password when pulling them fro
2011-10-12 10:03:26 -07:00
Mike Heffner
5a4468bc25 Unescape basic authentication username and password when pulling them from a URL. 2011-10-12 12:56:44 -04:00
Erik Michaels-Ober
a919c4d177 Merge pull request #85 from wlmcewen/typhoeus_fix
Typhoeus adapter does not accept custom user agent
2011-10-11 16:05:59 -07:00
Wade McEwen
a516a9da3c Typhoeus adapter does not accept custom user agent
See solution noted here: https://github.com/dbalatero/typhoeus/issues/78#issuecomment-1025115
2011-10-11 17:48:18 -05:00
Andrew Kane
21bbebaf1c Use SystemTimer if possible in Ruby 1.8 2011-10-06 12:27:01 -07:00
Andrew Kane
882ded46c1 Rescue Timeout::Error for Ruby 1.8.7 2011-10-06 01:33:31 -07:00
Andrew Kane
e3c1091de8 Only rescue from StandardError's 2011-10-06 01:09:28 -07:00
Andrew Kane
50b6e2841d Added retry and timeout middleware 2011-10-05 23:00:39 -07:00
Erik Michaels-Ober
3475865928 Release 0.7.5 v0.7.5 2011-10-04 09:13:14 -07:00
Erik Michaels-Ober
1a529e3b18 Release 0.7.5 2011-10-04 09:12:04 -07:00
Erik Michaels-Ober
faee9997e8 Release 0.7.5 2011-10-04 09:12:00 -07:00
risk :danger: olson
16257218d3 hi frozen rails 2011-09-20 16:00:00 +03:00
Jim Myhrberg
42da55ecf9 slightly cleaner if condition 2011-09-19 09:52:34 +01:00
Erik Michaels-Ober
78b51aff85 Travis removed Ruby 1.9.1 support
Rationale: https://gist.github.com/1223640 [ci skip]
2011-09-17 08:24:49 -07:00
Erik Michaels-Ober
ec4ac456f9 Bump yajl-ruby dependency to version 1.0 2011-09-15 20:08:01 -07:00