http_stub 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3e67c607aa3b80f5e886bd7de7fbbfd3749f72
-  data.tar.gz: f0f313f13ccd2d1e0b2eaf62292e2c293b5b2592
+  metadata.gz: cd84700c863cf0c87b4be11b874723b35475c6fb
+  data.tar.gz: 2857f2d1bd0c3ab6b1bf4ca0a01753bf69b20234
 SHA512:
-  metadata.gz: e3f87569921e42a1272453d37ef65a5585c148ec081a943bc128af5cbff417e59440beedee64b21dc08af0f1c71b3a14f428fcc215903c92104b1ba40787abec
-  data.tar.gz: fb62118fd274913421bda1ef15a2776871a9af76dd2ad96f07b29b1a20417bc2ab60d102bd65ba1faaaefd91aeb7d21687a35dcb0c0a8587245d92eea760a91d
+  metadata.gz: f37b401cd641a3b8874f8cd40a4074f2db3ce886d8bedba62b533a7ef2e7dbc999a796cf3e9c86bdcf9f857cbd169276a0464ee40205984db01405aca531e499
+  data.tar.gz: 792b251f35f1fe21026106d931ee053162840b569aa7ffc3fa3c52a89921c9fc3c7dab7e01cf30563fbac3e8baa670833dcf4638b1aeef3d0e27e0625b55654b

data/lib/http_stub.rb

@@ -11,6 +11,7 @@ require 'sass'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/hash/deep_merge'

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

@@ -47,7 +47,7 @@ module HttpStub
           private
 
           def add_stub_options_to_builder(stub, uri, options)
-            stub.match_requests(uri, options.slice(:method, :headers, :parameters))
+            stub.match_requests({ uri: uri }.merge(options.slice(:method, :headers, :parameters)))
             stub.respond_with(options[:response])
           end
 

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

@@ -20,7 +20,7 @@ module HttpStub
         end
 
         def add_scenario!(name, response_overrides={}, &block)
-          @server.add_one_stub_scenario!(name) { |stub| compose_stub(stub, response_overrides, &block) }
+          @server.add_scenario_with_one_stub!(name) { |stub| compose_stub(stub, response_overrides, &block) }
         end
 
         private

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

@@ -6,8 +6,8 @@ module HttpStub
         include HttpStub::Configurer::DSL::StubBuilderProducer
         include HttpStub::Configurer::DSL::ScenarioActivator
 
-        def initialize(response_defaults, name)
-          @response_defaults         = response_defaults
+        def initialize(default_stub_builder, name)
+          @default_stub_builder      = default_stub_builder
           @name                      = name
           @stub_builders             = []
           @triggered_scenario_names  = []

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

@@ -9,16 +9,20 @@ module HttpStub
         attr_accessor :host, :port
 
         def initialize(server_facade)
-          @server_facade     = server_facade
-          @response_defaults = {}
+          @server_facade        = server_facade
+          @default_stub_builder = HttpStub::Configurer::DSL::StubBuilder.new
         end
 
         def base_uri
           "http://#{host}:#{port}"
         end
 
+        def request_defaults=(args)
+          @default_stub_builder.match_requests(args)
+        end
+
         def response_defaults=(args)
-          @response_defaults = args
+          @default_stub_builder.respond_with(args)
         end
 
         def has_started!
@@ -31,12 +35,12 @@ module HttpStub
         end
 
         def add_scenario!(name, &block)
-          builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@response_defaults, name)
+          builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@default_stub_builder, name)
           block.call(builder)
           @server_facade.define_scenario(builder.build)
         end
 
-        def add_one_stub_scenario!(name, &block)
+        def add_scenario_with_one_stub!(name, &block)
           add_scenario!(name) do |scenario|
             scenario.add_stub! { |stub| stub.invoke(&block) }
           end
@@ -47,7 +51,7 @@ module HttpStub
         end
 
         def add_activator!(&block)
-          builder = HttpStub::Configurer::DSL::StubActivatorBuilder.new(@response_defaults)
+          builder = HttpStub::Configurer::DSL::StubActivatorBuilder.new(@default_stub_builder)
           block.call(builder)
           @server_facade.define_scenario(builder.build)
         end

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

@@ -7,13 +7,13 @@ module HttpStub
         delegate :build, to: :@scenario_builder
         delegate :match_requests, :respond_with, :trigger, to: :@stub_builder
 
-        def initialize(response_defaults)
-          @response_defaults = response_defaults
+        def initialize(default_stub_builder)
+          @default_stub_builder = default_stub_builder
         end
 
         def on(activation_uri)
-          @scenario_builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@response_defaults, activation_uri)
-          @stub_builder     = HttpStub::Configurer::DSL::StubBuilder.new(@response_defaults)
+          @scenario_builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@default_stub_builder, activation_uri)
+          @stub_builder     = HttpStub::Configurer::DSL::StubBuilder.new(@default_stub_builder)
           @scenario_builder.add_stub!(@stub_builder)
         end
 

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

