http_stub 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 438c42456ebda9bd71a4c56735be06a71c62ef68
-  data.tar.gz: d9c2910a45e9c6ec166e58d7d02dd1f8a2d31357
+  metadata.gz: 473cfd88f509d2e18bbf47ffbcd7d013d5bae137
+  data.tar.gz: 3c2afdb69d93618e52df58e22a7e1fd9de623756
 SHA512:
-  metadata.gz: 79748781d578ca9908fb56d818605e2ad1670958d69c9f47a5b1d692227d156f34fa4ed1f22caf26f0ef07a5838bbe98ba9190d3bae21ba79d4b779101562107
-  data.tar.gz: 719ec839fe7f02751cf4ea178e33daac0a9502c43ec3bac543c5f7f319e756decb8e0ab05b08fb2cc79a4bed2bb1d3938ac15476eecd3b1414114a96ecb1f811
+  metadata.gz: e024dcbeb70730ee13353fde8845fff7f6b2bedb3a668d3f33428f5069c40b3f0ed3a7104ef6c6f803644fe8f5bf42a74b6511524e07ff33cec4c00744f40f97
+  data.tar.gz: d191926b0caf32e8553cc7c109912f23ada60a360f211c682214476bfca9ea41f269bce5ebce0fae1d615c1b6da4b9660d1fe7f07e46108c49428f28ca4b61fa

data/lib/http_stub.rb

@@ -31,8 +31,8 @@ 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_factory'
 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/response_pipeline'

data/lib/http_stub/server/{stub_factory.rb → request_parser.rb}

@@ -1,14 +1,14 @@
 module HttpStub
   module Server
 
-    class StubFactory
+    class RequestParser
 
       class << self
 
-        def create(request)
-          payload = JSON.parse(request.params["payload"] || request.body.read)
-          consolidated_payload = consolidate_files_into_payload(payload, request)
-          HttpStub::Server::Stub.new(consolidated_payload)
+        def parse(request)
+          JSON.parse(request.params["payload"] || request.body.read).tap do |payload|
+            consolidate_files_into_payload(payload, request)
+          end
         end
 
         private
@@ -19,7 +19,6 @@ module HttpStub
           payload["triggers"].each do |trigger_payload|
             consolidate_files_into_payload(trigger_payload, request)
           end if payload["triggers"]
-          payload
         end
 
       end

data/lib/http_stub/server/stub_activator.rb

@@ -3,10 +3,6 @@ module HttpStub
 
     class StubActivator
 
-      def self.create_from(request)
-        self.new(JSON.parse(request.params["payload"] || request.body.read))
-      end
-
       def initialize(args)
         @args = args
         @stub = HttpStub::Server::Stub.new(args)

data/lib/http_stub/server/stub_activator_controller.rb

@@ -9,7 +9,8 @@ module HttpStub
       end
 
       def register(request)
-        @stub_activator_registry.add(HttpStub::Server::StubActivator.create_from(request), request)
+        stub_activator = HttpStub::Server::StubActivator.new(HttpStub::Server::RequestParser.parse(request))
+        @stub_activator_registry.add(stub_activator, request)
         HttpStub::Server::Response::SUCCESS
       end
 

data/lib/http_stub/server/stub_controller.rb

@@ -8,7 +8,8 @@ module HttpStub
       end
 
       def register(request)
-        @registry.add(HttpStub::Server::StubFactory.create(request), request)
+        stub = HttpStub::Server::Stub.new(HttpStub::Server::RequestParser.parse(request))
+        @registry.add(stub, request)
         HttpStub::Server::Response::SUCCESS
       end
 

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.15.1".freeze
+  VERSION = "0.15.2".freeze
 end

data/spec/lib/http_stub/configurer_integration_spec.rb

@@ -19,15 +19,38 @@ describe HttpStub::Configurer, "when the server is running" do
 
     context "and a stub is activated" do
 
-      before(:example) { configurer.activate!("/an_activator") }
+      context "and the response contains text" do
 
-      context "and the stub request is made" do
+        before(:example) { configurer.activate!("/an_activator") }
 
