http_stub 0.6.0 → 0.7.0

data/lib/http_stub.rb

@@ -24,6 +24,6 @@ require File.expand_path('../http_stub/server', __FILE__)
 require File.expand_path('../http_stub/configurer/stub_request', __FILE__)
 require File.expand_path('../http_stub/configurer/stub_activator_request', __FILE__)
 require File.expand_path('../http_stub/configurer/command', __FILE__)
-require File.expand_path('../http_stub/configurer/pre_initialize_command_processor', __FILE__)
-require File.expand_path('../http_stub/configurer/post_initialize_command_processor', __FILE__)
+require File.expand_path('../http_stub/configurer/patient_command_chain', __FILE__)
+require File.expand_path('../http_stub/configurer/impatient_command_chain', __FILE__)
 require File.expand_path('../http_stub/configurer', __FILE__)

data/lib/http_stub/configurer.rb

@@ -19,52 +19,67 @@ module HttpStub
 
       def stub_activator(activation_uri, stub_uri, options)
         request = HttpStub::Configurer::StubActivatorRequest.new(activation_uri, stub_uri, options)
-        handle(request, "registering activator '#{activation_uri}'")
+        handle(request: request, description: "registering activator '#{activation_uri}'")
       end
 
       def stub!(uri, options)
         request = HttpStub::Configurer::StubRequest.new(uri, options)
-        handle(request, "stubbing '#{uri}'")
+        handle(request: request, description: "stubbing '#{uri}'", resetable: true)
       end
 
       alias_method :stub_response!, :stub!
 
       def activate!(uri)
-        handle(Net::HTTP::Get.new(uri), "activating '#{uri}'")
+        handle(request: Net::HTTP::Get.new(uri), description: "activating '#{uri}'", resetable: true)
       end
 
       alias_method :activate_stub!, :activate!
 
+      def server_has_started!
+        @effective_command_chain = HttpStub::Configurer::ImpatientCommandChain.new()
+      end
+
       def initialize!
-        processor.replay()
-        @processor = HttpStub::Configurer::PostInitializeCommandProcessor.new(processor)
+        server_has_started!
+        initialize_command_chain.execute()
+      end
+
+      def reset!
+        clear!
+        initialize_command_chain.filter(&:resetable?).execute()
       end
 
       def clear_activators!
-        handle(Net::HTTP::Delete.new("/stubs/activators"), "clearing activators")
+        handle(request: Net::HTTP::Delete.new("/stubs/activators"), description: "clearing activators")
       end
 
       def clear!
-        handle(Net::HTTP::Delete.new("/stubs"), "clearing stubs")
+        handle(request: Net::HTTP::Delete.new("/stubs"), description: "clearing stubs")
       end
 
       alias_method :clear_stubs!, :clear!
 
       private
 
-      def handle(request, description)
-        processor.process(HttpStub::Configurer::Command.new(@host, @port, request, description))
+      def handle(command_options)
+        effective_command_chain <<
+            HttpStub::Configurer::Command.new({ host: @host, port: @port }.merge(command_options))
+      end
+
+      def effective_command_chain
+        @effective_command_chain ||= initialize_command_chain
       end
 
-      def processor
-        @processor ||= HttpStub::Configurer::PreInitializeCommandProcessor.new
+      def initialize_command_chain
+        @initialize_command_chain ||= HttpStub::Configurer::PatientCommandChain.new()
       end
 
     end
 
     module InstanceMethods
 
-      DELEGATE_METHODS = %w{ stub_activator stub! stub_response! activate! activate_stub! clear_activators! clear! clear_stubs! }
+      DELEGATE_METHODS = %w{ stub_activator stub! stub_response! activate! activate_stub!
+                             server_has_started! reset! clear_activators! clear! clear_stubs! }
 
       def self.included(mod)
         DELEGATE_METHODS.each do |method_name|

data/lib/http_stub/configurer/command.rb

@@ -3,18 +3,23 @@ module HttpStub
 
     class Command
 
-      def initialize(host, port, request, description)
-        @host = host
-        @port = port
-        @request = request
-        @description = description
+      def initialize(options)
+        @host = options[:host]
+        @port = options[:port]
+        @request = options[:request]
+        @description = options[:description]
+        @resetable_flag = !!options[:resetable]
       end
 
       def execute
-        response = Net::HTTP.new(@host, @port).start { |http| http.request(@request) }
+        response = Net::HTTP.start(@host, @port) { |http| http.request(@request) }
         raise "Error occurred #{@description}: #{response.message}" unless response.code == "200"
       end
 
+      def resetable?
+        @resetable_flag
+      end
+
     end
 
   end

data/lib/http_stub/configurer/impatient_command_chain.rb

