http_stub 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75535217ff4857d46b0848a19809db63b7bfecbe
-  data.tar.gz: ce77b9eb4347fe6713abdfd6d346aad8a81ac371
+  metadata.gz: 9b3e67c607aa3b80f5e886bd7de7fbbfd3749f72
+  data.tar.gz: f0f313f13ccd2d1e0b2eaf62292e2c293b5b2592
 SHA512:
-  metadata.gz: c00f25eafc1aa46f84266e399d759c301d37937c07b6cadeef9cc70b7ac3d43ff4a87ac5c53d9ed3049f755f60da51839f164bcf1f890a4126da00574f553378
-  data.tar.gz: 834af43f6a410d5b1e441e6fe80d0f10bfb517645534883cd5e9b8cbddc72251279052e279919bc91060c2c009a6915ae23a995302a0f1f0f9a30d36a6ead2d9
+  metadata.gz: e3f87569921e42a1272453d37ef65a5585c148ec081a943bc128af5cbff417e59440beedee64b21dc08af0f1c71b3a14f428fcc215903c92104b1ba40787abec
+  data.tar.gz: fb62118fd274913421bda1ef15a2776871a9af76dd2ad96f07b29b1a20417bc2ab60d102bd65ba1faaaefd91aeb7d21687a35dcb0c0a8587245d92eea760a91d

data/lib/http_stub/configurer/dsl/endpoint_template.rb

@@ -4,19 +4,31 @@ module HttpStub
 
       class EndpointTemplate
 
-        delegate :match_requests, :schema, :respond_with, :trigger, :invoke, to: :@default_stub_builder
+        delegate :match_requests, :schema, :respond_with, :trigger, :invoke, to: :@template_stub_builder
 
-        def initialize(server, response_defaults)
+        def initialize(server)
           @server = server
-          @default_stub_builder = HttpStub::Configurer::DSL::StubBuilder.new(response_defaults)
+          @template_stub_builder = HttpStub::Configurer::DSL::StubBuilder.new
+        end
+
+        def build_stub(response_overrides={}, &block)
+          @server.build_stub { |stub| compose_stub(stub, response_overrides, &block) }
+        end
+
+        def add_stub!(response_overrides={}, &block)
+          @server.add_stub! { |stub| compose_stub(stub, response_overrides, &block) }
         end
 
         def add_scenario!(name, response_overrides={}, &block)
-          @server.add_one_stub_scenario!(name) do |stub_builder|
-            stub_builder.merge!(@default_stub_builder)
-            stub_builder.respond_with(response_overrides)
-            stub_builder.invoke(&block) if block_given?
-          end
+          @server.add_one_stub_scenario!(name) { |stub| compose_stub(stub, response_overrides, &block) }
+        end
+
+        private
+
+        def compose_stub(stub_builder, response_overrides, &block)
+          stub_builder.merge!(@template_stub_builder)
+          stub_builder.respond_with(response_overrides)
+          stub_builder.invoke(&block) if block_given?
         end
 
       end

data/lib/http_stub/configurer/dsl/server.rb

@@ -43,9 +43,7 @@ module HttpStub
         end
 
         def endpoint_template(&block)
-          HttpStub::Configurer::DSL::EndpointTemplate.new(self, @response_defaults).tap do |template|
-            template.invoke(&block)
-          end
+          HttpStub::Configurer::DSL::EndpointTemplate.new(self).tap { |template| template.invoke(&block) }
         end
 
         def add_activator!(&block)

data/lib/http_stub/configurer/dsl/stub_builder.rb

@@ -8,8 +8,8 @@ module HttpStub
 
         public
         
-        def initialize(response_defaults)
-          @response = response_defaults ? response_defaults.clone : {}
+        def initialize(response_defaults={})
+          @response = response_defaults.clone
           @triggers = []
         end
 

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.18.1".freeze
+  VERSION = "0.18.2".freeze
 end

data/spec/acceptance/endpoint_template_spec.rb

@@ -13,6 +13,13 @@ describe "Endpoint Template acceptance" do
       expect(response.code).to eql(404)
     end
 
+    it "registers any stubs added to the template" do
+      response = issue_request("custom_stub_uri")
+
+      expect(response.code).to eql(201)
+      expect(response.body).to eql("custom stub body")
+    end
+
     context "and a templated scenario is activated" do
 
       before(:example) { stub_server.activate!(scenario_name) }
@@ -21,7 +28,7 @@ describe "Endpoint Template acceptance" do
 
         let(:scenario_name) { "custom_request" }
 
-        let(:response) { issue_request("custom_uri") }
+        let(:response) { issue_request("custom_scenario_uri") }
 
         it "registers a templated stub for the scenario" do
           expect(response.code).to eql(200)
