http_stub 0.24.3 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae298667f0d24ef61eee93ad2a8a9daa92d5ed87
-  data.tar.gz: 82479a4ed23ef2173f90a9f19504fdaa72377f50
+  metadata.gz: 89ef636d0f034ff2c6ad0966f3becc70899c8ca8
+  data.tar.gz: e2dd710bf4504f1ec6799a4717b0ed493a94a858
 SHA512:
-  metadata.gz: 5f81e67a3de971f554b81ce98e0d0fdd49534d855ae524466ee030ea46eedfd63baafd5900f37795daabddfbe4ef75071834dcf2d5e6110b01a826c1e9358b2a
-  data.tar.gz: b0858d659ce4bacb911d4b16e7ab870219384901881668ee181c7a68285b6d6291114f568c4be25ecdcca8318b1b4b5af796495bc411ddd92f3bf0d40b2d7ae3
+  metadata.gz: c221e672a19916af0902c7a54eccd1cfe58d01f3a6b9ca1be504056079fdc193e09156bbe086634807e72975d5e065c48fa41c7c20d113183181b304736df632
+  data.tar.gz: 2061dd82264cfcba3b0cc3aa177086d1dde71407d32430242530464c3ac1b4de021e71fb7e9b0b6a5c529353aee6d9900baa552546264f03bee0b175af43e896

data/lib/http_stub.rb

@@ -16,6 +16,7 @@ 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 'active_support/json/encoding'
 
 require_relative 'http_stub/extensions/core/hash/formatted'
 require_relative 'http_stub/extensions/core/hash/indifferent_and_insensitive_access'
@@ -40,6 +41,7 @@ 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/match/rules'
 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'
@@ -51,11 +53,15 @@ 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/payload_file_consolidator'
+require_relative 'http_stub/server/stub/payload/base_uri_modifier'
+require_relative 'http_stub/server/stub/payload/response_body_modifier'
+require_relative 'http_stub/server/stub/payload'
 require_relative 'http_stub/server/stub/parser'
 require_relative 'http_stub/server/stub/stub'
 require_relative 'http_stub/server/stub/empty'
-require_relative 'http_stub/server/stub/match/result'
+require_relative 'http_stub/server/stub/match/match'
+require_relative 'http_stub/server/stub/match/miss'
+require_relative 'http_stub/server/stub/match/controller'
 require_relative 'http_stub/server/stub/registry'
 require_relative 'http_stub/server/stub/controller'
 require_relative 'http_stub/server/stub'

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

@@ -23,11 +23,14 @@ module HttpStub
 
         def initialize
           super()
-          @stub_registry         = HttpStub::Server::Stub::Registry.new
           @scenario_registry     = HttpStub::Server::Registry.new("scenario")
-          @match_result_registry = HttpStub::Server::Registry.new("match result")
-          @stub_controller       = HttpStub::Server::Stub::Controller.new(@stub_registry, @match_result_registry)
+          @stub_registry         = HttpStub::Server::Stub::Registry.new
+          @stub_match_registry   = HttpStub::Server::Registry.new("stub match")
+          @stub_miss_registry    = HttpStub::Server::Registry.new("stub miss")
           @scenario_controller   = HttpStub::Server::Scenario::Controller.new(@scenario_registry, @stub_registry)
+          @stub_controller       =
+            HttpStub::Server::Stub::Controller.new(@stub_registry, @stub_match_registry, @stub_miss_registry)
+          @stub_match_controller = HttpStub::Server::Stub::Match::Controller.new(@stub_match_registry)
         end
 
         before do
@@ -66,7 +69,16 @@ module HttpStub
         end
 
         get "/http_stub/stubs/matches" do
-          haml :match_results, {}, match_results: @match_result_registry.all
+          haml :stub_matches, {}, matches: @stub_match_registry.all
+        end
+
+        get "/http_stub/stubs/matches/last" do
+          response = @stub_match_controller.find_last(@http_stub_request, logger)
+          @response_pipeline.process(response)
+        end
+
+        get "/http_stub/stubs/misses" do
+          haml :stub_misses, {}, misses: @stub_miss_registry.all
         end
 
         get "/http_stub/stubs/:id" do

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