@@ -6,15 +6,15 @@ module HttpStub
 
         attr_reader :request, :response, :triggers
 
-        public
-        
-        def initialize(response_defaults={})
-          @response = response_defaults.clone
+        def initialize(default_builder=nil)
+          @request  = {}
+          @response = {}
           @triggers = []
+          self.merge!(default_builder) if default_builder
         end
 
-        def match_requests(uri, args={})
-          self.tap { @request = { uri: uri }.merge(args) }
+        def match_requests(args)
+          self.tap { @request.deep_merge!(args) }
         end
 
         def schema(type, definition)
@@ -37,7 +37,7 @@ module HttpStub
         end
 
         def merge!(stub_builder)
-          @request = (@request || {}).deep_merge(stub_builder.request || {})
+          self.match_requests(stub_builder.request)
           self.respond_with(stub_builder.response)
           self.trigger(stub_builder.triggers)
         end

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

@@ -5,7 +5,7 @@ module HttpStub
       module StubBuilderProducer
 
         def build_stub(&block)
-          builder = HttpStub::Configurer::DSL::StubBuilder.new(@response_defaults)
+          builder = HttpStub::Configurer::DSL::StubBuilder.new(@default_stub_builder)
           builder.invoke(&block) if block_given?
           builder
         end

data/lib/http_stub/version.rb

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

data/spec/acceptance/server_defaults_spec.rb

@@ -0,0 +1,44 @@
+describe "Server defaults acceptance" do
+  include_context "configurer integration"
+
+  context "when a configurer defines server defaults" do
+
+    let(:configurer) { HttpStub::Examples::ConfigurerWithServerDefaults.new }
+
+    before(:example) { configurer.class.initialize! }
+
+    it "matches requests that match the request default rules" do
+      response = issue_matching_request("has_defaults")
+
+      expect(response.code).to eql(203)
+    end
+
+    it "does not match requests that do not match the request default rules" do
+      response = HTTParty.get("#{server_uri}/has_defaults")
+
+      expect(response.code).to eql(404)
+    end
+
+    it "includes the response defaults in a match" do
+      response = issue_matching_request("has_defaults")
+
+      expect(response.code).to eql(203)
+      expect(response.body).to eql("Some body")
+      expect(response.headers["defaulted_response_header"]).to eql("Response header value")
+    end
+
+    it "includes the response defaults in all matches" do
+      response = issue_matching_request("also_has_defaults")
+
+      expect(response.code).to eql(203)
+      expect(response.body).to eql("Also some body")
+      expect(response.headers["defaulted_response_header"]).to eql("Response header value")
+    end
+
+    def issue_matching_request(uri)
+      HTTParty.get("#{server_uri}/#{uri}", headers: { "defaulted_request_header" => "Request header value"})
+    end
+
+  end
+
+end

data/spec/acceptance/stub_spec.rb

@@ -13,7 +13,7 @@ describe "Stub basics acceptance" do
 
         before(:example) do
           stub_server.add_stub! do
-            match_requests("/stub_with_status", method: :get).respond_with(status: 201, body: "Stub body")
+            match_requests(uri: "/stub_with_status", method: :get).respond_with(status: 201, body: "Stub body")
           end
         end
 
@@ -52,7 +52,7 @@ describe "Stub basics acceptance" do
       context "and it does not contain a response status" do
 
         before(:example) do
-          stub_server.add_stub! { match_requests("/stub_without_status", method: :get).respond_with(body: "Stub body") }
+          stub_server.add_stub! { match_requests(uri: "/stub_without_status", method: :get).respond_with(body: "Stub body") }
         end
 
         context "and a matching request is made" do
@@ -70,7 +70,7 @@ describe "Stub basics acceptance" do
       context "and it does not contain a request method" do
 
         before(:example) do
-          stub_server.add_stub! { match_requests("/stub_without_method").respond_with(body: "Stub body") }
+          stub_server.add_stub! { match_requests(uri: "/stub_without_method").respond_with(body: "Stub body") }
         end
 
         context "and a request is made with a matching uri" do
@@ -93,7 +93,7 @@ describe "Stub basics acceptance" do
 
         before(:example) do
           stub_server.add_stub! do
-            match_requests("/stub_with_headers", method: :get, headers: { key: "value" })
+            match_requests(uri: "/stub_with_headers", method: :get, headers: { key: "value" })
             respond_with(status: 202, body: "Another stub body")
           end
         end
@@ -129,7 +129,7 @@ describe "Stub basics acceptance" do
 
         before(:example) do
           stub_server.add_stub! do
-            match_requests("/stub_with_parameters", method: :get, parameters: { key: "value" })
+            match_requests(uri: "/stub_with_parameters", method: :get, parameters: { key: "value" })
             respond_with(status: 202, body: "Another stub body")
           end
         end
