http_stub 0.22.0 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca138df9424e75479a87d7f172fec131427ae8e
-  data.tar.gz: 3bee3b4a46fcdc888e23bd5458727173a68f7488
+  metadata.gz: e4c4645eda720411e136a1e6b217cc9ee3fde9f2
+  data.tar.gz: 5b6592c82b4e506028076c326b39fc6d0214dbf4
 SHA512:
-  metadata.gz: c0de2e43d78065a51a6fc10faf2e919dc916e4a16ac574d3b8c6e69f2d62e558f3cb174f0bed7955248b4844ff2c1cadd9365b54b99bbbcdc492179ed6e7ad35
-  data.tar.gz: dca38624939a165c2849cd079d3f5865df2fb6606cc8ec1adbe2e9b5b8f074e022bf2d0793a8135a4c9ab177418475bc45f0807ecaace03232e7bc05b0511338
+  metadata.gz: 0a5971eca0c6d1e0ade4f7963a00f4259e2fd14d3274d5a1af9ef817b2ea597666f84a445b4bfcb584b369987742ec730ac896710af9c695a685d7e0b4de25be
+  data.tar.gz: 11933cc237590fb5b30e6e1f96eef69461d3f7b8281cb44d1f8756261e944330ab54acbcb9d093f08e62e594c60cc6f78822edf3399c3f4b184b3bfe4bdf8d30

data/lib/http_stub.rb

@@ -47,7 +47,7 @@ require_relative 'http_stub/server/stub/payload_file_consolidator'
 require_relative 'http_stub/server/stub/parser'
 require_relative 'http_stub/server/stub/stub'
 require_relative 'http_stub/server/stub/empty'
-require_relative 'http_stub/server/stub/match/match'
+require_relative 'http_stub/server/stub/match/result'
 require_relative 'http_stub/server/stub/registry'
 require_relative 'http_stub/server/stub/controller'
 require_relative 'http_stub/server/stub'

data/lib/http_stub/server/application.rb

@@ -11,11 +11,11 @@ module HttpStub
 
       def initialize
         super()
-        @match_registry      = HttpStub::Server::Registry.new("match")
-        @stub_registry       = HttpStub::Server::Stub::Registry.new(@match_registry)
-        @scenario_registry   = HttpStub::Server::Registry.new("scenario")
-        @stub_controller     = HttpStub::Server::Stub::Controller.new(@stub_registry)
-        @scenario_controller = HttpStub::Server::Scenario::Controller.new(@scenario_registry, @stub_registry)
+        @match_result_registry = HttpStub::Server::Registry.new("match result")
+        @stub_registry         = HttpStub::Server::Stub::Registry.new(@match_result_registry)
+        @scenario_registry     = HttpStub::Server::Registry.new("scenario")
+        @stub_controller       = HttpStub::Server::Stub::Controller.new(@stub_registry)
+        @scenario_controller   = HttpStub::Server::Scenario::Controller.new(@scenario_registry, @stub_registry)
       end
 
       private
@@ -62,7 +62,7 @@ module HttpStub
       end
 
       get "/http_stub/stubs/matches" do
-        haml :matches, {}, matches: @match_registry.all
+        haml :match_results, {}, match_results: @match_result_registry.all
       end
 
       get "/http_stub/stubs/:id" do

data/lib/http_stub/server/registry.rb

@@ -5,7 +5,7 @@ module HttpStub
 
       def initialize(model_name)
         @model_name = model_name
-        @models = []
+        @models     = []
       end
 
       def add(model, logger)

data/lib/http_stub/server/stub/controller.rb

@@ -15,7 +15,7 @@ module HttpStub
         end
 
         def replay(request, logger)
-          stub = @registry.find(request, logger)
+          stub = @registry.match(request, logger)
           stub ? stub.response : HttpStub::Server::Response::NOT_FOUND
         end
 

data/lib/http_stub/server/stub/match/result.rb

@@ -0,0 +1,20 @@
+module HttpStub
+  module Server
+    module Stub
+      module Match
+
+        class Result
+
+          attr_reader :request, :stub
+
+          def initialize(request, stub)
+            @request = request
+            @stub    = stub
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/server/stub/registry.rb

