http_stub 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347738836829271815cece8a214373ba88eca832
-  data.tar.gz: de16a1c9ac5fc32864414c97b320a9564c681df2
+  metadata.gz: d74076fbfbad5830130f7c27707249d65108d40f
+  data.tar.gz: 749c5d0060cb935728a3dda7d520807d1b2a2d2a
 SHA512:
-  metadata.gz: 7bb9b5a27d2528112e775a175bc4827365a81d268acafc283ae6b20b19ae4d9ee677e88e194565519e062dbcc39511a4bdac316be86e734587c205b8d8467829
-  data.tar.gz: 0554a3a709aa560bb30690d4b9fdc1235cc5e78409068ad97e9a0aa6255bd966bf793401c4f048bce4d76072e735ec78b6b7ba3bbe88a40ce0ab49825500640b
+  metadata.gz: 51991b22a7a48eee4c0c52eb897f16fbd5ca4dc44b7ebba32fbf4ff8774bfa32fbe2100718b3820b93a2a037beb6090549bca1c08bf638cb3623d319f7d76d34
+  data.tar.gz: 7015ac70615f0b0478c4042313ddb9a16a0d57e7475edbfb071bad2b7d86bd13ba0068f22bd74d4e76548d9ba3d46fb5b72baadeb9ddd539080598511b3fba2a

data/lib/http_stub.rb

@@ -30,6 +30,7 @@ require_relative 'http_stub/server/request/sinatra_request'
 require_relative 'http_stub/server/request/request'
 require_relative 'http_stub/server/request/factory'
 require_relative 'http_stub/server/registry'
+require_relative 'http_stub/server/status/controller'
 require_relative 'http_stub/server/stub/match/omitted_value_matcher'
 require_relative 'http_stub/server/stub/match/regexp_value_matcher'
 require_relative 'http_stub/server/stub/match/exact_value_matcher'
@@ -67,13 +68,6 @@ require_relative 'http_stub/server/stub/match/controller'
 require_relative 'http_stub/server/stub/registry'
 require_relative 'http_stub/server/stub/controller'
 require_relative 'http_stub/server/stub'
-require_relative 'http_stub/server/scenario/links'
-require_relative 'http_stub/server/scenario/trigger'
-require_relative 'http_stub/server/scenario/parser'
-require_relative 'http_stub/server/scenario/not_found_error'
-require_relative 'http_stub/server/scenario/scenario'
-require_relative 'http_stub/server/scenario/controller'
-require_relative 'http_stub/server/scenario'
 require_relative 'http_stub/server/session'
 require_relative 'http_stub/server/session/configuration'
 require_relative 'http_stub/server/session/identifier_strategy'
@@ -81,6 +75,13 @@ require_relative 'http_stub/server/session/empty'
 require_relative 'http_stub/server/session/session'
 require_relative 'http_stub/server/session/registry'
 require_relative 'http_stub/server/session/controller'
+require_relative 'http_stub/server/scenario/links'
+require_relative 'http_stub/server/scenario/trigger'
+require_relative 'http_stub/server/scenario/parser'
+require_relative 'http_stub/server/scenario/not_found_error'
+require_relative 'http_stub/server/scenario/scenario'
+require_relative 'http_stub/server/scenario/controller'
+require_relative 'http_stub/server/scenario'
 require_relative 'http_stub/server/memory/memory'
 require_relative 'http_stub/server/memory/controller'
 require_relative 'http_stub/server/application/configuration'
@@ -90,11 +91,12 @@ require_relative 'http_stub/server/application/cross_origin_support'
 require_relative 'http_stub/server/application/session_uri_support'
 require_relative 'http_stub/server/application/text_formatting_support'
 require_relative 'http_stub/server/application/response_pipeline'
-require_relative 'http_stub/server/application/routes/memory'
 require_relative 'http_stub/server/application/routes/resource'
+require_relative 'http_stub/server/application/routes/status'
+require_relative 'http_stub/server/application/routes/stub'
 require_relative 'http_stub/server/application/routes/session'
 require_relative 'http_stub/server/application/routes/scenario'
-require_relative 'http_stub/server/application/routes/stub'
+require_relative 'http_stub/server/application/routes/memory'
 require_relative 'http_stub/server/application/application'
 require_relative 'http_stub/server/daemon'
 require_relative 'http_stub/configurer/request/http/basic'

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

@@ -28,13 +28,13 @@ module HttpStub
         end
 
         def initialize!
-          @server_facade.flush_requests
-          switch_to_transactional_session
+          @server_facade.initialize_server
+          @default_session = @session_factory.transactional
         end
 
         def has_started!
           @server_facade.server_has_started
-          switch_to_transactional_session
+          @default_session = @session_factory.transactional
         end
 
         def reset!
@@ -73,13 +73,6 @@ module HttpStub
           @default_session.clear!
         end
 
-        private
-
-        def switch_to_transactional_session
-          @session_factory.transactional.mark_as_default!
-          @default_session = @session_factory.transactional
-        end
-
       end
 
     end

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