@@ -161,7 +161,7 @@ describe "Stub basics acceptance" do
 
         before(:example) do
           stub_server.add_stub! do
-            match_requests("/stub_with_parameters", method: :get, parameters: { key: 88 })
+            match_requests(uri: "/stub_with_parameters", method: :get, parameters: { key: 88 })
             respond_with(status: 203, body: "Body for parameter number")
           end
         end
@@ -181,25 +181,13 @@ describe "Stub basics acceptance" do
 
     end
 
-    context "that contains response defaults" do
-
-      let(:configurer) { HttpStub::Examples::ConfigurerWithResponseDefaults.new }
-
-      it "includes the defaults in each response" do
-        response = Net::HTTP.get_response(server_host, "/response_with_defaults", server_port)
-
-        expect(response["defaulted_header"]).to eql("Header value")
-      end
-
-    end
-
     describe "that contains response headers" do
 
       context "with a content-type header" do
 
         before(:example) do
           stub_server.add_stub! do
-            match_requests("/some_stub_path", method: :get)
+            match_requests(uri: "/some_stub_path", method: :get)
             respond_with(body: "Some stub body", headers: { "content-type" => "application/xhtml" })
           end
         end
@@ -226,7 +214,7 @@ describe "Stub basics acceptance" do
 
           before(:example) do
             stub_server.add_stub! do |stub|
-              stub.match_requests("/some_stub_path", method: :get)
+              stub.match_requests(uri: "/some_stub_path", method: :get)
               stub.respond_with(body: "Some stub body", headers: response_headers)
             end
           end

data/spec/acceptance/stub_trigger_spec.rb

@@ -12,7 +12,7 @@ describe "Stub trigger acceptance" do
       let(:triggered_stubs) do
         (1..3).map do |trigger_number|
           stub_server.build_stub do |stub|
-            stub.match_requests("/triggered_stub_#{trigger_number}", method: :get)
+            stub.match_requests(uri: "/triggered_stub_#{trigger_number}", method: :get)
             stub.respond_with(status: 200 + trigger_number, body: "Triggered stub body #{trigger_number}")
           end
         end
@@ -20,7 +20,7 @@ describe "Stub trigger acceptance" do
 
       before(:example) do
         stub_server.add_stub! do |stub|
-          stub.match_requests("/stub_with_triggers", method: :get)
+          stub.match_requests(uri: "/stub_with_triggers", method: :get)
           stub.respond_with(body: "Trigger stub body")
           stub.trigger(triggered_stubs)
         end
@@ -59,7 +59,7 @@ describe "Stub trigger acceptance" do
       let(:pdf_file_path) { "#{HttpStub::Spec::RESOURCES_DIR}/sample.pdf" }
       let(:pdf_file_trigger) do
         stub_server.build_stub do |stub|
