http_stub 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d11882c6f2e8da679ce7ea3385600f36aa6a80
-  data.tar.gz: f6d82ab5f7aec1b153f82eeee569090851bb45a6
+  metadata.gz: ce0263a68a9d4c8c707c93ee727ca7cd1f1388d3
+  data.tar.gz: fb4eacb144bf2a1c5444dd2338f1c7ec35e94fc8
 SHA512:
-  metadata.gz: a0a219718f1abb17958d155c0b0e87def0f8f4fca68c30a5908d14726756912d65d41169c861abfb1f1e728b96395ddc4ce9871b82c00ad01ebc654bdca651a1
-  data.tar.gz: 169a55811bea9ed005aee6aee936f7472c8c0820427f2993ae34bc26f335f6d70d449ec082029098874b609fd00ef2d03174266c13dc134d1b459c7487a1ba5a
+  metadata.gz: f9e438b9879d87af9ebd28542529353c5b20bd802ba922143d4d0f56d395de6ce6eca492640731aa70209234061d3d3af879753ca767bd354ccf753e77f0ffab
+  data.tar.gz: fd634a047f29426b9d5dac4409b677bb978de7d54bdfea4bea7a54ad2a6d7b34d4eb35bb4f3743a395f995184042dfa61036a1120875264b665f09ff43bb2f19

data/lib/http_stub/server/application.rb

@@ -21,10 +21,10 @@ module HttpStub
 
       def initialize
         super()
-        @match_result_registry = HttpStub::Server::Registry.new("match result")
-        @stub_registry         = HttpStub::Server::Stub::Registry.new(@match_result_registry)
+        @stub_registry         = HttpStub::Server::Stub::Registry.new
         @scenario_registry     = HttpStub::Server::Registry.new("scenario")
-        @stub_controller       = HttpStub::Server::Stub::Controller.new(@stub_registry)
+        @match_result_registry = HttpStub::Server::Registry.new("match result")
+        @stub_controller       = HttpStub::Server::Stub::Controller.new(@stub_registry, @match_result_registry)
         @scenario_controller   = HttpStub::Server::Scenario::Controller.new(@scenario_registry, @stub_registry)
       end
 

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

@@ -4,23 +4,26 @@ module HttpStub
 
       class Controller
 
-        def initialize(registry)
-          @registry = registry
+        def initialize(stub_registry, match_result_registry)
+          @stub_registry         = stub_registry
+          @match_result_registry = match_result_registry
         end
 
         def register(request, logger)
           stub = HttpStub::Server::Stub.create(HttpStub::Server::Stub::Parser.parse(request))
-          @registry.add(stub, logger)
+          @stub_registry.add(stub, logger)
           HttpStub::Server::Response.success("location" => stub.stub_uri)
         end
 
         def match(request, logger)
-          stub = @registry.match(request, logger)
-          stub ? stub.response_for(request) : HttpStub::Server::Response::NOT_FOUND
+          stub = @stub_registry.match(request, logger)
+          response = stub ? stub.response_for(request) : HttpStub::Server::Response::NOT_FOUND
+          @match_result_registry.add(HttpStub::Server::Stub::Match::Result.new(request, response, stub), logger)
+          response
         end
 
         def clear(logger)
-          @registry.clear(logger)
+          [ @stub_registry, @match_result_registry ].each { |registry| registry.clear(logger) }
         end
 
       end

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

@@ -5,11 +5,12 @@ module HttpStub
 
         class Result
 
-          attr_reader :request, :stub
+          attr_reader :request, :response, :stub
 
-          def initialize(request, stub)
-            @request = request
-            @stub    = stub
+          def initialize(request, response, stub)
+            @request  = request
+            @response = response
+            @stub     = stub
           end
 
         end

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

@@ -4,16 +4,14 @@ module HttpStub
 
       class Registry
 
-        delegate :add, :concat, :find, :all, to: :@stub_registry
+        delegate :add, :concat, :find, :all, :clear, to: :@stub_registry
 
-        def initialize(match_result_registry)
-          @match_result_registry = match_result_registry
-          @stub_registry         = HttpStub::Server::Registry.new("stub")
+        def initialize
+          @stub_registry = HttpStub::Server::Registry.new("stub")
         end
 
         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
         end
