webmock 1.11.0 → 1.12.0

data/Rakefile

@@ -46,18 +46,6 @@ end
 
 task :default => [:spec, :spec_http_without_webmock, :test, :minitest]
 
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  $:.push File.expand_path('../lib', __FILE__)
-  require 'webmock/version'
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "webmock #{WebMock::VERSION}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/webmock/webmock.rb')
-end
-
-
 task :require_ruby_18 do
   raise "This must be run on Ruby 1.8" unless RUBY_VERSION =~ /^1\.8/
 end

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -5,7 +5,7 @@ rescue LoadError
 end
 
 if defined?(Curl)
-  WebMock::VersionChecker.new('Curb', Gem.loaded_specs['curb'].version.to_s, '0.7.16').check_version!
+  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16').check_version!
 
   module WebMock
     module HttpLibAdapters
@@ -143,7 +143,7 @@ if defined?(Curl)
 
       def invoke_curb_callbacks
         @on_progress.call(0.0,1.0,0.0,1.0) if @on_progress
-        @on_header.call(self.header_str) if @on_header
+        self.header_str.lines.each { |header_line| @on_header.call header_line } if @on_header
         @on_body.call(self.body_str) if @on_body
         @on_complete.call(self) if @on_complete
 

data/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb

@@ -174,7 +174,7 @@ if defined?(EventMachine::HttpClient)
         WebMock::RequestSignature.new(
           method.downcase.to_sym,
           uri.to_s,
-          :body => body,
+          :body => body || (@req.file && File.read(@req.file)),
           :headers => headers
         )
       end

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -5,7 +5,7 @@ rescue LoadError
 end
 
 if defined?(Excon)
-  WebMock::VersionChecker.new('Excon', Excon::VERSION, '0.9.6').check_version!
+  WebMock::VersionChecker.new('Excon', Excon::VERSION, '0.22.0').check_version!
 
   module WebMock
     module HttpLibAdapters
@@ -122,7 +122,7 @@ if defined?(Excon)
           mock = WebMock::Response.new
           mock.status  = real.status
           mock.headers = real.headers
-          mock.body    = real.body
+          mock.body    = real.body.dup
           mock
         end
 

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -193,7 +193,7 @@ end
 
 class StubSocket #:nodoc:
 
-  attr_accessor :read_timeout
+  attr_accessor :read_timeout, :continue_timeout
 
   def initialize(*args)
   end

data/lib/webmock/minitest.rb

@@ -1,7 +1,7 @@
-require 'minitest/unit'
+require 'minitest/test'
 require 'webmock'
 
-MiniTest::Unit::TestCase.class_eval do
+MiniTest::Test.class_eval do
   include WebMock::API
 
   alias_method :teardown_without_webmock, :teardown
@@ -14,7 +14,7 @@ MiniTest::Unit::TestCase.class_eval do
   [:assert_request_requested, :assert_request_not_requested].each do |name|
     alias_method :"#{name}_without_assertions_count", name
     define_method :"#{name}_with_assertions_count" do |*args|
-      self._assertions += 1
+      self.assertions += 1
       send :"#{name}_without_assertions_count", *args
     end
     alias_method name, :"#{name}_with_assertions_count"

data/lib/webmock/rack_response.rb

@@ -49,6 +49,7 @@ module WebMock
       env['rack.url_scheme'] = uri.scheme
       env['rack.run_once']   = true
       env['rack.session']    = session
+      env['rack.session.options'] = session_options
 
       headers.each do |k, v|
         env["HTTP_#{k.tr('-','_').upcase}"] = v
@@ -60,5 +61,9 @@ module WebMock
     def session
       @session ||= {}
     end
+
+    def session_options
+      @session_options ||= {}
+    end
   end
 end

data/lib/webmock/util/query_mapper.rb

@@ -114,6 +114,7 @@ module WebMock::Util
     #
     # @param [Hash, #to_hash, Array] new_query_values The new query values.
     def self.values_to_query(new_query_values)
+
       if new_query_values == nil
         return nil
       end
