http_stub 0.22.4 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74144ffbb6dae5921a1631ba6a219e0fbc4bdff7
-  data.tar.gz: e789bd03754aeb44631801f7154a9585d7f08842
+  metadata.gz: 83d11882c6f2e8da679ce7ea3385600f36aa6a80
+  data.tar.gz: f6d82ab5f7aec1b153f82eeee569090851bb45a6
 SHA512:
-  metadata.gz: 73947db83ba0eb75d7b40028c3f1868f77aa34123d6ef8822e39648062312d21fbe4eec0331df59b095078373d99f9b7e5b2a076e880c0dca27d77e7bdb6b62b
-  data.tar.gz: f715347c8d45c0109c25ec08d704797301b2d8b803ab15c64d4a21d37e736effa4fb7cb27c5a5f615db32491e7724019cfe2f67abb7f88be91f1672e99f91550
+  metadata.gz: a0a219718f1abb17958d155c0b0e87def0f8f4fca68c30a5908d14726756912d65d41169c861abfb1f1e728b96395ddc4ce9871b82c00ad01ebc654bdca651a1
+  data.tar.gz: 169a55811bea9ed005aee6aee936f7472c8c0820427f2993ae34bc26f335f6d70d449ec082029098874b609fd00ef2d03174266c13dc134d1b459c7487a1ba5a

data/lib/http_stub.rb

@@ -17,19 +17,22 @@ 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 'http_stub/hash_with_indifferent_and_insensitive_access'
+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/rack/handler'
-require_relative 'http_stub/server/formatted_hash'
-require_relative 'http_stub/server/header_parser'
+require_relative 'http_stub/server/request/parameters'
+require_relative 'http_stub/server/request/headers'
+require_relative 'http_stub/server/request/request'
 require_relative 'http_stub/server/request'
 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'
 require_relative 'http_stub/server/stub/match/exact_value_matcher'
 require_relative 'http_stub/server/stub/match/string_value_matcher'
-require_relative 'http_stub/server/stub/match/hash_with_string_value_matchers'
-require_relative 'http_stub/server/stub/match/truthy_matcher'
+require_relative 'http_stub/server/stub/match/hash_matcher'
+require_relative 'http_stub/server/stub/match/rule/truthy'
 require_relative 'http_stub/server/stub/match/rule/uri'
 require_relative 'http_stub/server/stub/match/rule/method'
 require_relative 'http_stub/server/stub/match/rule/headers'
@@ -37,6 +40,11 @@ require_relative 'http_stub/server/stub/match/rule/parameters'
 require_relative 'http_stub/server/stub/match/rule/simple_body'
 require_relative 'http_stub/server/stub/match/rule/json_body'
 require_relative 'http_stub/server/stub/match/rule/body'
+require_relative 'http_stub/server/stub/response/attribute/interpolator/headers'
+require_relative 'http_stub/server/stub/response/attribute/interpolator/parameters'
+require_relative 'http_stub/server/stub/response/attribute/interpolator'
+require_relative 'http_stub/server/stub/response/attribute/headers'
+require_relative 'http_stub/server/stub/response/attribute/body'
 require_relative 'http_stub/server/stub/response/base'
 require_relative 'http_stub/server/stub/response/text'
 require_relative 'http_stub/server/stub/response/file'
@@ -77,6 +85,8 @@ 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/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'

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

@@ -0,0 +1,19 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class RequestAttributeReferencer
+
+        def initialize(attribute_type)
+          @attribute_type = attribute_type
+        end
+
+        def [](name)
+          "control:request.#{@attribute_type}[#{name}]"
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module HttpStub
+  module Configurer
+    module DSL
+
+      class RequestReferencer
+
+        def initialize
+          @parameter_referencer = HttpStub::Configurer::DSL::RequestAttributeReferencer.new(:parameters)
+          @header_referencer    = HttpStub::Configurer::DSL::RequestAttributeReferencer.new(:headers)
+        end
+
+        def parameters
+          @parameter_referencer
+        end
+
+        def headers
+          @header_referencer
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -4,8 +4,8 @@ module HttpStub
 
       module ScenarioActivator
 
-        def activate!(*uri)
-          activate_all!(uri.flatten)
+        def activate!(*names)
+          activate_all!(names.flatten)
         end
 
       end

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

@@ -26,8 +26,8 @@ module HttpStub
 
         private
 
-        def activate_all!(uris)
-          @triggered_scenario_names.concat(uris)
+        def activate_all!(names)
+          @triggered_scenario_names.concat(names)
         end
 
       end

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

@@ -38,9 +38,9 @@ module HttpStub
           @server_facade.stub_response(resolved_builder.build)
         end
 
-        def add_scenario!(name, &block)
+        def add_scenario!(name, &_block)
           builder = HttpStub::Configurer::DSL::ScenarioBuilder.new(@default_stub_builder, name)
-          block.call(builder)
+          yield builder
           @server_facade.define_scenario(builder.build)
         end
 