@@ -4,9 +4,10 @@ module HttpStub
 
       class Request
 
-        attr_reader :uri, :method, :headers, :parameters, :body
+        attr_reader :base_uri, :uri, :method, :headers, :parameters, :body
 
         def initialize(rack_request)
+          @base_uri   = rack_request.base_url
           @uri        = rack_request.path_info
           @method     = rack_request.request_method.downcase
           @headers    = HttpStub::Server::Request::Headers.create(rack_request)
@@ -14,6 +15,10 @@ module HttpStub
           @body       = rack_request.body.read
         end
 
+        def to_hash
+          { uri: @uri, method: @method, headers: @headers, parameters: @parameters, body: @body }
+        end
+
       end
 
     end

data/lib/http_stub/server/response.rb

@@ -3,11 +3,13 @@ module HttpStub
 
     class Response
 
-      def self.success(headers={})
-        HttpStub::Server::Stub::Response::Text.new("status" => 200, "headers" => headers, "body" => "OK")
+      def self.ok(opts={})
+        HttpStub::Server::Stub::Response::Text.new(
+          { "headers" => {}, "body" => "OK" }.merge(opts).merge("status" => 200)
+        )
       end
 
-      SUCCESS   = success.freeze
+      OK        = ok.freeze
       NOT_FOUND = HttpStub::Server::Stub::Response::Text.new("status" => 404, "body" => "NOT FOUND").freeze
       EMPTY     = HttpStub::Server::Stub::Response::Text.new.freeze
 

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

@@ -12,14 +12,14 @@ module HttpStub
         def register(request, logger)
           scenario = HttpStub::Server::Scenario.create(HttpStub::Server::Scenario::Parser.parse(request))
           @scenario_registry.add(scenario, logger)
-          HttpStub::Server::Response::SUCCESS
+          HttpStub::Server::Response::OK
         end
 
         def activate(name, logger)
           scenario = @scenario_registry.find(name, logger)
           if scenario
             @scenario_activator.activate(scenario, logger)
-            HttpStub::Server::Response::SUCCESS
+            HttpStub::Server::Response::OK
           else
             HttpStub::Server::Response::NOT_FOUND
           end

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

@@ -6,9 +6,7 @@ module HttpStub
 
         def self.parse(request)
           JSON.parse(request.parameters["payload"]).tap do |payload|
-            payload["stubs"].each do |stub_payload|
-              HttpStub::Server::Stub::PayloadFileConsolidator.consolidate!(stub_payload, request)
-            end
+            payload["stubs"].each { |stub_payload| HttpStub::Server::Stub::Payload.modify!(stub_payload, request) }
           end
         end
 

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

@@ -4,26 +4,28 @@ module HttpStub
 
       class Controller
 
-        def initialize(stub_registry, match_result_registry)
-          @stub_registry         = stub_registry
-          @match_result_registry = match_result_registry
+        def initialize(stub_registry, match_registry, miss_registry)
+          @stub_registry  = stub_registry
+          @match_registry = match_registry
+          @miss_registry  = miss_registry
         end
 
         def register(request, logger)
           stub = HttpStub::Server::Stub.create(HttpStub::Server::Stub::Parser.parse(request))
           @stub_registry.add(stub, logger)
-          HttpStub::Server::Response.success("location" => stub.stub_uri)
+          HttpStub::Server::Response.ok("headers" => { "location" => stub.uri })
         end
 
         def match(request, logger)
           stub = @stub_registry.match(request, logger)
           response = stub ? stub.response_for(request) : HttpStub::Server::Response::NOT_FOUND
-          @match_result_registry.add(HttpStub::Server::Stub::Match::Result.new(request, response, stub), logger)
+          @match_registry.add(HttpStub::Server::Stub::Match::Match.new(request, response, stub), logger) if stub
+          @miss_registry.add(HttpStub::Server::Stub::Match::Miss.new(request), logger) unless stub
           response
         end
 
         def clear(logger)