@@ -146,7 +147,7 @@ module WebMock::Util
         if value.is_a?(Hash)
           value = value.map do |key, val|
             [
-              Addressable::URI.encode_component(key, Addressable::URI::CharacterClasses::UNRESERVED),
+              Addressable::URI.encode_component(key.dup, Addressable::URI::CharacterClasses::UNRESERVED),
               val
             ]
           end
@@ -168,7 +169,7 @@ module WebMock::Util
           return parent
         else
           encoded_value = Addressable::URI.encode_component(
-            value, Addressable::URI::CharacterClasses::UNRESERVED
+            value.dup, Addressable::URI::CharacterClasses::UNRESERVED
           )
           return "#{parent}=#{encoded_value}"
         end
@@ -178,7 +179,7 @@ module WebMock::Util
       buffer = ""
       new_query_values.each do |parent, value|
         encoded_parent = Addressable::URI.encode_component(
-          parent, Addressable::URI::CharacterClasses::UNRESERVED
+          parent.dup, Addressable::URI::CharacterClasses::UNRESERVED
         )
         buffer << "#{to_query.call(encoded_parent, value)}&"
       end

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -59,18 +59,20 @@ module WebMock
     end
 
     Config.instance.allow_net_connect ||
-    (
-    Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) ||
-    Config.instance.allow && (
-      (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) ||
-      (
-        Config.instance.allow.respond_to?(:include?) &&
-        (
-          Config.instance.allow.include?(uri.host) ||
-          Config.instance.allow.include?("#{uri.host}:#{uri.port}")
-        )
-      )
-    )
+    ( Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri) ||
+      Config.instance.allow && net_connect_explicit_allowed?(Config.instance.allow, uri) )
+  end
+
+  def self.net_connect_explicit_allowed?(allowed, uri=nil)
+    case allowed
+    when Array
+      allowed.any? { |allowed_item| net_connect_explicit_allowed?(allowed_item, uri) }
+    when Regexp
+      uri.to_s =~ allowed
+    when String
+      allowed == uri.host ||
+      allowed == "#{uri.host}:#{uri.port}"
+    end
   end
 
   def self.reset!

data/minitest/test_helper.rb

@@ -5,11 +5,13 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require File.expand_path(File.dirname(__FILE__) + '/../test/http_request')
 
-gem "minitest"
+gem 'minitest'
+
 require 'minitest/autorun'
 require 'webmock/minitest'
 
-class MiniTest::Unit::TestCase
+class MiniTest::Test
+
   def assert_raise(*exp, &block)
     assert_raises(*exp, &block)
   end
@@ -26,4 +28,5 @@ class MiniTest::Unit::TestCase
    def assert_fail(message, &block)
      assert_raise_with_message(MiniTest::Assertion, message, &block)
    end
-end
+
+end

data/minitest/test_webmock.rb

@@ -1,7 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../test/shared_test')
 
-class MiniTestWebMock < MiniTest::Unit::TestCase
+class MiniTestWebMock < MiniTest::Test
   include SharedTest
-
 end

data/minitest/webmock_spec.rb

@@ -9,14 +9,14 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
     end
 
     it "should update assertions count" do
-      assert_equal 0, _assertions
+      assert_equal 0, assertions
       http_request(:get, "http://www.example.com/")
 
       assert_requested(@stub_http)
-      assert_equal 2, _assertions
+      assert_equal 2, assertions
 
       assert_not_requested(:post, "http://www.example.com")
-      assert_equal 4, _assertions
+      assert_equal 4, assertions
     end
 
     it "should raise error on non stubbed request" do

data/spec/acceptance/curb/curb_spec.rb

@@ -85,12 +85,15 @@ unless RUBY_PLATFORM =~ /java/
         stub_request(:any, "example.com").
           to_return(:headers => {:one => 1})
 
-        test = nil
+        test = []
         @curl.on_header do |data|
-          test = data
+          test << data
         end
         @curl.http_get