@@ -38,7 +45,7 @@ describe "Endpoint Template acceptance" do
 
         it "registers a templated stub for the scenario" do
           expect(response.code).to eql(202)
-          expect(response.body).to eql("custom body")
+          expect(response.body).to eql("custom scenario body")
         end
 
       end

data/spec/lib/http_stub/configurer/dsl/endpoint_template_spec.rb

@@ -1,17 +1,19 @@
 describe HttpStub::Configurer::DSL::EndpointTemplate do
 
-  let(:stub_fixture) { HttpStub::StubFixture.new }
+  let(:server)                { instance_double(HttpStub::Configurer::DSL::Server) }
+  let(:response_defaults)     { {} }
+  let(:template_stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder) }
 
-  let(:server)               { instance_double(HttpStub::Configurer::DSL::Server) }
-  let(:response_defaults)    { {} }
-  let(:default_stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder) }
-
-  let(:endpoint_template) { HttpStub::Configurer::DSL::EndpointTemplate.new(server, response_defaults) }
+  let(:endpoint_template) { HttpStub::Configurer::DSL::EndpointTemplate.new(server) }
 
   before(:example) do
-    allow(HttpStub::Configurer::DSL::StubBuilder).to(
-      receive(:new).with(response_defaults).and_return(default_stub_builder)
-    )
+    allow(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).and_return(template_stub_builder)
+  end
+
+  it "creates a stub builder to hold the templated default values" do
+    expect(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).with(no_args)
+
+    endpoint_template
   end
 
   describe "#match_requests" do
@@ -21,8 +23,8 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
     subject { endpoint_template.match_requests(uri, args) }
 
-    it "delegates to the default stub builder" do
-      expect(default_stub_builder).to receive(:match_requests).with(uri, args)
+    it "delegates to the templates stub builder" do
+      expect(template_stub_builder).to receive(:match_requests).with(uri, args)
 
       subject
     end
@@ -36,8 +38,8 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
     subject { endpoint_template.schema(type, definition) }
 
-    it "delegates to the default stub builder" do
-      expect(default_stub_builder).to receive(:schema).with(type, definition)
+    it "delegates to the templates stub builder" do
+      expect(template_stub_builder).to receive(:schema).with(type, definition)
 
       subject
     end
@@ -50,8 +52,8 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
     subject { endpoint_template.respond_with(args) }
 
-    it "delegates to the default stub builder" do
-      expect(default_stub_builder).to receive(:respond_with).with(args)
+    it "delegates to the templates stub builder" do
+      expect(template_stub_builder).to receive(:respond_with).with(args)
 
       subject
     end
@@ -64,8 +66,8 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
     subject { endpoint_template.trigger(trigger) }
 
-    it "delegates to the default stub builder" do
-      expect(default_stub_builder).to receive(:trigger).with(trigger)
+    it "delegates to the templates stub builder" do
+      expect(template_stub_builder).to receive(:trigger).with(trigger)
 
       subject
     end
@@ -79,8 +81,8 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
     subject { endpoint_template.invoke(&block) }
 
-    it "delegates to the default stub builder" do
-      expect(default_stub_builder).to receive(:invoke).and_yield
+    it "delegates to the templates stub builder" do
+      expect(template_stub_builder).to receive(:invoke).and_yield
       expect(block_verifier).to receive(:verify)
 
       subject
@@ -88,32 +90,19 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
   end
 
-  describe "#add_scenario!" do
-
-    let(:name)         { "some_scenario_name" }
-    let(:stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder).as_null_object }
-
-    before(:example) { allow(server).to receive(:add_one_stub_scenario!).and_yield(stub_builder) }
-
-    subject { endpoint_template.add_scenario!(name) }
-
-    it "add a one stub scenario to the server" do
-      expect(server).to receive(:add_one_stub_scenario!).with(name)
-
-      subject
-    end
+  shared_examples_for "an endpoint template method composing a stub" do
 
     it "merges the added stub with the default stub builder" do
-      expect(stub_builder).to receive(:merge!).with(default_stub_builder)
+      expect(stub_builder).to receive(:merge!).with(template_stub_builder)
 
-      subject
+      subject_without_overrides_and_block
     end
 
     context "when response overrides are provided" do
 
       let(:response_overrides) { { status: 302 } }
 
-      subject { endpoint_template.add_scenario!(name, response_overrides) }
+      subject { subject_with_response_overrides(response_overrides) }
 
       it "informs the stub builder to respond with the response overrides" do
         expect(stub_builder).to receive(:respond_with).with(response_overrides)
@@ -125,7 +114,7 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
     context "when response overrides are not provided" do
 
-      subject { endpoint_template.add_scenario!(name) }
+      subject { subject_without_overrides_and_block }
 
       it "does not change the stub builder by requesting it respond with an empty hash" do
         expect(stub_builder).to receive(:respond_with).with({})