@@ -26,10 +24,6 @@ module HttpStub
           @stub_registry.rollback_to(@remembered_stub) if @remembered_stub
         end
 
-        def clear(logger)
-          [ @match_result_registry, @stub_registry ].each { |registry| registry.clear(logger) }
-        end
-
       end
 
     end

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

@@ -2,6 +2,6 @@
   %h3 Request
   = partial :request, locals: { request: match.request }
   %h3 Response
-  =partial :response, locals: { response: match.stub.response }
+  = partial :response, locals: { response: match.response }
   %h3 Matched Stub
   %a{ href: match.stub.stub_uri, class: [:stub, :link] } Match

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

@@ -1,16 +1,16 @@
 %table
   %tr
     %td.title URI:
-    %td=h(request.uri)
+    %td= h(request.uri)
   %tr
     %td.title Method:
-    %td=request.method
+    %td= request.method
   %tr
     %td.title Headers:
-    %td=h(request.headers)
+    %td= h(request.headers)
   %tr
     %td.title Parameters:
-    %td=h(request.parameters)
+    %td= h(request.parameters)
   %tr
     %td.title Body:
-    %td=h(request.body)
+    %td= h(request.body)

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

@@ -1,14 +1,14 @@
 %table
   %tr
     %td.title Status:
-    %td=response.status
+    %td= response.status
   %tr
     %td.title Headers:
-    %td=h(response.headers)
+    %td= h(response.headers)
   %tr
     %td.title Body:
     %td
-      %pre=partial "#{response.type}_response".to_sym, locals: { response: response }
+      %pre= partial "#{response.type}_response".to_sym, locals: { response: response }
   %tr
     %td.title Delay:
-    %td=h(response.delay_in_seconds)
+    %td= h(response.delay_in_seconds)

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

@@ -2,7 +2,7 @@
   %h3 Request
   = partial :request, locals: { request: the_stub }
   %h3 Response
-  =partial :response, locals: { response: the_stub.response }
+  = partial :response, locals: { response: the_stub.response }
   %h3 Triggers
   - the_stub.triggers.each do |trigger|
     = partial :stub, locals: { the_stub: trigger }

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

@@ -1 +1 @@
-=pp(response.body)
+= pp(response.body)

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

@@ -4,9 +4,9 @@
   %table{ class: :scenarios }
     - scenarios.each do |scenario|
       %tr
-        %td{ class: [:scenario_name, :'header-rule'] }= scenario.name
-        %td{ class: :'header-rule' }
+        %td{ class: [:scenario_name, :"header-rule"] }= scenario.name
+        %td{ class: :"header-rule" }
           %a{ href: scenario.links.activate, class: [:scenario, :link, :activate_scenario], data: { name: scenario.name } } Activate
-        %td{ class: :'header-rule' }
+        %td{ class: :"header-rule" }
           %a{ href: scenario.links.detail, class: [:scenario, :link, :view_scenario] } View Detail
 = partial :activate_scenario

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.23.0".freeze
+  VERSION = "0.23.1".freeze
 end

data/spec/acceptance/stub_match_spec.rb

@@ -18,7 +18,7 @@ describe "Stub match acceptance" do
     let(:response)          { HTTParty.get("#{server_uri}/http_stub/stubs/matches") }
     let(:response_document) { Nokogiri::HTML(response.body) }
 
-    shared_context "registers a stub" do
+    shared_context "builds a simple stub" do
 
       let(:stub_response_status)  { 203 }
       let(:stub_response_headers) do
@@ -26,17 +26,34 @@ describe "Stub match acceptance" do
       end
       let(:stub_response_body)    { "Stub response body" }
 
-      def register_stub
-        @register_stub_response = stub_server.add_stub!(build_stub)
-      end
-
       def build_stub
         stub_server.build_stub do |stub|
           stub.match_requests(uri: request_uri, method: request_method,
                               headers: request_headers, parameters: request_parameters, body: request_body)
           stub.respond_with(status: stub_response_status, headers: stub_response_headers, body: stub_response_body)
         end
+      end
+
+    end
 