@@ -15,10 +15,6 @@ module HttpStub
           @default_stub_template = default_stub_template
         end
 
-        def mark_as_default!
-          @session_facade.mark_as_default
-        end
-
         def endpoint_template(&block)
           HttpStub::Configurer::DSL::SessionEndpointTemplate.new(self, @default_stub_template, &block)
         end

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

@@ -10,12 +10,16 @@ module HttpStub
           @request_processor = HttpStub::Configurer::Server::RequestProcessor.new(configuration)
         end
 
-        def server_has_started
-          @request_processor.disable_buffering!
+        def initialize_server
+          @request_processor.flush!
+          @request_processor.submit(
+            request:     HttpStub::Configurer::Request::Http::Factory.post("status/initialized"),
+            description: "marking server as initialized"
+          )
         end
 
-        def flush_requests
-          @request_processor.flush!
+        def server_has_started
+          @request_processor.disable_buffering!
         end
 
         def reset

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

@@ -14,13 +14,6 @@ module HttpStub
           @session_description = "session '#{session_id}'"
         end
 
-        def mark_as_default
-          @request_processor.submit(
-            request:     REQUEST_FACTORY.post("sessions/default", http_stub_session_id: @session_id),
-            description: "marking #{@session_description} as the default"
-          )
-        end
-
         def stub_response(stub)
           @request_processor.submit(
             request:     REQUEST_FACTORY.multipart("stubs", stub, http_stub_session_id: @session_id),

data/lib/http_stub/server/application/application.rb

@@ -30,8 +30,9 @@ module HttpStub
 
         register HttpStub::Server::Application::CrossOriginSupport
 
-        include HttpStub::Server::Application::Routes::Memory
         include HttpStub::Server::Application::Routes::Resource
+        include HttpStub::Server::Application::Routes::Status
+        include HttpStub::Server::Application::Routes::Memory
         include HttpStub::Server::Application::Routes::Scenario
         include HttpStub::Server::Application::Routes::Session
         include HttpStub::Server::Application::Routes::Stub

data/lib/http_stub/server/application/routes/session.rb

@@ -34,11 +34,6 @@ module HttpStub
                     haml :sessions, {}, sessions: @session_controller.find_all
                   end
 
-                  post "/default" do
-                    @session_controller.mark_default(http_stub_request)
-                    halt 200, "OK"
-                  end
-
                   delete do
                     pass unless http_stub_request.session_id
                     @session_controller.delete(http_stub_request, logger)

data/lib/http_stub/server/application/routes/status.rb

@@ -0,0 +1,37 @@
+module HttpStub
+  module Server
+    module Application
+      module Routes
+
+        module Status
+
+          def initialize
+            super()
+            @status_controller = HttpStub::Server::Status::Controller.new(@session_configuration, @server_memory)
+          end
+
+          def self.included(application)
+            application.instance_eval do
+
+              namespace "/http_stub/status" do
+
+                get do
+                  halt 200, @status_controller.current
+                end
+
+                post "/initialized" do
+                  @status_controller.initialized
+                  halt 200, "OK"
+                end
+
+              end
+
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/server/daemon.rb

@@ -16,9 +16,9 @@ module HttpStub
       end
 
       def initialize(args)
-        @configurer = args[:configurer]
-        default_args = { host: "localhost" }
-        default_args = { host: @configurer.stub_server.host, port: @configurer.stub_server.port } if @configurer
+        @configurer  = args[:configurer]
+        default_args = { host: "localhost", ping_uri: "/http_stub/status" }
+        default_args.merge!(host: @configurer.stub_server.host, port: @configurer.stub_server.port) if @configurer
         super(default_args.merge(args))
       end
 

data/lib/http_stub/server/memory/memory.rb

@@ -4,18 +4,26 @@ module HttpStub
 
       class Memory
 
+        DEFAULT_STATUS     = "Started".freeze
+        INITIALIZED_STATUS = "Initialized".freeze
+
         SESSION_ID = HttpStub::Server::Session::MEMORY_SESSION_ID
 
-        private_constant :SESSION_ID
+        private_constant :DEFAULT_STATUS, :INITIALIZED_STATUS, :SESSION_ID
 
-        attr_reader :scenarios, :sessions
+        attr_reader :status, :scenarios, :sessions
 
         def initialize(session_configuration)
+          @status    = DEFAULT_STATUS
           @scenarios = HttpStub::Server::Registry.new("scenario")
           @session   = HttpStub::Server::Session::Session.new(SESSION_ID, @scenarios, HttpStub::Server::Session::Empty)
           @sessions  = HttpStub::Server::Session::Registry.new(session_configuration, @scenarios, @session)
         end
 
+        def initialized!
+          @status = INITIALIZED_STATUS
+        end
+
         def stubs
           @session.stubs
         end
@@ -23,6 +31,7 @@ module HttpStub
         def reset(logger)
           @scenarios.clear(logger)
           @sessions.clear(logger)
+          @status = DEFAULT_STATUS
         end
 
       end

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

@@ -21,10 +21,6 @@ module HttpStub
           @server_memory.sessions.all
         end
 
-        def mark_default(request)
-          @session_configuration.default_identifier = request.session_id
-        end
-
         def delete(request, logger)
           @server_memory.sessions.delete(request.session_id, logger)
         end

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

@@ -0,0 +1,25 @@
+module HttpStub
+  module Server
+    module Status
+
+      class Controller
+
+        def initialize(session_configuration, server_memory)
+          @session_configuration = session_configuration
+          @server_memory         = server_memory
+        end
+
+        def current
+          @server_memory.status
+        end
+
+        def initialized
+          @server_memory.initialized!
+          @session_configuration.default_identifier = HttpStub::Server::Session::TRANSACTIONAL_SESSION_ID
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.26.0".freeze
+  VERSION = "0.26.1".freeze
 end

data/spec/acceptance/configurer_initialization_spec.rb

@@ -105,13 +105,23 @@ describe "Configurer initialization acceptance" do
           end
         end
 
-        it "registers the stub" do
-          response = HTTParty.get("#{server_uri}/some_stub_path")
+        it "registers the stub in the servers transactional session" do
+          response = HTTParty.get("#{server_uri}/some_stub_path", request_session_id_header("http_stub_transactional"))
 
           expect(response.code).to eql(200)
           expect(response.body).to eql("Some stub body")
         end
 
+        it "does not register the stub in the servers memory session" do
+          response = HTTParty.get("#{server_uri}/some_stub_path", request_session_id_header("http_stub_memory"))
+
+          expect(response.code).to eql(404)
+        end
+
+      end
+
+      def request_session_id_header(session_id)
+        { headers: { "http_stub_session_id" => session_id } }
       end
 
     end

data/spec/acceptance/server_status_spec.rb

@@ -0,0 +1,37 @@
+describe "Server status acceptance" do
+
+  describe "GET /http_stub/status" do
+
+    let(:response) { HTTParty.get("#{server_uri}/http_stub/status") }
+
+    context "when a server is started without a configurer" 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"
+
+      it "indicates the server has been initialized" do
+        expect(response.body).to eql("Initialized")
+      end
+
+    end
+
+  end
+
+end

data/spec/acceptance/stub_miss_list_spec.rb

@@ -8,6 +8,14 @@ describe "Stub miss list acceptance" do
 
     before(:example) { configure_stub_registrator }
 
+    context "when no miss has been registered" do
+
+      it "returns a response with an empty request list" do
+        expect(response.body).to_not include("Request")
+      end
+
+    end
+
     context "when a request has been made that does not match a stub" do
 
       before(:example) { stub_registrator.issue_matching_request }
@@ -32,7 +40,6 @@ describe "Stub miss list acceptance" do
 
       before(:example) { stub_registrator.register_stub }
 
-
       include_context "HTML view excluding request details"
 
     end

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

@@ -233,19 +233,10 @@ describe HttpStub::Configurer::DSL::Server do
 
     subject { server.initialize! }
 
-    before(:example) do
-      allow(server_facade).to receive(:flush_requests)
-      allow(transactional_session).to receive(:mark_as_default!)
-    end
-
-    it "flushes requests held by the server facade" do
-      expect(server_facade).to receive(:flush_requests)
-
-      subject
-    end
+    before(:example) { allow(server_facade).to receive(:initialize_server) }
 
-    it "marks the transactional session as the servers default" do
-      expect(transactional_session).to receive(:mark_as_default!)
+    it "initializes the server via the facade" do
+      expect(server_facade).to receive(:initialize_server)
 
       subject
     end
@@ -263,10 +254,7 @@ describe HttpStub::Configurer::DSL::Server do
 
     subject { server.has_started! }
 
-    before(:example) do
-      allow(server_facade).to receive(:server_has_started)
-      allow(transactional_session).to receive(:mark_as_default!)
-    end
+    before(:example) { allow(server_facade).to receive(:server_has_started) }
 
     it "informs the facade that the server has started" do
       expect(server_facade).to receive(:server_has_started)
@@ -274,12 +262,6 @@ describe HttpStub::Configurer::DSL::Server do
       subject
     end
 
-    it "marks the transactional session as the servers default" do
-      expect(transactional_session).to receive(:mark_as_default!)
-
-      subject
-    end
-
     it "causes subsequent session operations to be performed against the transactional session" do
       subject
       expect(transactional_session).to receive(:activate!)

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

@@ -17,18 +17,6 @@ describe HttpStub::Configurer::DSL::Session do
     session
   end
 
-  describe "#mark_as_default!" do
-
-    subject { session.mark_as_default! }
-
-    it "marks the session as the servers default via the session facade" do
-      expect(session_facade).to receive(:mark_as_default)
-
-      subject
-    end
-
-  end
-
   describe "#endpoint_template" do
 
     let(:block)                    { lambda { block_verifier.verify } }