webmock 1.6.4 → 1.7.0

data/lib/webmock/responses_sequence.rb

@@ -1,5 +1,5 @@
 module WebMock
-  
+
   class ResponsesSequence
 
     attr_accessor :times_to_repeat
@@ -36,5 +36,5 @@ module WebMock
     end
 
   end
-  
+
 end

data/lib/webmock/rspec.rb

@@ -6,7 +6,7 @@ if defined?(RSpec) && defined?(RSpec::Expectations)
 elsif defined?(Spec)
   RSPEC_NAMESPACE = Spec
   RSPEC_CONFIGURER = Spec::Runner
-else  
+else
   begin
     require 'rspec/core'
     require 'rspec/expectations'
@@ -19,7 +19,7 @@ else
 end
 
 require 'webmock/rspec/matchers'
-  
+
 RSPEC_CONFIGURER.configure { |config|
 
   config.include WebMock::API

data/lib/webmock/rspec/matchers.rb

@@ -7,17 +7,22 @@ module WebMock
     def have_been_made
       WebMock::RequestPatternMatcher.new
     end
-    
+
+    def have_been_requested
+      WebMock::RequestPatternMatcher.new
+    end
+
+
     def have_not_been_made
       WebMock::RequestPatternMatcher.new.times(0)
     end
-    
+
     def have_requested(method, uri)
       WebMock::WebMockMatcher.new(method, uri)
     end
-    
+
     def have_not_requested(method, uri)
       WebMock::WebMockMatcher.new(method, uri).times(0)
     end
   end
-end
+end

data/lib/webmock/rspec/matchers/webmock_matcher.rb

@@ -29,7 +29,7 @@ module WebMock
     def matches?(webmock)
       @request_execution_verifier.matches?
     end
-    
+
     def does_not_match?(webmock)
       @request_execution_verifier.does_not_match?
     end

data/lib/webmock/stub_registry.rb

@@ -40,4 +40,4 @@ module WebMock
     end
 
   end
-end
+end

data/lib/webmock/stub_request_snippet.rb

@@ -1,26 +1,29 @@
 module WebMock
   class StubRequestSnippet
-    def initialize(request_signature)
-      @request_signature = request_signature
+    def initialize(request_stub)
+      @request_stub = request_stub
     end
 
-    def to_s
-      string = "stub_request(:#{@request_signature.method},"
-      string << " \"#{WebMock::Util::URI.strip_default_port_from_uri_string(@request_signature.uri.to_s)}\")"
+    def to_s(with_response = true)
+      request_pattern = @request_stub.request_pattern
+      string = "stub_request(:#{request_pattern.method_pattern.to_s},"
+      string << " \"#{request_pattern.uri_pattern.to_s}\")"
 
       with = ""
 
-      if (@request_signature.body.to_s != '')
-        with << ":body => #{@request_signature.body.inspect}"
+      if (request_pattern.body_pattern)
+        with << ":body => #{request_pattern.body_pattern.to_s}"
       end
 
-      if (@request_signature.headers && !@request_signature.headers.empty?)
-        with << ", \n       " unless with.empty?
+      if (request_pattern.headers_pattern)
+        with << ",\n       " unless with.empty?
 
-        with << ":headers => #{WebMock::Util::Headers.sorted_headers_string(@request_signature.headers)}"
+        with << ":headers => #{request_pattern.headers_pattern.to_s}"
       end
       string << ".\n  with(#{with})" unless with.empty?
-      string << ".\n  to_return(:status => 200, :body => \"\", :headers => {})"
+      if with_response
+        string << ".\n  to_return(:status => 200, :body => \"\", :headers => {})"
+      end
       string
     end
   end

data/lib/webmock/util/hash_keys_stringifier.rb

@@ -1,14 +1,14 @@
 module WebMock
   module Util
     class HashKeysStringifier
-      
+
       def self.stringify_keys!(arg)
         case arg
         when Array
           arg.map { |elem| stringify_keys!(elem) }
         when Hash
           Hash[
-            *arg.map { |key, value|  
+            *arg.map { |key, value|
               k = key.is_a?(Symbol) ? key.to_s : key
               v = stringify_keys!(value)
               [k,v]
@@ -17,7 +17,7 @@ module WebMock
           arg
         end
       end
-      
+
     end
   end
-end
+end

data/lib/webmock/util/headers.rb

@@ -26,12 +26,12 @@ module WebMock
             when Regexp then v.inspect
             when Array then "["+v.map{|v| "'#{v.to_s}'"}.join(", ")+"]"
             else "'#{v.to_s}'"
-          end    
+          end
           "'#{k}'=>#{v}"
-        end.sort.join(", ") 
+        end.sort.join(", ")
         str << '}'
       end
-      
+
       def self.decode_userinfo_from_header(header)
         header.sub(/^Basic /, "").unpack("m").first
       end

data/lib/webmock/util/json.rb

@@ -0,0 +1,54 @@
+# This is a copy of https://github.com/jnunemaker/crack/blob/master/lib/crack/json.rb
+# with date parsing removed
+module WebMock
+  module Util
+    class JSON
+      def self.parse(json)
+        YAML.load(unescape(convert_json_to_yaml(json)))
+      rescue ArgumentError => e
+        raise ParseError, "Invalid JSON string"
+      end
+
+      protected
+      def self.unescape(str)
+        str.gsub(/\\u([0-9a-f]{4})/) { [$1.hex].pack("U") }
+      end
+
+      # Ensure that ":" and "," are always followed by a space
+      def self.convert_json_to_yaml(json) #:nodoc:
+        scanner, quoting, marks, pos, times = StringScanner.new(json), false, [], nil, []
+        while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
+          case char = scanner[1]
+          when '"', "'"
+            if !quoting
+              quoting = char
+              pos = scanner.pos
+            elsif quoting == char
+              quoting = false
+            end
+          when ":",","
+              marks << scanner.pos - 1 unless quoting
+          when "\\"
+              scanner.skip(/\\/)
+          end
+        end
+
+        if marks.empty?
+          json.gsub(/\\\//, '/')
+        else
+          left_pos  = [-1].push(*marks)
+          right_pos = marks << json.length
+          output    = []
+          left_pos.each_with_index do |left, i|
+            output << json[left.succ..right_pos[i]]
+          end
+          output = output * " "
+
+          times.each { |i| output[i-1] = ' ' }
+          output.gsub!(/\\\//, '/')
+          output
+        end
+      end
+    end
+  end
+end

data/lib/webmock/util/uri.rb

@@ -67,7 +67,7 @@ module WebMock
       end
 
       def self.is_uri_localhost?(uri)
-        uri.is_a?(Addressable::URI) && 
+        uri.is_a?(Addressable::URI) &&
         %w(localhost 127.0.0.1 0.0.0.0).include?(uri.host)
       end
 

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -25,6 +25,22 @@ module WebMock
     VERSION
   end
 
+  def self.disable!(options = {})
+    except = [options[:except]].flatten.compact
+    HttpLibAdapterRegistry.instance.each_adapter do |name, adapter|
+      adapter.enable!
+      adapter.disable! unless except.include?(name)
+    end
+  end
+
+  def self.enable!(options = {})
+    except = [options[:except]].flatten.compact
+    HttpLibAdapterRegistry.instance.each_adapter do |name, adapter|
+      adapter.disable!
+      adapter.enable! unless except.include?(name)
+    end
+  end
+
   def self.allow_net_connect!(options = {})
     Config.instance.allow_net_connect = true
     Config.instance.net_http_connect_on_start = options[:net_http_connect_on_start]
@@ -43,19 +59,19 @@ 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.include?(uri.host)
+      Config.instance.allow && (Config.instance.allow.include?(uri.host) || Config.instance.allow.include?("#{uri.host}:#{uri.port}"))
   end
 
   def self.reset!
     WebMock::RequestRegistry.instance.reset!
     WebMock::StubRegistry.instance.reset!
   end
-  
+
   def self.reset_webmock
     WebMock::Deprecation.warning("WebMock.reset_webmock is deprecated. Please use WebMock.reset! method instead")
     reset!
   end
-  
+
   def self.reset_callbacks
     WebMock::CallbackRegistry.reset
   end
@@ -89,4 +105,5 @@ module WebMock
     ))
   end
 
+  self.enable!
 end

data/minitest/test_helper.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require File.expand_path(File.dirname(__FILE__) + '/../test/http_request')
+
+gem "minitest"
+require 'minitest/autorun'
+require 'webmock/minitest'
+
+class MiniTest::Unit::TestCase
+  def assert_raise(*exp, &block)
+    assert_raises(*exp, &block)
+  end
+
+  def assert_raise_with_message(e, message, &block)
+     e = assert_raises(e, &block)
+     if message.is_a?(Regexp)
+       assert_match(message, e.message)
+     else
+       assert_equal(message, e.message)
+     end
+   end
+
+   def assert_fail(message, &block)
+     assert_raise_with_message(MiniTest::Assertion, message, &block)
+   end
+end

data/minitest/test_webmock.rb

@@ -0,0 +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
+  include SharedTest
+end

data/minitest/webmock_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+  describe "Webmock" do
+    include HttpRequestTestHelper
+
+    before do
+      stub_http_request(:any, "http://www.example.com")
+      stub_http_request(:any, "https://www.example.com")
+    end
+
+    it "should raise error on non stubbed request" do
+      lambda { http_request(:get, "http://www.example.net/") }.must_raise(WebMock::NetConnectNotAllowedError)
+    end
+
+    it "should verify that expected request occured" do
+      http_request(:get, "http://www.example.com/")
+      assert_requested(:get, "http://www.example.com", :times => 1)
+      assert_requested(:get, "http://www.example.com")
+    end
+
+    it  "should verify that expect request didn't occur" do
+     expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
+     expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+     assert_fail(expected_message) do
+       assert_requested(:get, "http://www.example.com")
+     end
+    end
+
+  end
+

data/spec/curb_spec.rb

@@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /java/
 
   shared_examples_for "Curb" do
     include CurbSpecHelper
-    
+
     it_should_behave_like "WebMock"
 
     describe "when doing PUTs" do
@@ -35,7 +35,7 @@ unless RUBY_PLATFORM =~ /java/
         stub_request(:any, "example.com").to_return(:body => body)
 
         test = nil
-        @curl.on_success do |c| 
+        @curl.on_success do |c|
           test = c.body_str
         end
         @curl.http_get
@@ -48,7 +48,7 @@ unless RUBY_PLATFORM =~ /java/
           to_return(:status => [response_code, "Server On Fire"])
 
         test = nil
-        @curl.on_failure do |c, code| 
+        @curl.on_failure do |c, code|
           test = code
         end
         @curl.http_get
@@ -61,19 +61,19 @@ unless RUBY_PLATFORM =~ /java/
           to_return(:body => body)
 
         test = nil
-        @curl.on_body do |data| 
+        @curl.on_body do |data|
           test = data
         end
         @curl.http_get
         test.should == body
       end
-      
+
       it "should call on_header when response headers are read" do
         stub_request(:any, "example.com").
           to_return(:headers => {:one => 1})
 
         test = nil
-        @curl.on_header do |data| 
+        @curl.on_header do |data|
           test = data
         end
         @curl.http_get
@@ -119,7 +119,7 @@ unless RUBY_PLATFORM =~ /java/
         order.should == [:on_progress,:on_header,:on_body,:on_complete,:on_success]
       end
 
-      it "should call callbacks in correct order on successful request" do
+      it "should call callbacks in correct order on failed request" do
         stub_request(:any, "example.com").to_return(:status => [500, ""])
         order = []
         @curl.on_success {|*args| order << :on_success }
@@ -217,7 +217,7 @@ unless RUBY_PLATFORM =~ /java/
         end
       end
     end
-    
+
     describe "#content_type" do
       before(:each) do
         @curl = Curl::Easy.new
@@ -281,6 +281,12 @@ unless RUBY_PLATFORM =~ /java/
         c.response_code.should == 200
       end
 
+      it "should work with several body arguments for post using the class method" do
+        stub_http_request(:post, "www.example.com").with(:user => {:first_name=>'Bartosz', :last_name=>'Blimke'})
+        c = Curl::Easy.http_post "http://www.example.com", 'user[first_name]=Bartosz', 'user[last_name]=Blimke'
+        c.response_code.should == 200
+      end
+
       it "should work with blank arguments for put" do
         stub_http_request(:put, "www.example.com").with(:body => "01234")
         c = Curl::Easy.new
@@ -289,6 +295,18 @@ unless RUBY_PLATFORM =~ /java/
         c.http_put
         c.response_code.should == 200
       end
+
+      it "should work with multiple arguments for post" do
+        data = { :name => "john", :address => "111 example ave" }
+
+        stub_http_request(:post, "www.example.com").with(:body => data)
+        c = Curl::Easy.new
+        c.url = "http://www.example.com"
+        c.http_post Curl::PostField.content('name', data[:name]),  Curl::PostField.content('address', data[:address])
+
+        c.response_code.should == 200
+      end
+
     end
 
     describe "using #perform for requests" do