@@ -4,20 +4,18 @@ module HttpStub
 
       class Registry
 
-        delegate :add, :concat, :all, to: :@stub_registry
+        delegate :add, :concat, :find, :all, to: :@stub_registry
 
-        def initialize(match_registry)
-          @match_registry = match_registry
-          @stub_registry  = HttpStub::Server::Registry.new("stub")
+        def initialize(match_result_registry)
+          @match_result_registry = match_result_registry
+          @stub_registry         = HttpStub::Server::Registry.new("stub")
         end
 
-        def find(criteria, logger)
-          stub = @stub_registry.find(criteria, logger)
-          if criteria.is_a?(HttpStub::Server::Request)
-            @match_registry.add(HttpStub::Server::Stub::Match::Match.new(stub, criteria), logger)
-            stub.triggers.add_to(self, logger) if stub
+        def match(request, logger)
+          @stub_registry.find(request, logger).tap do |matched_stub|
+            @match_result_registry.add(HttpStub::Server::Stub::Match::Result.new(request, matched_stub), logger)
+            matched_stub.triggers.add_to(self, logger) if matched_stub
           end
-          stub
         end
 
         def remember
@@ -29,7 +27,7 @@ module HttpStub
         end
 
         def clear(logger)
-          [ @match_registry, @stub_registry ].each { |registry| registry.clear(logger) }
+          [ @match_result_registry, @stub_registry ].each { |registry| registry.clear(logger) }
         end
 
       end

data/lib/http_stub/server/views/_match.haml

@@ -1,4 +1,7 @@
 %table{ class: :match }
+  %tr
+    %td Type:
+    %td Match
   %tr
     %td Request:
     %td= partial :request, locals: { request: match.request }
@@ -8,6 +11,6 @@
       %table{ class: :response }
         = partial :response, locals: { response: match.stub.response }
   %tr
-    %td Matched Stub:
+    %td Stub:
     %td
-      %a{ href: match.stub.stub_uri, class: :stub } Match
+      %a{ href: match.stub.stub_uri, class: :stub } Stub

data/lib/http_stub/server/views/_miss.haml

@@ -0,0 +1,7 @@
+%table{ class: :miss }
+  %tr
+    %td Type:
+    %td Miss
+  %tr
+    %td Request:
+    %td= partial :request, locals: { request: miss.request }

data/lib/http_stub/server/views/match_results.haml

@@ -0,0 +1,7 @@
+%h1 Stub Matches & Misses
+- match_results.each do |match_result|
+  - if match_result.stub
+    = partial :match, locals: { match: match_result }
+  - else
+    = partial :miss, locals: { miss: match_result }
+%br

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.22.0".freeze
+  VERSION = "0.22.2".freeze
 end

data/spec/acceptance/stub_match_spec.rb

@@ -41,7 +41,7 @@ describe "Stub match acceptance" do
 
     end
 