-          stub.match_requests("/triggered_stub_pdf_file", method: :get)
+          stub.match_requests(uri: "/triggered_stub_pdf_file", method: :get)
           stub.respond_with(
             status: 201,
             headers: { "content-type" => "application/pdf" },
@@ -71,7 +71,7 @@ describe "Stub trigger acceptance" do
       let(:text_body) { "Sample trigger stub body" }
       let(:text_trigger) do
         stub_server.build_stub do |stub|
-          stub.match_requests("/triggered_stub_text", method: :get)
+          stub.match_requests(uri: "/triggered_stub_text", method: :get)
           stub.respond_with(status: 202, body: "Sample trigger stub body")
         end
       end
@@ -79,7 +79,7 @@ describe "Stub trigger acceptance" do
       let(:txt_file_path) { "#{HttpStub::Spec::RESOURCES_DIR}/sample.txt" }
       let(:txt_file_trigger) do
         stub_server.build_stub do |stub|
-          stub.match_requests("/triggered_stub_txt_file", method: :get)
+          stub.match_requests(uri: "/triggered_stub_txt_file", method: :get)
           stub.respond_with(
             status: 203,
             headers: { "content-type" => "text/plain" },
@@ -92,7 +92,7 @@ describe "Stub trigger acceptance" do
 
       before(:example) do
         stub_server.add_stub! do |stub|
-          stub.match_requests("/stub_with_triggers", method: :get)
+          stub.match_requests(uri: "/stub_with_triggers", method: :get)
           stub.respond_with(body: "Trigger stub body")
           stub.trigger(triggered_stubs)
         end

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

@@ -17,7 +17,7 @@ describe HttpStub::Configurer::DSL::Deprecated do
     end
 
     it "causes the builder being added to match requests on the provided uri" do
-      expect(builder).to receive(:match_requests).with(stub_uri, anything)
+      expect(builder).to receive(:match_requests).with(hash_including(uri: stub_uri))
 
       subject
     end
@@ -25,7 +25,7 @@ describe HttpStub::Configurer::DSL::Deprecated do
     context "when a method is provided" do
 
       it "causes the builder being added to match requests on the provided method" do
-        expect(builder).to receive(:match_requests).with(anything, hash_including(method: method))
+        expect(builder).to receive(:match_requests).with(hash_including(method: method))
 
         subject
       end
@@ -37,7 +37,7 @@ describe HttpStub::Configurer::DSL::Deprecated do
       let(:options) { {} }
 
       it "causes the builder being added to not match requests based on method" do
-        expect(builder).to receive(:match_requests).with(anything, hash_excluding(:method))
+        expect(builder).to receive(:match_requests).with(hash_excluding(:method))
 
         subject
       end
@@ -47,7 +47,7 @@ describe HttpStub::Configurer::DSL::Deprecated do
     context "when parameters are provided" do
 
       it "causes the builder being added to match requests on the provided parameters" do
-        expect(builder).to receive(:match_requests).with(anything, hash_including(parameters: parameters))
+        expect(builder).to receive(:match_requests).with(hash_including(parameters: parameters))
 
         subject
       end
@@ -59,7 +59,7 @@ describe HttpStub::Configurer::DSL::Deprecated do
       let(:options) { {} }
 
       it "causes the builder being added to not match requests based on parameters" do
-        expect(builder).to receive(:match_requests).with(anything, hash_excluding(:parameters))
+        expect(builder).to receive(:match_requests).with(hash_excluding(:parameters))
 
         subject
       end
@@ -69,7 +69,7 @@ describe HttpStub::Configurer::DSL::Deprecated do
     context "when headers are provided" do
 
       it "causes the builder being added to match requests on the provided headers" do
-        expect(builder).to receive(:match_requests).with(anything, hash_including(headers: headers))
+        expect(builder).to receive(:match_requests).with(hash_including(headers: headers))
 
         subject
       end
@@ -81,7 +81,7 @@ describe HttpStub::Configurer::DSL::Deprecated do
       let(:options) { {} }
 
       it "causes the builder being added to not match requests based on headers" do
-        expect(builder).to receive(:match_requests).with(anything, hash_excluding(:headers))
+        expect(builder).to receive(:match_requests).with(hash_excluding(:headers))
 
         subject
       end

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

@@ -18,13 +18,12 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
 
   describe "#match_requests" do
 
-    let(:uri)  { "/some/uri" }
     let(:args) { { key: :value } }
 
-    subject { endpoint_template.match_requests(uri, args) }
+    subject { endpoint_template.match_requests(args) }
 
     it "delegates to the templates stub builder" do
-      expect(template_stub_builder).to receive(:match_requests).with(uri, args)
+      expect(template_stub_builder).to receive(:match_requests).with(args)
 
       subject
     end
@@ -229,7 +228,7 @@ describe HttpStub::Configurer::DSL::EndpointTemplate 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) }
+    before(:example) { allow(server).to receive(:add_scenario_with_one_stub!).and_yield(stub_builder) }
 
     def subject_without_overrides_and_block
       endpoint_template.add_scenario!(name)
@@ -244,7 +243,7 @@ describe HttpStub::Configurer::DSL::EndpointTemplate do
     end
 
     it "adds a one stub scenario to the server" do
-      expect(server).to receive(:add_one_stub_scenario!).with(name)
+      expect(server).to receive(:add_scenario_with_one_stub!).with(name)
 
       subject_without_overrides_and_block
     end

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

@@ -1,21 +1,22 @@
 describe HttpStub::Configurer::DSL::Server do
 
-  let(:server_facade) { instance_double(HttpStub::Configurer::Server::Facade) }
+  let(:server_facade)        { instance_double(HttpStub::Configurer::Server::Facade) }
+  let(:default_stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder) }
 
   let(:server) { HttpStub::Configurer::DSL::Server.new(server_facade) }
 
-  shared_context "establish response defaults" do
-
-    let(:response_defaults) { { key: "value" } }
-
-    before(:example) { server.response_defaults = { key: "value" } }
-
+  before(:example) do
+    allow(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).with(no_args).and_return(default_stub_builder)
   end
 
   it "produces stub builders" do
     expect(server).to be_a(HttpStub::Configurer::DSL::StubBuilderProducer)
   end
 
+  it "activates scenarios" do
+    expect(server).to be_a(HttpStub::Configurer::DSL::ScenarioActivator)
+  end
+
   describe "#base_uri" do
 
     subject { server.base_uri }
@@ -35,6 +36,30 @@ describe HttpStub::Configurer::DSL::Server do
 
   end
 
