http_stub 0.13.5 → 0.14.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55a4336aae9316c8d777ed41a0f0727a3e823f9
-  data.tar.gz: 1626c8d91fed1870ba6c4876e281a60efe06cb66
+  metadata.gz: 3cec045dffff863269a30e24044093374be1218f
+  data.tar.gz: dc15184117f995a3718732ab94bddc6d4fbd4166
 SHA512:
-  metadata.gz: 5a9281b96bad47e690cf8ab42b73ae0da0a52200561a307aaa0e2ea16e0c1cc1e4998ddf9779d311aeb67fb968fd9ede7b4fe4169ffef26ca8c2c84d2157047b
-  data.tar.gz: 802e5b6711c1f8c3468210dc27e3c9a2cbd9e5f6670c20fdbd4a23a63621252059231ffe11a292f7939e8075db0c33e513536b076c8f5bb4d7b2f220178868e5
+  metadata.gz: 7e903d5defca3127e859d7d66831bbcd66ad5d0c8a3cbbcaf5a5b08f2a431a18bf7d97441405272643a1ea0c9a60b58988b2af3b7704b5d2f98c715017ed46a4
+  data.tar.gz: 6fcd2527a0bab4f1006890912b57628cea65d8032de7e71e73a252108eefeccf452fc979f5f72a8ac6e9e3284c82f787e468c0cb98bbd0f56c0455612cd2130e

data/lib/http_stub.rb

@@ -5,6 +5,8 @@ require 'sass'
 require 'net/http'
 require 'json'
 require 'http_server_manager'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/hash/slice'
 
 require_relative 'http_stub/hash_extensions'
 require_relative 'http_stub/models/headers'
@@ -18,9 +20,11 @@ require_relative 'http_stub/models/request_header_parser'
 require_relative 'http_stub/models/stub_uri'
 require_relative 'http_stub/models/stub_headers'
 require_relative 'http_stub/models/stub_parameters'
+require_relative 'http_stub/models/stub_triggers'
 require_relative 'http_stub/models/stub'
 require_relative 'http_stub/models/stub_activator'
 require_relative 'http_stub/models/registry'
+require_relative 'http_stub/models/stub_registry'
 require_relative 'http_stub/models/request_pipeline'
 require_relative 'http_stub/controllers/stub_controller'
 require_relative 'http_stub/controllers/stub_activator_controller'
@@ -30,9 +34,14 @@ require_relative 'http_stub/configurer/request/omittable'
 require_relative 'http_stub/configurer/request/regexpable'
 require_relative 'http_stub/configurer/request/controllable_value'
 require_relative 'http_stub/configurer/request/stub'
+require_relative 'http_stub/configurer/request/stub_payload_builder'
 require_relative 'http_stub/configurer/request/stub_activator'
-require_relative 'http_stub/configurer/command'
-require_relative 'http_stub/configurer/command_processor'
-require_relative 'http_stub/configurer/patient_command_chain'
-require_relative 'http_stub/configurer/impatient_command_chain'
+require_relative 'http_stub/configurer/request/stub_activator_payload_builder'
+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/facade'
+require_relative 'http_stub/configurer/server/dsl'
+require_relative 'http_stub/configurer/deprecated_dsl'
 require_relative 'http_stub/configurer'

data/lib/http_stub/configurer.rb

@@ -5,6 +5,7 @@ module HttpStub
     def self.included(mod)
       mod.extend(HttpStub::Configurer::ClassMethods)
       mod.send(:include, HttpStub::Configurer::InstanceMethods)
+      mod.send(:include, HttpStub::Configurer::DeprecatedDSL)
     end
 
     module ClassMethods
@@ -29,84 +30,29 @@ module HttpStub
         "http://#{@host}:#{@port}"
       end
 
-      def stub_activator(activation_uri, stub_uri, options)
-        request = HttpStub::Configurer::Request::StubActivator.new(activation_uri, stub_uri, options)
-        handle(request: request, description: "registering activator '#{activation_uri}'")
-      end
-
-      def stub!(uri, options)
-        request = HttpStub::Configurer::Request::Stub.new(uri, options)
-        handle(request: request, description: "stubbing '#{uri}'", resetable: true)
-      end
-
-      alias_method :stub_response!, :stub!
-
-      def activate!(uri)
-        handle(request: Net::HTTP::Get.new(uri), description: "activating '#{uri}'", resetable: true)
-      end
-
-      alias_method :activate_stub!, :activate!
-
-      def server_has_started!
-        @effective_command_chain = HttpStub::Configurer::ImpatientCommandChain.new()
+      def stub_server
+        @dsl ||= HttpStub::Configurer::Server::DSL.new(server_facade)
       end
 
       def initialize!
         on_initialize if self.respond_to?(:on_initialize) && !@initialized
