http_stub 0.27.0 → 0.28.0.beta1

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

@@ -4,16 +4,27 @@ module HttpStub
 
       class Triggers
 
-        attr_reader :scenario_names
-        attr_reader :stubs
+        DEFAULT_ARGS = { scenario_names: [], stubs: [] }.with_indifferent_access.freeze
+
+        private_constant :DEFAULT_ARGS
+
+        attr_reader :scenario_names, :stubs
 
         def initialize(args={})
-          resolved_args = { "scenario_names" => [], "stubs" => [] }.merge(args || {})
-          @scenario_names = resolved_args["scenario_names"]
-          @stubs          = resolved_args["stubs"].map { |stub_args| HttpStub::Server::Stub.create(stub_args) }
+          resolved_args   = DEFAULT_ARGS.merge(args || {})
+          @scenario_names = resolved_args[:scenario_names]
+          @stubs          = create_stubs(resolved_args[:stubs])
           @description    = resolved_args.to_s
         end
 
+        private
+
+        def create_stubs(stub_hashes)
+          stub_hashes.map { |hash| HttpStub::Server::Stub.create(hash) }
+        end
+
+        public
+
         EMPTY = HttpStub::Server::Stub::Triggers.new.freeze
 
         def to_json(*args)

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

@@ -0,0 +1 @@
+%a{ href: body.uri, class: :file }= body.uri

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

@@ -8,7 +8,12 @@
   %tr
     %td.title Body:
     %td
-      %pre= partial "#{response.type}_response".to_sym, locals: { response: response }
+      %pre= partial "#{response.body.short_class_name}_response".to_sym, locals: { body: response.body }
   %tr
     %td.title Delay:
     %td= h(response.delay_in_seconds)
+  %tr
+    %td.title Blocks:
+    %td
+      - response.blocks.each do |block|
+        %pre= h(block.source)

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

@@ -0,0 +1 @@
+= pp(body.text)

data/lib/http_stub/server/views/application.sass

@@ -7,51 +7,51 @@ $color_font: black
 $color_peach: #FFF6EF
 
 body
-  :background $color_background
-  :font-family "Helvetica Neue", Helvetica, Arial, sans-serif
-  :display flex
-  :flex-direction column
-  :align-items center
+  background: $color_background
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif
+  display: flex
+  flex-direction: column
+  align-items: center
 
 header
-  :padding-left 1rem
-  :text-align center
+  padding-left: 1rem
+  text-align: center
 
 section
-  :display flex
-  :align-items center
-  :flex-direction column
-  :max-width 800px
-  :border-radius 10px
-  :background white
-  :padding 1rem
+  display: flex
+  align-items: center
+  flex-direction: column
+  max-width: 1000px
+  border-radius: 10px
+  background: white
+  padding: 1rem
 
 table
-  :padding 1rem
-  :border-collapse collapse
+  padding: 1rem
+  border-collapse: collapse
   tr
-    :background $color_content_bg
+    background: $color_content_bg
     td
-      :padding 1rem
-      :max-width 600px
+      padding: 1rem
+      max-width: 800px
       &.name
-        :font-weight bold
+        font-weight: bold
       &.title
-        :font-weight bold
+        font-weight: bold
 
 .header-rule
-  :border-bottom 1px solid $color_border
+  border-bottom: 1px solid $color_border
 
 a.link
-  :border 1px solid $color_dark_border
-  :border-radius 3px
-  :padding 0.5rem
-  :text-decoration none
-  :color $color_font
+  border: 1px solid $color_dark_border
+  border-radius: 3px
+  padding: 0.5rem
+  text-decoration: none
+  color: $color_font
   &:hover
-    :background $color_highlight
+    background: $color_highlight
 
 pre
-  :white-space pre-wrap !important
-  :word-wrap break-word !important
-  :max-width 600px
+  white-space: pre-wrap !important
+  word-wrap: break-word !important
+  max-width: 800px

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.27.0".freeze
+  VERSION = "0.28.0.beta1".freeze
 end

data/spec/acceptance/{configurer_part_spec.rb → configurator_part_spec.rb}