@@ -0,0 +1,13 @@
+module HttpStub
+  module Configurer
+
+    class ImpatientCommandChain
+
+      def <<(command)
+        command.execute()
+      end
+
+    end
+
+  end
+end

data/lib/http_stub/configurer/patient_command_chain.rb

@@ -0,0 +1,25 @@
+module HttpStub
+  module Configurer
+
+    class PatientCommandChain
+
+      def initialize(commands=[])
+        @commands = commands
+      end
+
+      def <<(command)
+        @commands << command
+      end
+
+      def execute
+        @commands.each(&:execute)
+      end
+
+      def filter(&block)
+        HttpStub::Configurer::PatientCommandChain.new(@commands.select(&block))
+      end
+
+    end
+
+  end
+end

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/lib/http_stub/configurer/command_integration_spec.rb

@@ -1,7 +1,10 @@
 describe HttpStub::Configurer::Command, "when the server is running" do
   include_context "server integration"
 
-  let(:command) { HttpStub::Configurer::Command.new("localhost", 8001, request, "performing an operation") }
+  let(:command) do
+    HttpStub::Configurer::Command.new(host: "localhost", port: 8001,
+                                      request: request, description: "performing an operation")
+  end
 
   describe "#execute" do
 

data/spec/lib/http_stub/configurer/command_spec.rb

@@ -0,0 +1,31 @@
+describe HttpStub::Configurer::Command do
+
+  let(:options) do
+    { host: "some_host", port: 8888, request: double("HttpRequest"), description: "Some Description" }
+  end
+
+  let(:command) { HttpStub::Configurer::Command.new(resetable: true) }
+
+  describe "#resetable" do
+
+    describe "when created with a resetable flag that is true" do
+
+      let(:options) { options.merge(resetable: true) }
+
+      it "should return true" do
+        command.should be_resetable
+      end
+
+    end
+
+    describe "when created without a resetable flag" do
+
+      it "should return false" do
+        command.should be_resetable
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/http_stub/configurer/impatient_command_chain_spec.rb

@@ -0,0 +1,17 @@
+describe HttpStub::Configurer::ImpatientCommandChain do
+
+  let(:command) { double(HttpStub::Configurer::Command) }
+
+  let(:command_chain) { HttpStub::Configurer::ImpatientCommandChain.new() }
+
+  describe "#<<" do
+
+    it "should immediately execute the provided command" do
+      command.should_receive(:execute)
+
+      command_chain << command
+    end
+
+  end
+
+end

data/spec/lib/http_stub/configurer/patient_command_chain_spec.rb

@@ -0,0 +1,73 @@
+describe HttpStub::Configurer::PatientCommandChain do
+
+  let(:command_chain) { HttpStub::Configurer::PatientCommandChain.new }
+
+  describe "#execute" do
+
+    describe "when a number of commands have been added" do
+
+      let(:commands) do
+        (1..3).map { |i| double("Command#{i}") }
+      end
+
+      before(:each) do
+        commands.each { |command| command_chain << command }
+      end
+
+      it "should execute each command added" do
+        commands.each { |command| command.should_receive(:execute) }
+
+        command_chain.execute()
+      end
+
+    end
+
+    describe "when no commands have been added" do
+
+      it "should execute without error" do
+        lambda { command_chain.execute() }.should_not raise_error
+      end
+
+    end
+
+  end
+
+  describe "#filter" do
+
+    describe "when a number of command have been added" do
+
+      let(:commands) do
+        (1..5).map { |i| double("Command#{i}", occasional_match_flag?: i % 2 == 0, no_match_flag?: false) }
+      end
+
+      before(:each) do
+        commands.each { |command| command_chain << command }
+      end
+
+      describe "when some commands match the filter provided" do
+
+        it "should return a chain containing the matching commands" do
+          [commands[1], commands[3]].each { |command| command.should_receive(:execute) }
+
+          filter_chain = command_chain.filter(&:occasional_match_flag?)
+
+          filter_chain.execute()
+        end
+
+      end
+
+      describe "when no commands match the filter provided" do
+
+        it "should return an empty chain" do
+          filter_chain = command_chain.filter(&:no_match_flag?)
+
+          filter_chain.execute()
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/http_stub/configurer_integration_spec.rb

@@ -47,7 +47,7 @@ describe HttpStub::Configurer, "when the server is running" do
 
       let(:configurer) { HttpStub::Examples::ConfigurerWithClassStub.new }
 
-      it "the stub should be registered" do
+      it "should register the stub" do
         response = Net::HTTP.get_response("localhost", "/a_class_stub", 8001)
 
         response.code.should eql("201")
@@ -77,6 +77,60 @@ describe HttpStub::Configurer, "when the server is running" do
 
     end
 