@@ -139,7 +128,7 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
       expect(stub_builder).to receive(:merge!).ordered
       expect(stub_builder).to receive(:respond_with).ordered
 
-      subject
+      subject_without_overrides_and_block
     end
 
     context "when a block is provided" do
@@ -147,7 +136,7 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
       let(:block_verifier)     { double("BlockVerifier") }
       let(:block)              { lambda { block_verifier.verify } }
 
-      subject { endpoint_template.add_scenario!(name, &block) }
+      subject { subject_with_block(&block) }
 
       it "requests the added stub builder invoke the provided block" do
         expect(stub_builder).to receive(:invoke).and_yield
@@ -167,7 +156,7 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
     context "when a block is not provided" do
 
-      subject { endpoint_template.add_scenario!(name) }
+      subject { subject_without_overrides_and_block }
 
       it "does not requests the added stub builder invoke a block" do
         expect(stub_builder).not_to receive(:invoke)
@@ -179,4 +168,89 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
   end
 
+  describe "#build_stub" do
+
+    let(:stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder).as_null_object }
+
+    before(:example) { allow(server).to receive(:build_stub).and_yield(stub_builder) }
+
+    def subject_without_overrides_and_block
+      endpoint_template.build_stub
+    end
+
+    def subject_with_response_overrides(overrides)
+      endpoint_template.build_stub(overrides)
+    end
+
+    def subject_with_block(&block)
+      endpoint_template.build_stub(&block)
+    end
+
+    it "builds a stub on the server" do
+      expect(server).to receive(:build_stub)
+
+      subject_without_overrides_and_block
+    end
+
+    it_behaves_like "an endpoint template method composing a stub"
+
+  end
+
+  describe "#add_stub!" do
+
+    let(:stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder).as_null_object }
+
+    before(:example) { allow(server).to receive(:add_stub!).and_yield(stub_builder) }
+
+    def subject_without_overrides_and_block
+      endpoint_template.add_stub!
+    end
+
+    def subject_with_response_overrides(overrides)
+      endpoint_template.add_stub!(overrides)
+    end
+
+    def subject_with_block(&block)
+      endpoint_template.add_stub!(&block)
+    end
+
+    it "builds a stub on the server" do
+      expect(server).to receive(:add_stub!)
+
+      subject_without_overrides_and_block
+    end
+
+    it_behaves_like "an endpoint template method composing a stub"
+
+  end
+
+  describe "#add_scenario!" do
+
+    let(:name)         { "some_scenario_name" }
+    let(:stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder).as_null_object }
+
+    before(:example) { allow(server).to receive(:add_one_stub_scenario!).and_yield(stub_builder) }
+
+    def subject_without_overrides_and_block
+      endpoint_template.add_scenario!(name)
+    end
+
+    def subject_with_response_overrides(overrides)
+      endpoint_template.add_scenario!(name, overrides)
+    end
+
+    def subject_with_block(&block)
+      endpoint_template.add_scenario!(name, &block)
+    end
+
+    it "adds a one stub scenario to the server" do
+      expect(server).to receive(:add_one_stub_scenario!).with(name)
+
+      subject_without_overrides_and_block
+    end
+
+    it_behaves_like "an endpoint template method composing a stub"
+
+  end
+
 end

data/spec/lib/http_stub/configurer/dsl/server_spec.rb

@@ -227,42 +227,14 @@ describe HttpStub::Configurer::DSL::Server do
       subject
     end
 
-    it "returns the created endpoint template" do
-      expect(subject).to eql(endpoint_template)
-    end
-
     it "creates a template for the server" do
-      expect(HttpStub::Configurer::DSL::EndpointTemplate).to(
-        receive(:new).with(server, anything).and_return(endpoint_template)
-      )
+      expect(HttpStub::Configurer::DSL::EndpointTemplate).to receive(:new).with(server).and_return(endpoint_template)
 
       subject
     end
 
-    context "when response defaults have been established" do
-
-      include_context "establish response defaults"
-
-      it "creates a template with the defaults" do
-        expect(HttpStub::Configurer::DSL::EndpointTemplate).to(
-          receive(:new).with(anything, response_defaults).and_return(endpoint_template)
-        )
-
-        subject
-      end
-
-    end
-
-    context "when no response defaults have been established" do
-
-      it "creates a template with empty response defaults" do
-        expect(HttpStub::Configurer::DSL::EndpointTemplate).to(
-          receive(:new).with(anything, {}).and_return(endpoint_template)
-        )
-
-        subject
-      end
-
+    it "returns the created endpoint template" do
+      expect(subject).to eql(endpoint_template)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Matthew Ueckerman