-        let(:response) { HTTParty.get("#{server_uri}/stub_path") }
+        context "and the stub request is made" do
+
+          let(:response) { HTTParty.get("#{server_uri}/stub_path") }
+
+          it "replays the stubbed response" do
+            expect(response.code).to eql(200)
+            expect(response.body).to eql("Stub activator body")
+          end
+
+        end
+
+      end
+
+      context "and the response contains a file" do
+
+        let(:configurer)  { HttpStub::Examples::ConfigurerWithFileResponse.new }
+
+        before(:example) { configurer.activate!("/a_file_activator") }
+
+        context "and the stub request is made" do
+
+          let(:response) { HTTParty.get("#{server_uri}/activated_response_with_file") }
+
+          it "replays the stubbed response" do
+            expect(response.code).to eql(200)
+            expect_response_to_contain_file(HttpStub::Examples::ConfigurerWithFileResponse::FILE_PATH)
+          end
 
-        it "replays the stubbed response" do
-          expect(response.code).to eql(200)
-          expect(response.body).to eql("Stub activator body")
         end
 
       end
@@ -584,7 +607,7 @@ describe HttpStub::Configurer, "when the server is running" do
 
             it "replays the triggered response" do
               expect(response.code).to eql(201)
-              assert_response_contains_file(pdf_file_path)
+              expect_response_to_contain_file(pdf_file_path)
             end
 
           end
@@ -655,7 +678,7 @@ describe HttpStub::Configurer, "when the server is running" do
         end
 
         it "responds with the file" do
-          assert_response_contains_file(HttpStub::Examples::ConfigurerWithFileResponse::FILE_PATH)
+          expect_response_to_contain_file(HttpStub::Examples::ConfigurerWithFileResponse::FILE_PATH)
         end
 
       end
@@ -781,7 +804,7 @@ describe HttpStub::Configurer, "when the server is running" do
 
   end
 
-  def assert_response_contains_file(path)
+  def expect_response_to_contain_file(path)
     response_file = Tempfile.new(File.basename(path)).tap do |file|
       file.write(response.parsed_response)
       file.flush

data/spec/lib/http_stub/server/request_parser_spec.rb

@@ -0,0 +1,90 @@
+describe HttpStub::Server::RequestParser do
+
+  let(:request_parser) { HttpStub::Server::RequestParser }
+
+  describe "::parse" do
+
+    let(:params)    { {} }
+    let(:body_hash) { {} }
+    let(:request)   { instance_double(Rack::Request, params: params, body: StringIO.new(body_hash.to_json)) }
+
+    subject { request_parser.parse(request) }
+
+    context "when the request contains a payload parameter" do
+
+      let(:payload) { HttpStub::StubFixture.new.server_payload }
+      let(:params)  { { "payload" => payload.to_json } }
+
+      it "returns the payload" do
+        expect(subject).to eql(payload)
+      end
+
+    end
+
+    context "when the request body contains the payload (for API backwards compatibility)" do
+
+      let(:body_hash) { HttpStub::StubFixture.new.server_payload }
+
+      it "returns the request body" do
+        expect(subject).to eql(body_hash)
+      end
+
+    end
+
+    context "when the payload contains a response file and has a corresponding file parameter" do
+
+      let(:payload_fixture) { HttpStub::StubFixture.new.with_file_response! }
+      let(:payload)         { payload_fixture.server_payload }
+      let(:file_params)     { { "response_file_#{payload_fixture.id}" => payload_fixture.file_parameter } }
+      let(:params)          { { "payload" => payload.to_json }.merge(file_params) }
+
+      it "returns the payload with a response body that contains the file parameter value" do
+        expected_payload = payload.clone.tap { |hash| hash["response"]["body"] = payload_fixture.file_parameter }
+
+        expect(subject).to eql(expected_payload)
+      end
+
+    end
+
+    context "when the payload contains triggers" do
+
+      let(:payload_fixture) { HttpStub::StubFixture.new.with_triggers!(trigger_fixtures) }
+      let(:payload)         { payload_fixture.server_payload }
+
+      context "and the trigger payloads contain response text" do
+
+        let(:trigger_fixtures) { (1..3).map { HttpStub::StubFixture.new.with_text_response! } }
+        let(:params)           { { "payload" => payload.to_json } }
+
+        it "returns the payload unchanged" do
+          expect(subject).to eql(payload)
+        end
+
+      end
+
+      context "and the trigger payloads contain a response file with corresponding file parameters" do
+
+        let(:trigger_fixtures) { (1..3).map { HttpStub::StubFixture.new.with_file_response! } }
+        let(:file_params) do
+          trigger_fixtures.reduce({}) do |result, fixture|
+            result.merge("response_file_#{fixture.id}" => fixture.file_parameter)
+          end
+        end
+        let(:params)           { { "payload" => payload.to_json }.merge(file_params) }
+
+        it "returns the payload with the trigger response bodies replaced by the files" do
+          expected_payload = payload_fixture.server_payload
+          expected_payload["triggers"].zip(trigger_fixtures.map(&:file_parameter)).each do |trigger, file_param|
+            trigger["response"]["body"] = file_param
+          end
+
+          expect(subject).to eql(expected_payload)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/http_stub/server/stub_activator_controller_spec.rb