+  describe "#request_defaults=" do
+
+    let(:args) { { request_rule_key: "request rule value" } }
+
+    it "establishes request matcher rules on the default stub builder" do
+      expect(default_stub_builder).to receive(:match_requests).with(args)
+
+      server.request_defaults = args
+    end
+
+  end
+
+  describe "#response_defaults=" do
+
+    let(:args) { { response_key: "response value" } }
+
+    it "establishes response values on the default stub builder" do
+      expect(default_stub_builder).to receive(:respond_with).with(args)
+
+      server.response_defaults = args
+    end
+
+  end
+
   describe "#has_started!" do
 
     it "informs the facade that the server has started" do
@@ -123,32 +148,16 @@ describe HttpStub::Configurer::DSL::Server do
 
     subject { server.add_scenario!(scenario_name, &block) }
 
-    context "when response defaults have been established" do
-
-      include_context "establish response defaults"
-
-      it "creates a scenario builder containing the response defaults" do
-        expect(HttpStub::Configurer::DSL::ScenarioBuilder).to receive(:new).with(response_defaults, anything)
-
-        subject
-      end
-
-      it "creates a scenario builder containing the provided scenario name" do
-        expect(HttpStub::Configurer::DSL::ScenarioBuilder).to receive(:new).with(anything, scenario_name)
-
-        subject
-      end
+    it "creates a scenario builder containing the servers default stub builder" do
+      expect(HttpStub::Configurer::DSL::ScenarioBuilder).to receive(:new).with(default_stub_builder, anything)
 
+      subject
     end
 
-    context "when no response defaults have been established" do
-
-      it "creates a scenario builder with empty response defaults" do
-        expect(HttpStub::Configurer::DSL::ScenarioBuilder).to receive(:new).with({}, anything)
-
-        subject
-      end
+    it "creates a scenario builder containing the provided scenario name" do
+      expect(HttpStub::Configurer::DSL::ScenarioBuilder).to receive(:new).with(anything, scenario_name)
 
+      subject
     end
 
     it "yields the created builder to the provided block" do
@@ -171,7 +180,7 @@ describe HttpStub::Configurer::DSL::Server do
 
   end
 
-  describe "#add_one_stub_scenario!" do
+  describe "#add_scenario_with_one_stub!" do
 
     let(:scenario_name)  { "some_scenario_name" }
     let(:block_verifier) { double("BlockVerifier") }
@@ -180,7 +189,7 @@ describe HttpStub::Configurer::DSL::Server do
     let(:scenario_builder) { instance_double(HttpStub::Configurer::DSL::ScenarioBuilder) }
     let(:stub_builder)     { instance_double(HttpStub::Configurer::DSL::StubBuilder, invoke: nil) }
 
-    subject { server.add_one_stub_scenario!(scenario_name, &block) }
+    subject { server.add_scenario_with_one_stub!(scenario_name, &block) }
 
     before(:each) do
       allow(server).to receive(:add_scenario!).and_yield(scenario_builder)
@@ -256,28 +265,10 @@ describe HttpStub::Configurer::DSL::Server do
 
     subject { server.add_activator!(&block) }
 
-    context "when response defaults have been established" do
-
-      let(:response_defaults) { { key: "value" } }
-
-      before(:example) { server.response_defaults = { key: "value" } }
-
-      it "creates a stub activator builder containing the response defaults" do
-        expect(HttpStub::Configurer::DSL::StubActivatorBuilder).to receive(:new).with(response_defaults)
-
-        subject
-      end
-
-    end
-
-    context "when no response defaults have been established" do
-
-      it "creates a stub activator builder with empty response defaults" do
-        expect(HttpStub::Configurer::DSL::StubActivatorBuilder).to receive(:new).with({})
-
-        subject
-      end
+    it "creates a stub activator builder containing the servers default stub builder" do
+      expect(HttpStub::Configurer::DSL::StubActivatorBuilder).to receive(:new).with(default_stub_builder)
 
+      subject
     end
 
     it "yields the created builder to the provided block" do

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

@@ -48,9 +48,9 @@ describe HttpStub::Configurer::DSL::StubActivatorBuilder do
     before(:example) { builder.on(activation_uri) }
 
     it "delegates to a stub builder" do
-      expect(stub_builder).to receive(:match_requests).with(stub_fixture.request.uri, request_payload)
+      expect(stub_builder).to receive(:match_requests).with(request_payload)
 
-      builder.match_requests(stub_fixture.request.uri, request_payload)
+      builder.match_requests(request_payload)
     end
 
   end

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

@@ -3,8 +3,8 @@ describe HttpStub::Configurer::DSL::StubBuilderProducer do
   class HttpStub::Configurer::DSL::TestableStubBuilderProducer
     include HttpStub::Configurer::DSL::StubBuilderProducer
 
-    def initialize(response_defaults)
-      @response_defaults = response_defaults
+    def initialize(default_stub_builder)
+      @default_stub_builder = default_stub_builder
       @builders = []
     end
 
