http_stub 0.22.4 → 0.23.0

data/lib/http_stub/server/application_helpers.rb

@@ -8,11 +8,9 @@ module HttpStub
       end
 
       def pp(text)
-        begin
-          text ? JSON.pretty_generate(JSON.parse(text)) : ""
-        rescue JSON::ParserError
-          text
-        end
+        text ? JSON.pretty_generate(JSON.parse(text)) : ""
+      rescue JSON::ParserError
+        text
       end
 
     end

data/lib/http_stub/server/daemon.rb

@@ -17,17 +17,16 @@ module HttpStub
 
       def initialize(args)
         @configurer = args[:configurer]
-        default_args = @configurer ?
-          { host: @configurer.stub_server.host, port: @configurer.stub_server.port } : { host: "localhost" }
+        default_args = { host: "localhost" }
+        default_args = { host: @configurer.stub_server.host, port: @configurer.stub_server.port } if @configurer
         super(default_args.merge(args))
       end
 
       def start!
         super
-        if @configurer
-          @configurer.initialize!
-          logger.info "#{@name} initialized"
-        end
+        return unless @configurer
+        @configurer.initialize!
+        logger.info "#{@name} initialized"
       end
 
       def start_command

data/lib/http_stub/server/request.rb

@@ -1,19 +1,12 @@
 module HttpStub
   module Server
 
-    class Request
+    module Request
 
-      attr_reader :uri, :method, :headers, :parameters, :body
-
-      def initialize(request)
-        @uri        = request.path_info
-        @method     = request.request_method.downcase
-        @headers    = HttpStub::Server::FormattedHash.new(HttpStub::Server::HeaderParser.parse(request), ":")
-        @parameters = HttpStub::Server::FormattedHash.new(request.params, "=")
-        @body       = request.body.read
+      def self.create(rack_request)
+        HttpStub::Server::Request::Request.new(rack_request)
       end
 
     end
-
   end
 end

data/lib/http_stub/server/request/headers.rb

@@ -0,0 +1,25 @@
+module HttpStub
+  module Server
+    module Request
+
+      class Headers < ::Hash
+        include HttpStub::Extensions::Core::Hash::IndifferentAndInsensitiveAccess
+        include HttpStub::Extensions::Core::Hash::Formatted
+
+        def self.create(rack_request)
+          rack_request.env.each_with_object(self.new) do |(name, value), result|
+            match = name.match(/^(?:HTTP_)?([A-Z0-9_]+)$/)
+            result[match[1]] = value if match
+          end
+        end
+
+        def initialize(header_hash={})
+          super(header_hash, ":")
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/http_stub/server/request/parameters.rb

@@ -0,0 +1,21 @@
+module HttpStub
+  module Server
+    module Request
+
+      class Parameters < ::HashWithIndifferentAccess
+        include HttpStub::Extensions::Core::Hash::Formatted
+
+        def self.create(rack_request)
+          self.new(rack_request.params)
+        end
+
+        def initialize(parameter_hash={})
+          super(parameter_hash, "=", "&")
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/http_stub/server/request/request.rb

@@ -0,0 +1,21 @@
+module HttpStub
+  module Server
+    module Request
+
+      class Request
+
+        attr_reader :uri, :method, :headers, :parameters, :body
+
+        def initialize(rack_request)
+          @uri        = rack_request.path_info
+          @method     = rack_request.request_method.downcase
+          @headers    = HttpStub::Server::Request::Headers.create(rack_request)
+          @parameters = HttpStub::Server::Request::Parameters.create(rack_request)
+          @body       = rack_request.body.read
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/server/scenario/links.rb

@@ -9,7 +9,7 @@ module HttpStub
         end
 
         def detail
-          "/http_stub/scenarios?#{URI.encode_www_form(:name => @name)}"
+          "/http_stub/scenarios?#{URI.encode_www_form(name: @name)}"
         end
 
         def activate

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

@@ -16,7 +16,7 @@ module HttpStub
 
         def match(request, logger)
           stub = @registry.match(request, logger)
-          stub ? stub.response : HttpStub::Server::Response::NOT_FOUND
+          stub ? stub.response_for(request) : HttpStub::Server::Response::NOT_FOUND
         end
 
         def clear(logger)