@@ -1,21 +1,31 @@
 describe HttpStub::Server::StubActivatorController do
 
-  let(:request)                 { double("HttpRequest") }
-  let(:the_stub)                { double(HttpStub::Server::Stub) }
-  let(:stub_activator)          { double(HttpStub::Server::StubActivator, the_stub: the_stub) }
-  let(:stub_activator_registry) { double("HttpStub::Server::StubActivatorRegistry").as_null_object }
-  let(:stub_registry)           { double("HttpStub::Server::StubRegistry").as_null_object }
+  let(:request)                 { instance_double(Rack::Request) }
+  let(:payload) { HttpStub::StubFixture.new.server_payload.merge("activation_uri" => "/some/activation/uri") }
+  let(:the_stub)                { instance_double(HttpStub::Server::Stub) }
+  let(:stub_activator)          { instance_double(HttpStub::Server::StubActivator, the_stub: the_stub) }
+  let(:stub_activator_registry) { instance_double(HttpStub::Server::Registry).as_null_object }
+  let(:stub_registry)           { instance_double(HttpStub::Server::StubRegistry).as_null_object }
 
   let(:controller) { HttpStub::Server::StubActivatorController.new(stub_activator_registry, stub_registry) }
 
-  before(:example) { allow(HttpStub::Server::StubActivator).to receive(:create_from).and_return(stub_activator) }
+  before(:example) do
+    allow(HttpStub::Server::RequestParser).to receive(:parse).and_return(payload)
+    allow(HttpStub::Server::StubActivator).to receive(:new).and_return(stub_activator)
+  end
 
   describe "#register" do
 
     subject { controller.register(request) }
 
-    it "creates a stub activator from the provided request" do
-      expect(HttpStub::Server::StubActivator).to receive(:create_from).with(request).and_return(stub_activator)
+    it "parses the payload from the request" do
+      expect(HttpStub::Server::RequestParser).to receive(:parse).with(request).and_return(payload)
+
+      subject
+    end
+
+    it "creates a stub activator with the parsed payload" do
+      expect(HttpStub::Server::StubActivator).to receive(:new).with(payload).and_return(stub_activator)
 
       subject
     end

data/spec/lib/http_stub/server/stub_activator_spec.rb

@@ -8,43 +8,12 @@ describe HttpStub::Server::StubActivator do
 
   before(:example) { allow(HttpStub::Server::Stub).to receive(:new).and_return(underlying_stub) }
 
-  describe "::create_from" do
+  describe "#constructor" do
 
-    let(:payload) { args.to_json }
-
-    subject { HttpStub::Server::StubActivator.create_from(request) }
-
-    shared_context "verification a stub activator is created from a request" do
-
-      it "creates a stub activator with JSON parsed from the request payload" do
-        expect(HttpStub::Server::StubActivator).to receive(:new).with(args)
-
-        subject
-      end
-
-      it "returns the created stub activator" do
-        created_stub_activator = instance_double(HttpStub::Server::StubActivator)
-        allow(HttpStub::Server::StubActivator).to receive(:new).and_return(created_stub_activator)
-
-        expect(subject).to eql(created_stub_activator)
-      end
-
-    end
-
-    context "when the request body contains the payload" do
-
-      let(:request) { double("HttpRequest", params: {}, body: double("RequestBody", read: payload)) }
-
-      include_context "verification a stub activator is created from a request"
-
-    end
-
-    context "when the request contains a payload parameter" do
-
-      let(:request) { double("HttpRequest", params: { "payload" => payload }) }
-
-      include_context "verification a stub activator is created from a request"
+    it "creates an underlying stub from the provided arguments" do
+      expect(HttpStub::Server::Stub).to receive(:new).with(args)
 
+      stub_activator
     end
 
   end

