http_stub 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf1b8a410f17f0ab1797a5474d9c67567d4fec05
-  data.tar.gz: ed4cd4e41c8c080c2012ff00de1850a5f80c4ca9
+  metadata.gz: 347738836829271815cece8a214373ba88eca832
+  data.tar.gz: de16a1c9ac5fc32864414c97b320a9564c681df2
 SHA512:
-  metadata.gz: f23b2f2d17db36ebefd1b6564b13b5631ed387c226715bfd71a0f07928cc6cea0aa753b88a1f8171704e20f908c907a3eb4902370b294c4d432815d160d3d31d
-  data.tar.gz: 472618feeed2b8bcd06177553a484cec111a12c5e24eb53bf18cc363b49b80631ad576b155556f2f9955ad53f1842e2f2e03c802dbf6e4143b02232123106b09
+  metadata.gz: 7bb9b5a27d2528112e775a175bc4827365a81d268acafc283ae6b20b19ae4d9ee677e88e194565519e062dbcc39511a4bdac316be86e734587c205b8d8467829
+  data.tar.gz: 0554a3a709aa560bb30690d4b9fdc1235cc5e78409068ad97e9a0aa6255bd966bf793401c4f048bce4d76072e735ec78b6b7ba3bbe88a40ce0ab49825500640b

data/lib/http_stub.rb

@@ -1,4 +1,5 @@
 require 'sinatra'
+require_relative 'http_stub/extensions/sinatra/namespace'
 require 'sinatra/partial'
 require 'json'
 require 'net/http'
@@ -21,11 +22,13 @@ require_relative 'http_stub/extensions/core/hash/formatted'
 require_relative 'http_stub/extensions/core/hash/indifferent_and_insensitive_access'
 require_relative 'http_stub/extensions/core/hash/with_indifferent_and_insensitive_access'
 require_relative 'http_stub/extensions/core/hash'
+require_relative 'http_stub/extensions/core/uri'
 require_relative 'http_stub/extensions/rack/handler'
 require_relative 'http_stub/server/request/parameters'
 require_relative 'http_stub/server/request/headers'
+require_relative 'http_stub/server/request/sinatra_request'
 require_relative 'http_stub/server/request/request'
-require_relative 'http_stub/server/request'
+require_relative 'http_stub/server/request/factory'
 require_relative 'http_stub/server/registry'
 require_relative 'http_stub/server/stub/match/omitted_value_matcher'
 require_relative 'http_stub/server/stub/match/regexp_value_matcher'
@@ -67,13 +70,31 @@ 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/activator'
 require_relative 'http_stub/server/scenario/controller'
 require_relative 'http_stub/server/scenario'
-require_relative 'http_stub/server/application/text_formatting_support'
+require_relative 'http_stub/server/session'
+require_relative 'http_stub/server/session/configuration'
+require_relative 'http_stub/server/session/identifier_strategy'
+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/memory/memory'
+require_relative 'http_stub/server/memory/controller'
+require_relative 'http_stub/server/application/configuration'
+require_relative 'http_stub/server/application/request_support'
+require_relative 'http_stub/server/application/response_support'
 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/session'
+require_relative 'http_stub/server/application/routes/scenario'
+require_relative 'http_stub/server/application/routes/stub'
 require_relative 'http_stub/server/application/application'
 require_relative 'http_stub/server/daemon'
 require_relative 'http_stub/configurer/request/http/basic'
@@ -84,23 +105,25 @@ require_relative 'http_stub/configurer/request/regexpable'
 require_relative 'http_stub/configurer/request/controllable_value'
 require_relative 'http_stub/configurer/request/stub_response_file'
 require_relative 'http_stub/configurer/request/stub_response'
+require_relative 'http_stub/configurer/request/triggers'
 require_relative 'http_stub/configurer/request/stub'
 require_relative 'http_stub/configurer/request/scenario'
+require_relative 'http_stub/configurer/server/configuration'
 require_relative 'http_stub/configurer/server/command'
 require_relative 'http_stub/configurer/server/command_processor'
 require_relative 'http_stub/configurer/server/buffered_command_processor'
 require_relative 'http_stub/configurer/server/request_processor'