data/lib/http_stub/server/stub/empty.rb

@@ -21,6 +21,10 @@ module HttpStub
           false
         end
 
+        def response_for(_request)
+          self
+        end
+
         def to_s
           ""
         end

data/lib/http_stub/server/stub/match/hash_matcher.rb

@@ -0,0 +1,19 @@
+module HttpStub
+  module Server
+    module Stub
+      module Match
+
+        class HashMatcher
+
+          def self.match?(stub_hash, actual_hash)
+            !stub_hash.find do |(key, value)|
+              !HttpStub::Server::Stub::Match::StringValueMatcher.match?(value, actual_hash[key])
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/server/stub/match/omitted_value_matcher.rb

@@ -5,11 +5,9 @@ module HttpStub
 
         class OmittedValueMatcher
 
-          private
-
           OMITTED_CONTROL_VALUE = "control:omitted".freeze
 
-          public
+          private_constant :OMITTED_CONTROL_VALUE
 
           def self.match?(stub_value, actual_value)
             stub_value == OMITTED_CONTROL_VALUE && actual_value.nil?

data/lib/http_stub/server/stub/match/rule/body.rb

@@ -6,18 +6,16 @@ module HttpStub
 
           class Body
 
-            private
-
             SCHEMA_PROPERTIES = %w{ type definition }.freeze
 
-            public
+            private_constant :SCHEMA_PROPERTIES
 
             class << self
 
               def create(body)
                 matcher = create_schema_body(body["schema"]) if body.is_a?(Hash) && body["schema"]
                 matcher ||= HttpStub::Server::Stub::Match::Rule::SimpleBody.new(body) if body.present?
-                matcher || HttpStub::Server::Stub::Match::TruthyMatcher
+                matcher || HttpStub::Server::Stub::Match::Rule::Truthy
               end
 
               private

data/lib/http_stub/server/stub/match/rule/headers.rb

@@ -4,22 +4,16 @@ module HttpStub
       module Match
         module Rule
 
-          class Headers
+          class Headers < ::Hash
+            include HttpStub::Extensions::Core::Hash::IndifferentAndInsensitiveAccess
+            include HttpStub::Extensions::Core::Hash::Formatted
 
             def initialize(headers)
-              original_headers   = headers || {}
-              @formatted_headers = HttpStub::Server::FormattedHash.new(original_headers, ":")
-              @matchable_headers = HttpStub::Server::Stub::Match::HashWithStringValueMatchers.new(
-                original_headers.downcase_and_underscore_keys
-              )
+              super((headers || {}).underscore_keys, ":")
             end
 
             def matches?(request, _logger)
-              @matchable_headers.matches?(request.headers.downcase_and_underscore_keys)
-            end
-
-            def to_s
-              @formatted_headers.to_s
+              HttpStub::Server::Stub::Match::HashMatcher.match?(self, request.headers)
             end
 
           end

data/lib/http_stub/server/stub/match/rule/json_body.rb

@@ -23,11 +23,9 @@ module HttpStub
             private
 
             def validate_against_schema(request)
-              begin
-                JSON::Validator.fully_validate(@schema_definition, request.body, validate_schema: true, json: true)
-              rescue Exception => exc
-                [ exc.message ]
-              end
+              JSON::Validator.fully_validate(@schema_definition, request.body, validate_schema: true, json: true)
+            rescue StandardError => err
+              [ err.message ]
             end
 
           end

data/lib/http_stub/server/stub/match/rule/method.rb

@@ -11,7 +11,7 @@ module HttpStub
             end
 
             def matches?(request, _logger)
-              @method.blank? || @method.downcase == request.method.downcase
+              @method.blank? || @method.casecmp(request.method) == 0
             end
 
             def to_s

data/lib/http_stub/server/stub/match/rule/parameters.rb

@@ -4,18 +4,15 @@ module HttpStub
       module Match
         module Rule
 
-          class Parameters
+          class Parameters < ::HashWithIndifferentAccess
+            include HttpStub::Extensions::Core::Hash::Formatted
 
             def initialize(parameters)
