webmock 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 179133602a27a9b18e133abc3ed4f2cdc0dd40b654584328ece6a78c0158abd5
-  data.tar.gz: c32e65dbc8de6903fc1074fc705d0484a2029d5c78bf55d8a67606867040f642
+SHA1:
+  metadata.gz: 9824be80903ce63b7e2f3a3b61c5924ba3d884ff
+  data.tar.gz: 4666fd52ab43ddd61feabf9b53b565b332d56d17
 SHA512:
-  metadata.gz: 047c1a68dc3afcb1eb74ab1b4aa0f77edf0f7d17972b15abdde404d8305ad1fafa7a2915e0c82ed7337af935ca7740e4c9cc9d6ea8b83071b484b51c3da3624f
-  data.tar.gz: 3aa1f21106c10505bc565455c9c7db69f70ae70a0e4cf61e57545f56db997f3363ec6479f789df31b688b7586aa727ef6f9332851f7edeb0a572eec18a410091
+  metadata.gz: a9e1a7c45d9e2ae020ebb116edcd3d52b529df4a29495f0539f234738f34dff65d2e38c45de3a2361cb203be364c94d1e1eebd88ccbdaac27d0c0ed15e7f614c
+  data.tar.gz: 421aca9b146365fa1f0c6425435620b290323e10230acdf39fe6b572fc3072aad7bca874243176b4cf03a39eb4ed239a3063b640f2abe3e7ebf9e6b15fb44785

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.3.0
+
+ *  Better formatting of outputted request stub snippets, displayed on failures due to unstubbed requests.
+
+    Thanks to [Olia Kremmyda](https://github.com/Olia-Kremmyda)
+
+
 ## 3.2.1
 
  *  Fixed Ruby warning under Ruby 2.5

data/README.md

@@ -1053,6 +1053,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Olia Kremmyda
 * Michał Matyas
 * Matt Brictson
+* Olia Kremmyda
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/request_pattern.rb

@@ -344,6 +344,10 @@ module WebMock
       WebMock::Util::Headers.sorted_headers_string(@pattern)
     end
 
+    def pp_to_s
+      WebMock::Util::Headers.pp_headers_string(@pattern)
+    end
+
     private
 
     def empty_headers?(headers)

data/lib/webmock/stub_request_snippet.rb

@@ -16,13 +16,13 @@ module WebMock
       with = "".dup
 
       if (request_pattern.body_pattern)
-        with << "body: #{request_pattern.body_pattern.to_s}"
+        with << "\n    body: #{request_pattern.body_pattern.to_s}"
       end
 
       if (request_pattern.headers_pattern)
-        with << ",\n       " unless with.empty?
+        with << ",\n  " unless with.empty?
 
-        with << "headers: #{request_pattern.headers_pattern.to_s}"
+        with << "  headers: #{request_pattern.headers_pattern.pp_to_s}"
       end
       string << ".\n  with(#{with})" unless with.empty?
       if with_response

data/lib/webmock/util/headers.rb

@@ -34,6 +34,21 @@ module WebMock
         str << '}'
       end
 
+      def self.pp_headers_string(headers)
+        headers = WebMock::Util::Headers.normalize_headers(headers)
+        seperator = "\n\t "
+        str = "{#{seperator} ".dup
+        str << headers.map do |k,v|
+          v = case v
+            when Regexp then v.inspect
+            when Array then "["+v.map{|w| "'#{w.to_s}'"}.join(", ")+"]"
+            else "'#{v.to_s}'"
+          end
+          "'#{k}'=>#{v}"
+        end.sort.join(",#{seperator} ")
+        str << "\n    }"
+      end
+
       def self.decode_userinfo_from_header(header)
         header.sub(/^Basic /, "").unpack("m").first
       end

data/lib/webmock/version.rb

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

data/spec/unit/request_signature_snippet_spec.rb

@@ -60,7 +60,7 @@ RSpec.describe WebMock::RequestSignatureSnippet do
         result = subject.request_stubs
         result.sub!("registered request stubs:\n\n", "")
         expect(result).to eq(
-          "stub_request(:get, \"https://www.example.com/\").\n  with(body: {\"a\"=>\"b\"})"
+          "stub_request(:get, \"https://www.example.com/\").\n  with(\n    body: {\"a\"=>\"b\"})"
         )
       end
 
@@ -74,7 +74,7 @@ RSpec.describe WebMock::RequestSignatureSnippet do
         result = subject.request_stubs
         result.sub!("registered request stubs:\n\n", "")
         expect(result).to eq(
-          "stub_request(:get, \"https://www.example.com/\").\n  with(body: {\"a\"=>\"b\"})\n\nBody diff:\n [[\"-\", \"key\", \"different value\"], [\"+\", \"a\", \"b\"]]\n"
+          "stub_request(:get, \"https://www.example.com/\").\n  with(\n    body: {\"a\"=>\"b\"})\n\nBody diff:\n [[\"-\", \"key\", \"different value\"], [\"+\", \"a\", \"b\"]]\n"
         )
       end
     end

data/spec/unit/stub_request_snippet_spec.rb

@@ -16,7 +16,7 @@ describe WebMock::StubRequestSnippet do
       it "should print stub request snippet with body if available" do
         @request_signature.body = "abcdef"
         expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").)+
-        "\n  with(body: \"abcdef\")." +
+        "\n  with(\n    body: \"abcdef\")." +
         "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
@@ -25,7 +25,7 @@ describe WebMock::StubRequestSnippet do
       it "should print stub request snippet with multiline body" do
         @request_signature.body = "abc\ndef"
         expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").)+
-        "\n  with(body: \"abc\\ndef\")." +
+        "\n  with(\n    body: \"abc\\ndef\")." +
         "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
@@ -34,7 +34,7 @@ describe WebMock::StubRequestSnippet do
       it "should print stub request snippet with headers if any" do
         @request_signature.headers = {'B' => 'b', 'A' => 'a'}
         expected = 'stub_request(:get, "http://www.example.com/?a=b&c=d").'+
-        "\n  with(headers: {\'A\'=>\'a\', \'B\'=>\'b\'})." +
+        "\n  with(  headers: {\n\t\  'A\'=>\'a\',\n\t  \'B\'=>\'b\'\n    })." +
         "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
@@ -44,7 +44,7 @@ describe WebMock::StubRequestSnippet do
         @request_signature.body = "abcdef"
         @request_signature.headers = {'B' => 'b', 'A' => 'a'}
         expected = 'stub_request(:get, "http://www.example.com/?a=b&c=d").'+
-        "\n  with(body: \"abcdef\",\n       headers: {\'A\'=>\'a\', \'B\'=>\'b\'})." +
+        "\n  with(\n    body: \"abcdef\",\n    headers: {\n\t  \'A\'=>\'a\',\n\t  \'B\'=>\'b\'\n    })." +
         "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
@@ -52,7 +52,7 @@ describe WebMock::StubRequestSnippet do
 
       it "should not print to_return part if not wanted" do
         expected = 'stub_request(:get, "http://www.example.com/").'+
-        "\n  with(body: \"abcdef\")"
+        "\n  with(\n    body: \"abcdef\")"
         stub = WebMock::RequestStub.new(:get, "www.example.com").with(body: "abcdef").to_return(body: "hello")
         expect(WebMock::StubRequestSnippet.new(stub).to_s(false)).to eq(expected)
       end
@@ -68,8 +68,11 @@ describe WebMock::StubRequestSnippet do
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").
-  with(body: {"user"=>{"first_name"=>"Bartosz"}},
-       headers: {'Content-Type'=>'application/x-www-form-urlencoded'}).
+  with(
+    body: {"user"=>{"first_name"=>"Bartosz"}},
+    headers: {
+\t  'Content-Type'=>'application/x-www-form-urlencoded'
+    }).
   to_return(status: 200, body: \"\", headers: {})
         STUB
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
@@ -82,8 +85,11 @@ stub_request(:post, "http://www.example.com/").
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").
-  with(body: "#{multipart_form_body}",
-       headers: {'Content-Type'=>'multipart/form-data; boundary=ABC123'}).
+  with(
+    body: "#{multipart_form_body}",
+    headers: {
+\t  'Content-Type'=>'multipart/form-data; boundary=ABC123'
+    }).
   to_return(status: 200, body: \"\", headers: {})
         STUB
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -398,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: webmock
-rubygems_version: 2.7.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.