@@ -54,9 +54,9 @@ module HttpStub
           HttpStub::Configurer::DSL::EndpointTemplate.new(self).tap { |template| template.invoke(&block) }
         end
 
-        def add_activator!(&block)
+        def add_activator!(&_block)
           builder = HttpStub::Configurer::DSL::StubActivatorBuilder.new(@default_stub_builder)
-          block.call(builder)
+          yield builder
           @server_facade.define_scenario(builder.build)
         end
 

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

@@ -21,8 +21,10 @@ module HttpStub
           { schema: { type: type, definition: definition } }
         end
 
-        def respond_with(args)
-          self.tap { @response.deep_merge!(args) }
+        def respond_with(args={}, &_block)
+          resolved_args = args
+          resolved_args = yield HttpStub::Configurer::DSL::RequestReferencer.new if block_given?
+          self.tap { @response.deep_merge!(resolved_args) }
         end
 
         def trigger(stub_builder_or_builders)
@@ -33,7 +35,7 @@ module HttpStub
         end
 
         def invoke(&block)
-          block.arity == 0 ? self.instance_eval(&block) : block.call(self)
+          block.arity == 0 ? self.instance_eval(&block) : (yield self)
         end
 
         def merge!(stub_builder)

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

@@ -4,12 +4,10 @@ module HttpStub
 
       class ControllableValue
 
-        private
-
         CONTROL_FORMATTERS = [ HttpStub::Configurer::Request::Regexpable,
                                HttpStub::Configurer::Request::Omittable ].freeze
 
-        public
+        private_constant :CONTROL_FORMATTERS
 
         def self.format(value)
           CONTROL_FORMATTERS.reduce(value) { |result, formatter| formatter.format(result) }

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

@@ -25,10 +25,10 @@ module HttpStub
 
             private
 
-            def create_basic_request(request_method, path, &block)
+            def create_basic_request(request_method, path, &_block)
               http_request_class = Net::HTTP.const_get(request_method.to_s.capitalize)
               http_request = http_request_class.new(path)
-              block.call(http_request) if block_given?
+              yield http_request if block_given?
               HttpStub::Configurer::Request::Http::Basic.new(http_request)
             end
 

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

@@ -12,11 +12,9 @@ module HttpStub
 
           private
 
-          def format_hash(value)
-            value.reduce({}) do |result, entry|
-              key, value  = entry
+          def format_hash(hash)
+            hash.each_with_object({}) do |(key, value), result|
               result[key] = value == :omitted ? "control:omitted" : value
-              result
             end
           end
 

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

@@ -6,11 +6,9 @@ module HttpStub
 
         class << self
 
-          private
-
           FORMATTERS = { Regexp => :format_regexp, Hash => :format_hash }.freeze
 
-          public
+          private_constant :FORMATTERS
 
           def format(value)
             formatter = FORMATTERS.find { |formatter_entry| value.is_a?(formatter_entry[0]) }
@@ -20,14 +18,11 @@ module HttpStub
           private
 
           def format_regexp(regexp)
-            "regexp:#{regexp.source.gsub(/\\\//, "/")}"
+            "regexp:#{regexp.source.gsub(%r{\\\/}, "/")}"
           end
 
           def format_hash(hash)
-            hash.reduce({}) do |result, entry|
-              result[entry[0]] = format(entry[1])
-              result
-            end
+            hash.each_with_object({}) { |entry, result| result[entry[0]] = format(entry[1]) }
           end
 
         end

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

@@ -9,13 +9,11 @@ module HttpStub
         end
 
         def process(command)
-          begin
-            response = Net::HTTP.start(host, port) { |http| http.request(command.http_request) }
-            raise "#{error_message_prefix(command)}: #{response.code} #{response.message}" unless response.code == "200"
-            response
-          rescue Exception => exc
-            raise "#{error_message_prefix(command)}: #{exc}"
-          end
+          response = Net::HTTP.start(host, port) { |http| http.request(command.http_request) }
+          raise "#{error_message_prefix(command)}: #{response.code} #{response.message}" unless response.code == "200"
+          response
+        rescue StandardError => err
+          raise "#{error_message_prefix(command)}: #{err}"
         end
 
         private

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

@@ -4,14 +4,12 @@ module HttpStub
 
       class Facade
 
-        private
-
         STUBS_BASE_URI          = "/http_stub/stubs".freeze
         STUB_MEMORY_URI         = "#{STUBS_BASE_URI}/memory".freeze
         SCENARIOS_BASE_URI      = "/http_stub/scenarios".freeze
         SCENARIO_ACTIVATION_URI = "#{SCENARIOS_BASE_URI}/activate".freeze
 
-        public
+        private_constant :STUBS_BASE_URI, :STUB_MEMORY_URI, :SCENARIOS_BASE_URI, :SCENARIO_ACTIVATION_URI
 
         def initialize(configurer)
           @request_processor = HttpStub::Configurer::Server::RequestProcessor.new(configurer)
@@ -32,7 +30,7 @@ module HttpStub
         end
 
         def activate(scenario_name)