-        initialize_command_chain.execute()
+        server_facade.flush_requests
+        server_facade.remember_stubs
         @initialized = true
-        server_has_started!
       end
 
-      def reset!
-        clear!
-        initialize_command_chain.filter(&:resetable?).execute()
-      end
-
-      def clear_activators!
-        handle(request: Net::HTTP::Delete.new("/stubs/activators"), description: "clearing activators")
-      end
-
-      def clear!
-        handle(request: Net::HTTP::Delete.new("/stubs"), description: "clearing stubs")
-      end
-
-      alias_method :clear_stubs!, :clear!
-
       private
 
-      def handle(command_args)
-        effective_command_chain <<
-          HttpStub::Configurer::Command.new({ processor: command_processor }.merge(command_args))
-      end
-
-      def effective_command_chain
-        @effective_command_chain ||= initialize_command_chain
-      end
-
-      def initialize_command_chain
-        @initialize_command_chain ||= HttpStub::Configurer::PatientCommandChain.new()
-      end
-
-      def command_processor
-        @command_processor ||= HttpStub::Configurer::CommandProcessor.new(self)
+      def server_facade
+        @server_facade ||= HttpStub::Configurer::Server::Facade.new(self)
       end
 
     end
 
     module InstanceMethods
 
-      DELEGATE_METHODS = %w{ stub_activator stub! stub_response! activate! activate_stub!
-                             server_has_started! reset! clear_activators! clear! clear_stubs! }
-
-      def self.included(mod)
-        DELEGATE_METHODS.each do |method_name|
-          mod.class_eval <<-METHOD_DEF
-            def #{method_name}(*args)
-              self.class.#{method_name}(*args)
-            end
-          METHOD_DEF
-        end
+      def stub_server
+        self.class.stub_server
       end
 
     end

data/lib/http_stub/configurer/deprecated_dsl.rb

@@ -0,0 +1,57 @@
+module HttpStub
+  module Configurer
+
+    module DeprecatedDSL
+
+      def self.included(mod)
+        mod.extend(HttpStub::Configurer::DeprecatedDSL::Methods)
+        mod.send(:include, HttpStub::Configurer::DeprecatedDSL::Methods)
+      end
+
+      module Methods
+
+        def server_has_started!
+          stub_server.has_started!
+        end
+
+        def stub!(uri, options)
+          stub_server.add_stub! { |stub| add_stub_options_to_builder(stub, uri, options) }
+        end
+
+        alias_method :stub_response!, :stub!
+
+        def stub_activator(activation_uri, stub_uri, options)
+          stub_server.add_activator! do |activator|
+            activator.path(activation_uri)
+            add_stub_options_to_builder(activator, stub_uri, options)
+          end
+        end
+
+        def activate!(uri)
+          stub_server.activate!(uri)
+        end
+
+        def recall_stubs!
+          stub_server.recall_stubs!
+        end
+
+        def clear_stubs!
+          stub_server.clear_stubs!
+        end
+
+        def clear_activators!
+          stub_server.clear_activators!
+        end
+
+        private
+
+        def add_stub_options_to_builder(stub, uri, options)
+          stub.match_request(uri, options.slice(:method, :headers, :parameters))
+          stub.with_response(options[:response])
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/configurer/request/stub.rb

@@ -4,21 +4,15 @@ module HttpStub
 
       class Stub < Net::HTTP::Post
 
-        def initialize(uri, args)
+        def initialize(payload)
           super("/stubs")
+          @payload = payload
           self.content_type = "application/json"
-          self.body = {
-              "uri" => HttpStub::Configurer::Request::ControllableValue.format(uri),
-              "method" => args[:method],
-              "headers" => HttpStub::Configurer::Request::ControllableValue.format(args[:headers] || {}),
-              "parameters" => HttpStub::Configurer::Request::ControllableValue.format(args[:parameters] || {}),
-              "response" => {
-                  "status" => args[:response][:status] || "",
-                  "headers" => args[:response][:headers] || {},
-                  "body" => args[:response][:body],
-                  "delay_in_seconds" => args[:response][:delay_in_seconds] || ""
-              }
-          }.to_json
+          self.body = payload.to_json
+        end
+
+        def stub_uri
+          @payload[:uri]
         end
 
       end

data/lib/http_stub/configurer/request/stub_activator.rb

@@ -4,11 +4,15 @@ module HttpStub
 
       class StubActivator < Net::HTTP::Post
 
-        def initialize(activation_uri, stub_uri, options)
+        def initialize(payload)
           super("/stubs/activators")