@@ -1,16 +1,16 @@
-describe "Configurer Part acceptance" do
-  include_context "configurer integration"
+describe "Configurator Part acceptance" do
+  include_context "server integration"
 
-  let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithParts } }
+  let(:configurator) { HttpStub::Examples::ConfiguratorWithParts }
 
-  context "when a configurer contains a part" do
+  context "when a configurator contains a part" do
 
     context "that contains a configure stub method" do
 
       let(:response) { issue_request("registered_in_configure_stub_method") }
 
       it "invokes the method" do
-        expect(response.body).to eql("configure stub response")
+        expect(response.body).to eql("configured stub response")
       end
 
     end
@@ -20,7 +20,7 @@ describe "Configurer Part acceptance" do
       let(:response) { issue_request("registered_in_configure_stubs_method") }
 
       it "invokes the method" do
-        expect(response.body).to eql("configure stubs response")
+        expect(response.body).to eql("configured stubs response")
       end
 
     end
@@ -30,7 +30,7 @@ describe "Configurer Part acceptance" do
       let(:response) { issue_request("registered_in_configure_scenario_method") }
 
       it "invokes the method" do
-        expect(response.body).to eql("configure scenario response")
+        expect(response.body).to eql("configured scenario response")
       end
 
     end
@@ -40,7 +40,7 @@ describe "Configurer Part acceptance" do
       let(:response) { issue_request("registered_in_configure_scenarios_method") }
 
       it "invokes the method" do
-        expect(response.body).to eql("configure scenarios response")
+        expect(response.body).to eql("configured scenarios response")
       end
 
     end

data/spec/acceptance/cross_origin_support_spec.rb

@@ -4,12 +4,10 @@ describe "Cross origin support acceptance" do
 
   let(:cross_origin_page) { CrossOriginServer::IndexPage.new(browser) }
 
-  context "when a stub server with cross origin support is initialized" do
-    include_context "configurer integration"
+  context "when a stub server with cross origin support is started" do
+    include_context "server integration"
 
-    let(:configurer_specification) do
-      { class: HttpStub::Examples::ConfigurerWithCrossOriginSupport, name: :cross_origin_stub, port: 8004 }
-    end
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithCrossOriginSupport }
 
     context "and a browser page rendered by a different server requests a scenario be activated" do
 
@@ -48,9 +46,9 @@ describe "Cross origin support acceptance" do
 
     end
 
-    context "and a scenario configuring OPTIONS request reponses is activated" do
+    context "and a scenario composing OPTIONS request reponses is activated" do
 
-      before(:example) { stub_server.activate!("Options scenario") }
+      before(:example) { client.activate!("Options scenario") }
 
       context "and a matching pre-flight request is made" do
 
@@ -77,10 +75,10 @@ describe "Cross origin support acceptance" do
 
   end
 
-  context "when a stub server without cross origin support is initialized" do
-    include_context "configurer integration"
+  context "when a stub server without cross origin support is started" do
+    include_context "server integration"
 
-    let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithTrivialScenarios } }
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithTrivialScenarios }
 
     context "and a browser page rendered by a different server requests a scenario be activated" do
 
@@ -101,7 +99,7 @@ describe "Cross origin support acceptance" do
 
     context "and a scenario is activated" do
 
-      before(:example) { stub_server.activate!("Scenario 1") }
+      before(:example) { client.activate!("Scenario 1") }
 
       context "and a matching request is made" do
 

data/spec/acceptance/endpoint_template_spec.rb

@@ -1,9 +1,9 @@
-describe "Endpoint Template acceptance" do
+describe "Endpoint template acceptance" do
 
-  context "when a configurer contains an endpoint template" do
-    include_context "configurer integration"
+  context "when a server configured with an endpoint template is started" do
+    include_context "server integration"
 
-    let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithEndpointTemplate } }
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithEndpointTemplate }
 
     it "does not register a stub when the template is defined" do
       response = issue_request("template_uri")
@@ -20,7 +20,7 @@ describe "Endpoint Template acceptance" do
 
     context "and a templated scenario is activated" do
 