-          request = HttpStub::Configurer::Request::Http::Factory.post(SCENARIO_ACTIVATION_URI, :name => scenario_name)
+          request = HttpStub::Configurer::Request::Http::Factory.post(SCENARIO_ACTIVATION_URI, name: scenario_name)
           @request_processor.submit(
             request:     request,
             description: "activating '#{scenario_name}'"

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

@@ -4,21 +4,14 @@ module HttpStub
 
       module Hash
 
-        def downcase_and_underscore_keys
-          self.reduce({}) do |result, element|
-            result[element[0].is_a?(::String) ? element[0].downcase.gsub(/-/, '_') : element[0]] = element[1]
-            result
-          end
-        end
-
-        def has_hash?(other_hash)
-          other_hash.nil? || other_hash.reduce(true) do |result, element|
-            result && (self[element[0]] == element[1])
+        def underscore_keys
+          self.each_with_object({}) do |element, result|
+            result[element[0].is_a?(::String) ? element[0].tr("-", "_") : element[0]] = element[1]
           end
         end
 
         def with_indifferent_and_insensitive_access
-          HttpStub::HashWithIndifferentAndInsensitiveAccess.new(self)
+          HttpStub::Extensions::Core::Hash::WithIndifferentAndInsensitiveAccess.new(self)
         end
 
       end

data/lib/http_stub/extensions/core/hash/formatted.rb

@@ -0,0 +1,23 @@
+module HttpStub
+  module Extensions
+    module Core
+      module Hash
+
+        module Formatted
+
+          def initialize(hash, key_value_delimiter, entry_delimiter=", ")
+            self.merge!(hash || {})
+            @key_value_delimiter = key_value_delimiter
+            @entry_delimiter     = entry_delimiter
+          end
+
+          def to_s
+            self.map { |key_and_value| key_and_value.map(&:to_s).join(@key_value_delimiter) }.join(@entry_delimiter)
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/extensions/core/hash/indifferent_and_insensitive_access.rb

@@ -0,0 +1,24 @@
+module HttpStub
+  module Extensions
+    module Core
+      module Hash
+
+        module IndifferentAndInsensitiveAccess
+
+          def [](key)
+            self.key?(key) ? super : indifferent_and_insensitive_find(key)
+          end
+
+          private
+
+          def indifferent_and_insensitive_find(key)
+            entry = self.find { |entry_key, _entry_value| entry_key.to_s.casecmp(key.to_s) == 0 }
+            entry ? entry[1] : nil
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/extensions/core/hash/with_indifferent_and_insensitive_access.rb

@@ -0,0 +1,18 @@
+module HttpStub
+  module Extensions
+    module Core
+      module Hash
+
+        class WithIndifferentAndInsensitiveAccess < ::Hash
+          include HttpStub::Extensions::Core::Hash::IndifferentAndInsensitiveAccess
+
+          def initialize(hash={})
+            self.merge!(hash || {})
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/extensions/rack/handler.rb

@@ -15,7 +15,7 @@ module HttpStub
 
           def get_with_run_check(server)
             handler = get_without_run_check(server)
-            raise NameError.new("#{server} Rack handler is invalid") unless handler.respond_to?(:run)
+            raise NameError, "#{server} Rack handler is invalid" unless handler.respond_to?(:run)
             handler
           end
 

data/lib/http_stub/rake/task_generators.rb

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

data/lib/http_stub/server/application.rb

@@ -3,6 +3,10 @@ module HttpStub
 
     class Application < Sinatra::Base
 
+      SUPPORTED_REQUEST_TYPES = [ :get, :post, :put, :delete, :patch, :options ].freeze
+
+      private_constant :SUPPORTED_REQUEST_TYPES
+
       set :root, File.dirname(__FILE__)
 
       register Sinatra::Partial
@@ -10,6 +14,11 @@ module HttpStub
       enable  :dump_errors, :logging, :partial_underscores
       disable :protection
 
+      def self.any_request_type(path, opts={}, &block)
+        SUPPORTED_REQUEST_TYPES.each { |type| self.send(type, path, opts, &block) }
+      end
+      private_class_method :any_request_type
+
       def initialize
         super()
         @match_result_registry = HttpStub::Server::Registry.new("match result")
@@ -19,21 +28,11 @@ module HttpStub
         @scenario_controller   = HttpStub::Server::Scenario::Controller.new(@scenario_registry, @stub_registry)
       end
 
-      private
-
-      SUPPORTED_REQUEST_TYPES = [ :get, :post, :put, :delete, :patch, :options ].freeze
-
-      def self.any_request_type(path, opts={}, &block)
-        SUPPORTED_REQUEST_TYPES.each { |type| self.send(type, path, opts, &block) }
-      end
-
       before do
         @response_pipeline = HttpStub::Server::ResponsePipeline.new(self)
-        @http_stub_request = HttpStub::Server::Request.new(request)
+        @http_stub_request = HttpStub::Server::Request.create(request)
       end
 
-      public
-
       get "/http_stub" do
         haml :index, {}
       end