-          [ @stub_registry, @match_result_registry ].each { |registry| registry.clear(logger) }
+          [ @stub_registry, @match_registry, @miss_registry ].each { |registry| registry.clear(logger) }
         end
 
       end

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

@@ -7,15 +7,15 @@ module HttpStub
         private
 
         def initialize
-          @uri = @method = @body = @stub_uri = ""
-          @headers = @parameters             = {}
-          @triggers                          = []
-          @response                          = HttpStub::Server::Response::EMPTY
+          @uri         = ""
+          @match_rules = HttpStub::Server::Stub::Match::Rules::EMPTY
+          @response    = HttpStub::Server::Response::EMPTY
+          @triggers    = []
         end
 
         public
 
-        attr_reader :uri, :method, :headers, :parameters, :body, :response, :triggers, :stub_uri
+        attr_reader :uri, :match_rules, :response, :triggers
 
         def matches?(_criteria, _logger)
           false
@@ -25,6 +25,10 @@ module HttpStub
           self
         end
 
+        def to_hash
+          {}
+        end
+
         def to_s
           ""
         end

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

@@ -0,0 +1,22 @@
+module HttpStub
+  module Server
+    module Stub
+      module Match
+
+        class Controller
+
+          def initialize(result_registry)
+            @result_registry = result_registry
+          end
+
+          def find_last(request, logger)
+            result = @result_registry.find(request.parameters.slice(:method, :uri), logger)
+            result ? HttpStub::Server::Response.ok("body" => result.to_json) : HttpStub::Server::Response::NOT_FOUND
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/server/stub/match/{result.rb → match.rb}

@@ -3,7 +3,7 @@ module HttpStub
     module Stub
       module Match
 
-        class Result
+        class Match
 
           attr_reader :request, :response, :stub
 
@@ -13,6 +13,14 @@ module HttpStub
             @stub     = stub
           end
 
+          def matches?(criteria, _logger)
+            @request.uri.include?(criteria[:uri]) && @request.method.casecmp(criteria[:method]).zero?
+          end
+
+          def to_hash
+            { request: @request, response: @response, stub: @stub }
+          end
+
         end
 
       end

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

@@ -0,0 +1,19 @@
+module HttpStub
+  module Server
+    module Stub
+      module Match
+
+        class Miss
+
+          attr_reader :request
+
+          def initialize(request)
+            @request = request
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module HttpStub
+  module Server
+    module Stub
+      module Match
+
+        class Rules
+
+          attr_reader :uri, :method, :headers, :parameters, :body
+
+          def initialize(args)
+            @uri        = HttpStub::Server::Stub::Match::Rule::Uri.new(args["uri"])
+            @method     = HttpStub::Server::Stub::Match::Rule::Method.new(args["method"])
+            @headers    = HttpStub::Server::Stub::Match::Rule::Headers.new(args["headers"])
+            @parameters = HttpStub::Server::Stub::Match::Rule::Parameters.new(args["parameters"])
+            @body       = HttpStub::Server::Stub::Match::Rule::Body.create(args["body"])
+          end
+
+          EMPTY = self.new("uri" => "", "method" => "", "headers" => {}, "parameters" => {}, "body" => "").freeze
+
+          def matches?(request, logger)
+            [ @uri, @method, @headers, @parameters, @body ].all? { |matcher| matcher.matches?(request, logger) }
+          end
+
+          def to_hash
+            { uri: @uri, method: @method, headers: @headers, parameters: @parameters, body: @body }
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module HttpStub
       class Parser
 
         def self.parse(request)