+    describe "and the initializer contains stub activators that are activated and conventional stubs" do
+
+      let(:configurer) { HttpStub::Examples::ConfigurerWithComplexInitializer.new }
+
+      it "should register the activated activator" do
+        response = Net::HTTP.get_response("localhost", "/activated_during_initialization_stub_path", 8001)
+
+        response.code.should eql("200")
+        response.body.should eql("Activated during initialization body")
+      end
+
+      it "should register the stub" do
+        response = Net::HTTP.get_response("localhost", "/stubbed_during_initialization_path", 8001)
+
+        response.code.should eql("200")
+        response.body.should eql("Stubbed during initialization body")
+      end
+
+      describe "and another stub is registered" do
+
+        before(:each) do
+          configurer.stub_response!("/another_stub", method: :get, response: { body: "Another stub body" })
+        end
+
+        describe "and the configurer is reset" do
+
+          before(:each) { configurer.reset! }
+
+          it "should remove the stub registered post-initialization" do
+            response = Net::HTTP.get_response("localhost", "/another_stub", 8001)
+
+            response.code.should eql("404")
+          end
+
+          it "should retain the activated activator during initialization" do
+            response = Net::HTTP.get_response("localhost", "/activated_during_initialization_stub_path", 8001)
+
+            response.code.should eql("200")
+            response.body.should eql("Activated during initialization body")
+          end
+
+          it "should retain the stub registered during initialization" do
+            response = Net::HTTP.get_response("localhost", "/stubbed_during_initialization_path", 8001)
+
+            response.code.should eql("200")
+            response.body.should eql("Stubbed during initialization body")
+          end
+
+        end
+
+      end
+
+    end
+
     describe "and a response for a request is stubbed" do
 
       describe "that contains no headers or parameters" do
@@ -234,16 +288,45 @@ describe HttpStub::Configurer, "when the server is running" do
 
   describe "and the configurer is uninitialized" do
 
-    describe "and an attempt is made to activate a stub" do
+    describe "and the configurer is informed that the server has started" do
 
-      let(:response) { Net::HTTP.get_response("localhost", "/stub_path", 8001) }
+      before(:each) { configurer.server_has_started! }
 
-      it "should raise an exception indicating an error occurred during activation" do
+      it "should not initialize the configurer" do
         activation_lambda = lambda { configurer.activate!("/an_activator") }
 
         activation_lambda.should raise_error(/error occurred activating '\/an_activator'/i)
       end
 
+      describe "and an attempt is made to register a stub" do
+
+        before(:each) do
+          configurer.stub_response!("/some_stub_path", method: :get, response: { body: "Some stub body" })
+        end
+
+        it "should register the stub" do
+          response = Net::HTTP.get_response("localhost", "/some_stub_path", 8001)
+
+          response.code.should eql("200")
+          response.body.should eql("Some stub body")
+        end
+
+      end
+
+    end
+
+    describe "and the configurer has not been informed that the server has started" do
+
+      describe "and an attempt is made to activate a stub" do
+
+        it "should raise an exception indicating an error occurred during activation" do
+          activation_lambda = lambda { configurer.activate!("/an_activator") }
+
+          activation_lambda.should raise_error(/error occurred activating '\/an_activator'/i)
+        end
+
+      end
+
     end
 
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'simplecov'
 SimpleCov.start do
   add_filter "/spec/"
-  minimum_coverage 97.2
+  minimum_coverage 97.3
   refuse_coverage_drop
 end if ENV["coverage"]
 
@@ -14,6 +14,7 @@ require File.expand_path('../../lib/http_stub/rake/task_generators', __FILE__)
 require File.expand_path('../../lib/http_stub', __FILE__)
 require File.expand_path('../../examples/configurer_with_class_activator', __FILE__)
 require File.expand_path('../../examples/configurer_with_class_stub', __FILE__)
+require File.expand_path('../../examples/configurer_with_complex_initializer', __FILE__)
 require File.expand_path('../../examples/configurer_with_many_class_activators', __FILE__)
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |file| require file }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -211,8 +211,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ./lib/http_stub/configurer/command.rb
-- ./lib/http_stub/configurer/post_initialize_command_processor.rb
-- ./lib/http_stub/configurer/pre_initialize_command_processor.rb
+- ./lib/http_stub/configurer/impatient_command_chain.rb
+- ./lib/http_stub/configurer/patient_command_chain.rb
 - ./lib/http_stub/configurer/stub_activator_request.rb
 - ./lib/http_stub/configurer/stub_request.rb
 - ./lib/http_stub/configurer.rb
@@ -239,8 +239,9 @@ files:
 - ./lib/http_stub.rb
 - ./spec/curl_samples.txt
 - ./spec/lib/http_stub/configurer/command_integration_spec.rb