data/spec/lib/http_stub/server/stub_controller_spec.rb

@@ -1,20 +1,30 @@
 describe HttpStub::Server::StubController do
 
-  let(:request)  { double("HttpRequest") }
-  let(:response) { double(HttpStub::Server::Response) }
-  let(:the_stub) { double(HttpStub::Server::Stub, response: response) }
-  let(:registry) { double(HttpStub::Server::Registry).as_null_object }
+  let(:request)            { instance_double(Rack::Request) }
+  let(:payload)            { HttpStub::StubFixture.new.server_payload }
+  let(:response)           { instance_double(HttpStub::Server::StubResponse::Base) }
+  let(:the_stub)           { instance_double(HttpStub::Server::Stub, response: response) }
+  let(:registry)           { instance_double(HttpStub::Server::StubRegistry).as_null_object }
 
   let(:controller) { HttpStub::Server::StubController.new(registry) }
 
-  before(:example) { allow(HttpStub::Server::StubFactory).to receive(:create).and_return(the_stub) }
+  before(:example) do
+    allow(HttpStub::Server::RequestParser).to receive(:parse).and_return(payload)
+    allow(HttpStub::Server::Stub).to receive(:new).and_return(the_stub)
+  end
 
   describe "#register" do
 
     subject { controller.register(request) }
 
-    it "creates a stub from the provided request via the factory" do
-      expect(HttpStub::Server::StubFactory).to receive(:create).with(request).and_return(the_stub)
+    it "parses the payload from the request" do
+      expect(HttpStub::Server::RequestParser).to receive(:parse).with(request).and_return(payload)
+
+      subject
+    end
+
+    it "creates a stub with the parsed payload" do
+      expect(HttpStub::Server::Stub).to receive(:new).with(payload).and_return(the_stub)
 
       subject
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Matthew Ueckerman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -290,6 +290,7 @@ files:
 - "./lib/http_stub/server/regexp_value_matcher.rb"
 - "./lib/http_stub/server/registry.rb"
 - "./lib/http_stub/server/request_header_parser.rb"
+- "./lib/http_stub/server/request_parser.rb"
 - "./lib/http_stub/server/response.rb"
 - "./lib/http_stub/server/response_pipeline.rb"
 - "./lib/http_stub/server/string_value_matcher.rb"
@@ -297,7 +298,6 @@ files:
 - "./lib/http_stub/server/stub_activator.rb"
 - "./lib/http_stub/server/stub_activator_controller.rb"
 - "./lib/http_stub/server/stub_controller.rb"
-- "./lib/http_stub/server/stub_factory.rb"
 - "./lib/http_stub/server/stub_headers.rb"
 - "./lib/http_stub/server/stub_parameters.rb"
 - "./lib/http_stub/server/stub_registry.rb"
@@ -350,13 +350,13 @@ files:
 - "./spec/lib/http_stub/server/regexp_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/registry_spec.rb"
 - "./spec/lib/http_stub/server/request_header_parser_spec.rb"
+- "./spec/lib/http_stub/server/request_parser_spec.rb"
 - "./spec/lib/http_stub/server/response_pipeline_spec.rb"
 - "./spec/lib/http_stub/server/response_spec.rb"
 - "./spec/lib/http_stub/server/string_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/stub_activator_controller_spec.rb"
 - "./spec/lib/http_stub/server/stub_activator_spec.rb"
 - "./spec/lib/http_stub/server/stub_controller_spec.rb"
-- "./spec/lib/http_stub/server/stub_factory_spec.rb"
 - "./spec/lib/http_stub/server/stub_headers_spec.rb"
 - "./spec/lib/http_stub/server/stub_parameters_spec.rb"
 - "./spec/lib/http_stub/server/stub_registry_integration_spec.rb"
@@ -435,13 +435,13 @@ test_files:
 - "./spec/lib/http_stub/server/regexp_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/registry_spec.rb"
 - "./spec/lib/http_stub/server/request_header_parser_spec.rb"
+- "./spec/lib/http_stub/server/request_parser_spec.rb"
 - "./spec/lib/http_stub/server/response_pipeline_spec.rb"
 - "./spec/lib/http_stub/server/response_spec.rb"
 - "./spec/lib/http_stub/server/string_value_matcher_spec.rb"
 - "./spec/lib/http_stub/server/stub_activator_controller_spec.rb"
 - "./spec/lib/http_stub/server/stub_activator_spec.rb"
 - "./spec/lib/http_stub/server/stub_controller_spec.rb"
