http_stub 0.27.0 → 0.28.0.beta1

data/lib/http_stub/{configurer/dsl/stub_builder_template.rb → configurator/stub/template.rb}

@@ -1,19 +1,19 @@
 module HttpStub
-  module Configurer
-    module DSL
+  module Configurator
+    module Stub
 
-      class StubBuilderTemplate
+      class Template
 
         attr_reader :template
 
         delegate :match_requests, :schema, :respond_with, :trigger, :invoke, to: :@template
 
         def initialize(parent_template=nil, &block)
-          @template = HttpStub::Configurer::DSL::StubBuilder.new(parent_template.try(:template), &block)
+          @template = HttpStub::Configurator::Stub.create(parent_template.try(:template), &block)
         end
 
         def build_stub(response_overrides={}, &block)
-          HttpStub::Configurer::DSL::StubBuilder.new(@template) do |stub|
+          HttpStub::Configurator::Stub.create(@template) do |stub|
             stub.respond_with(response_overrides)
             stub.invoke(&block) if block_given?
           end

data/lib/http_stub/extensions/core/object.rb

@@ -0,0 +1,17 @@
+module HttpStub
+  module Extensions
+    module Core
+
+      module Object
+
+        def short_class_name
+          self.class.name.demodulize.underscore
+        end
+
+      end
+
+    end
+  end
+end
+
+::Object.send(:include, HttpStub::Extensions::Core::Object)

data/lib/http_stub/rake/server_tasks.rb

@@ -6,28 +6,16 @@ module HttpStub
       def initialize(args)
         namespace args[:name] do
           define_start_task(args)
-          define_initialize_task(args) if args[:configurer]
         end
       end
 
       private
 
       def define_start_task(args)
+        raise "configurator must be specified" unless args[:configurator]
         namespace :start do
           desc "Start stub #{args[:name]} in the foreground"
-          task(:foreground) { run_application(args) }
-        end
-      end
-
-      def define_initialize_task(args)
-        desc "Configure stub #{args[:name]}"
-        task(:configure) { args[:configurer].initialize! }
-      end
-
-      def run_application(args)
-        HttpStub::Server::Application::Application.instance_eval do
-          configure(args)
-          run!
+          task(:foreground) { HttpStub::Server.start(args[:configurator]) }
         end
       end
 

data/lib/http_stub/rake/task_generators.rb

@@ -1,7 +1,7 @@
-require ::File.expand_path('../../../http_stub', __FILE__)
+require_relative '../server'
 require 'rake/tasklib' unless defined? ::Rake::TaskLib
 
 require 'http_server_manager/rake/task_generators'
 
-require ::File.expand_path('../server_tasks', __FILE__)
-require ::File.expand_path('../server_daemon_tasks', __FILE__)
+require_relative 'server_tasks'
+require_relative 'server_daemon_tasks'

data/lib/http_stub/server.rb

@@ -0,0 +1,110 @@
+require 'sinatra'
+require_relative 'extensions/sinatra/namespace'
+require 'sinatra/partial'
+require 'json'
+require 'json-schema'
+require 'http_server_manager'
+require 'method_source'
+require 'haml'
+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'
+require 'active_support/core_ext/hash/indifferent_access'
+
+require_relative 'extensions/core/object'
+require_relative 'extensions/core/hash/formatted'
+require_relative 'extensions/core/hash/indifferent_and_insensitive_access'
+require_relative 'extensions/core/hash/with_indifferent_and_insensitive_access'
+require_relative 'extensions/core/hash'
+require_relative 'extensions/core/uri'
+
+require_relative 'extensions/rack/handler'
+
+require_relative 'server/stdout_logger'
+require_relative 'server/request/parameters'
+require_relative 'server/request/headers'
+require_relative 'server/request/sinatra_request'
+require_relative 'server/request/request'
+require_relative 'server/request/factory'
+require_relative 'server/registry'
+require_relative 'server/stub/match/omitted_value_matcher'
+require_relative 'server/stub/match/regexp_value_matcher'
+require_relative 'server/stub/match/exact_value_matcher'
+require_relative 'server/stub/match/string_value_matcher'
+require_relative 'server/stub/match/hash_matcher'
+require_relative 'server/stub/match/rule/truthy'
+require_relative 'server/stub/match/rule/uri'
+require_relative 'server/stub/match/rule/method'
+require_relative 'server/stub/match/rule/headers'
+require_relative 'server/stub/match/rule/parameters'
+require_relative 'server/stub/match/rule/simple_body'
+require_relative 'server/stub/match/rule/json_schema_body'
+require_relative 'server/stub/match/rule/schema_body'
+require_relative 'server/stub/match/rule/body'
+require_relative 'server/stub/match/rules'
+require_relative 'server/stub/response/headers'
+require_relative 'server/stub/response/blocks'
+require_relative 'server/stub/response/text_body'
+require_relative 'server/stub/response/file_body'
+require_relative 'server/stub/response/body'
+require_relative 'server/stub/response/response'
+require_relative 'server/stub/response'
+require_relative 'server/response'
+require_relative 'server/stub/triggers'
+require_relative 'server/stub/stub'
+require_relative 'server/stub/empty'
+require_relative 'server/stub/match/match'
+require_relative 'server/stub/match/miss'
+require_relative 'server/stub/match/controller'
+require_relative 'server/stub/registry'
+require_relative 'server/stub/controller'
+require_relative 'server/stub'
+require_relative 'server/session'
+require_relative 'server/session/identifier_strategy'
+require_relative 'server/session/empty'
+require_relative 'server/session/session'
+require_relative 'server/session/registry'
+require_relative 'server/session/controller'
+require_relative 'server/scenario/links'
+require_relative 'server/scenario/trigger'
+require_relative 'server/scenario/not_found_error'
+require_relative 'server/scenario/scenario'
+require_relative 'server/scenario/registry'
+require_relative 'server/scenario/controller'
+require_relative 'server/scenario'
+require_relative 'server/memory/initial_state'
+require_relative 'server/memory/memory'
+require_relative 'server/memory/controller'
+require_relative 'server/application/request_support'
+require_relative 'server/application/cross_origin_support'
+require_relative 'server/application/session_uri_support'
+require_relative 'server/application/text_formatting_support'
+require_relative 'server/application/routes/resource'
+require_relative 'server/application/routes/status'
+require_relative 'server/application/routes/stub'
+require_relative 'server/application/routes/session'
+require_relative 'server/application/routes/scenario'
+require_relative 'server/application/routes/memory'
+require_relative 'server/application/application'
+require_relative 'server/daemon'
+
+module HttpStub
+
+  module Server
+
+    def self.start(configurator)
+      HttpStub::Server::Application::Application.instance_eval do
+        configure(configurator)
+        run!
+      end
+    end
+
+  end
+
+end

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

@@ -14,19 +14,23 @@ module HttpStub
         enable  :dump_errors, :logging, :partial_underscores
         disable :protection, :cross_origin_support
 
-        def self.configure(args)
-          configuration = HttpStub::Server::Application::Configuration.new(args)
-          configuration.settings.each { |name, value| set(name, value) }
+        class << self
+
+          attr_reader :configurator_state
+
+          def configure(configurator)
+            @configurator_state = configurator.state
+            @configurator_state.application_settings.each { |name, value| set(name, value) }
+          end
+
         end
 
         def initialize
-          @session_configuration = HttpStub::Server::Session::Configuration.new(settings.session_identifier)
-          @server_memory         = HttpStub::Server::Memory::Memory.new(@session_configuration)
+          @server_memory = HttpStub::Server::Memory::Memory.new(self.class.configurator_state)
           super()
         end
 
         include HttpStub::Server::Application::RequestSupport
-        include HttpStub::Server::Application::ResponseSupport
 
         register HttpStub::Server::Application::CrossOriginSupport
 

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

@@ -4,7 +4,7 @@ module HttpStub
 
       module RequestSupport
 
-        STUBBABLE_REQUEST_METHODS = [ :get, :post, :put, :patch, :delete, :options ].freeze
+        STUBBABLE_REQUEST_METHODS = %i{ get post put patch delete options }.freeze
 
         private_constant :STUBBABLE_REQUEST_METHODS
 
@@ -12,7 +12,7 @@ module HttpStub
 
         def initialize
           super()
-          @request_factory = HttpStub::Server::Request::Factory.new(@session_configuration, @server_memory)
+          @request_factory = HttpStub::Server::Request::Factory.new(settings.session_identifier, @server_memory)
         end
 
         def establish_http_stub_request

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

@@ -7,7 +7,7 @@ module HttpStub
 
           def initialize
             super()
-            @memory_controller = HttpStub::Server::Memory::Controller.new(@session_configuration, @server_memory)
+            @memory_controller = HttpStub::Server::Memory::Controller.new(@server_memory)
           end
 
           def self.included(application)