-      before(:example) { stub_server.activate!(scenario_name) }
+      before(:example) { client.activate!(scenario_name) }
 
       context "that customises the request matching rules" do
 

data/spec/acceptance/scenario_spec.rb

@@ -1,15 +1,15 @@
 describe "Scenario acceptance" do
 
-  context "when a configurer that contains scenarios is initialized" do
-    include_context "configurer integration"
+  context "when a server configured with scenario's is started" do
+    include_context "server integration"
 
-    let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithTrivialScenarios } }
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithTrivialScenarios }
 
     context "and a scenario is activated" do
 
       context "containing stubs" do
 
-        before(:example) { stub_server.activate!("Scenario 1") }
+        before(:example) { client.activate!("Scenario 1") }
 
         (1..3).each do |stub_number|
 
@@ -30,7 +30,7 @@ describe "Scenario acceptance" do
 
       context "containing triggered scenarios" do
 
-        before(:example) { stub_server.activate!("Activates another scenario") }
+        before(:example) { client.activate!("Activates another scenario") }
 
         (1..3).each do |stub_number|
 
@@ -67,9 +67,9 @@ describe "Scenario acceptance" do
 
     context "and the response contains a file" do
 
-      let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithFileResponses } }
+      let(:configurator) { HttpStub::Examples::ConfiguratorWithFileResponses }
 
-      before(:example) { stub_server.activate!("Scenario with file") }
+      before(:example) { client.activate!("Scenario with file") }
 
       context "and the stub request is made" do
 
@@ -77,7 +77,7 @@ describe "Scenario acceptance" do
 
         it "replays the stubbed response" do
           expect(response.code).to eql(200)
-          expect(response).to contain_file(HttpStub::Examples::ConfigurerWithFileResponses::FILE_PATH)
+          expect(response).to contain_file(HttpStub::Examples::ConfiguratorWithFileResponses::FILE_PATH)
         end
 
       end

data/spec/acceptance/server_defaults_spec.rb

@@ -1,9 +1,9 @@
 describe "Server defaults acceptance" do
 
-  context "when a configurer defines server defaults" do
-    include_context "configurer integration"
+  context "when a server configured with defaults is started" do
+    include_context "server integration"
 
-    let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithServerDefaults } }
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithServerDefaults }
 
     it "matches requests that match the request default rules" do
       response = issue_matching_request("has_defaults")

data/spec/acceptance/server_memory_spec.rb

@@ -1,16 +1,24 @@
 describe "Server memory acceptance" do
+  include_context "server integration"
 
-  context "when a configurer with a stub is initialized" do
-    include_context "configurer integration"
+  let(:configurator) { HttpStub::Examples::ConfiguratorWithScenariosAndStubs }
 
-    let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithTrivialStub } }
+  context "when a server configured with scenarios and stubs is started" do
 
     describe "GET /http_stub/memory" do
 
       let(:response) { HTTParty.get("#{server_uri}/http_stub/memory") }
 
-      it "lists the stubs registered during initialization" do
-        expect(response.body).to include("Class stub body")
+      it "lists scenarios activated initially" do
+        expect(response.body).to include("Activated initially body")
+      end
+
+      it "does not list scenario's that are not activated initially" do
+        expect(response.body).to_not include("Not activated initially body")
+      end
+
+      it "lists stubs" do
+        expect(response.body).to include("Stub body")
       end
 
     end

data/spec/acceptance/server_status_spec.rb

@@ -4,30 +4,13 @@ describe "Server status acceptance" do
 
     let(:response) { HTTParty.get("#{server_uri}/http_stub/status") }
 
-    context "when a server is started without a configurer" do
+    context "when a server is started" do
       include_context "server integration"
 
-      it "indicates the server has started" do
-        expect(response.body).to eql("Started")
-      end
-
-      context "and the server is updated to reflect it is initialized" do
-
-        before(:example) { HTTParty.post("#{server_uri}/http_stub/status/initialized") }
-
-        it "indicates the server has been initialized" do
-          expect(response.body).to eql("Initialized")
-        end
-
-      end
-
-    end
-
-    context "when a server with a configurer is started" do
-      include_context "configurer integration"
+      let(:configurator) { HttpStub::Examples::ConfiguratorWithTrivialStubs }
 
