http_stub 0.15.5 → 0.16.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de9073e7cd507e925511a4e9e4ab51c7182cb44c
-  data.tar.gz: 0922450c8acc9793b0472877dfd2f603008588cf
+  metadata.gz: e089a8fb77ad42e2691e6c05fe6a2d766ac07626
+  data.tar.gz: 5bb5f0740862f3e106b5fc9015c85fddb3452d49
 SHA512:
-  metadata.gz: 3722e4850fd58d0c2f104896e7f8b3662a39f596762ab78e35cebe8bdebe0266d956e94045f57ba1a659d6d4e89a9c163f8ca211da3e25064c5a85af86aad778
-  data.tar.gz: c9b22acf23548d508c60f5c00bec96b758cfbf2efee142d5e8fa43a3039095403f6b96f113e2703350c7a7949afe9a668a2ec8193f3716b36d33eb496d807aef
+  metadata.gz: 51fb2fc9c208dc1af31405a5bc1520c743693cf155a6834d6a555d414c5cf1d722b7eca43edb2c3e7d2e60d8bf7d589776b8f7499097f3d026edf4c3ee416031
+  data.tar.gz: 3403a0f714d40df0e387332213695d672f0f443adff2031b061bd65f46a6b17e989c1bb47677b1842febdf2a5cd3edd71ac7a2fb1a903bc26189226f387a116c

data/lib/http_stub.rb

@@ -9,6 +9,7 @@ require 'http_server_manager'
 
 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/string/inflections'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/hash/deep_merge'
@@ -17,30 +18,36 @@ require 'active_support/core_ext/hash/indifferent_access'
 require_relative 'http_stub/hash_with_indifferent_and_insensitive_access'
 require_relative 'http_stub/extensions/core/hash'
 require_relative 'http_stub/extensions/rack/handler'
-require_relative 'http_stub/server/headers'
-require_relative 'http_stub/server/omitted_value_matcher'
-require_relative 'http_stub/server/regexp_value_matcher'
-require_relative 'http_stub/server/exact_value_matcher'
-require_relative 'http_stub/server/string_value_matcher'
-require_relative 'http_stub/server/hash_with_string_value_matchers'
-require_relative 'http_stub/server/request_header_parser'
-require_relative 'http_stub/server/stub_uri'
-require_relative 'http_stub/server/stub_headers'
-require_relative 'http_stub/server/stub_parameters'
-require_relative 'http_stub/server/stub_response/base'
-require_relative 'http_stub/server/stub_response/text'
-require_relative 'http_stub/server/stub_response/file'
-require_relative 'http_stub/server/stub_response'
-require_relative 'http_stub/server/response'
-require_relative 'http_stub/server/stub_triggers'
-require_relative 'http_stub/server/stub'
-require_relative 'http_stub/server/stub_activator'
-require_relative 'http_stub/server/request_parser'
 require_relative 'http_stub/server/registry'
-require_relative 'http_stub/server/stub_registry'
+require_relative 'http_stub/server/stub/omitted_value_matcher'
+require_relative 'http_stub/server/stub/regexp_value_matcher'
+require_relative 'http_stub/server/stub/exact_value_matcher'
+require_relative 'http_stub/server/stub/string_value_matcher'
+require_relative 'http_stub/server/stub/hash_with_string_value_matchers'
+require_relative 'http_stub/server/stub/headers'
+require_relative 'http_stub/server/stub/request_header_parser'
+require_relative 'http_stub/server/stub/payload_file_consolidator'
+require_relative 'http_stub/server/stub/request_parser'
+require_relative 'http_stub/server/stub/method'
+require_relative 'http_stub/server/stub/uri'
+require_relative 'http_stub/server/stub/request_parameters'
+require_relative 'http_stub/server/stub/request_headers'
+require_relative 'http_stub/server/stub/response/base'
+require_relative 'http_stub/server/stub/response/text'
+require_relative 'http_stub/server/stub/response/file'
+require_relative 'http_stub/server/stub/response'
+require_relative 'http_stub/server/stub/triggers'
+require_relative 'http_stub/server/stub/instance'
+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/request_parser'
+require_relative 'http_stub/server/scenario/instance'
+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/response'
 require_relative 'http_stub/server/response_pipeline'
