http_stub 0.11.3 → 0.13.0

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

@@ -14,7 +14,7 @@ module HttpStub
               "parameters" => HttpStub::Configurer::Request::ControllableValue.format(options[:parameters] || {}),
               "response" => {
                   "status" => options[:response][:status] || "",
-                  "content_type" => options[:response][:content_type] || "application/json",
+                  "headers" => options[:response][:headers] || {},
                   "body" => options[:response][:body],
                   "delay_in_seconds" => options[:response][:delay_in_seconds] || ""
               }

data/lib/http_stub/models/response.rb

@@ -5,10 +5,13 @@ module HttpStub
 
       private
 
-      DEFAULT_OPTIONS = { "status" => 200, "delay_in_seconds" => 0 }
+      DEFAULT_OPTIONS = { "status" => 200, "delay_in_seconds" => 0 }.freeze
+      DEFAULT_HEADERS = { "content-type" => "application/json" }.freeze
 
       def establish_defaults_in(options)
+        headers = options["headers"] ||= {}
         DEFAULT_OPTIONS.each { |key, value| options[key] = value if !options[key] || options[key] == "" }
+        DEFAULT_HEADERS.each { |key, value| headers[key] = value if !headers[key] || headers[key] == "" }
       end
 
       public
@@ -36,7 +39,7 @@ module HttpStub
       end
 
       def headers
-        {"content-type" => @response_options["content_type"]}
+        @response_options["headers"]
       end
 
       def empty?

data/lib/http_stub/rake/{daemon_tasks.rb → server_daemon_tasks.rb}

@@ -1,11 +1,11 @@
 module HttpStub
   module Rake
 
-    class DaemonTasks < ::Rake::TaskLib
+    class ServerDaemonTasks < ::Rake::TaskLib
 
       def initialize(options)
         HttpStub::Rake::ServerTasks.new(options)
-        namespace(options[:name]) { HttpServerManager::Rake::ServerTasks.new(HttpStub::Daemon.new(options)) }
+        namespace(options[:name]) { HttpServerManager::Rake::ServerTasks.new(HttpStub::ServerDaemon.new(options)) }
       end
 
     end

data/lib/http_stub/rake/task_generators.rb

@@ -4,4 +4,4 @@ require 'rake/tasklib' unless defined? (::Rake::TaskLib)
 require 'http_server_manager/rake/task_generators'
 
 require File.expand_path('../server_tasks', __FILE__)
-require File.expand_path('../daemon_tasks', __FILE__)
+require File.expand_path('../server_daemon_tasks', __FILE__)

data/lib/http_stub/{daemon.rb → server_daemon.rb}

@@ -1,6 +1,6 @@
 module HttpStub
 
-  class Daemon < HttpServerManager::Server
+  class ServerDaemon < HttpServerManager::Server
 
     class << self
 

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.11.3"
+  VERSION = "0.13.0"
 end

data/lib/http_stub.rb

@@ -24,7 +24,7 @@ require_relative 'http_stub/models/request_pipeline'
 require_relative 'http_stub/controllers/stub_controller'
 require_relative 'http_stub/controllers/stub_activator_controller'
 require_relative 'http_stub/server'
-require_relative 'http_stub/daemon'
+require_relative 'http_stub/server_daemon'
 require_relative 'http_stub/configurer/request/omittable'
 require_relative 'http_stub/configurer/request/regexpable'
 require_relative 'http_stub/configurer/request/controllable_value'

data/spec/lib/http_stub/configurer/request/stub_spec.rb

@@ -6,21 +6,21 @@ describe HttpStub::Configurer::Request::Stub do
 
       let(:uri) { "/some/uri" }
       let(:stub_method) { "Some Method" }
-      let(:headers) { { "header_name" => "value" } }
-      let(:parameters) { { "parameter_name" => "value" } }
+      let(:request_headers) { { "request_header_name" => "value" } }
+      let(:request_parameters) { { "parameter_name" => "value" } }
       let(:response_status) { 500 }
+      let(:response_headers) { { "response_header_name" => "value" } }
       let(:response_body) { "Some body" }
       let(:response_delay_in_seconds) { 7 }