-          HttpStub::Server::Stub::PayloadFileConsolidator.consolidate!(
+          HttpStub::Server::Stub::Payload.modify!(
             JSON.parse(request.parameters["payload"] || request.body), request
           )
         end

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

@@ -0,0 +1,20 @@
+module HttpStub
+  module Server
+    module Stub
+
+      module Payload
+
+        MODIFIERS = [ HttpStub::Server::Stub::Payload::BaseUriModifier,
+                      HttpStub::Server::Stub::Payload::ResponseBodyModifier ].freeze
+
+        private_constant :MODIFIERS
+
+        def self.modify!(payload, request)
+          payload.tap { MODIFIERS.each { |modifier| modifier.modify!(payload, request) } }
+        end
+
+      end
+
+    end
+  end
+end

data/lib/http_stub/server/stub/payload/base_uri_modifier.rb

@@ -0,0 +1,17 @@
+module HttpStub
+  module Server
+    module Stub
+      module Payload
+
+        class BaseUriModifier
+
+          def self.modify!(payload, request)
+            payload["base_uri"] = request.base_uri
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/http_stub/server/stub/payload/response_body_modifier.rb

@@ -0,0 +1,19 @@
+module HttpStub
+  module Server
+    module Stub
+      module Payload
+
+        class ResponseBodyModifier
+
+          def self.modify!(payload, request)
+            response_file = request.parameters["response_file_#{payload["id"]}"]
+            payload["response"]["body"] = response_file if response_file
+            payload["triggers"].each { |trigger_payload| modify!(trigger_payload, request) } if payload["triggers"]
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module HttpStub
           attr_reader :status, :headers, :delay_in_seconds
 
           def initialize(args={})
-            @original_args = args
+            @original_args    = args
             resolved_args     = self.class.merge_defaults(args)
             @status           = resolved_args["status"]
             @headers          = HttpStub::Server::Stub::Response::Attribute::Headers.new(resolved_args["headers"])
@@ -45,6 +45,10 @@ module HttpStub
             self.class.name.demodulize.underscore
           end
 
+          def to_hash
+            { status: @status, headers: @headers, delay_in_seconds: @delay_in_seconds }
+          end
+
         end
 
       end

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

@@ -21,6 +21,11 @@ module HttpStub
 
           def serve_on(application)
             application.send_file(@file.path, send_options)
+            @status = application.response.status
+          end
+
+          def to_hash
+            super.merge(file_uri: @uri)
           end
 
           private

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

@@ -23,6 +23,10 @@ module HttpStub
             application.halt(@status, @headers.to_hash, @body)
           end
 
+          def to_hash
+            super.merge(body: @body)
+          end
+
         end
 
       end

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

@@ -4,41 +4,31 @@ module HttpStub
 
       class Stub
 
-        attr_reader :uri, :method, :headers, :parameters, :body, :response, :triggers, :stub_uri
+        attr_reader :uri, :match_rules, :response, :triggers
 
         def initialize(args)
           @id          = args["id"] || SecureRandom.uuid
-          @uri         = HttpStub::Server::Stub::Match::Rule::Uri.new(args["uri"])
-          @method      = HttpStub::Server::Stub::Match::Rule::Method.new(args["method"])
-          @headers     = HttpStub::Server::Stub::Match::Rule::Headers.new(args["headers"])
-          @parameters  = HttpStub::Server::Stub::Match::Rule::Parameters.new(args["parameters"])
-          @body        = HttpStub::Server::Stub::Match::Rule::Body.create(args["body"])
+          @uri         = "#{args["base_uri"]}/http_stub/stubs/#{@id}"
+          @match_rules = HttpStub::Server::Stub::Match::Rules.new(args)
           @response    = HttpStub::Server::Stub::Response.create(args["response"])
           @triggers    = HttpStub::Server::Stub::Triggers.new(args["triggers"])
-          @stub_uri    = "/http_stub/stubs/#{@id}"
           @description = args.to_s
         end
 
         def matches?(criteria, logger)
-          criteria.is_a?(String) ? matches_by_id?(criteria) : matches_by_rules?(criteria, logger)
+          criteria.is_a?(String) ? criteria == @id : @match_rules.matches?(criteria, logger)
         end
 
         def response_for(request)
           @response.with_values_from(request)
         end
 
-        def to_s
-          @description
+        def to_hash
+          { id: @id, uri: @uri, match_rules: @match_rules, response: @response, triggers: @triggers }
         end
 
-        private
-
-        def matches_by_id?(criteria)
-          criteria == @id
-        end
-
-        def matches_by_rules?(request, logger)
-          [ @uri, @method, @headers, @parameters, @body ].all? { |matcher| matcher.matches?(request, logger) }
+        def to_s
+          @description
         end
 
       end