-require_relative 'http_stub/server/stub_controller'
-require_relative 'http_stub/server/stub_activator_controller'
 require_relative 'http_stub/server/application'
 require_relative 'http_stub/server/daemon'
 require_relative 'http_stub/configurer/request/http/basic'
@@ -52,14 +59,17 @@ 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/stub'
-require_relative 'http_stub/configurer/request/stub_builder'
-require_relative 'http_stub/configurer/request/stub_activator'
-require_relative 'http_stub/configurer/request/stub_activator_builder'
+require_relative 'http_stub/configurer/request/scenario'
 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/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/scenario_builder'
+require_relative 'http_stub/configurer/dsl/stub_activator_builder'
+require_relative 'http_stub/configurer/dsl/sanctioned'
+require_relative 'http_stub/configurer/dsl/deprecated'
 require_relative 'http_stub/configurer'

data/lib/http_stub/configurer.rb

@@ -5,7 +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)
+      mod.send(:include, HttpStub::Configurer::DSL::Deprecated)
     end
 
     module ClassMethods
@@ -31,7 +31,7 @@ module HttpStub
       end
 
       def stub_server
-        @dsl ||= HttpStub::Configurer::Server::DSL.new(server_facade)
+        @dsl ||= HttpStub::Configurer::DSL::Sanctioned.new(server_facade)
       end
 
       def initialize!

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

@@ -0,0 +1,60 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      module Deprecated
+
+        def self.included(mod)
+          mod.extend(HttpStub::Configurer::DSL::Deprecated::Methods)
+          mod.send(:include, HttpStub::Configurer::DSL::Deprecated::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.on(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_scenarios!
+          end
+
+          private
+
+          def add_stub_options_to_builder(stub, uri, options)
+            stub.match_requests(uri, options.slice(:method, :headers, :parameters))
+            stub.respond_with(options[:response])
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/configurer/{server/dsl.rb → dsl/sanctioned.rb}

@@ -1,8 +1,10 @@
 module HttpStub
   module Configurer
-    module Server
+    module DSL
 
-      class DSL
+      class Sanctioned
+        include HttpStub::Configurer::DSL::StubBuilderProducer
+        include HttpStub::Configurer::DSL::ScenarioActivator
 
         def initialize(server_facade)
           @server_facade     = server_facade
@@ -17,29 +19,21 @@ module HttpStub
           @server_facade.server_has_started
         end
 
-        def build_stub(&block)
-          builder = HttpStub::Configurer::Request::StubBuilder.new(@response_defaults)
-          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(resolved_builder.build)
         end
 
-        def add_stubs!(builders)
-          builders.each { |builder| add_stub!(builder) }
+        def add_scenario!(name, &block)
+          builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@response_defaults, name)
+          block.call(builder)
+          @server_facade.define_scenario(builder.build)
         end
 
         def add_activator!(&block)
-          builder = HttpStub::Configurer::Request::StubActivatorBuilder.new(@response_defaults)
+          builder = HttpStub::Configurer::DSL::StubActivatorBuilder.new(@response_defaults)
           block.call(builder)
-          @server_facade.stub_activator(builder.build)
-        end
-
-        def activate!(uri)
-          @server_facade.activate(uri)
+          @server_facade.define_scenario(builder.build)
         end
 
         def remember_stubs
@@ -54,8 +48,14 @@ module HttpStub
           @server_facade.clear_stubs
         end
 
-        def clear_activators!
-          @server_facade.clear_activators
+        def clear_scenarios!
+          @server_facade.clear_scenarios
+        end
+
+        private
+
+        def activate_all!(scenario_names)
+          scenario_names.each { |scenario_name| @server_facade.activate(scenario_name) }
         end
 
       end

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

@@ -0,0 +1,15 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      module ScenarioActivator
+
+        def activate!(*uri)
+          activate_all!(uri.flatten)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class ScenarioBuilder
+        include HttpStub::Configurer::DSL::StubBuilderProducer
+        include HttpStub::Configurer::DSL::ScenarioActivator
+
+        def initialize(response_defaults, name)
+          @response_defaults         = response_defaults
+          @name                      = name
+          @stub_builders             = []
+          @triggered_scenario_names  = []
+        end
+
+        def add_stub!(builder=nil, &block)
+          resolved_builder = builder || build_stub(&block)
+          @stub_builders << resolved_builder
+        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!(uris)
+          @triggered_scenario_names.concat(uris)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class StubActivatorBuilder
+
+        delegate :build, to: :@scenario_builder
+        delegate :match_requests, :respond_with, :trigger, to: :@stub_builder
+
+        def initialize(response_defaults)
+          @response_defaults = response_defaults
+        end
+
+        def on(activation_uri)
+          @scenario_builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@response_defaults, activation_uri)
+          @stub_builder     = HttpStub::Configurer::DSL::StubBuilder.new(@response_defaults)
+          @scenario_builder.add_stub!(@stub_builder)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/configurer/{request → dsl}/stub_builder.rb