+require_relative 'http_stub/configurer/server/session_facade'
 require_relative 'http_stub/configurer/server/facade'
 require_relative 'http_stub/configurer/dsl/request_attribute_referencer'
 require_relative 'http_stub/configurer/dsl/request_referencer'
 require_relative 'http_stub/configurer/dsl/stub_builder'
-require_relative 'http_stub/configurer/dsl/stub_builder_producer'
-require_relative 'http_stub/configurer/dsl/scenario_activator'
+require_relative 'http_stub/configurer/dsl/stub_builder_template'
+require_relative 'http_stub/configurer/dsl/session_endpoint_template'
+require_relative 'http_stub/configurer/dsl/session'
+require_relative 'http_stub/configurer/dsl/session_factory'
 require_relative 'http_stub/configurer/dsl/scenario_builder'
-require_relative 'http_stub/configurer/dsl/endpoint_template'
-require_relative 'http_stub/configurer/dsl/stub_activator_builder'
+require_relative 'http_stub/configurer/dsl/server_endpoint_template'
 require_relative 'http_stub/configurer/dsl/server'
-require_relative 'http_stub/configurer/dsl/deprecated'
-require_relative 'http_stub/configurer/dsl/deprecated'
 require_relative 'http_stub/configurer/part'
 require_relative 'http_stub/configurer'

data/lib/http_stub/configurer.rb

@@ -5,19 +5,17 @@ module HttpStub
     def self.included(mod)
       mod.extend(HttpStub::Configurer::ClassMethods)
       mod.send(:include, HttpStub::Configurer::InstanceMethods)
-      mod.send(:include, HttpStub::Configurer::DSL::Deprecated)
     end
 
     module ClassMethods
 
       def stub_server
-        @stub_server ||= HttpStub::Configurer::DSL::Server.new(server_facade)
+        @stub_server ||= HttpStub::Configurer::DSL::Server.new
       end
 
       def initialize!
         on_initialize if self.respond_to?(:on_initialize) && !@initialized
-        server_facade.flush_requests
-        server_facade.remember_stubs
+        stub_server.initialize!
         @initialized = true
       end
 
@@ -29,12 +27,6 @@ module HttpStub
         end
       end
 
-      private
-
-      def server_facade
-        @server_facade ||= HttpStub::Configurer::Server::Facade.new(self)
-      end
-
     end
 
     module InstanceMethods

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

@@ -3,14 +3,14 @@ module HttpStub
     module DSL
 
       class ScenarioBuilder
-        include HttpStub::Configurer::DSL::StubBuilderProducer
-        include HttpStub::Configurer::DSL::ScenarioActivator
 
-        def initialize(default_stub_builder, name)
-          @default_stub_builder     = default_stub_builder
+        delegate :build_stub, to: :@default_stub_template
+
+        def initialize(name, default_stub_template)
           @name                     = name
-          @stub_builders            = []
+          @default_stub_template    = default_stub_template
           @triggered_scenario_names = []
+          @stub_builders            = []
         end
 
         def add_stub!(builder=nil, &block)
@@ -18,18 +18,20 @@ module HttpStub
           @stub_builders << resolved_builder
         end
 
+        def add_stubs!(builders)
+          builders.each { |builder| add_stub!(builder) }
+        end
+
+        def activate!(*names)
+          @triggered_scenario_names.concat(names.flatten)
+        end
+
         def build
           HttpStub::Configurer::Request::Scenario.new(
             name: @name, stubs: @stub_builders.map(&:build), triggered_scenario_names: @triggered_scenario_names
           )
         end
 
-        private
-
-        def activate_all!(names)
-          @triggered_scenario_names.concat(names)
-        end
-
       end
 
     end

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

@@ -3,52 +3,46 @@ module HttpStub
     module DSL
 
       class Server
-        include HttpStub::Configurer::DSL::StubBuilderProducer
-        include HttpStub::Configurer::DSL::ScenarioActivator
 