@@ -14,9 +14,9 @@ describe HttpStub::Configurer::DSL::StubBuilderProducer do
 
   end
 
-  let(:response_defaults) { { default_key: "default value" } }
+  let(:default_stub_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder) }
 
-  let(:producer) { HttpStub::Configurer::DSL::TestableStubBuilderProducer.new(response_defaults) }
+  let(:producer) { HttpStub::Configurer::DSL::TestableStubBuilderProducer.new(default_stub_builder) }
 
   describe "#build_stub" do
 
@@ -26,8 +26,8 @@ describe HttpStub::Configurer::DSL::StubBuilderProducer do
 
     subject { producer.build_stub }
 
-    it "creates a stub builder containing the producers response defaults" do
-      expect(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).with(response_defaults)
+    it "creates a stub builder containing the producers default stub builder" do
+      expect(HttpStub::Configurer::DSL::StubBuilder).to receive(:new).with(default_stub_builder)
 
       subject
     end

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

@@ -1,8 +1,8 @@
 describe HttpStub::Configurer::DSL::StubBuilder do
 
-  let(:response_defaults) { {} }
+  let(:default_builder) { nil }
 
-  let(:builder) { HttpStub::Configurer::DSL::StubBuilder.new(response_defaults) }
+  let(:builder) { HttpStub::Configurer::DSL::StubBuilder.new(default_builder) }
 
   shared_context "triggers one stub" do
 
@@ -26,11 +26,56 @@ describe HttpStub::Configurer::DSL::StubBuilder do
 
   end
 
+  describe "constructor" do
+
+    class HttpStub::Configurer::DSL::StubBuilderWithObservedMerge < HttpStub::Configurer::DSL::StubBuilder
+
+      attr_reader :merged_stub_builders
+
+      def initialize(default_builder)
+        @merged_stub_builders = []
+        super(default_builder)
+      end
+
+      def merge!(stub_builder)
+        @merged_stub_builders << stub_builder
+      end
+
+    end
+
+    context "when a default builder is provided" do
+
+      let(:default_builder) { instance_double(HttpStub::Configurer::DSL::StubBuilder) }
+
+      let(:builder) { HttpStub::Configurer::DSL::StubBuilderWithObservedMerge.new(default_builder) }
+
+      it "merges the default builder" do
+        builder
+
+        expect(builder.merged_stub_builders).to eql([ default_builder ])
+      end
+
+    end
+
+  end
+
+  context "when a default builder is not provided" do
+
+    let(:builder) { HttpStub::Configurer::DSL::StubBuilderWithObservedMerge.new(nil) }
+
+    it "does not merge a builder" do
+      builder
+
+      expect(builder.merged_stub_builders).to eql([])
+    end
+
+  end
+
   describe "#match_requests" do
 
     let(:fixture) { HttpStub::StubFixture.new }
 
-    subject { builder.match_requests(fixture.request.uri, fixture.request.symbolized) }
+    subject { builder.match_requests(fixture.request.symbolized) }
 
     it "returns the builder to support method chaining" do
       expect(subject).to eql(builder)
@@ -60,14 +105,6 @@ describe HttpStub::Configurer::DSL::StubBuilder do
 
     subject { builder.respond_with(status: 201) }
 
-    it "does not modify any provided response defaults" do
-      original_response_defaults = response_defaults.clone
-
-      subject
-
-      expect(response_defaults).to eql(original_response_defaults)
-    end
-
     it "returns the builder to support method chaining" do
       expect(subject).to eql(builder)
     end
@@ -88,10 +125,10 @@ describe HttpStub::Configurer::DSL::StubBuilder do
 
     context "when the block accepts an argument" do
 
-      subject { builder.invoke { |builder| builder.match_requests("/some_uri") } }
+      subject { builder.invoke { |builder| builder.match_requests(uri: "/some_uri") } }
 
       it "invokes the block with the builder as the argument" do
-        expect(builder).to receive(:match_requests).with("/some_uri")
+        expect(builder).to receive(:match_requests).with(uri: "/some_uri")
 
         subject
       end
@@ -100,10 +137,10 @@ describe HttpStub::Configurer::DSL::StubBuilder do
 
     context "when the block accepts no arguments" do
 
-      subject { builder.invoke { match_requests("/some_uri") } }
+      subject { builder.invoke { match_requests(uri: "/some_uri") } }
 
       it "invokes the block in the context of the builder" do
-        expect(builder).to receive(:match_requests).with("/some_uri")
+        expect(builder).to receive(:match_requests).with(uri: "/some_uri")
 
         subject
       end
@@ -121,8 +158,8 @@ describe HttpStub::Configurer::DSL::StubBuilder do
       let(:provided_triggers) { (1..3).map { instance_double(HttpStub::Configurer::DSL::StubBuilder) } }
 
       let(:provided_builder) do
-        HttpStub::Configurer::DSL::StubBuilder.new({}).tap do |builder|
-          builder.match_requests("/replacement_uri", method: :put,
+        HttpStub::Configurer::DSL::StubBuilder.new.tap do |builder|
+          builder.match_requests(uri: "/replacement_uri", method: :put,
                                  headers:    { request_header_key: "replacement request header value",
                                                other_request_header_key: "other request header value" },
                                  parameters: { parameter_key: "replacement parameter value",
@@ -143,7 +180,7 @@ describe HttpStub::Configurer::DSL::StubBuilder do
       let(:original_triggers) { (1..3).map { instance_double(HttpStub::Configurer::DSL::StubBuilder) } }
 
       before(:example) do
-        builder.match_requests("/original_uri", method: :get,
+        builder.match_requests(uri: "/original_uri", method: :get,
                                headers:    { request_header_key: "original request header value" },
                                parameters: { parameter_key: "original parameter value" })
         builder.respond_with(status: 202,
@@ -220,7 +257,7 @@ describe HttpStub::Configurer::DSL::StubBuilder do
 
       context "and a builder that is empty is provided" do
 
-        let(:provided_builder) { HttpStub::Configurer::DSL::StubBuilder.new({}) }
+        let(:provided_builder) { HttpStub::Configurer::DSL::StubBuilder.new }
 
         it "preserves the uri" do
           subject
@@ -349,12 +386,14 @@ describe HttpStub::Configurer::DSL::StubBuilder do
 
   describe "#build" do
 
-    let(:fixture) { HttpStub::StubFixture.new }
-    let(:stub)    { instance_double(HttpStub::Configurer::Request::Stub) }
+    let(:fixture)  { HttpStub::StubFixture.new }
+    let(:triggers) { [] }
+    let(:stub)     { instance_double(HttpStub::Configurer::Request::Stub) }
 
     subject do
-      builder.match_requests(fixture.request.uri, fixture.request.symbolized)
+      builder.match_requests(fixture.request.symbolized)
       builder.respond_with(fixture.response.symbolized)
+      builder.trigger(triggers)
 
       builder.build
     end
@@ -364,7 +403,7 @@ describe HttpStub::Configurer::DSL::StubBuilder do
     context "when provided a request match and response data" do
 
       it "creates a stub payload with request options that include the uri and the provided request options" do
-        expect_stub_to_be_created_with(request: { uri: fixture.request.uri }.merge(fixture.request.symbolized))
+        expect_stub_to_be_created_with(request: fixture.request.symbolized)
 
         subject
       end
@@ -375,44 +414,118 @@ describe HttpStub::Configurer::DSL::StubBuilder do
         subject
       end
 
-      context "when response default options are established" do
+      describe "creates a stub payload with triggers that" do
 
-        let(:response_defaults) { { some_options: "default value" } }
+        context "when a trigger is added" do
 
-        it "creates a stub payload with response arguments that includes the defaults" do
-          expect_stub_to_be_created_with(response: fixture.response.symbolized.merge(response_defaults))
+          include_context "triggers one stub"
+
+          it "contain the provided trigger builder" do
+            expect_stub_to_be_created_with(triggers: [ trigger_builder ])
+
+            subject
+          end
+
+        end
+
+        context "when many triggers are added" do
+
+          include_context "triggers many stubs"
+
+          it "contain the provided trigger builders" do
+            expect_stub_to_be_created_with(triggers: trigger_builders)
+
+            subject
+          end
 
-          subject
         end
 
-        context "and response options provided match the defaults" do
+      end
 
-          let(:response_defaults) do
+      context "when a default stub builder is provided that contains defaults" do
+
+        let(:request_defaults) do
+          {
+            uri:        "/uri/value",
+            headers:    { "request_header_name_1" => "request header value 1",
+                          "request_header_name_2" => "request header value 2" },
+            parameters: { "parameter_name_1" => "parameter value 1",
+                          "parameter_name_2" => "parameter value 2" },
+            body:       "body value"
+          }
+        end
+        let(:response_defaults) do
+          {
+            status:           203,
+            headers:          { "response_header_name_1" => "response header value 1",
+                                "response_header_name_2" => "response header value 2" },
+            body:             "some body",
+            delay_in_seconds: 8
+          }
+        end
+        let(:trigger_defaults) { (1..3).map { instance_double(HttpStub::Configurer::DSL::StubBuilder) } }
+
+        let(:default_builder) do
+          instance_double(HttpStub::Configurer::DSL::StubBuilder, request: request_defaults,
+                                                                  response: response_defaults,
+                                                                  triggers: trigger_defaults)
+        end
+
+        describe "the built request payload" do
+
+          let(:request_overrides) do
             {
-              status:           203,
-              headers:          { "header-name-1" => "value 1", "header-name-2" => "value 2" },
-              body:             "some body",
-              delay_in_seconds: 8
+              uri:        "/some/updated/uri",
+              headers:    { "request_header_name_2" => "updated request header value 2",
+                            "request_header_name_3" => "request header value 3" },
+              parameters: { "parameter_name_2" => "updated parameter value 2",
+                            "parameter_name_3" => "parameter value 3" },
+              body:       "updated body value"
             }
           end
+
+          before(:example) { fixture.request = request_overrides }
+
+          it "overrides any defaults with values established in the stub" do
+            expect_stub_to_be_created_with(
+              request: {
+                uri:              "/some/updated/uri",
+                headers:          { "request_header_name_1" => "request header value 1",
+                                    "request_header_name_2" => "updated request header value 2",
+                                    "request_header_name_3" => "request header value 3" },
+                parameters:       { "parameter_name_1" => "parameter value 1",
+                                    "parameter_name_2" => "updated parameter value 2",
+                                    "parameter_name_3" => "parameter value 3" },
+                body:             "updated body value"
+              }
+            )
+
+            subject
+          end
+
+        end
+
+        describe "the built response payload" do
+
           let(:response_overrides) do
             {
               status:  302,
-              headers: { "header-name-2" => "updated value 2", "header-name-3" => "value 3" },
-              body:    "another body"
+              headers: { "response_header_name_2" => "updated response header value 2",
+                         "response_header_name_3" => "response header value 3" },
+              body:    "updated body"
             }
           end
 
           before(:example) { fixture.response = response_overrides }
 
-          it "overriddes the defaults with the provided options" do
+          it "overrides any defaults with values established in the stub" do
             expect_stub_to_be_created_with(
               response: {
                 status:           302,
-                headers:          { "header-name-1" => "value 1",
-                                    "header-name-2" => "updated value 2",
-                                    "header-name-3" => "value 3" },
-                body:             "another body",
+                headers:          { "response_header_name_1" => "response header value 1",
+                                    "response_header_name_2" => "updated response header value 2",
+                                    "response_header_name_3" => "response header value 3" },
+                body:             "updated body",
                 delay_in_seconds: 8
               }
             )
@@ -422,28 +535,16 @@ describe HttpStub::Configurer::DSL::StubBuilder do
 
         end
 
-      end
-
-      context "when a trigger is added" do
-        
-        include_context "triggers one stub"
-
-        it "creates a stub payload with the provided trigger builder" do
-          expect_stub_to_be_created_with(triggers: [ trigger_builder ])
-
-          subject
-        end
-
-      end
+        describe "the built response triggers" do
 
-      context "when many triggers are added" do
+          let(:triggers) { (1..3).map { instance_double(HttpStub::Configurer::DSL::StubBuilder) } }
 
-        include_context "triggers many stubs"
+          it "combines any defaults with values values established in the stub" do
+            expect_stub_to_be_created_with(triggers: trigger_defaults + triggers)
 
-        it "creates a stub payload with the provided trigger builders" do
-          expect_stub_to_be_created_with(triggers: trigger_builders)
+            subject
+          end
 
-          subject
         end
 
       end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ require_relative '../examples/configurer_with_trivial_scenarios'
 require_relative '../examples/configurer_with_exhaustive_scenarios'
 require_relative '../examples/configurer_with_initialize_callback'
 require_relative '../examples/configurer_with_complex_initializer'
-require_relative '../examples/configurer_with_response_defaults'
+require_relative '../examples/configurer_with_server_defaults'
 require_relative '../examples/configurer_with_stub_triggers'
 require_relative '../examples/configurer_with_file_responses'
 require_relative '../examples/configurer_with_stub_request_body'

data/spec/support/stub_fixture.rb

@@ -57,6 +57,10 @@ module HttpStub
       @trigger_fixtures = []
     end
 
+    def request=(options)
+      self.tap { @request.payload = options }
+    end
+
     def response=(options)
       self.tap { @response.payload = options }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - Matthew Ueckerman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -351,6 +351,7 @@ files:
 - "./spec/acceptance/configurer_part_spec.rb"
 - "./spec/acceptance/endpoint_template_spec.rb"
 - "./spec/acceptance/scenario_spec.rb"
+- "./spec/acceptance/server_defaults_spec.rb"
 - "./spec/acceptance/stub_body_request_matching_spec.rb"
 - "./spec/acceptance/stub_control_values_spec.rb"
 - "./spec/acceptance/stub_spec.rb"
@@ -461,6 +462,7 @@ test_files:
 - "./spec/acceptance/configurer_part_spec.rb"
 - "./spec/acceptance/endpoint_template_spec.rb"
 - "./spec/acceptance/scenario_spec.rb"
+- "./spec/acceptance/server_defaults_spec.rb"
 - "./spec/acceptance/stub_body_request_matching_spec.rb"
 - "./spec/acceptance/stub_control_values_spec.rb"
 - "./spec/acceptance/stub_spec.rb"