-        test.should match(/One: 1/)
+        test.should == [
+          "HTTP/1.1 200 \r\n",
+          'One: 1'
+        ]
       end
 
       it "should call on_complete when request is complete" do

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -199,6 +199,13 @@ unless RUBY_PLATFORM =~ /java/
       http_request(:post, "http://www.example.com", :body => {:a => "1", :b => "2"}).body.should == "ok"
     end
 
+    if defined?(EventMachine::HttpConnection)
+      it "should work when a file is passed as body" do
+        stub_request(:post, "www.example.com").with(:body => File.read(__FILE__)).to_return(:body => "ok")
+        http_request(:post, "http://www.example.com", :file => __FILE__).body.should == "ok"
+      end
+    end
+
     it "should work with UTF-8 strings" do
       body = "Привет, Мир!"
       stub_request(:post, "www.example.com").to_return(:body => body)

data/spec/acceptance/em_http_request/em_http_request_spec_helper.rb

@@ -17,6 +17,7 @@ module EMHttpRequestSpecHelper
       http = request.send(method, {
         :timeout => 30,
         :body => options[:body],
+        :file => options[:file],
         :query => options[:query],
         :head => head.merge('authorization' => [uri.user, uri.password])
       }, &block)

data/spec/acceptance/net_http/net_http_spec.rb

@@ -203,6 +203,11 @@ describe "Net:HTTP" do
         response = Net::HTTP.get('www.google.com','/')
       end
 
+      it "should connect to the server if the URI matches any regex the array", :net_connect => true do
+        WebMock.disable_net_connect!(:allow => [/google.com/, /yahoo.com/])
+        response = Net::HTTP.get('www.google.com','/')
+      end
+
     end
 
   end

data/spec/support/webmock_server.rb

@@ -29,7 +29,11 @@ class WebMockServer
 
     concurrent do
       ['TERM', 'INT'].each do |signal|
-        trap(signal){ server.shutdown }
+        trap(signal) do
+          Thread.new do
+            server.shutdown
+          end
+        end
       end
       server.start do |socket|
         socket.puts <<-EOT.gsub(/^\s+\|/, '')

data/webmock.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'em-synchrony',    '>= 1.0.0' if RUBY_VERSION >= "1.9"
   s.add_development_dependency 'curb',            '>= 0.8.0' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'typhoeus',        '>= 0.5.0' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'excon',           '>= 0.11.0'
-  s.add_development_dependency 'minitest',        '>= 2.2.2'
+  s.add_development_dependency 'excon',           '>= 0.22.0'
+  s.add_development_dependency 'minitest',        '~> 5.0.0'
   s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 39
   prerelease: 
   segments: 
   - 1
-  - 11
+  - 12
   - 0
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-04 00:00:00 Z
+date: 2013-06-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -30,8 +30,8 @@ dependencies:
         - 2
         - 7
         version: 2.2.7
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: crack
@@ -46,8 +46,8 @@ dependencies:
         - 3
         - 2
         version: 0.3.2
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -61,8 +61,8 @@ dependencies:
         - 2
         - 10
         version: "2.10"
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -77,8 +77,8 @@ dependencies:
         - 2
         - 4
         version: 2.2.4
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: patron
@@ -93,8 +93,8 @@ dependencies:
         - 4
         - 18
         version: 0.4.18
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: em-http-request
@@ -109,8 +109,8 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: curb
@@ -125,8 +125,8 @@ dependencies:
         - 8
         - 0
         version: 0.8.0
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: typhoeus
@@ -141,8 +141,8 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: excon
@@ -151,30 +151,30 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 71
         segments: 
         - 0
-        - 11
+        - 22
         - 0
-        version: 0.11.0
-  type: :development
+        version: 0.22.0
   prerelease: false
+  type: :development
   requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: minitest
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 55
         segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
-  type: :development
+        - 5
+        - 0
+        - 0
+        version: 5.0.0
   prerelease: false
+  type: :development
   requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -189,8 +189,8 @@ dependencies:
         - 5
         - 0
         version: 3.5.0
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id011
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
@@ -205,7 +205,6 @@ files:
 - .gemtest
 - .gitignore
 - .rspec-tm
-- .rvmrc
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -346,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.8.19
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.