+    shared_context "registers a stub" do
+
+      def register_stub
+        @register_stub_response = stub_server.add_stub!(build_stub)
+      end
+
+    end
+
+    shared_context "issues requests with parameters" do
+
+      let(:request_parameters) do
+        (1..3).reduce({}) { |result, i| result.tap { result["parameter_#{i}"] = "parameter value #{i}" } }
+      end
+
+      def issue_request
+        HTTParty.send(
+          request_method, "#{server_uri}#{request_uri}", headers: request_headers, query: request_parameters
+        )
       end
 
     end
@@ -59,22 +76,14 @@ describe "Stub match acceptance" do
 
       context "when the request contains parameters" do
 
-        let(:request_parameters) do
-          (1..3).reduce({}) { |result, i| result.tap { result["parameter_#{i}"] = "parameter value #{i}" } }
-        end
+        include_context "issues requests with parameters"
 
-        it "returns a response body that contain the parameters" do
+        it "returns a response body that contains the parameters" do
           request_parameters.each do |expected_parameter_key, expected_parameter_value|
             expect(response.body).to match(/#{expected_parameter_key}=#{expected_parameter_value}/)
           end
         end
 
-        def issue_request
-          HTTParty.send(
-            request_method, "#{server_uri}#{request_uri}", headers: request_headers, query: request_parameters
-          )
-        end
-
       end
 
       context "when the request contains a body" do
@@ -99,6 +108,7 @@ describe "Stub match acceptance" do
 
     context "when a request has been made matching a stub" do
 
+      include_context "builds a simple stub"
       include_context "registers a stub"
 
       before(:example) do
@@ -132,8 +142,62 @@ describe "Stub match acceptance" do
         expect(full_stub_uri).to end_with(stub_link["href"])
       end
 
-      def full_stub_uri
-        @register_stub_response.header["location"]
+    end
+
+    context "when a request has been made matching a stub whose response includes request references" do
+
+      include_context "registers a stub"
+      include_context "issues requests with parameters"
+
+      def build_stub
+        stub_server.build_stub do |stub|
+          stub.match_requests(uri: request_uri, method: request_method,
+                              headers: request_headers, parameters: request_parameters)
+          stub.respond_with do |request|
+            {
+              status:  203,
+              headers: { header_reference:    request.headers[:request_header_2],
+                         parameter_reference: request.parameters[:parameter_2] },
+              body:    "header: #{request.headers[:request_header_3]}, parameter: #{request.parameters[:parameter_3]}"
+            }
+          end
+        end
+      end
+
+      before(:example) do
+        register_stub
+
+        issue_request
+      end
+
+      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(/203/)
+      end
+
+      it "returns a response body that contains stub response headers with interpolated request references" do
+        expected_stub_response_headers = {
+          header_reference:    "request header value 2",
+          parameter_reference: "parameter value 2"
+        }
+
+        expected_stub_response_headers.each do |expected_header_key, expected_header_value|
+          expect(response.body).to match(/#{expected_header_key}:#{expected_header_value}/)
+        end
+      end
+
+      it "returns a response body that contains stub response body with interpolated request references" do
+        expected_stub_response_body = "header: request header value 3, parameter: parameter value 3"
+
+        expect(response.body).to match(/#{escape_html(expected_stub_response_body)}/)
+      end
+
+      it "returns a response body that contains a link to the matched stub" do
+        stub_link = response_document.css("a.stub").first
+        expect(full_stub_uri).to end_with(stub_link["href"])
       end
 
     end
@@ -152,6 +216,7 @@ describe "Stub match acceptance" do
 
     context "when a request has been made configuring a stub" do
 
+      include_context "builds a simple stub"
       include_context "registers a stub"
 
       before(:example) { register_stub }
@@ -164,6 +229,7 @@ describe "Stub match acceptance" do
 
     context "when a request has been made configuring a scenario" do
 
+      include_context "builds a simple stub"
       include_context "registers a stub"
 
       before(:example) { register_scenario }
@@ -178,6 +244,10 @@ describe "Stub match acceptance" do
 
     end
 
+    def full_stub_uri
+      @register_stub_response.header["location"]
+    end
+
   end
 
 end

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

@@ -6,9 +6,11 @@ describe HttpStub::Server::Stub::Controller do
   let(:response) { instance_double(HttpStub::Server::Stub::Response::Base) }
   let(:stub_uri) { "/some/stub/uri" }
   let(:the_stub) { instance_double(HttpStub::Server::Stub::Stub, response: response, stub_uri: stub_uri) }
-  let(:registry) { instance_double(HttpStub::Server::Stub::Registry).as_null_object }
 
-  let(:controller) { HttpStub::Server::Stub::Controller.new(registry) }
+  let(:stub_registry)         { instance_double(HttpStub::Server::Stub::Registry).as_null_object }
+  let(:match_result_registry) { instance_double(HttpStub::Server::Registry).as_null_object }
+
+  let(:controller) { HttpStub::Server::Stub::Controller.new(stub_registry, match_result_registry) }
 
   before(:example) do
     allow(HttpStub::Server::Stub::Parser).to receive(:parse).and_return(payload)
@@ -32,7 +34,7 @@ describe HttpStub::Server::Stub::Controller do
     end
 
     it "adds the stub to the stub registry" do
-      expect(registry).to receive(:add).with(the_stub, logger)
+      expect(stub_registry).to receive(:add).with(the_stub, logger)
 
       subject
     end
@@ -54,9 +56,15 @@ describe HttpStub::Server::Stub::Controller do
 
   describe "#match" do
 
+    let(:calculated_stub_response) { instance_double(HttpStub::Server::Stub::Response::Base) }
+
     subject { controller.match(request, logger) }
 
-    before(:example) { allow(registry).to receive(:match).with(request, logger).and_return(matched_stub) }
+    before(:example) do
+      allow(stub_registry).to receive(:match).with(request, logger).and_return(matched_stub)
+      allow(the_stub).to receive(:response_for).and_return(calculated_stub_response)
+      allow(match_result_registry).to receive(:add)
+    end
 
     describe "when a stub has been registered that matches the request" do
 
@@ -68,11 +76,22 @@ describe HttpStub::Server::Stub::Controller do
         subject
       end
 
-      it "returns the calculated response" do
-        calculated_response = instance_double(HttpStub::Server::Stub::Response::Base)
-        allow(the_stub).to receive(:response_for).and_return(calculated_response)
+      it "determines the match result for the request, calculated response and stub" do
+        expect(HttpStub::Server::Stub::Match::Result).to receive(:new).with(request, calculated_stub_response, the_stub)
+
+        subject
+      end
+
+      it "adds the match result to the match result registry" do
+        expect(match_result_registry).to(
+          receive(:add).with(an_instance_of(HttpStub::Server::Stub::Match::Result), logger)
+        )
+
+        subject
+      end
 
-        expect(subject).to eql(calculated_response)
+      it "returns the calculated response" do
+        expect(subject).to eql(calculated_stub_response)
       end
 
     end
@@ -85,6 +104,22 @@ describe HttpStub::Server::Stub::Controller do
         expect(subject).to eql(HttpStub::Server::Response::NOT_FOUND)
       end
 
+      it "creates a match result for request with the not found response and no stub" do
+        expect(HttpStub::Server::Stub::Match::Result).to(
+          receive(:new).with(request, HttpStub::Server::Response::NOT_FOUND, nil)
+        )
+
+        subject
+      end
+
+      it "adds the match result to the match result registry" do
+        expect(match_result_registry).to(
+          receive(:add).with(an_instance_of(HttpStub::Server::Stub::Match::Result), logger)
+        )
+
+        subject
+      end
+
     end
 
   end
@@ -94,7 +129,13 @@ describe HttpStub::Server::Stub::Controller do
     subject { controller.clear(logger) }
 
     it "clears the stub registry" do
-      expect(registry).to receive(:clear).with(logger)
+      expect(stub_registry).to receive(:clear).with(logger)
+
+      subject
+    end
+
+    it "clears the match result registry" do
+      expect(match_result_registry).to receive(:clear).with(logger)
 
       subject
     end

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

@@ -1,9 +1,10 @@
 describe HttpStub::Server::Stub::Match::Result do
 
-  let(:request) { instance_double(HttpStub::Server::Request) }
-  let(:stub)    { instance_double(HttpStub::Server::Stub::Stub) }
+  let(:request)  { instance_double(HttpStub::Server::Request::Request) }
+  let(:response) { instance_double(HttpStub::Server::Stub::Response::Base) }
+  let(:stub)     { instance_double(HttpStub::Server::Stub::Stub) }
 
-  let(:stub_match) { HttpStub::Server::Stub::Match::Result.new(request, stub) }
+  let(:stub_match) { HttpStub::Server::Stub::Match::Result.new(request, response, stub) }
 
   describe "#request" do
 
@@ -13,6 +14,14 @@ describe HttpStub::Server::Stub::Match::Result do
 
   end
 
+  describe "#response" do
+
+    it "exposes the provided value" do
+      expect(stub_match.response).to eql(response)
+    end
+
+  end
+
   describe "#stub" do
 
     it "exposes the provided value" do

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

@@ -1,9 +1,8 @@
 describe HttpStub::Server::Stub::Registry, "integrating with real stubs" do
 
-  let(:request_match_registry) { HttpStub::Server::Registry.new("request match") }
-  let(:logger)                 { instance_double(Logger, info: nil) }
+  let(:logger) { instance_double(Logger, info: nil) }
 
-  let(:stub_registry) { HttpStub::Server::Stub::Registry.new(request_match_registry) }
+  let(:stub_registry) { HttpStub::Server::Stub::Registry.new }
 
   describe "#recall" do
 

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

@@ -1,11 +1,10 @@
 describe HttpStub::Server::Stub::Registry do
 
-  let(:match_result_registry)    { instance_double(HttpStub::Server::Registry) }
   let(:underlying_stub_registry) { instance_double(HttpStub::Server::Registry) }
 
   let(:logger) { instance_double(Logger) }
 
-  let(:stub_registry) { HttpStub::Server::Stub::Registry.new(match_result_registry) }
+  let(:stub_registry) { HttpStub::Server::Stub::Registry.new }
 
   before(:example) { allow(HttpStub::Server::Registry).to receive(:new).and_return(underlying_stub_registry) }
 
@@ -58,15 +57,10 @@ describe HttpStub::Server::Stub::Registry 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) }
 
     subject { stub_registry.match(request, logger) }
 
-    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
+    before(:example) { allow(underlying_stub_registry).to receive(:find).and_return(found_stub) }
 
     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)