@@ -19,11 +19,6 @@ module HttpStub
                   haml :stubs, {}, stubs: @memory_controller.find_stubs
                 end
 
-                delete do
-                  @memory_controller.reset(logger)
-                  halt 200, "OK"
-                end
-
               end
 
             end

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

@@ -15,11 +15,6 @@ module HttpStub
 
               namespace "/http_stub/scenarios" do
 
-                post do
-                  response = @scenario_controller.register(http_stub_request, logger)
-                  @response_pipeline.process(response)
-                end
-
                 get do
                   pass unless http_stub_request.parameters[:name]
                   haml :scenario, {}, scenario: @scenario_controller.find(http_stub_request, logger)
@@ -31,12 +26,7 @@ module HttpStub
 
                 post "/activate" do
                   response = @scenario_controller.activate(http_stub_request, logger)
-                  @response_pipeline.process(response)
-                end
-
-                delete do
-                  @scenario_controller.clear(logger)
-                  halt 200, "OK"
+                  response.serve_on(self)
                 end
 
               end

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

@@ -7,7 +7,7 @@ module HttpStub
 
           def initialize
             super()
-            @session_controller = HttpStub::Server::Session::Controller.new(@session_configuration, @server_memory)
+            @session_controller = HttpStub::Server::Session::Controller.new(@server_memory)
           end
 
           def self.included(application)

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

@@ -5,22 +5,12 @@ module HttpStub
 
         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
 

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

@@ -16,11 +16,6 @@ module HttpStub
 
               namespace "/http_stub/stubs" do
 
-                post do
-                  response = @stub_controller.register(http_stub_request, logger)
-                  @response_pipeline.process(response)
-                end
-
                 get do
                   haml :stubs, {}, stubs: @stub_controller.find_all(http_stub_request)
                 end
@@ -30,11 +25,6 @@ module HttpStub
                   halt 200, "OK"
                 end
 
-                delete do
-                  @stub_controller.clear(http_stub_request, logger)
-                  halt 200, "OK"
-                end
-
                 namespace "/matches" do
 
                   get do
@@ -43,7 +33,7 @@ module HttpStub
 
                   get "/last" do
                     response = @stub_match_controller.last_match(http_stub_request, logger)
-                    @response_pipeline.process(response)
+                    response.serve_on(self)
                   end
 
                 end
@@ -61,7 +51,7 @@ module HttpStub
 
               any_request_method "*" do
                 response = @stub_controller.match(http_stub_request, logger)
-                @response_pipeline.process(response)
+                response.serve_on(self)
               end
 
             end

data/lib/http_stub/server/daemon.rb

@@ -16,19 +16,10 @@ module HttpStub
       end
 
       def initialize(args)
-        @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
+        default_args = { host: "localhost", port: args[:configurator].state.port, ping_uri: "/http_stub/status" }
         super(default_args.merge(args))
       end
 
-      def start!
-        super
-        return unless @configurer
-        @configurer.initialize!
-        logger.info "#{@name} initialized"
-      end
-
       def start_command
         "rake #{@name}:start:foreground"
       end

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

@@ -4,20 +4,14 @@ module HttpStub
 
       class Controller
 
-        def initialize(session_configuration, server_memory)
-          @session_configuration = session_configuration
-          @server_memory         = server_memory
+        def initialize(server_memory)
+          @server_memory = server_memory
         end
 
         def find_stubs
           @server_memory.stubs
         end
 
-        def reset(logger)
-          @session_configuration.reset
-          @server_memory.reset(logger)
-        end
-
       end
 
     end

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

@@ -0,0 +1,27 @@
+module HttpStub
+  module Server
+    module Memory
+
+      class InitialState
+
+        def initialize(configurator_state)
+          @configurator_state = configurator_state
+        end
+
+        def load_scenarios
+          @configurator_state.scenario_hashes.map { |hash| HttpStub::Server::Scenario.create(hash) }
+        end
+
+        def load_stubs(scenario_registry)
+          initial_stubs   = @configurator_state.stub_hashes.map { |hash| HttpStub::Server::Stub.create(hash) }
+          activated_stubs = scenario_registry.find_all(&:initially_activated?).map do |activated_scenario|
+            scenario_registry.stubs_activated_by(activated_scenario, HttpStub::Server::StdoutLogger)
+          end.flatten
+          initial_stubs + activated_stubs
+        end
+
+      end
+
+    end
+  end
+end