-        attr_accessor :host, :port
+        delegate :host, :host=, :port, :port=, :base_uri, :external_base_uri, to: :@configuration
+        delegate :session_identifier, :session_identifier=,                   to: :@configuration
+        delegate :enable, :enabled?,                                          to: :@configuration
 
-        def initialize(server_facade)
-          @server_facade        = server_facade
-          @default_stub_builder = HttpStub::Configurer::DSL::StubBuilder.new
-          @enabled_features     = []
-        end
-
-        def base_uri
-          "http://#{host}:#{port}"
-        end
-
-        def external_base_uri
-          ENV["STUB_EXTERNAL_BASE_URI"] || base_uri
-        end
-
-        def enable(*features)
-          @enabled_features = features
-        end
+        delegate :activate!, :build_stub, :add_stub!, :add_stubs!, to: :@default_session
 
-        def enabled?(feature)
-          @enabled_features.include?(feature)
+        def initialize
+          @configuration         = HttpStub::Configurer::Server::Configuration.new
+          @server_facade         = HttpStub::Configurer::Server::Facade.new(@configuration)
+          @default_stub_template = HttpStub::Configurer::DSL::StubBuilderTemplate.new
+          @session_factory       = HttpStub::Configurer::DSL::SessionFactory.new(@server_facade, @default_stub_template)
+          @default_session       = @session_factory.memory
+          @enabled_features      = []
         end
 
         def request_defaults=(args)
-          @default_stub_builder.match_requests(args)
+          @default_stub_template.match_requests(args)
         end
 
         def response_defaults=(args)
-          @default_stub_builder.respond_with(args)
+          @default_stub_template.respond_with(args)
+        end
+
+        def initialize!
+          @server_facade.flush_requests
+          switch_to_transactional_session
         end
 
         def has_started!
           @server_facade.server_has_started
+          switch_to_transactional_session
         end
 
-        def add_stub!(builder=nil, &block)
-          resolved_builder = builder || self.build_stub(&block)
-          @server_facade.stub_response(resolved_builder.build)
+        def reset!
+          @server_facade.reset
         end
 
         def add_scenario!(name, &_block)
-          builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@default_stub_builder, name)
+          builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(name, @default_stub_template)
           yield builder
           @server_facade.define_scenario(builder.build)
         end
@@ -60,35 +54,30 @@ module HttpStub
         end
 
         def endpoint_template(&block)
-          HttpStub::Configurer::DSL::EndpointTemplate.new(self).tap { |template| template.invoke(&block) }
+          HttpStub::Configurer::DSL::ServerEndpointTemplate.new(self, @default_session, &block)
         end
 
-        def add_activator!(&_block)
-          builder = HttpStub::Configurer::DSL::StubActivatorBuilder.new(@default_stub_builder)
-          yield builder
-          @server_facade.define_scenario(builder.build)
+        def session(id)
+          @session_factory.create(id)
         end
 
-        def remember_stubs
-          @server_facade.remember_stubs
+        def clear_sessions!
+          @server_facade.clear_sessions
         end
 
         def recall_stubs!
-          @server_facade.recall_stubs
+          @default_session.reset!
         end
 
         def clear_stubs!
-          @server_facade.clear_stubs
-        end
-
-        def clear_scenarios!
-          @server_facade.clear_scenarios
+          @default_session.clear!
         end
 
         private
 
-        def activate_all!(scenario_names)
-          scenario_names.each { |scenario_name| @server_facade.activate(scenario_name) }
+        def switch_to_transactional_session
+          @session_factory.transactional.mark_as_default!
+          @default_session = @session_factory.transactional
         end
 
       end

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