-              @parameters = HttpStub::Server::Stub::Match::HashWithStringValueMatchers.new(parameters || {})
+              super(parameters || {}, "=", "&")
             end
 
             def matches?(request, _logger)
-              @parameters.matches?(request.parameters)
-            end
-
-            def to_s
-              @parameters ? @parameters.map { |key_and_value| key_and_value.map(&:to_s).join("=") }.join("&") : ""
+              HttpStub::Server::Stub::Match::HashMatcher.match?(self, request.parameters)
             end
 
           end

data/lib/http_stub/server/stub/match/rule/simple_body.rb

@@ -7,15 +7,15 @@ module HttpStub
           class SimpleBody
 
             def initialize(body)
-              @body = HttpStub::Server::Stub::Match::StringValueMatcher.new(body)
+              @body = body
             end
 
             def matches?(request, _logger)
-              @body.matches?(request.body)
+              HttpStub::Server::Stub::Match::StringValueMatcher.match?(@body, request.body)
             end
 
             def to_s
-              @body.to_s
+              @body
             end
 
           end

data/lib/http_stub/server/stub/match/rule/truthy.rb

@@ -0,0 +1,27 @@
+module HttpStub
+  module Server
+    module Stub
+      module Match
+        module Rule
+
+          class Truthy
+
+            class << self
+
+              def matches?(_request, _logger)
+                true
+              end
+
+              def to_s
+                ""
+              end
+
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/http_stub/server/stub/match/rule/uri.rb

@@ -7,15 +7,15 @@ module HttpStub
           class Uri
 
             def initialize(uri)
-              @uri = HttpStub::Server::Stub::Match::StringValueMatcher.new(uri)
+              @uri = uri
             end
 
             def matches?(request, _logger)
-              @uri.matches?(request.uri)
+              HttpStub::Server::Stub::Match::StringValueMatcher.match?(@uri, request.uri)
             end
 
             def to_s
-              @uri.to_s
+              @uri
             end
 
           end

data/lib/http_stub/server/stub/match/string_value_matcher.rb

@@ -5,24 +5,15 @@ module HttpStub
 
         class StringValueMatcher
 
-          private
-
           MATCHERS = [ HttpStub::Server::Stub::Match::OmittedValueMatcher,
                        HttpStub::Server::Stub::Match::RegexpValueMatcher,
                        HttpStub::Server::Stub::Match::ExactValueMatcher ].freeze
 
-          public
-
-          def initialize(stub_value)
-            @stub_match_value = stub_value ? stub_value.to_s : stub_value
-          end
-
-          def matches?(actual_value)
-            !!MATCHERS.find { |matcher| matcher.match?(@stub_match_value, actual_value) }
-          end
+          private_constant :MATCHERS
 
-          def to_s
-            @stub_match_value
+          def self.match?(stub_value, actual_value)
+            stub_match_value = stub_value ? stub_value.to_s : stub_value
+            !!MATCHERS.find { |matcher| matcher.match?(stub_match_value, actual_value) }
           end
 
         end

data/lib/http_stub/server/stub/response.rb

@@ -5,8 +5,11 @@ module HttpStub
       module Response
 
         def self.create(args)
-          args["body"].is_a?(Hash) ?
-            HttpStub::Server::Stub::Response::File.new(args) : HttpStub::Server::Stub::Response::Text.new(args)
+          if args["body"].is_a?(Hash)
+            HttpStub::Server::Stub::Response::File.new(args)
+          else
+            HttpStub::Server::Stub::Response::Text.new(args)
+          end
         end
 
       end

data/lib/http_stub/server/stub/response/attribute/body.rb

@@ -0,0 +1,32 @@
+module HttpStub
+  module Server
+    module Stub
+      module Response
+        module Attribute
+
+          class Body < ::String
+
+            def initialize(stub_body)
+              @stub_body = stub_body
+              super stub_body.nil? ? "" : stub_body
+            end
+
+            def with_values_from(request)
+              if self.provided?
+                HttpStub::Server::Stub::Response::Attribute::Interpolator.interpolate(@stub_body, request)
+              else
+                nil
+              end
+            end
+
+            def provided?
+              !@stub_body.nil?
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end