-- "./spec/lib/http_stub/server/stub_factory_spec.rb"
 - "./spec/lib/http_stub/server/stub_headers_spec.rb"
 - "./spec/lib/http_stub/server/stub_parameters_spec.rb"
 - "./spec/lib/http_stub/server/stub_registry_integration_spec.rb"

data/spec/lib/http_stub/server/stub_factory_spec.rb

@@ -1,117 +0,0 @@
-describe HttpStub::Server::StubFactory do
-
-  describe "::create" do
-
-    let(:params)    { {} }
-    let(:body_hash) { {} }
-    let(:request)   { instance_double(Rack::Request, params: params, body: StringIO.new(body_hash.to_json)) }
-
-    subject { HttpStub::Server::StubFactory.create(request) }
-
-    shared_context "returns the created stub" do
-
-      it "returns the created stub" do
-        stub = instance_double(HttpStub::Server::Stub)
-        allow(HttpStub::Server::Stub).to receive(:new).and_return(stub)
-
-        expect(subject).to eql(stub)
-      end
-
-    end
-
-    context "when the request contains a payload parameter" do
-
-      let(:payload) { HttpStub::StubFixture.new.server_payload }
-      let(:params)  { { "payload" => payload.to_json } }
-
-      it "creates the stub with the payload" do
-        expect(HttpStub::Server::Stub).to receive(:new).with(payload)
-
-        subject
-      end
-
-      include_context "returns the created stub"
-
-    end
-
-    context "when the request body contains the payload (for API backwards compatibility)" do
-
-      let(:body_hash) { HttpStub::StubFixture.new.server_payload }
-
-      it "creates the stub with the request body" do
-        expect(HttpStub::Server::Stub).to receive(:new).with(body_hash)
-
-        subject
-      end
-
-      include_context "returns the created stub"
-
-    end
-
-    context "when a stub payload contains a response file and has a corresponding file parameter" do
-
-      let(:stub_fixture) { HttpStub::StubFixture.new.with_file_response! }
-      let(:payload)      { stub_fixture.server_payload }
-      let(:file_params)  { { "response_file_#{stub_fixture.id}" => stub_fixture.file_parameter } }
-      let(:params)       { { "payload" => payload.to_json }.merge(file_params) }
-
-      it "creates the stub with a response body that contains the file parameter value" do
-        expected_args = payload.clone.tap { |hash| hash["response"]["body"] = stub_fixture.file_parameter }
-        expect(HttpStub::Server::Stub).to receive(:new).with(expected_args)
-
-        subject
-      end
-
-      include_context "returns the created stub"
-
-    end
-
-    context "when a stub payload contains triggers" do
-
-      let(:stub_fixture) { HttpStub::StubFixture.new.with_triggers!(trigger_fixtures) }
-      let(:payload)      { stub_fixture.server_payload }
-
-      context "and the trigger payloads contain response text" do
-
-        let(:trigger_fixtures) { (1..3).map { HttpStub::StubFixture.new.with_text_response! } }
-        let(:params)           { { "payload" => payload.to_json } }
-
-        it "creates the stub with the stub payload unchanged" do
-          expect(HttpStub::Server::Stub).to receive(:new).with(payload)
-
-          subject
-        end
-
-        include_context "returns the created stub"
-
-      end
-
-      context "and the trigger payloads contain a response file with corresponding file parameters" do
-
-        let(:trigger_fixtures) { (1..3).map { HttpStub::StubFixture.new.with_file_response! } }
-        let(:file_params) do
-          trigger_fixtures.reduce({}) do |result, fixture|
-            result.merge("response_file_#{fixture.id}" => fixture.file_parameter)
-          end
-        end
-        let(:params)           { { "payload" => payload.to_json }.merge(file_params) }
-
-        it "creates the stub with the trigger response bodies replaced by the files" do
-          expected_args = stub_fixture.server_payload
-          expected_args["triggers"].zip(trigger_fixtures.map(&:file_parameter)).each do |trigger, file_param|
-            trigger["response"]["body"] = file_param
-          end
-          expect(HttpStub::Server::Stub).to receive(:new).with(expected_args)
-
-          subject
-        end
-
-        include_context "returns the created stub"
-
-      end
-
-    end
-
-  end
-
-end