-- ./spec/lib/http_stub/configurer/post_initialize_command_processor_spec.rb
-- ./spec/lib/http_stub/configurer/pre_initialize_command_processor_spec.rb
+- ./spec/lib/http_stub/configurer/command_spec.rb
+- ./spec/lib/http_stub/configurer/impatient_command_chain_spec.rb
+- ./spec/lib/http_stub/configurer/patient_command_chain_spec.rb
 - ./spec/lib/http_stub/configurer/stub_activator_request_spec.rb
 - ./spec/lib/http_stub/configurer/stub_request_spec.rb
 - ./spec/lib/http_stub/configurer_integration_spec.rb
@@ -281,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3857634377426384844
+      hash: 1991227053042448790
 requirements: []
 rubyforge_project: http_stub
 rubygems_version: 1.8.25
@@ -291,8 +292,9 @@ summary: A HTTP Server replaying configured stub responses.
 test_files:
 - ./spec/curl_samples.txt
 - ./spec/lib/http_stub/configurer/command_integration_spec.rb
-- ./spec/lib/http_stub/configurer/post_initialize_command_processor_spec.rb
-- ./spec/lib/http_stub/configurer/pre_initialize_command_processor_spec.rb
+- ./spec/lib/http_stub/configurer/command_spec.rb
+- ./spec/lib/http_stub/configurer/impatient_command_chain_spec.rb
+- ./spec/lib/http_stub/configurer/patient_command_chain_spec.rb
 - ./spec/lib/http_stub/configurer/stub_activator_request_spec.rb
 - ./spec/lib/http_stub/configurer/stub_request_spec.rb
 - ./spec/lib/http_stub/configurer_integration_spec.rb

data/lib/http_stub/configurer/post_initialize_command_processor.rb

@@ -1,21 +0,0 @@
-module HttpStub
-  module Configurer
-
-    class PostInitializeCommandProcessor
-
-      def initialize(pre_initialize_processor)
-        @pre_initialize_processor = pre_initialize_processor
-      end
-
-      def process(command)
-        command.execute()
-      end
-
-      def replay
-        @pre_initialize_processor.replay()
-      end
-
-    end
-
-  end
-end

data/lib/http_stub/configurer/pre_initialize_command_processor.rb

@@ -1,21 +0,0 @@
-module HttpStub
-  module Configurer
-
-    class PreInitializeCommandProcessor
-
-      def initialize
-        @cache = []
-      end
-
-      def process(command)
-        @cache << command
-      end
-
-      def replay
-        @cache.each { |command| command.execute() }
-      end
-
-    end
-
-  end
-end

data/spec/lib/http_stub/configurer/post_initialize_command_processor_spec.rb

@@ -1,34 +0,0 @@
-describe HttpStub::Configurer::PostInitializeCommandProcessor do
-
-  let(:command) { double(HttpStub::Configurer::Command).as_null_object }
-
-  let(:pre_processor) { double(HttpStub::Configurer::PreInitializeCommandProcessor) }
-  let(:post_processor) { HttpStub::Configurer::PostInitializeCommandProcessor.new(pre_processor) }
-
-  describe "#process" do
-
-    it "should immediately execute the provided command" do
-      command.should_receive(:execute)
-
-      post_processor.process(command)
-    end
-
-    it "should not execute the command via the pre initialize command processor" do
-      pre_processor.should_not_receive(:execute)
-
-      post_processor.process(command)
-    end
-
-  end
-
-  describe "#replay" do
-
-    it "should replay any commands known by the pre initialize command processor" do
-      pre_processor.should_receive(:replay)
-
-      post_processor.replay
-    end
-
-  end
-
-end

data/spec/lib/http_stub/configurer/pre_initialize_command_processor_spec.rb

@@ -1,47 +0,0 @@
-describe HttpStub::Configurer::PreInitializeCommandProcessor do
-
-  let(:processor) { HttpStub::Configurer::PreInitializeCommandProcessor.new }
-
-  describe "#replay" do
-
-    describe "when a number of commands have been processed" do
-
-      let(:commands) do
-        (1..3).map { |i| double("Command#{i}").as_null_object }
-      end
-
-      before(:each) do
-        commands.each { |command| processor.process(command) }
-      end
-
-      it "should execute the cached commands" do
-        commands.each { |command| command.should_receive(:execute) }
-
-        processor.replay()
-      end
-
-      describe "and those commands have already been replayed" do
-
-        before(:each) { processor.replay() }
-
-        it "should re-replay those commands" do
-          commands.each { |command| command.should_receive(:execute) }
-
-          processor.replay()
-        end
-
-      end
-
-    end
-
-    describe "when no commands have been processed" do
-
-      it "should execute without error" do
-        lambda { processor.replay() }.should_not raise_error
-      end
-
-    end
-
-  end
-
-end