-    shared_context "behaviours of a request that is recorded in the stub match log" do
+    shared_context "issues requests of various types" do
 
       it "returns a response body that contains the uri of the request" do
         expect(response.body).to match(/#{escape_html(request_uri)}/)
@@ -107,7 +107,11 @@ describe "Stub match acceptance" do
         issue_request
       end
 
-      include_context "behaviours of a request that is recorded in the stub match log"
+      include_context "issues requests of various types"
+
+      it "returns a response body that indicates the request matched a stub" do
+        expect(response.body).to include("Match")
+      end
 
       it "returns a response body that contains stub response status" do
         expect(response.body).to match(/#{escape_html(stub_response_status)}/)
@@ -138,7 +142,11 @@ describe "Stub match acceptance" do
 
       before(:example) { issue_request }
 
-      it_behaves_like "behaviours of a request that is recorded in the stub match log"
+      include_context "issues requests of various types"
+
+      it "returns a response body that indicates the request did not match a stub" do
+        expect(response.body).to include("Miss")
+      end
 
     end
 
@@ -148,19 +156,19 @@ describe "Stub match acceptance" do
 
       before(:example) { register_stub }
 
-      it "should not be recorded in the stub request log" do
+      it "returns a response body that does not include the stub configuration request" do
         expect(response.body).to_not match(/#{request_uri}/)
       end
 
     end
 
-    context "when a request has been made configuring a scenarios" do
+    context "when a request has been made configuring a scenario" do
 
       include_context "registers a stub"
 
       before(:example) { register_scenario }
 
-      it "should not be recorded in the stub request log" do
+      it "returns a response body that does not include the scenario configuration request" do
         expect(response.body).to_not match(/#{request_uri}/)
       end
 

data/spec/lib/http_stub/rake/server_tasks_smoke_spec.rb

@@ -28,7 +28,7 @@ describe HttpStub::Rake::ServerTasks do
         end
 
         def wait_until_server_has_started
-          ::Wait.until!("http stub server #{task_args[:name]} started") do
+          ::Wait.until!(description: "http stub server #{task_args[:name]} started") do
             Net::HTTP.get_response("localhost", "/", port)
           end
         end

data/spec/lib/http_stub/server/application_spec.rb

@@ -4,9 +4,9 @@ describe HttpStub::Server::Application do
   let(:response)      { last_response }
   let(:response_body) { response.body.to_s }
 
-  let(:match_registry)    { instance_double(HttpStub::Server::Stub::Registry) }
-  let(:stub_registry)     { instance_double(HttpStub::Server::Stub::Registry) }
-  let(:scenario_registry) { instance_double(HttpStub::Server::Registry) }
+  let(:match_result_registry) { instance_double(HttpStub::Server::Registry) }
+  let(:stub_registry)         { instance_double(HttpStub::Server::Stub::Registry) }
+  let(:scenario_registry)     { instance_double(HttpStub::Server::Registry) }
 
   let(:stub_controller)     { instance_double(HttpStub::Server::Stub::Controller) }
   let(:scenario_controller) { instance_double(HttpStub::Server::Scenario::Controller) }
@@ -16,7 +16,7 @@ describe HttpStub::Server::Application do
   let(:app) { HttpStub::Server::Application.new! }
 
   before(:example) do
-    allow(HttpStub::Server::Registry).to receive(:new).with("match").and_return(match_registry)
+    allow(HttpStub::Server::Registry).to receive(:new).with("match result").and_return(match_result_registry)
     allow(HttpStub::Server::Registry).to receive(:new).with("scenario").and_return(scenario_registry)
     allow(HttpStub::Server::Stub::Registry).to receive(:new).and_return(stub_registry)
     allow(HttpStub::Server::Stub::Controller).to receive(:new).and_return(stub_controller)
@@ -151,12 +151,12 @@ describe HttpStub::Server::Application do
 
   context "when a request to list the matches is received" do
 
-    let(:found_matches) { [ HttpStub::Server::Stub::Match::MatchFixture.empty ] }
+    let(:found_match_results) { [ HttpStub::Server::Stub::Match::ResultFixture.empty ] }
 
     subject { get "/http_stub/stubs/matches" }
 
-    it "retrieves the matches from the registry" do
-      expect(match_registry).to receive(:all).and_return(found_matches)
+    it "retrieves the match results from the registry" do
+      expect(match_result_registry).to receive(:all).and_return(found_match_results)
 
       subject
     end

data/spec/lib/http_stub/server/stub/controller_spec.rb

@@ -56,9 +56,11 @@ describe HttpStub::Server::Stub::Controller do
 
     subject { controller.replay(request, logger) }
 
-    describe "when a stub has been registered that should be replayed for the request" do
+    before(:example) { allow(registry).to receive(:match).with(request, logger).and_return(matched_stub) }
 
-      before(:example) { allow(registry).to receive(:find).with(request, logger).and_return(the_stub) }
+    describe "when a stub has been registered that matches the request" do
+
+      let(:matched_stub) { the_stub }
 
       it "returns the stubs response" do
         expect(the_stub).to receive(:response).and_return(response)
@@ -68,9 +70,9 @@ describe HttpStub::Server::Stub::Controller do
 
     end
 
-    describe "when no stub should be replayed for the request" do
+    describe "when no stub matches the request" do
 
-      before(:example) { allow(registry).to receive(:find).with(request, logger).and_return(nil) }
+      let(:matched_stub) { nil }
 
       it "returns a not found response" do
         expect(subject).to eql(HttpStub::Server::Response::NOT_FOUND)

data/spec/lib/http_stub/server/stub/match/result_spec.rb

@@ -0,0 +1,24 @@
+describe HttpStub::Server::Stub::Match::Result do
+
+  let(:request) { instance_double(HttpStub::Server::Request) }
+  let(:stub)    { instance_double(HttpStub::Server::Stub::Stub) }
+
+  let(:stub_match) { HttpStub::Server::Stub::Match::Result.new(request, stub) }
+
+  describe "#request" do
+
+    it "exposes the provided value" do
+      expect(stub_match.request).to eql(request)
+    end
+
+  end
+
+  describe "#stub" do
+
+    it "exposes the provided value" do
+      expect(stub_match.stub).to eql(stub)
+    end
+
+  end
+
+end

data/spec/lib/http_stub/server/stub/registry_spec.rb

@@ -1,11 +1,11 @@
 describe HttpStub::Server::Stub::Registry do
 
-  let(:match_registry)           { instance_double(HttpStub::Server::Registry) }
+  let(:match_result_registry)    { instance_double(HttpStub::Server::Registry) }
   let(:underlying_stub_registry) { instance_double(HttpStub::Server::Registry) }
 
-  let(:logger)                   { instance_double(Logger) }
+  let(:logger) { instance_double(Logger) }
 
-  let(:stub_registry) { HttpStub::Server::Stub::Registry.new(match_registry) }
+  let(:stub_registry) { HttpStub::Server::Stub::Registry.new(match_result_registry) }
 
   before(:example) { allow(HttpStub::Server::Registry).to receive(:new).and_return(underlying_stub_registry) }
 
@@ -39,114 +39,109 @@ describe HttpStub::Server::Stub::Registry do
 
   describe "#find" do
 
-    let(:triggers) { instance_double(HttpStub::Server::Stub::Triggers, add_to: nil) }
-    let(:stub)     { instance_double(HttpStub::Server::Stub::Stub, triggers: triggers) }
+    let(:id) { SecureRandom.uuid }
 
-    subject { stub_registry.find(criteria, logger) }
+    subject { stub_registry.find(id, logger) }
 
-    shared_examples_for "an approach to finding a stub in the registry" do
-
-      it "delegates to an underlying simple registry to find based on the criteria" do
-        expect(underlying_stub_registry).to receive(:find).with(criteria, logger)
-
-        subject
-      end
+    it "delegates to an underlying simple registry" do
+      expect(underlying_stub_registry).to receive(:find).with(id, logger)
 
-      context "when a stub is found" do
+      subject
+    end
 
-        before(:example) { allow(underlying_stub_registry).to receive(:find).and_return(stub) }
+  end
 
-        it "returns the stub found in the underlying stub registry" do
-          expect(subject).to eql(stub)
-        end
+  describe "#match" do
 
-      end
+    let(:request)  { HttpStub::Server::RequestFixture.create }
 
-      context "when a stub is not found" do
+    let(:triggers)     { instance_double(HttpStub::Server::Stub::Triggers, add_to: nil) }
+    let(:stub)         { instance_double(HttpStub::Server::Stub::Stub, triggers: triggers) }
+    let(:found_stub)   { nil }
+    let(:match_result) { instance_double(HttpStub::Server::Stub::Match::Result) }
 
-        before(:example) { allow(underlying_stub_registry).to receive(:find).and_return(nil) }
+    subject { stub_registry.match(request, logger) }
 
-        it "returns the result from the underlying registry" do
-          expect(subject).to eql(nil)
-        end
+    before(:example) do
+      allow(underlying_stub_registry).to receive(:find).and_return(found_stub)
+      allow(HttpStub::Server::Stub::Match::Result).to receive(:new).and_return(match_result)
+      allow(match_result_registry).to receive(:add)
+    end
 
-      end
+    it "finds a matching stub in the underlying simple registry based on the request" do
+      expect(underlying_stub_registry).to receive(:find).with(request, logger)
 
+      subject
     end
 
-    context "when a request is provided" do
+    context "when a stub is found" do
 
-      let(:request)  { HttpStub::Server::RequestFixture.create }
-      let(:criteria) { request }
+      let(:found_stub) { stub }
 
-      let(:stub_match) { instance_double(HttpStub::Server::Stub::Match::Match) }
+      it "creates a match containing the request and the stub" do
+        expect(HttpStub::Server::Stub::Match::Result).to receive(:new).with(request, stub)
 
-      before(:example) do
-        allow(HttpStub::Server::Stub::Match::Match).to receive(:new).and_return(stub_match)
-        allow(match_registry).to receive(:add)
+        subject
       end
 
-      it_behaves_like "an approach to finding a stub in the registry"
+      it "adds the match result to the match result registry" do
+        expect(match_result_registry).to receive(:add).with(match_result, logger)
 
-      context "when a stub is found" do
+        subject
+      end
 
-        before(:example) { allow(underlying_stub_registry).to receive(:find).and_return(stub) }
+      it "adds the stubs triggers to the underlying stub registry" do
+        expect(triggers).to receive(:add_to).with(stub_registry, logger)
 
-        it "creates a match containing the stub and request" do
-          expect(HttpStub::Server::Stub::Match::Match).to receive(:new).with(stub, request)
+        subject
+      end
 
-          subject
-        end
+      it "returns the stub found in the underlying stub registry" do
+        expect(subject).to eql(stub)
+      end
 
-        it "adds the match to the match registry" do
-          expect(match_registry).to receive(:add).with(stub_match, logger)
+    end
 
-          subject
-        end
+    context "when a stub is not found" do
 
-        it "adds the stubs triggers to the underlying stub registry" do
-          expect(triggers).to receive(:add_to).with(stub_registry, logger)
+      let(:found_stub) { nil }
 
-          subject
-        end
+      it "creates a match result with a nil stub" do
+        expect(HttpStub::Server::Stub::Match::Result).to receive(:new).with(request, nil)
 
+        subject
       end
 
-      context "when a stub is not found" do
-
-        before(:example) { allow(underlying_stub_registry).to receive(:find).and_return(nil) }
-
-        it "creates a match with a nil stub" do
-          expect(HttpStub::Server::Stub::Match::Match).to receive(:new).with(nil, request)
+      it "adds the match result to the match result registry" do
+        expect(match_result_registry).to receive(:add).with(match_result, logger)
 
-          subject
-        end
-
-        it "adds the match to the match registry" do
-          expect(match_registry).to receive(:add).with(stub_match, logger)
-
-          subject
-        end
+        subject
+      end
 
+      it "returns the result from the underlying registry" do
+        expect(subject).to eql(nil)
       end
 
     end
 
-    context "when an id is provided" do
+  end
+
+  describe "#all" do
 
-      let(:id)       { SecureRandom.uuid }
-      let(:criteria) { id }
+    let(:stubs) { (1..3).map { instance_double(HttpStub::Server::Stub::Stub) } }
 
-      before(:example) { allow(underlying_stub_registry).to receive(:find).and_return(nil) }
+    subject { stub_registry.all }
 
-      it_behaves_like "an approach to finding a stub in the registry"
+    it "delegates to an underlying simple registry" do
+      expect(underlying_stub_registry).to receive(:all)
 
-      it "does not add a match to the match registry" do
-        expect(match_registry).to_not receive(:add)
+      subject
+    end
 
-        subject
-      end
+    it "returns the result from the underlying registry" do
+      allow(underlying_stub_registry).to receive(:all).and_return(stubs)
 
+      expect(subject).to eql(stubs)
     end
 
   end
@@ -184,33 +179,13 @@ describe HttpStub::Server::Stub::Registry do
 
   end
 
-  describe "#all" do
-
-    let(:stubs) { (1..3).map { instance_double(HttpStub::Server::Stub::Stub) } }
-
-    subject { stub_registry.all }
-
-    it "delegates to an underlying simple registry" do
-      expect(underlying_stub_registry).to receive(:all)
-
-      subject
-    end
-
-    it "returns the result from the underlying registry" do
-      allow(underlying_stub_registry).to receive(:all).and_return(stubs)
-
-      expect(subject).to eql(stubs)
-    end
-
-  end
-
   describe "#clear" do
 
     subject { stub_registry.clear(logger) }
 
     before(:example) do
       allow(underlying_stub_registry).to receive(:clear)
-      allow(match_registry).to receive(:clear)
+      allow(match_result_registry).to receive(:clear)
     end
 
     it "clears the underlying simple registry" do
@@ -219,8 +194,8 @@ describe HttpStub::Server::Stub::Registry do
       subject
     end
 
-    it "clears the match registry" do
-      expect(match_registry).to receive(:clear).with(logger)
+    it "clears the match result registry" do
+      expect(match_result_registry).to receive(:clear).with(logger)
 
       subject
     end

data/spec/spec_helper.rb

@@ -46,7 +46,7 @@ end
 
 require_relative 'support/http_stub/server/request_fixture'
 require_relative 'support/http_stub/server/scenario/scenario_fixture'
-require_relative 'support/http_stub/server/stub/match/match_fixture'
+require_relative 'support/http_stub/server/stub/match/result_fixture'
 require_relative 'support/http_stub/stub_fixture'
 require_relative 'support/http_stub/scenario_fixture'
 require_relative 'support/http_stub/empty_configurer'

data/spec/support/http_stub/server/stub/match/{match_fixture.rb → result_fixture.rb}

@@ -3,10 +3,10 @@ module HttpStub
     module Stub
       module Match
 
-        class MatchFixture
+        class ResultFixture
 
           def self.empty
-            HttpStub::Server::Stub::Match::Match.new(nil, HttpStub::Server::RequestFixture.create)
+            HttpStub::Server::Stub::Match::Result.new(HttpStub::Server::RequestFixture.create, nil)
           end
 
         end

data/spec/support/server_integration.rb

@@ -3,7 +3,7 @@ shared_context "server integration" do
 
   before(:context) do
     @pid = Process.spawn("rake example_server:start:foreground --trace")
-    ::Wait.until!("http stub server started") { Net::HTTP.get_response(server_host, "/", server_port) }
+    ::Wait.until!(description: "http stub server started") { Net::HTTP.get_response(server_host, "/", server_port) }
   end
 
   after(:context) { Process.kill(9, @pid) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.2
 platform: ruby
 authors:
 - Matthew Ueckerman
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '10.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -323,9 +323,9 @@ files:
 - "./lib/http_stub/server/stub/empty.rb"
 - "./lib/http_stub/server/stub/match/exact_value_matcher.rb"
 - "./lib/http_stub/server/stub/match/hash_with_string_value_matchers.rb"
-- "./lib/http_stub/server/stub/match/match.rb"
 - "./lib/http_stub/server/stub/match/omitted_value_matcher.rb"
 - "./lib/http_stub/server/stub/match/regexp_value_matcher.rb"
+- "./lib/http_stub/server/stub/match/result.rb"
 - "./lib/http_stub/server/stub/match/rule/body.rb"
 - "./lib/http_stub/server/stub/match/rule/headers.rb"
 - "./lib/http_stub/server/stub/match/rule/json_body.rb"
@@ -347,6 +347,7 @@ files:
 - "./lib/http_stub/server/views/_activate_scenario.haml"
 - "./lib/http_stub/server/views/_file_response.haml"
 - "./lib/http_stub/server/views/_match.haml"
+- "./lib/http_stub/server/views/_miss.haml"
 - "./lib/http_stub/server/views/_request.haml"
 - "./lib/http_stub/server/views/_response.haml"
 - "./lib/http_stub/server/views/_stub.haml"
@@ -354,7 +355,7 @@ files:
 - "./lib/http_stub/server/views/application.sass"
 - "./lib/http_stub/server/views/index.haml"
 - "./lib/http_stub/server/views/layout.haml"
-- "./lib/http_stub/server/views/matches.haml"
+- "./lib/http_stub/server/views/match_results.haml"
 - "./lib/http_stub/server/views/scenario.haml"
 - "./lib/http_stub/server/views/scenarios.haml"
 - "./lib/http_stub/server/views/stub.haml"
@@ -423,9 +424,9 @@ files:
 - "./spec/lib/http_stub/server/stub/empty_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/exact_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/hash_with_string_value_matchers_spec.rb"
-- "./spec/lib/http_stub/server/stub/match/match_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/omitted_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/regexp_value_matcher_spec.rb"
+- "./spec/lib/http_stub/server/stub/match/result_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/rule/body_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/rule/headers_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/rule/json_body_spec.rb"
@@ -453,7 +454,7 @@ files:
 - "./spec/support/http_stub/scenario_fixture.rb"
 - "./spec/support/http_stub/server/request_fixture.rb"
 - "./spec/support/http_stub/server/scenario/scenario_fixture.rb"
-- "./spec/support/http_stub/server/stub/match/match_fixture.rb"
+- "./spec/support/http_stub/server/stub/match/result_fixture.rb"
 - "./spec/support/http_stub/stub_fixture.rb"
 - "./spec/support/server_integration.rb"
 homepage: http://github.com/MYOB-Technology/http_stub
@@ -544,9 +545,9 @@ test_files:
 - "./spec/lib/http_stub/server/stub/empty_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/exact_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/hash_with_string_value_matchers_spec.rb"
-- "./spec/lib/http_stub/server/stub/match/match_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/omitted_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/regexp_value_matcher_spec.rb"
+- "./spec/lib/http_stub/server/stub/match/result_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/rule/body_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/rule/headers_spec.rb"
 - "./spec/lib/http_stub/server/stub/match/rule/json_body_spec.rb"
@@ -574,6 +575,6 @@ test_files:
 - "./spec/support/http_stub/scenario_fixture.rb"
 - "./spec/support/http_stub/server/request_fixture.rb"
 - "./spec/support/http_stub/server/scenario/scenario_fixture.rb"
-- "./spec/support/http_stub/server/stub/match/match_fixture.rb"
+- "./spec/support/http_stub/server/stub/match/result_fixture.rb"
 - "./spec/support/http_stub/stub_fixture.rb"
 - "./spec/support/server_integration.rb"

data/lib/http_stub/server/stub/match/match.rb

@@ -1,20 +0,0 @@
-module HttpStub
-  module Server
-    module Stub
-      module Match
-
-        class Match
-
-          attr_reader :stub, :request
-
-          def initialize(stub, request)
-            @stub    = stub || HttpStub::Server::Stub::Empty::INSTANCE
-            @request = request
-          end
-
-        end
-
-      end
-    end
-  end
-end

data/lib/http_stub/server/views/matches.haml

@@ -1,4 +0,0 @@
-%h1 Stub Matches & Misses
-- matches.each do |match|
-  = partial :match, locals: { match: match }
-  %br

data/spec/lib/http_stub/server/stub/match/match_spec.rb

@@ -1,40 +0,0 @@
-describe HttpStub::Server::Stub::Match::Match do
-
-  let(:stub)    { instance_double(HttpStub::Server::Stub::Stub) }
-  let(:request) { instance_double(HttpStub::Server::Request) }
-
-  let(:stub_match) { HttpStub::Server::Stub::Match::Match.new(stub, request) }
-
-  describe "#stub" do
-
-    subject { stub_match.stub }
-
-    context "when a stub is provided" do
-
-      it "exposes the provided value" do
-        expect(subject).to eql(stub)
-      end
-
-    end
-
-    context "when a stub is not provided" do
-
-      let(:stub_match) { HttpStub::Server::Stub::Match::Match.new(nil, request) }
-
-      it "returns the empty stub" do
-        expect(subject).to eql(HttpStub::Server::Stub::Empty::INSTANCE)
-      end
-
-    end
-
-  end
-
-  describe "#request" do
-
-    it "exposes the provided value" do
-      expect(stub_match.request).to eql(request)
-    end
-
-  end
-
-end