-          stub_request = HttpStub::Configurer::Request::Stub.new(stub_uri, options)
-          self.content_type = stub_request.content_type
-          self.body = JSON.parse(stub_request.body).merge({ "activation_uri" => activation_uri }).to_json
+          @payload = payload
+          self.content_type = "application/json"
+          self.body = payload.to_json
+        end
+
+        def activation_uri
+          @payload[:activation_uri]
         end
 
       end

data/lib/http_stub/configurer/request/stub_activator_payload_builder.rb

@@ -0,0 +1,25 @@
+module HttpStub
+  module Configurer
+    module Request
+
+      class StubActivatorPayloadBuilder
+
+        delegate :match_request, :with_response, :and_add_stub, to: :@stub_payload_builder
+        
+        def initialize
+          @stub_payload_builder = HttpStub::Configurer::Request::StubPayloadBuilder.new
+        end
+
+        def path(uri)
+          @activation_uri = uri
+        end
+
+        def build
+          { activation_uri: @activation_uri }.merge(@stub_payload_builder.build)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/configurer/request/stub_payload_builder.rb

@@ -0,0 +1,44 @@
+module HttpStub
+  module Configurer
+    module Request
+
+      class StubPayloadBuilder
+        
+        def initialize
+          @args = { triggers: [] }
+        end
+
+        def match_request(uri, args={})
+          @uri = uri
+          @args.merge!(args)
+        end
+
+        def with_response(args)
+          @args.merge!(response: args)
+        end
+
+        def and_add_stub(stub_builder)
+          @args[:triggers] << stub_builder
+        end
+
+        def build
+          {
+            uri: HttpStub::Configurer::Request::ControllableValue.format(@uri),
+            method: @args[:method],
+            headers: HttpStub::Configurer::Request::ControllableValue.format(@args[:headers] || {}),
+            parameters: HttpStub::Configurer::Request::ControllableValue.format(@args[:parameters] || {}),
+            response: {
+              status: @args[:response][:status] || "",
+              headers: @args[:response][:headers] || {},
+              body: @args[:response][:body],
+              delay_in_seconds: @args[:response][:delay_in_seconds] || ""
+            },
+            triggers: @args[:triggers].map(&:build)
+          }
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module HttpStub
+  module Configurer
+    module Server
+
+      class BufferedCommandProcessor
+
+        def initialize(command_processor)
+          @command_processor = command_processor
+          @commands = []
+        end
+
+        def process(command)
+          @commands << command
+        end
+
+        def flush
+          @commands.each { |command| @command_processor.process(command) }
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module HttpStub
+  module Configurer
+    module Server
+
+      class Command
+
+        attr_reader :request, :description
+
+        def initialize(args)
+          @request = args[:request]
+          @description = args[:description]
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module HttpStub
+  module Configurer
+    module Server
+
+      class CommandProcessor
+
+        def initialize(configurer)
+          @configurer = configurer
+        end
+
+        def process(command)
+          begin
+            response = Net::HTTP.start(host, port) { |http| http.request(command.request) }
+            raise "#{error_message_prefix(command)}: #{response.code} #{response.message}" unless response.code == "200"
+          rescue Exception => exc
+            raise "#{error_message_prefix(command)}: #{exc}"
+          end
+        end
+
+        private
+
+        def host
+          @configurer.get_host
+        end
+
+        def port
+          @configurer.get_port
+        end
+
+        def error_message_prefix(command)
+          "Error occurred #{command.description} whilst configuring #{@configurer.get_base_uri}: "
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module HttpStub
+  module Configurer
+    module Server
+
+      class DSL
+
+        def initialize(server_facade)
+          @server_facade = server_facade
+        end
+
+        def has_started!
+          @server_facade.server_has_started
+        end
+
+        def build_stub(&block)
+          builder = HttpStub::Configurer::Request::StubPayloadBuilder.new
+          block.call(builder) if block_given?
+          builder
+        end
+
+        def add_stub!(builder=nil, &block)
+          resolved_builder = builder || self.build_stub(&block)
+          @server_facade.stub_response(HttpStub::Configurer::Request::Stub.new(resolved_builder.build))
+        end
+
+        def add_activator!(&block)
+          builder = HttpStub::Configurer::Request::StubActivatorPayloadBuilder.new
+          block.call(builder)
+          @server_facade.stub_activator(HttpStub::Configurer::Request::StubActivator.new(builder.build))
+        end
+
+        def activate!(uri)
+          @server_facade.activate(uri)
+        end
+
+        def remember_stubs
+          @server_facade.remember_stubs
+        end
+
+        def recall_stubs!
+          @server_facade.recall_stubs
+        end
+
+        def clear_stubs!
+          @server_facade.clear_stubs
+        end
+
+        def clear_activators!
+          @server_facade.clear_activators
+        end
+
+      end
+
+    end
+  end
+end