-      it "indicates the server has been initialized" do
-        expect(response.body).to eql("Initialized")
+      it "indicates the server is available" do
+        expect(response.body).to eql("OK")
       end
 
     end

data/spec/acceptance/session_spec.rb

@@ -1,16 +1,14 @@
 describe "Session acceptance" do
+  include_context "server integration"
 
-  context "when a configurer that has a session support enabled is initialized" do
-    include_context "configurer integration"
+  context "when a server configured with session support is started" do
 
-    let(:configurer_specification) do
-      { class: HttpStub::Examples::ConfigurerWithSessions, name: :session_based_stub, port: 8003 }
-    end
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithSessions }
 
-    context "when a stub is added to a session" do
+    context "and a stub is actviated in a session" do
 
       let(:stub_session_id) { "some_session" }
-      let(:stub_session)    { stub_server.session(stub_session_id) }
+      let(:stub_session)    { client.session(stub_session_id) }
 
       let(:match_response) { HTTParty.get("#{server_uri}/matching_path", request_session_id_header) }
 
@@ -79,7 +77,7 @@ describe "Session acceptance" do
     context "when many sessions have been created" do
 
       let(:session_ids) { (1..3).map { |i| "session#{i}"} }
-      let(:sessions)    { session_ids.map { |session_id| stub_server.session(session_id) } }
+      let(:sessions)    { session_ids.map { |session_id| client.session(session_id) } }
 
       before(:example) { sessions.each { |session| session.activate!("Some Scenario") } }
 
@@ -101,10 +99,9 @@ describe "Session acceptance" do
 
   end
 
-  context "when a configurer that has a session support disabled is initialized" do
-    include_context "configurer integration"
+  context "when a server configured without session support is started" do
 
-    let(:configurer_specification) { { class: HttpStub::EmptyConfigurer } }
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithTrivialStubs }
 
     describe "the administration landing page" do
 

data/spec/acceptance/stub_body_request_matching_spec.rb

@@ -1,13 +1,13 @@
 describe "Scenario acceptance" do
 
-  context "when a configurer that contains a stub matching a request body" do
-    include_context "configurer integration"
+  context "when a server is started that is configured with a stub matching a request body" do
+    include_context "server integration"
 
-    let(:configurer_specification) { { class: HttpStub::Examples::ConfigurerWithStubRequestBody } }
+    let(:configurator) { HttpStub::Examples::ConfiguratorWithStubRequestBody }
 
     context "against an exact match" do
 
-      before(:example) { stub_server.activate!("Match body exactly") }
+      before(:example) { client.activate!("Match body exactly") }
 
       context "and a request is made with a request body" do
 
@@ -15,7 +15,7 @@ describe "Scenario acceptance" do
 
           let(:response) { issue_request(body: "Exactly matches") }
 
-          it "responds with the configured response" do
+          it "responds with the composed response" do
             expect(response.code).to eql(204)
           end
 
@@ -51,7 +51,7 @@ describe "Scenario acceptance" do
 
     context "against a regular expression" do
 
-      before(:example) { stub_server.activate!("Match body regex") }
+      before(:example) { client.activate!("Match body regex") }
 
       context "and a request is made with a request body" do
 
@@ -59,7 +59,7 @@ describe "Scenario acceptance" do
 
           let(:response) { issue_request(body: "matches with additional content") }
 
-          it "responds with the configured response" do
+          it "responds with the composed response" do
             expect(response.code).to eql(204)
           end
 
@@ -95,7 +95,7 @@ describe "Scenario acceptance" do
 
     context "against a JSON schema" do
 
-      before(:example) { stub_server.activate!("Match body JSON schema") }
+      before(:example) { client.activate!("Match body JSON schema") }
 
       context "and a request is made with a request body" do
 
@@ -107,7 +107,7 @@ describe "Scenario acceptance" do
                                   float_property:   77.7 }.to_json)
           end
 
-          it "responds with the configured response" do
+          it "responds with the composed response" do
             expect(response.code).to eql(204)
           end