webmock 1.7.4 → 1.7.5

data/.travis.yml

@@ -4,3 +4,5 @@ rvm:
   - 1.9.3
   - ree
   - jruby
+
+script: "bundle exec rake && rake em_http_request_1_x_spec"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.5
+
+* Added support for Patron 0.4.15. This change is not backward compatible so please upgrade Patron to version >= 0.4.15 if you want to use it with WebMock.
+
+   Thanks to [Andreas Garnæs](https://github.com/andreas)
+
 ## 1.7.4
 
 * Added support for matching EM-HTTP-Request requests with body declared as a Hash

data/Gemfile

@@ -1,6 +1,11 @@
 source 'http://rubygems.org/'
 
 gemspec
+if ENV["EM_HTTP_REQUEST_1_X"]
+  gem 'em-http-request', '>= 1.0.0.beta.4'
+  gem 'em-synchrony', '>= 0.3.0.beta.1'
+end
+
 
 group :development do
   gem 'rake'

data/README.md

@@ -647,6 +647,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Nikita Fedyashev
 * Lin Jen-Shin
 * David Yeu
+* Andreas Garnæs
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/Rakefile

@@ -25,6 +25,11 @@ RSpec::Core::RakeTask.new(:spec_http_without_webmock) do |t|
   t.pattern = 'spec/real_net_http_spec.rb'
 end
 
+
+task :em_http_request_1_x_spec do
+  sh "EM_HTTP_REQUEST_1_X=true bundle install && bundle exec rspec spec/em_http_request_spec.rb" if RUBY_VERSION >= "1.9.2"
+end
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.test_files = FileList["test/**/*.rb"].exclude("test/test_helper.rb")
@@ -38,6 +43,7 @@ Rake::TestTask.new(:minitest) do |test|
   test.warning = false
 end
 
+
 task :default => [:spec, :spec_http_without_webmock, :test, :minitest]
 
 require 'rdoc/task'

data/lib/webmock/http_lib_adapters/patron_adapter.rb

@@ -25,7 +25,7 @@ if defined?(::Patron)
               WebMock::HttpLibAdapters::PatronAdapter.
                 handle_file_name(req, webmock_response)
               res = WebMock::HttpLibAdapters::PatronAdapter.
-                build_patron_response(webmock_response)
+                build_patron_response(webmock_response, default_response_charset)
               WebMock::CallbackRegistry.invoke_callbacks(
                 {:lib => :patron}, request_signature, webmock_response)
               res
@@ -98,15 +98,22 @@ if defined?(::Patron)
           request_signature
         end
 
-        def self.build_patron_response(webmock_response)
+        def self.build_patron_response(webmock_response, default_response_charset)
           raise ::Patron::TimeoutError if webmock_response.should_timeout
           webmock_response.raise_error_if_any
-          res = ::Patron::Response.new
-          res.instance_variable_set(:@body, webmock_response.body)
-          res.instance_variable_set(:@status, webmock_response.status[0])
-          res.instance_variable_set(:@status_line, webmock_response.status[1])
-          res.instance_variable_set(:@headers, webmock_response.headers)
-          res
+
+          header_fields = (webmock_response.headers || []).map { |(k, vs)| Array(vs).map { |v| "#{k}: #{v}" } }.flatten
+          status_line   = "HTTP/1.1 #{webmock_response.status[0]} #{webmock_response.status[1]}"
+          header_data   = ([status_line] + header_fields).join("\r\n")
+
+          ::Patron::Response.new(
+            "",
+            webmock_response.status[0],
+            0,
+            header_data,
+            webmock_response.body,
+            default_response_charset
+          )
         end
 
         def self.build_webmock_response(patron_response)

data/lib/webmock/version.rb

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

data/spec/patron_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'webmock_shared'
 
@@ -84,6 +86,42 @@ unless RUBY_PLATFORM =~ /java/
         stub_http_request(:copy, "www.example.com/abc").with(:headers => {'Destination' => "/def"})
         @sess.copy("/abc", "/def")
       end
+
+      if /^1\.9/ === RUBY_VERSION
+        describe "handling encoding same way as patron" do
+          around(:each) do |example|
+            @encoding = Encoding.default_internal
+            Encoding.default_internal = "UTF-8"
+            example.run
+            Encoding.default_internal = @encoding
+          end
+
+          it "should encode body based on charset in headers" do
+            stub_request(:get, "www.example.com").
+              to_return(:headers => {'Content-Type' => 'text/html; charset=iso-8859-1'},
+                        :body => "Øl".encode("iso-8859-1"))
+
+            @sess.get("").body.encoding.should == Encoding.default_internal
+          end
+
+          it "should encode body based on encoding-attribute in body" do
+            stub_request(:get, "www.example.com").
+              to_return(:body => "<?xml encoding=\"iso-8859-1\">Øl</xml>".encode("iso-8859-1"))
+
+
+            @sess.get("").body.encoding.should == Encoding.default_internal
+          end
+
+          it "should encode body based on Session#default_response_charset" do
+            stub_request(:get, "www.example.com").
+              to_return(:body => "Øl".encode("iso-8859-1"))
+
+            @sess.default_response_charset = "iso-8859-1"
+
+            @sess.get("").body.encoding.should == Encoding.default_internal
+          end
+        end
+      end
     end
   end
 end

data/spec/patron_spec_helper.rb

@@ -23,11 +23,15 @@ module PatronSpecHelper
         headers[k] = v
       end
     end
+
+    status_line_pattern = %r(\AHTTP/(\d+\.\d+)\s+(\d\d\d)\s*([^\r\n]+)?)
+    message = response.status_line.match(status_line_pattern)[3] || ""
+
     OpenStruct.new({
       :body => response.body,
       :headers => WebMock::Util::Headers.normalize_headers(headers),
       :status => response.status.to_s,
-      :message => response.status_line
+      :message => message
     })
   end
 

data/webmock.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',           '>= 2.0.0'
   s.add_development_dependency 'httpclient',      '>= 2.1.5.2'
   s.add_development_dependency 'patron',          '>= 0.4.9'
-  s.add_development_dependency 'em-http-request', '>= 0.2.14'
+  s.add_development_dependency 'em-http-request', '~> 0.3.0'
   s.add_development_dependency 'curb',            '>= 0.7.8'
   s.add_development_dependency 'typhoeus',        '>= 0.2.4'
   s.add_development_dependency 'minitest',        '>= 2.2.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000Z
+date: 2011-08-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2160447620 !ruby/object:Gem::Requirement
+  requirement: &2153330000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 2.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *2160447620
+  version_requirements: *2153330000
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2160424420 !ruby/object:Gem::Requirement
+  requirement: &2153329140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *2160424420
+  version_requirements: *2153329140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160422500 !ruby/object:Gem::Requirement
+  requirement: &2153328680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2160422500
+  version_requirements: *2153328680
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &2160421560 !ruby/object:Gem::Requirement
+  requirement: &2153328200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2160421560
+  version_requirements: *2153328200
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &2160420320 !ruby/object:Gem::Requirement
+  requirement: &2153327700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,21 +68,21 @@ dependencies:
         version: 0.4.9
   type: :development
   prerelease: false
-  version_requirements: *2160420320
+  version_requirements: *2153327700
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2160418840 !ruby/object:Gem::Requirement
+  requirement: &2153327020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *2160418840
+  version_requirements: *2153327020
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2160400940 !ruby/object:Gem::Requirement
+  requirement: &2153326340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: 0.7.8
   type: :development
   prerelease: false
-  version_requirements: *2160400940
+  version_requirements: *2153326340
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &2160400240 !ruby/object:Gem::Requirement
+  requirement: &2153317840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *2160400240
+  version_requirements: *2153317840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2160399300 !ruby/object:Gem::Requirement
+  requirement: &2153317380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *2160399300
+  version_requirements: *2153317380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2160398420 !ruby/object:Gem::Requirement
+  requirement: &2153316780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -123,7 +123,7 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *2160398420
+  version_requirements: *2153316780
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
   requests.
 email: