rspec-httpd 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea69f8da3ad709d768698cb52ca4e61629d25fd0259f484c5f16ab7339d80f10
-  data.tar.gz: 72856c694342e833015a370ecbc663df0d4def98ff59d9ec2849e7ae8afdb2fa
+  metadata.gz: d8a74da790f8631d6274b9b21573c5f100e8c407bdbafbec1f30589a15ed8a51
+  data.tar.gz: 709c1999177711fdbd3d3444e6539cd41a39d6be7c90c70aca71824a88226fca
 SHA512:
-  metadata.gz: 22bddec52820090e23b1ae6450ee6604338dfb4b68c2fbf6a5807b12112fa0a47ae8ed0b96b0416e79cf7eb32d22ddef575e02796aaf39cbf30971204821e75e
-  data.tar.gz: e264728cecce18ac99df7cac8f1e09931e13e10db5269230c3f558b861b7a513adcc37f2a070f687b25c4f64f832b8938afc59d11e87879baa8c77b659222dd7
+  metadata.gz: 1355bd07032124833b0d3df6a54328800fa6c0f20606c49634d9223d74084e8afde82e8149795ab718c0075b1f8b8cdd806d81c6334a4782688886f59448db39
+  data.tar.gz: 2b8c8b181cce3c37be518711b628567a8cab86904299fd1d2a94e73fd132a5e977702b89ed96b348f7aa9b4438d42d5e0cc2ebe46278a5171e15f8fdbd5683dc

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/rspec/httpd.rb

@@ -1,6 +1,11 @@
 require "rspec/core"
 require "forwardable"
 require "logger"
+require "expectation"
+
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/PerceivedComplexity
 
 module RSpec::Httpd
 end
@@ -9,7 +14,7 @@ require_relative "httpd/version"
 require_relative "httpd/server"
 require_relative "httpd/client"
 require_relative "httpd/config"
-require_relative "httpd/expectation"
+require_relative "httpd/expectation_failed"
 
 module RSpec::Httpd
   extend self
@@ -54,6 +59,10 @@ module RSpec::Httpd
   public
 
   def expect_response(expected = nil, status: nil, client: nil)
+    if expected.nil? && block_given?
+      expected = yield
+    end
+
     client ||= http
 
     # only check status? This lets us write
@@ -69,10 +78,13 @@ module RSpec::Httpd
     # here, because it needs access to the expect() implementation.
 
     expect(client.status).to eq(status || 200)
-    unless expected.nil?
-      do_expect_last_request(expected: expected, client: client)
+    return if expected.nil?
+
+    begin
+      # expect! comes from the expectation gem
+      expect! client.result => expected
+    rescue ::Expectation::Matcher::Mismatch
+      raise ExpectationFailed.new($!, client.request)
     end
   end
-
-  include RSpec::Httpd::Expectation
 end

data/lib/rspec/httpd/expectation_failed.rb

@@ -0,0 +1,37 @@
+class RSpec::Httpd::ExpectationFailed < RuntimeError
+  attr_reader :original_error, :request
+
+  def initialize(original_error, request)
+    @original_error, @request = original_error, request
+  end
+
+  def to_s
+    "#{request_info}: #{original_error}"
+  end
+
+  private
+
+  def request_info
+    request_info = "#{request.method} #{request.path}"
+    return request_info unless request.body
+
+    "#{request_info}#{body_info(parsed_body(body) || body)}"
+  end
+
+  def parsed_body(body)
+    JSON.parse(body)
+  rescue StandardError
+    nil
+  end
+
+  def body_info(body)
+    body = parsed_body(body) || body
+
+    case body
+    when Hash
+      body.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")
+    else
+      body.inspect
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-httpd
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Enrico Thierbach
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: expectation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +78,7 @@ files:
 - lib/rspec/httpd.rb
 - lib/rspec/httpd/client.rb
 - lib/rspec/httpd/config.rb
-- lib/rspec/httpd/expectation.rb
+- lib/rspec/httpd/expectation_failed.rb
 - lib/rspec/httpd/server.rb
 - lib/rspec/httpd/version.rb
 homepage: https://github.com/radiospiel/rspec-httpd

data/lib/rspec/httpd/expectation.rb

@@ -1,40 +0,0 @@
-require "rspec/core"
-require "forwardable"
-require "logger"
-
-module RSpec::Httpd::Expectation
-  def do_expect_last_request(expected:, client:)
-    actual = client.result
-
-    ctx = {
-      request: client.request, actual: actual, expected: expected
-    }
-
-    case expected
-    when Regexp then expect(actual).to match(expected), -> { format_failure SHOULD_MATCH_ERROR, ctx }
-    when Hash   then expect(actual).to include(expected), -> { format_failure SHOULD_INCLUDE_ERROR, ctx }
-    else             expect(actual).to eq(expected), -> { format_failure SHOULD_EQUAL_ERROR, ctx }
-    end
-  end
-
-  SHOULD_MATCH_ERROR    = "%request -- %actual should match %expected".freeze
-  SHOULD_INCLUDE_ERROR  = "%request -- %actual should include %expected".freeze
-  SHOULD_EQUAL_ERROR    = "%request -- %actual should equal %expected".freeze
-
-  private
-
-  def format_failure(format, ctx)
-    format.gsub(/\%(\S+)/) do
-      value = ctx.fetch(Regexp.last_match(1).to_sym)
-      case value
-      when Net::HTTPGenericRequest
-        request = value
-        s = "#{request.method} #{request.path}"
-        s += " body:#{request.body.inspect}" if request.body
-        s
-      else
-        value.inspect
-      end
-    end
-  end
-end