-      let(:response_content_type) { "application/xhtml" }
 
       let(:stub_options) do
         {
             method: stub_method,
-            headers: headers,
-            parameters: parameters,
+            headers: request_headers,
+            parameters: request_parameters,
             response: {
                 status: response_status,
-                content_type: response_content_type,
+                headers: response_headers,
                 body: response_body,
                 delay_in_seconds: response_delay_in_seconds
             }
@@ -44,19 +44,19 @@ describe HttpStub::Configurer::Request::Stub do
         request.content_type.should eql("application/json")
       end
 
-      context "when a header option is provided" do
+      context "when a request header option is provided" do
 
         it "should format the headers into control values" do
-          HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with(headers)
+          HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with(request_headers)
 
           request
         end
 
       end
 
-      context "when no header is provided" do
+      context "when no request header is provided" do
 
-        let(:headers) { nil }
+        let(:request_headers) { nil }
 
         it "should format an empty header hash" do
           HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with({})
@@ -66,19 +66,19 @@ describe HttpStub::Configurer::Request::Stub do
 
       end
 
-      context "when a parameter option is provided" do
+      context "when a request parameter option is provided" do
 
-        it "should format the parameters into control values" do
-          HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with(parameters)
+        it "should format the request parameters into control values" do
+          HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with(request_parameters)
 
           request
         end
 
       end
 
-      context "when no parameter option is provided" do
+      context "when no request parameter option is provided" do
 
-        let(:parameters) { nil }
+        let(:request_parameters) { nil }
 
         it "should format an empty parameter hash" do
           HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with({})
@@ -100,18 +100,18 @@ describe HttpStub::Configurer::Request::Stub do
           request_body.should include("method" => stub_method)
         end
 
-        it "should have an entry containing the string representation of the headers" do
+        it "should have an entry containing the string representation of the request headers" do
           HttpStub::Configurer::Request::ControllableValue.should_receive(:format)
-            .with(headers).and_return("headers as string")
+            .with(request_headers).and_return("request headers as string")
 
-          request_body.should include("headers" => "headers as string")
+          request_body.should include("headers" => "request headers as string")
         end
 
-        it "should have an entry containing the string representation of the parameters" do
+        it "should have an entry containing the string representation of the request parameters" do
           HttpStub::Configurer::Request::ControllableValue.should_receive(:format)
-            .with(parameters).and_return("parameters as string")
+            .with(request_parameters).and_return("request parameters as string")
 
-          request_body.should include("parameters" => "parameters as string")
+          request_body.should include("parameters" => "request parameters as string")
         end
 
         context "when a status response option is provided" do
@@ -154,19 +154,22 @@ describe HttpStub::Configurer::Request::Stub do
 
         end
 
-        context "when a content type is provided" do
+        context "when response headers are provided" do
 
-          it "should have a response entry for the option" do
-            request_body["response"].should include("content_type" => response_content_type)
+          let(:response_headers) { { "response_header_name" => "value" } }
+
+          it "should have a headers response entry containing the the provided headers" do
+            request_body["response"]["headers"].should eql(response_headers)
           end
+
         end
 
-        context "when a content type is not provided" do
+        context "when response headers are not provided" do
 
-          let (:response_content_type) { nil }
+          let (:response_headers) { nil }
 
-          it "should have a response entry with the default content type" do
-            request_body["response"].should include("content_type" => "application/json")
+          it "should have a headers response entry containing an empty hash" do
+            request_body["response"]["headers"].should eql({})
           end
         end
 

data/spec/lib/http_stub/configurer_integration_spec.rb

@@ -467,21 +467,47 @@ describe HttpStub::Configurer, "when the server is running" do
 
       end
 
-      describe "and an attempt is made to register a response with a given content type" do
+      describe "and an attempt is made to register a response with a content type header" do
 
         before(:each) do
           configurer.stub_response!(
-            "/some_stub_path", method: :get, response: { body: "Some stub body", content_type: "application/xhtml" }
+            "/some_stub_path", method: :get, response: { body: "Some stub body",
+                                                         headers: { "content-type" => "application/xhtml" } }
           )
         end
 
         it "should register the stub" do
           response = Net::HTTP.get_response("localhost", "/some_stub_path", 8001)
+
           response.content_type.should eql("application/xhtml")
         end
 
       end
 
+      describe "and an attempt is made to register a response with a other headers" do
+
+        let(:response_headers) do
+          {
+            "some_header" => "some value",
+            "another_header" => "another value",
+            "yet_another_header" => "yet another value"
+          }
+        end
+
+        before(:each) do
+          configurer.stub_response!(
+            "/some_stub_path", method: :get, response: { body: "Some stub body", headers: response_headers }
+          )
+        end
+
+        it "should register the stub" do
+          response = Net::HTTP.get_response("localhost", "/some_stub_path", 8001)
+
+          response_headers.each { |key, value| response[key].should eql(value) }
+        end
+
+      end
+
     end
 
     context "and the configurer has not been informed that the server has started" do

data/spec/lib/http_stub/models/response_spec.rb

@@ -1,11 +1,14 @@
 describe HttpStub::Models::Response do
 
   let(:status) { 202 }
+  let(:headers) { nil }
   let(:body) { "A response body" }
   let(:delay_in_seconds) { 18 }
 
   let(:response) do
-    HttpStub::Models::Response.new("status" => status, "body" => body, "delay_in_seconds" => delay_in_seconds)
+    HttpStub::Models::Response.new(
+      "status" => status, "headers" => headers, "body" => body, "delay_in_seconds" => delay_in_seconds
+    )
   end
 
   describe "::SUCCESS" do
@@ -116,9 +119,59 @@ describe HttpStub::Models::Response do
 
   end
 
+  describe "#headers" do
+
+    context "when headers are provided" do
+
+      context "that include a content type" do
+
+        let(:headers) do
+          { "content-type" => "some/content/type", "some_header" => "some value", "another_header" => "another value" }
+        end
+
+        it "should return a hash including the provided headers" do
+          response.headers.should eql(headers)
+        end
+
+      end
+
+      context "that do not include a content type" do
+
+        let(:headers) do
+          {
+            "some_header" => "some value",
+            "another_header" => "another value",
+            "yet_another_header" => "yet another value"
+          }
+        end
+
+        it "should return a hash including the provided headers" do
+          response.headers.should include(headers)
+        end
+
+        it "should return a hash including json as the default response content type" do
+          response.headers.should include("content-type" => "application/json")
+        end
+
+      end
+
+    end
+
+    context "when no headers are provided" do
+
+      let(:headers) { nil }
+
+      it "should return a hash containing json as the default response content type" do
+        response.headers.should eql("content-type" => "application/json")
+      end
+
+    end
+
+  end
+
   describe "#empty?" do
 
-    describe "when the response is EMPTY" do
+    context "when the response is EMPTY" do
 
       it "should return true" do
         HttpStub::Models::Response::EMPTY.should be_empty
@@ -126,7 +179,7 @@ describe HttpStub::Models::Response do
 
     end
 
-    describe "when the response is not EMPTY but contains no values" do
+    context "when the response is not EMPTY but contains no values" do
 
       it "should return true" do
         HttpStub::Models::Response.new.should be_empty
@@ -134,7 +187,7 @@ describe HttpStub::Models::Response do
 
     end
 
-    describe "when the response is not EMPTY" do
+    context "when the response is not EMPTY" do
 
       it "should return false" do
         HttpStub::Models::Response::SUCCESS.should_not be_empty

data/spec/lib/http_stub/rake/{daemon_tasks_smoke_spec.rb → server_daemon_tasks_smoke_spec.rb}

@@ -1,15 +1,15 @@
-describe HttpStub::Rake::DaemonTasks do
+describe HttpStub::Rake::ServerDaemonTasks do
   include Rake::DSL
 
-  before(:all) { HttpStub::Rake::DaemonTasks.new(name: :example_daemon, port: 8002) }
+  before(:all) { HttpStub::Rake::ServerDaemonTasks.new(name: :example_server_daemon, port: 8002) }
 
   describe "start task" do
 
     context "when invoked" do
 
-      before(:all) { @exit_flag = Rake::Task["example_daemon:start"].invoke("--trace") }
+      before(:all) { @exit_flag = Rake::Task["example_server_daemon:start"].invoke("--trace") }
 
-      after(:all) { Rake::Task["example_daemon:stop"].invoke("--trace") }
+      after(:all) { Rake::Task["example_server_daemon:stop"].invoke("--trace") }
 
       it "should exit with a status code of 0" do
         @exit_flag.should be_true

data/spec/lib/http_stub/server_daemon_integration_spec.rb

@@ -0,0 +1,7 @@
+describe HttpStub::ServerDaemon do
+
+  let(:server) { HttpStub::ServerDaemon.new(name: :example_server_daemon, port: 8002) }
+
+  it_should_behave_like "a managed http server"
+
+end

data/spec/lib/http_stub/{daemon_spec.rb → server_daemon_spec.rb}

@@ -1,10 +1,10 @@
-describe HttpStub::Daemon do
+describe HttpStub::ServerDaemon do
 
   let(:configurer) { nil }
 
-  let(:daemon) { HttpStub::Daemon.new(name: :sample_daemon, port: 8888, configurer: configurer) }
+  let(:server_daemon) { HttpStub::ServerDaemon.new(name: :sample_server_daemon, port: 8888, configurer: configurer) }
 
-  before(:each) { daemon.logger.stub(:info) }
+  before(:each) { server_daemon.logger.stub(:info) }
 
   describe ".log_dir" do
 
@@ -13,7 +13,7 @@ describe HttpStub::Daemon do
     after(:each) { HttpServerManager.log_dir = @original_log_dir }
 
     it "should establish the HttpServerManager log_dir" do
-      HttpStub::Daemon.log_dir = "/some/log/dir"
+      HttpStub::ServerDaemon.log_dir = "/some/log/dir"
 
       HttpServerManager.log_dir.should eql("/some/log/dir")
     end
@@ -27,7 +27,7 @@ describe HttpStub::Daemon do
     after(:each) { HttpServerManager.pid_dir = @original_pid_dir }
 
     it "should establish the HttpServerManager pid_dir" do
-      HttpStub::Daemon.pid_dir = "/some/pid/dir"
+      HttpStub::ServerDaemon.pid_dir = "/some/pid/dir"
 
       HttpServerManager.pid_dir.should eql("/some/pid/dir")
     end
@@ -36,7 +36,7 @@ describe HttpStub::Daemon do
 
   describe "#start!" do
 
-    before(:each) { daemon.stub(:running?).and_return(true) }
+    before(:each) { server_daemon.stub(:running?).and_return(true) }
 
     context "when a configurer is provided" do
 
@@ -45,23 +45,23 @@ describe HttpStub::Daemon do
       it "should initialize the configurer" do
         configurer.should_receive(:initialize!)
 
-        daemon.start!
+        server_daemon.start!
       end
 
-      it "should log that the daemon with the provided name has been initialized" do
-        daemon.logger.should_receive(:info).with("sample_daemon initialized")
+      it "should log that the server with the provided name has been initialized" do
+        server_daemon.logger.should_receive(:info).with("sample_server_daemon initialized")
 
-        daemon.start!
+        server_daemon.start!
       end
 
     end
 
     context "when no configurer is provided" do
 
-      it "should not log that the daemon has been initialized" do
-        daemon.logger.should_not_receive(:info).with("sample_daemon initialized")
+      it "should not log that the server has been initialized" do
+        server_daemon.logger.should_not_receive(:info).with("sample_server_daemon initialized")
 
-        daemon.start!
+        server_daemon.start!
       end
 
     end

data/spec/lib/http_stub/server_spec.rb

@@ -181,9 +181,13 @@ describe HttpStub::Server do
 
     it "should respond with the response's content type" do
       stub_controller.stub(:replay).and_return(
-        HttpStub::Models::Response.new("status" => 200, "body" => "A body", "content_type" => "application/xhtml")
+        HttpStub::Models::Response.new(
+          "status" => 200, "headers" => { "content-type" => "application/xhtml" }, "body" => "A body"
+        )
       )
+
       get "/some/stubbed/uri"
+
       response.content_type.should eql("application/xhtml")
     end
 

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'bundler'
-Bundler.require(:default, :development)
+Bundler.require(:development)
 
 SimpleCov.start do
   add_filter "/spec/"
   add_filter "/vendor/"
-  minimum_coverage 100
+  minimum_coverage 99.2
   refuse_coverage_drop
 end if ENV["coverage"]
 
@@ -18,8 +18,8 @@ require_relative '../examples/configurer_with_initialize_callback'
 require_relative '../examples/configurer_with_complex_initializer'
 require_relative '../examples/configurer_with_many_class_activators'
 
-HttpStub::Daemon.log_dir = File.expand_path('../../tmp/log', __FILE__)
-HttpStub::Daemon.pid_dir = File.expand_path('../../tmp/pids', __FILE__)
+HttpStub::ServerDaemon.log_dir = File.expand_path('../../tmp/log', __FILE__)
+HttpStub::ServerDaemon.pid_dir = File.expand_path('../../tmp/pids', __FILE__)
 
 HttpServerManager.logger = HttpServerManager::Test::SilentLogger
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -286,7 +286,6 @@ files:
 - ./lib/http_stub/configurer.rb
 - ./lib/http_stub/controllers/stub_activator_controller.rb
 - ./lib/http_stub/controllers/stub_controller.rb
-- ./lib/http_stub/daemon.rb
 - ./lib/http_stub/hash_extensions.rb
 - ./lib/http_stub/models/exact_value_matcher.rb
 - ./lib/http_stub/models/hash_with_value_matchers.rb
@@ -302,10 +301,11 @@ files:
 - ./lib/http_stub/models/stub_parameters.rb
 - ./lib/http_stub/models/stub_uri.rb
 - ./lib/http_stub/models/value_matcher.rb
-- ./lib/http_stub/rake/daemon_tasks.rb
+- ./lib/http_stub/rake/server_daemon_tasks.rb
 - ./lib/http_stub/rake/server_tasks.rb
 - ./lib/http_stub/rake/task_generators.rb
 - ./lib/http_stub/server.rb
+- ./lib/http_stub/server_daemon.rb
 - ./lib/http_stub/version.rb
 - ./lib/http_stub/views/_stub.haml
 - ./lib/http_stub/views/application.sass
@@ -327,8 +327,6 @@ files:
 - ./spec/lib/http_stub/configurer_spec.rb
 - ./spec/lib/http_stub/controllers/stub_activator_controller_spec.rb
 - ./spec/lib/http_stub/controllers/stub_controller_spec.rb
-- ./spec/lib/http_stub/daemon_integration_spec.rb
-- ./spec/lib/http_stub/daemon_spec.rb
 - ./spec/lib/http_stub/hash_extensions_spec.rb
 - ./spec/lib/http_stub/models/exact_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/hash_with_value_matchers_spec.rb
@@ -344,9 +342,11 @@ files:
 - ./spec/lib/http_stub/models/stub_spec.rb
 - ./spec/lib/http_stub/models/stub_uri_spec.rb
 - ./spec/lib/http_stub/models/value_matcher_spec.rb
-- ./spec/lib/http_stub/rake/daemon_tasks_smoke_spec.rb
+- ./spec/lib/http_stub/rake/server_daemon_tasks_smoke_spec.rb
 - ./spec/lib/http_stub/rake/server_tasks_smoke_spec.rb
 - ./spec/lib/http_stub/rake/server_tasks_spec.rb
+- ./spec/lib/http_stub/server_daemon_integration_spec.rb
+- ./spec/lib/http_stub/server_daemon_spec.rb
 - ./spec/lib/http_stub/server_integration_spec.rb
 - ./spec/lib/http_stub/server_spec.rb
 - ./spec/spec_helper.rb
@@ -372,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3912546874238801238
+      hash: 4435099791600975775
 requirements: []
 rubyforge_project: http_stub
 rubygems_version: 1.8.25
@@ -394,8 +394,6 @@ test_files:
 - ./spec/lib/http_stub/configurer_spec.rb
 - ./spec/lib/http_stub/controllers/stub_activator_controller_spec.rb
 - ./spec/lib/http_stub/controllers/stub_controller_spec.rb
-- ./spec/lib/http_stub/daemon_integration_spec.rb
-- ./spec/lib/http_stub/daemon_spec.rb
 - ./spec/lib/http_stub/hash_extensions_spec.rb
 - ./spec/lib/http_stub/models/exact_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/hash_with_value_matchers_spec.rb
@@ -411,9 +409,11 @@ test_files:
 - ./spec/lib/http_stub/models/stub_spec.rb
 - ./spec/lib/http_stub/models/stub_uri_spec.rb
 - ./spec/lib/http_stub/models/value_matcher_spec.rb
-- ./spec/lib/http_stub/rake/daemon_tasks_smoke_spec.rb
+- ./spec/lib/http_stub/rake/server_daemon_tasks_smoke_spec.rb
 - ./spec/lib/http_stub/rake/server_tasks_smoke_spec.rb
 - ./spec/lib/http_stub/rake/server_tasks_spec.rb
+- ./spec/lib/http_stub/server_daemon_integration_spec.rb
+- ./spec/lib/http_stub/server_daemon_spec.rb
 - ./spec/lib/http_stub/server_integration_spec.rb
 - ./spec/lib/http_stub/server_spec.rb
 - ./spec/spec_helper.rb

data/spec/lib/http_stub/daemon_integration_spec.rb

@@ -1,7 +0,0 @@
-describe HttpStub::Daemon do
-
-  let(:server) { HttpStub::Daemon.new(name: :example_daemon, port: 8002) }
-
-  it_should_behave_like "a managed http server"
-
-end