@@ -0,0 +1,23 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class ServerEndpointTemplate
+
+        delegate :match_requests, :schema, :respond_with, :trigger, :invoke, to: :@session_endpoint_template
+        delegate :build_stub, :add_stub!,                                    to: :@session_endpoint_template
+
+        def initialize(server, default_session, &block)
+          @server                    = server
+          @session_endpoint_template = default_session.endpoint_template(&block)
+        end
+
+        def add_scenario!(name, response_overrides={}, &block)
+          @server.add_scenario_with_one_stub!(name, self.build_stub(response_overrides, &block))
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class Session
+
+        MEMORY_SESSION_ID        = "http_stub_memory".freeze
+        TRANSACTIONAL_SESSION_ID = "http_stub_transactional".freeze
+
+        delegate :build_stub, to: :@default_stub_template
+
+        def initialize(id, server_facade, default_stub_template)
+          @id                    = id
+          @session_facade        = server_facade.create_session_facade(id)
+          @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
+
+        def activate!(*names)
+          @session_facade.activate(names)
+        end
+
+        def add_stub!(builder=nil, &block)
+          resolved_builder = builder || self.build_stub(&block)
+          @session_facade.stub_response(resolved_builder.build)
+        end
+
+        def add_stubs!(builders)
+          builders.each { |builder| add_stub!(builder) }
+        end
+
+        def reset!
+          @session_facade.reset_stubs
+        end
+
+        def clear!
+          @session_facade.clear_stubs
+        end
+
+        def delete!
+          @session_facade.delete
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class SessionEndpointTemplate
+
+        delegate :match_requests, :schema, :respond_with, :trigger, :invoke, :build_stub, to: :@stub_builder_template
+
+        def initialize(session, default_stub_template, &block)
+          @session               = session
+          @stub_builder_template = HttpStub::Configurer::DSL::StubBuilderTemplate.new(default_stub_template, &block)
+        end
+
+        def add_stub!(response_overrides={}, &block)
+          @session.add_stub!(self.build_stub(response_overrides, &block))
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class SessionFactory
+
+        MEMORY_SESSION_ID        = "http_stub_memory".freeze
+        TRANSACTIONAL_SESSION_ID = "http_stub_transactional".freeze
+
+        private_constant :MEMORY_SESSION_ID, :TRANSACTIONAL_SESSION_ID
+
+        def initialize(server_facade, default_stub_template)
+          @server_facade         = server_facade
+          @default_stub_template = default_stub_template
+          @sessions              = {}
+        end
+
+        def create(id)
+          @sessions[id] ||= HttpStub::Configurer::DSL::Session.new(id, @server_facade, @default_stub_template)
+        end
+
+        def memory
+          self.create(MEMORY_SESSION_ID)
+        end
+
+        def transactional
+          self.create(TRANSACTIONAL_SESSION_ID)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -6,11 +6,12 @@ module HttpStub
 
         attr_reader :request, :response, :triggers
 
-        def initialize(default_builder=nil)
+        def initialize(parent_builder=nil, &block)
           @request  = {}
           @response = {}
-          @triggers = []
-          self.merge!(default_builder) if default_builder
+          @triggers = { scenarios: [], stubs: [] }
+          self.merge!(parent_builder) if parent_builder
+          self.invoke(&block)         if block_given?
         end
 
         def match_requests(args)
@@ -27,10 +28,12 @@ module HttpStub
           self.tap { @response.deep_merge!(resolved_args) }
         end
 
-        def trigger(stub_builder_or_builders)
-          resolved_builders =
-            stub_builder_or_builders.is_a?(Array) ? stub_builder_or_builders : [ stub_builder_or_builders ]
-          @triggers.concat(resolved_builders)
+        def trigger(args)
+          resolved_args = args.clone
+          resolved_args[:scenarios] ||= resolved_args[:scenario] ? [ resolved_args[:scenario] ] : []
+          resolved_args[:stubs]     ||= resolved_args[:stub] ? [ resolved_args[:stub] ] : []
+          @triggers[:scenarios].concat(resolved_args[:scenarios])
+          @triggers[:stubs].concat(resolved_args[:stubs])
           self
         end
 
@@ -45,7 +48,14 @@ module HttpStub
         end
 
         def build
-          HttpStub::Configurer::Request::Stub.new(request: @request, response: @response, triggers: @triggers)
+          HttpStub::Configurer::Request::Stub.new(
+            request:  @request,
+            response: @response,
+            triggers: {
+              scenario_names: @triggers[:scenarios],
+              stubs:          @triggers[:stubs].map(&:build)
+            }
+          )
         end
 
       end