@@ -1,6 +1,6 @@
 module HttpStub
   module Configurer
-    module Request
+    module DSL
 
       class StubBuilder
         
@@ -10,17 +10,18 @@ module HttpStub
         end
 
         def match_requests(uri, args={})
-          @request = { uri: uri }.merge(args)
+          self.tap { @request = { uri: uri }.merge(args) }
         end
 
         def respond_with(args)
-          @response.deep_merge!(args)
+          self.tap { @response.deep_merge!(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)
+          self
         end
 
         def build

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

@@ -0,0 +1,21 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      module StubBuilderProducer
+
+        def build_stub(&block)
+          builder = HttpStub::Configurer::DSL::StubBuilder.new(@response_defaults)
+          block.arity == 0 ? builder.instance_eval(&block) : block.call(builder) if block_given?
+          builder
+        end
+
+        def add_stubs!(builders)
+          builders.each { |builder| add_stub!(builder) }
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/configurer/request/http/factory.rb

@@ -11,8 +11,14 @@ module HttpStub
               HttpStub::Configurer::Request::Http::Multipart.new("/stubs", model)
             end
 
-            def stub_activator(model)
-              HttpStub::Configurer::Request::Http::Multipart.new("/stubs/activators", model)
+            def scenario(model)
+              HttpStub::Configurer::Request::Http::Multipart.new("/stubs/scenarios", model)
+            end
+
+            alias_method :stub_activator, :scenario
+
+            def activate(uri)
+              get(uri.start_with?("/") ? uri : "/#{uri}")
             end
 
             def get(path)

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

@@ -0,0 +1,29 @@
+module HttpStub
+  module Configurer
+    module Request
+
+      class Scenario
+
+        def initialize(args)
+          @name                     = args[:name]
+          @stubs                    = args[:stubs]
+          @triggered_scenario_names = args[:triggered_scenario_names]
+        end
+
+        def payload
+          { name: @name, stubs: @stubs.map(&:payload), triggered_scenario_names: @triggered_scenario_names }
+        end
+
+        def response_files
+          @stubs.map(&:response_files).flatten
+        end
+
+        def to_s
+          @name
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -15,16 +15,16 @@ module HttpStub
           )
         end
 
-        def stub_activator(model)
+        def define_scenario(model)
           @request_processor.submit(
-            request: HttpStub::Configurer::Request::Http::Factory.stub_activator(model),
-            description: "registering activator '#{model}'"
+            request: HttpStub::Configurer::Request::Http::Factory.scenario(model),
+            description: "registering scenario '#{model}'"
           )
         end
 
         def activate(uri)
           @request_processor.submit(
-            request: HttpStub::Configurer::Request::Http::Factory.get(uri),
+            request: HttpStub::Configurer::Request::Http::Factory.activate(uri),
             description: "activating '#{uri}'"
           )
         end
@@ -49,10 +49,10 @@ module HttpStub
             description: "clearing stubs")
         end
 
-        def clear_activators
+        def clear_scenarios
           @request_processor.submit(
-            request: HttpStub::Configurer::Request::Http::Factory.delete("/stubs/activators"),
-            description: "clearing activators"
+            request: HttpStub::Configurer::Request::Http::Factory.delete("/stubs/scenarios"),
+            description: "clearing scenarios"
           )
         end