Permalink
Browse files

Merge branch 'master' into typhoeus-support

Conflicts:
	Rakefile
  • Loading branch information...
2 parents 95c47c0 + 163f678 commit c2a25b44fe4d9e79bf2578f594ef813ba8e5446a @bblimke committed Aug 9, 2011
Showing with 2,683 additions and 1,174 deletions.
  1. 0 .gemtest
  2. +7 −1 .gitignore
  3. +1 −0 .rvmrc
  4. +6 −0 .travis.yml
  5. +215 −119 CHANGELOG.md
  6. +17 −0 Gemfile
  7. +24 −0 Guardfile
  8. +1 −1 LICENSE
  9. +276 −179 README.md
  10. +31 −33 Rakefile
  11. +0 −1 VERSION
  12. +4 −1 lib/webmock.rb
  13. +3 −3 lib/webmock/api.rb
  14. +1 −1 lib/webmock/assertion_failure.rb
  15. +1 −1 lib/webmock/callback_registry.rb
  16. +2 −2 lib/webmock/config.rb
  17. +1 −1 lib/webmock/cucumber.rb
  18. +17 −5 lib/webmock/errors.rb
  19. +70 −25 lib/webmock/http_lib_adapters/curb.rb
  20. +9 −135 lib/webmock/http_lib_adapters/em_http_request.rb
  21. +144 −0 lib/webmock/http_lib_adapters/em_http_request/em_http_request_0_x.rb
  22. +194 −0 lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
  23. +13 −7 lib/webmock/http_lib_adapters/httpclient.rb
  24. +50 −22 lib/webmock/http_lib_adapters/net_http.rb
  25. +2 −2 lib/webmock/http_lib_adapters/net_http_response.rb
  26. +9 −3 lib/webmock/http_lib_adapters/patron.rb
  27. +15 −0 lib/webmock/minitest.rb
  28. +52 −0 lib/webmock/rack_response.rb
  29. +43 −4 lib/webmock/request_pattern.rb
  30. +4 −0 lib/webmock/request_signature.rb
  31. +35 −2 lib/webmock/request_stub.rb
  32. +2 −2 lib/webmock/responses_sequence.rb
  33. +2 −2 lib/webmock/rspec.rb
  34. +9 −4 lib/webmock/rspec/matchers.rb
  35. +1 −1 lib/webmock/rspec/matchers/webmock_matcher.rb
  36. +1 −1 lib/webmock/stub_registry.rb
  37. +14 −11 lib/webmock/stub_request_snippet.rb
  38. +4 −4 lib/webmock/util/hash_keys_stringifier.rb
  39. +3 −3 lib/webmock/util/headers.rb
  40. +54 −0 lib/webmock/util/json.rb
  41. +1 −1 lib/webmock/util/uri.rb
  42. +3 −0 lib/webmock/version.rb
  43. +4 −6 lib/webmock/webmock.rb
  44. +29 −0 minitest/test_helper.rb
  45. +6 −0 minitest/test_webmock.rb
  46. +30 −0 minitest/webmock_spec.rb
  47. +161 −7 spec/curb_spec.rb
  48. +2 −2 spec/curb_spec_helper.rb
  49. +115 −0 spec/em_http_request_spec.rb
  50. +16 −13 spec/em_http_request_spec_helper.rb
  51. +19 −4 spec/errors_spec.rb
  52. +22 −22 spec/example_curl_output.txt
  53. +1 −1 spec/httpclient_spec.rb
  54. +10 −6 spec/httpclient_spec_helper.rb
  55. +18 −0 spec/my_rack_app.rb
  56. +125 −0 spec/net_http_shared.rb
  57. +27 −31 spec/net_http_spec.rb
  58. +6 −6 spec/net_http_spec_helper.rb
  59. +1 −1 spec/network_connection.rb
  60. +0 −30 spec/other_net_http_libs_spec.rb
  61. +11 −4 spec/patron_spec.rb
  62. +5 −3 spec/patron_spec_helper.rb
  63. +60 −0 spec/quality_spec.rb
  64. +33 −0 spec/rack_response_spec.rb
  65. +20 −0 spec/real_net_http_spec.rb
  66. +8 −8 spec/request_execution_verifier_spec.rb
  67. +11 −2 spec/request_pattern_spec.rb
  68. +19 −19 spec/request_stub_spec.rb
  69. +8 −8 spec/response_spec.rb
  70. +18 −3 spec/spec_helper.rb
  71. +85 −37 spec/stub_request_snippet_spec.rb
  72. +62 −0 spec/support/webmock_server.rb
  73. +5 −5 spec/util/headers_spec.rb
  74. +7 −0 spec/util/json_spec.rb
  75. +1 −1 spec/util/uri_spec.rb
  76. +1 −0 spec/vendor/addressable/lib/uri.rb
  77. +1 −0 spec/vendor/crack/lib/crack.rb
  78. +4 −4 spec/vendor/right_http_connection-1.2.4/History.txt
  79. +4 −4 spec/vendor/right_http_connection-1.2.4/README.txt
  80. +3 −3 spec/vendor/right_http_connection-1.2.4/Rakefile
  81. +4 −4 spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb
  82. +4 −4 spec/vendor/right_http_connection-1.2.4/setup.rb
  83. +265 −121 spec/webmock_shared.rb
  84. +7 −0 spec/webmock_spec.rb
  85. +24 −0 test/http_request.rb
  86. +47 −0 test/shared_test.rb
  87. +6 −3 test/test_helper.rb
  88. +2 −67 test/test_webmock.rb
  89. +25 −168 webmock.gemspec
View
No changes.
View
@@ -11,11 +11,17 @@ tmtags
.\#*
## VIM
-*.swp
+.*.sw[a-z]
## PROJECT::GENERAL
coverage
rdoc
pkg
## PROJECT::SPECIFIC
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+tmp/*
+*.rbc
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm use 1.9.2@webmock --create
View
@@ -0,0 +1,6 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - ree
+ - jruby
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
17 Gemfile
@@ -0,0 +1,17 @@
+source 'http://rubygems.org/'
+
+gemspec
+
+group :development do
+ gem 'rake'
+ gem 'guard-rspec'
+ gem 'rb-fsevent'
+end
+
+group :test do
+ gem 'rack'
+end
+
+platforms :jruby do
+ gem 'jruby-openssl', '~> 0.7'
+end
View
@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+# rubies = %w[
+# 1.8.6
+# 1.8.7
+# 1.9.2
+# ree
+# jruby
+# ].map { |ruby| "#{ruby}@webmock" }
+
+rspec_options = {
+ # :rvm => rubies,
+ :all_on_start => false,
+ :notification => false,
+ :cli => '--color',
+ :version => 2
+}
+
+guard 'rspec', rspec_options do
+ watch(%r{^spec/.+_spec\.rb})
+ watch(%r{^lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+ watch('spec/spec_helper.rb') { "spec" }
+end
View
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Oops, something went wrong.

0 comments on commit c2a25b4

Please sign in to comment.