@@ -78,18 +72,6 @@ describe HttpStub::Server::Stub::Registry do
 
       let(:found_stub) { stub }
 
-      it "creates a match containing the request and the stub" do
-        expect(HttpStub::Server::Stub::Match::Result).to receive(:new).with(request, stub)
-
-        subject
-      end
-
-      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 stubs triggers to the underlying stub registry" do
         expect(triggers).to receive(:add_to).with(stub_registry, logger)
 
@@ -106,19 +88,7 @@ describe HttpStub::Server::Stub::Registry do
 
       let(:found_stub) { nil }
 
-      it "creates a match result with a nil stub" do
-        expect(HttpStub::Server::Stub::Match::Result).to receive(:new).with(request, nil)
-
-        subject
-      end
-
-      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 "returns the result from the underlying registry" do
+      it "returns nil" do
         expect(subject).to eql(nil)
       end
 
@@ -183,23 +153,12 @@ describe HttpStub::Server::Stub::Registry do
 
     subject { stub_registry.clear(logger) }
 
-    before(:example) do
-      allow(underlying_stub_registry).to receive(:clear)
-      allow(match_result_registry).to receive(:clear)
-    end
-
-    it "clears the underlying simple registry" do
+    it "delegates to the underlying simple registry" do
       expect(underlying_stub_registry).to receive(:clear).with(logger)
 
       subject
     end
 
-    it "clears the match result registry" do
-      expect(match_result_registry).to receive(:clear).with(logger)
-
-      subject
-    end
-
   end
 
 end

data/spec/support/http_stub/server/stub/match/result_fixture.rb

@@ -6,7 +6,9 @@ module HttpStub
         class ResultFixture
 
           def self.empty
-            HttpStub::Server::Stub::Match::Result.new(HttpStub::Server::RequestFixture.create, nil)
+            HttpStub::Server::Stub::Match::Result.new(
+              HttpStub::Server::RequestFixture.create, HttpStub::Server::Response::NOT_FOUND, nil
+            )
           end
 
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - dueckes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake