http_stub 0.13.1 → 0.13.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2JiODEwNjQzODFhNzU4ZjIyODg1Yjg0ZjU3Zjc4NDRlNzUxNmNhZQ==
+    YWIwNDc5MGFmMDA3OGU3MDBlMjM4ODdjZmY4YjliYjExOWI5NWQyYg==
   data.tar.gz: !binary |-
-    YWUzNDU3YWMyNDVmNzI3ZGM2MTIzMjdhZTIwZThmNWI0NWQ2YTZhMQ==
+    ZGQ1OGE1OWMxOGJjYTI3MTI0MWQ4M2E5ZmMxNDQzYTU1NjhkZWI4OQ==
 SHA512:
   metadata.gz: !binary |-
-    NTA5OGZiZDdkMTY3MjkyMTM3MTg5MThmYWM2MTU4OTY2MDcxODc2YjZhNTg1
-    ZGM4Y2FmYTRkNTg0ZGJkZmE5ODBjOGZiNmVhZGU5ZDNmMjYzYTA4NmI1ZWM4
-    YjA0NWJjZGQwOGIyZjc3ZDUwMGY4ZTcyYzc4YzZhMWZlYTk5ODM=
+    ZTFkYzhmMmQxNzYwZjQ2ZWZmYWJmMjAyMWZlNWFlYzdlMTAwMjE2NmQwY2E5
+    ZGQ4YzcxNWQxYmY0N2JlNmUxNWI0ZjA3YjJjYjViYzU3OGVmYTBhMjVjODFj
+    OWE0YjA0ZmFjYTU1ZGU4MDI1YTcxYTQwYWU4ZGIyYWQ2NzI0YWI=
   data.tar.gz: !binary |-
-    YzMxNjAwNzU2NjAzZjVlYjI5MTEyOTcxODYwZmQ3MjVkZjQ5YmJkZDk0NjRi
-    MmE4MTE5MmFhZjNmZWNkZWFlYjBiMWM1MWRjNjAwY2Q2MzI0ODZiNWRjNDA2
-    ZDk1NGFlMmFhY2QyZDgwMTQwYzI0ZTllNTI2MDZjYmZiN2QwNjM=
+    YmQ2NGJiMmY1YmIxNDcyYTEyZGQ2OTY3MzA2YjBiZmEwYzJmMTc2ZTdmNmFl
+    MzY1YjUyZjY1MGM2YzgzYTk4ZWFiNTdiZWY3NWU1Zjg0YWQ0MzE2YzdmYWI4
+    MGM0YTc4NWQzMzM4OTU0Nzg2NGE1MTBlNmVmYjEwMTFkYzI1M2I=

data/lib/http_stub.rb

@@ -12,8 +12,8 @@ require_relative 'http_stub/models/response'
 require_relative 'http_stub/models/omitted_value_matcher'
 require_relative 'http_stub/models/regexp_value_matcher'
 require_relative 'http_stub/models/exact_value_matcher'
-require_relative 'http_stub/models/value_matcher'
-require_relative 'http_stub/models/hash_with_value_matchers'
+require_relative 'http_stub/models/string_value_matcher'
+require_relative 'http_stub/models/hash_with_string_value_matchers'
 require_relative 'http_stub/models/request_header_parser'
 require_relative 'http_stub/models/stub_uri'
 require_relative 'http_stub/models/stub_headers'

data/lib/http_stub/configurer.rb

@@ -75,9 +75,9 @@ module HttpStub
 
       private
 
-      def handle(command_options)
+      def handle(command_args)
         effective_command_chain <<
-          HttpStub::Configurer::Command.new({ processor: command_processor }.merge(command_options))
+          HttpStub::Configurer::Command.new({ processor: command_processor }.merge(command_args))
       end
 
       def effective_command_chain

data/lib/http_stub/configurer/command.rb

@@ -5,11 +5,11 @@ module HttpStub
 
       attr_reader :request, :description
 
-      def initialize(options)
-        @processor = options[:processor]
-        @request = options[:request]
-        @description = options[:description]
-        @resetable_flag = !!options[:resetable]
+      def initialize(args)
+        @processor = args[:processor]
+        @request = args[:request]
+        @description = args[:description]
+        @resetable_flag = !!args[:resetable]
       end
 
       def execute

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

@@ -4,19 +4,19 @@ module HttpStub
 
       class Stub < Net::HTTP::Post
 
-        def initialize(uri, options)
+        def initialize(uri, args)
           super("/stubs")
           self.content_type = "application/json"
           self.body = {
               "uri" => HttpStub::Configurer::Request::ControllableValue.format(uri),
-              "method" => options[:method],
-              "headers" => HttpStub::Configurer::Request::ControllableValue.format(options[:headers] || {}),
-              "parameters" => HttpStub::Configurer::Request::ControllableValue.format(options[:parameters] || {}),
+              "method" => args[:method],
+              "headers" => HttpStub::Configurer::Request::ControllableValue.format(args[:headers] || {}),
+              "parameters" => HttpStub::Configurer::Request::ControllableValue.format(args[:parameters] || {}),
               "response" => {
-                  "status" => options[:response][:status] || "",
-                  "headers" => options[:response][:headers] || {},
-                  "body" => options[:response][:body],
-                  "delay_in_seconds" => options[:response][:delay_in_seconds] || ""
+                  "status" => args[:response][:status] || "",
+                  "headers" => args[:response][:headers] || {},
+                  "body" => args[:response][:body],
+                  "delay_in_seconds" => args[:response][:delay_in_seconds] || ""
               }
           }.to_json
         end

data/lib/http_stub/models/{hash_with_value_matchers.rb → hash_with_string_value_matchers.rb}

@@ -1,16 +1,16 @@
 module HttpStub
   module Models
 
-    class HashWithValueMatchers < Hash
+    class HashWithStringValueMatchers < Hash
 
       def initialize(stub_hash)
-        stub_hash.each_pair { |key, value| self[key] = HttpStub::Models::ValueMatcher.new(value) }
+        stub_hash.each_pair { |key, value| self[key] = HttpStub::Models::StringValueMatcher.new(value) }
       end
 
       def match?(actual_hash)
         !(self.find do |key_and_value_matcher|
-          other_value = actual_hash[key_and_value_matcher[0]]
-          !key_and_value_matcher[1].match?(other_value)
+          key, value_matcher = key_and_value_matcher
+          !value_matcher.match?(actual_hash[key])
         end)
       end
 

data/lib/http_stub/models/response.rb

@@ -5,13 +5,13 @@ module HttpStub
 
       private
 
-      DEFAULT_OPTIONS = { "status" => 200, "delay_in_seconds" => 0 }.freeze
+      DEFAULT_ARGS = { "status" => 200, "delay_in_seconds" => 0 }.freeze
       DEFAULT_HEADERS = { "content-type" => "application/json" }.freeze
 
-      def merge_default_options(options)
-        options.clone.tap do |options|
-          headers = options["headers"] ||= {}
-          DEFAULT_OPTIONS.each { |key, value| options[key] = value if !options[key] || options[key] == "" }
+      def merge_default_arguments(args)
+        args.clone.tap do |result|
+          headers = result["headers"] ||= {}
+          DEFAULT_ARGS.each { |key, value| result[key] = value if !result[key] || result[key] == "" }
           DEFAULT_HEADERS.each { |key, value| headers[key] = value if !headers[key] || headers[key] == "" }
         end
       end
@@ -20,13 +20,13 @@ module HttpStub
 
       attr_reader :status, :body, :delay_in_seconds, :headers
 
-      def initialize(options = {})
-        @original_options = options
-        resolved_options = merge_default_options(options)
-        @status = resolved_options["status"]
-        @body = resolved_options["body"]
-        @delay_in_seconds = resolved_options["delay_in_seconds"]
-        @headers = HttpStub::Models::Headers.new(resolved_options["headers"])
+      def initialize(args={})
+        @original_args = args
+        resolved_args = merge_default_arguments(args)
+        @status = resolved_args["status"]
+        @body = resolved_args["body"]
+        @delay_in_seconds = resolved_args["delay_in_seconds"]
+        @headers = HttpStub::Models::Headers.new(resolved_args["headers"])
       end
 
       SUCCESS = HttpStub::Models::Response.new("status" => 200, "body" => "OK")
@@ -34,7 +34,7 @@ module HttpStub
       EMPTY = HttpStub::Models::Response.new()
 
       def empty?
-        @original_options.empty?
+        @original_args.empty?
       end
 
     end

data/lib/http_stub/models/{value_matcher.rb → string_value_matcher.rb}

@@ -1,7 +1,7 @@
 module HttpStub
   module Models
 
-    class ValueMatcher
+    class StringValueMatcher
 
       private
 
@@ -12,15 +12,15 @@ module HttpStub
       public
 
       def initialize(stub_value)
-        @stub_value = stub_value
+        @stub_match_value = stub_value ? stub_value.to_s : stub_value
       end
 
       def match?(actual_value)
-        !!MATCHERS.find { |matcher| matcher.match?(@stub_value, actual_value) }
+        !!MATCHERS.find { |matcher| matcher.match?(@stub_match_value, actual_value) }
       end
 
       def to_s
-        @stub_value
+        @stub_match_value
       end
 
     end

data/lib/http_stub/models/stub.rb

@@ -5,12 +5,12 @@ module HttpStub
 
       attr_reader :uri, :headers, :parameters, :response
 
-      def initialize(options)
-        @options = options
-        @uri = HttpStub::Models::StubUri.new(options["uri"])
-        @headers = HttpStub::Models::StubHeaders.new(options["headers"])
-        @parameters = HttpStub::Models::StubParameters.new(options["parameters"])
-        @response = HttpStub::Models::Response.new(options["response"])
+      def initialize(args)
+        @args = args
+        @uri = HttpStub::Models::StubUri.new(args["uri"])
+        @headers = HttpStub::Models::StubHeaders.new(args["headers"])
+        @parameters = HttpStub::Models::StubParameters.new(args["parameters"])
+        @response = HttpStub::Models::Response.new(args["response"])
       end
 
       def satisfies?(request)
@@ -21,11 +21,11 @@ module HttpStub
       end
 
       def method
-        @options["method"]
+        @args["method"]
       end
 
       def to_s
-        @options.to_s
+        @args.to_s
       end
 
     end

data/lib/http_stub/models/stub_activator.rb

@@ -3,9 +3,9 @@ module HttpStub
 
     class StubActivator
 
-      def initialize(options)
-        @options = options
-        @stub = HttpStub::Models::Stub.new(options)
+      def initialize(args)
+        @args = args
+        @stub = HttpStub::Models::Stub.new(args)
       end
 
       def satisfies?(request)
@@ -17,11 +17,11 @@ module HttpStub
       end
 
       def activation_uri
-        @options["activation_uri"]
+        @args["activation_uri"]
       end
 
       def to_s
-        @options.to_s
+        @args.to_s
       end
 
     end

data/lib/http_stub/models/stub_headers.rb

@@ -5,7 +5,7 @@ module HttpStub
 
       def initialize(headers)
         super(headers)
-        @headers = HttpStub::Models::HashWithValueMatchers.new((headers || {}).downcase_and_underscore_keys)
+        @headers = HttpStub::Models::HashWithStringValueMatchers.new((headers || {}).downcase_and_underscore_keys)
       end
 
       def match?(request)

data/lib/http_stub/models/stub_parameters.rb

@@ -4,7 +4,7 @@ module HttpStub
     class StubParameters
 
       def initialize(parameters)
-        @parameters = HttpStub::Models::HashWithValueMatchers.new(parameters || {})
+        @parameters = HttpStub::Models::HashWithStringValueMatchers.new(parameters || {})
       end
 
       def match?(request)

data/lib/http_stub/models/stub_uri.rb

@@ -4,7 +4,7 @@ module HttpStub
     class StubUri
 
       def initialize(uri)
-        @uri = HttpStub::Models::ValueMatcher.new(uri)
+        @uri = HttpStub::Models::StringValueMatcher.new(uri)
       end
 
       def match?(request)

data/lib/http_stub/rake/server_daemon_tasks.rb

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

data/lib/http_stub/rake/server_tasks.rb

@@ -3,31 +3,31 @@ module HttpStub
 
     class ServerTasks < ::Rake::TaskLib
 
-      def initialize(options)
-        namespace options[:name] do
-          define_start_task(options)
-          define_initialize_task(options) if options[:configurer]
+      def initialize(args)
+        namespace args[:name] do
+          define_start_task(args)
+          define_initialize_task(args) if args[:configurer]
         end
       end
 
       private
 
-      def define_start_task(options)
+      def define_start_task(args)
         namespace :start do
-          desc "Starts stub #{options[:name]} in the foreground"
+          desc "Starts stub #{args[:name]} in the foreground"
           task(:foreground) do
             HttpStub::Server.instance_eval do
               set :environment, :test
-              set :port, options[:port]
+              set :port, args[:port]
               run!
             end
           end
         end
       end
 
-      def define_initialize_task(options)
-        desc "Configures stub #{options[:name]}"
-        task(:configure) { options[:configurer].initialize! }
+      def define_initialize_task(args)
+        desc "Configures stub #{args[:name]}"
+        task(:configure) { args[:configurer].initialize! }
       end
 
     end

data/lib/http_stub/server_daemon.rb

@@ -14,9 +14,9 @@ module HttpStub
 
     end
 
-    def initialize(options)
-      super({ host: "localhost" }.merge(options))
-      @configurer = options[:configurer]
+    def initialize(args)
+      super({ host: "localhost" }.merge(args))
+      @configurer = args[:configurer]
     end
 
     def start!

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

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

@@ -1,9 +1,9 @@
 describe HttpStub::Configurer::Command do
 
   let(:processor) { double(HttpStub::Configurer::CommandProcessor) }
-  let(:options) { { processor: processor, request: double("HttpRequest"), description: "Some Description" } }
+  let(:args) { { processor: processor, request: double("HttpRequest"), description: "Some Description" } }
 
-  let(:command) { HttpStub::Configurer::Command.new(options) }
+  let(:command) { HttpStub::Configurer::Command.new(args) }
 
   describe "#execute" do
 
@@ -19,7 +19,7 @@ describe HttpStub::Configurer::Command do
 
     describe "when created with a resetable flag that is true" do
 
-      before(:each) { options.merge!(resetable: true) }
+      before(:each) { args.merge!(resetable: true) }
 
       it "should return true" do
         command.resetable?.should be_true

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

@@ -2,7 +2,7 @@ describe HttpStub::Configurer::Request::Stub do
 
   describe "#initialize" do
 
-    context "when provided a uri and stub options" do
+    context "when provided a uri and stub arguments" do
 
       let(:uri) { "/some/uri" }
       let(:stub_method) { "Some Method" }
@@ -13,7 +13,7 @@ describe HttpStub::Configurer::Request::Stub do
       let(:response_body) { "Some body" }
       let(:response_delay_in_seconds) { 7 }
 
-      let(:stub_options) do
+      let(:stub_args) do
         {
             method: stub_method,
             headers: request_headers,
@@ -27,7 +27,7 @@ describe HttpStub::Configurer::Request::Stub do
         }
       end
 
-      let(:request) { HttpStub::Configurer::Request::Stub.new(uri, stub_options) }
+      let(:request) { HttpStub::Configurer::Request::Stub.new(uri, stub_args) }
       let(:request_body) { JSON.parse(request.body) }
 
       before(:each) { HttpStub::Configurer::Request::ControllableValue.stub(:format) }
@@ -44,7 +44,7 @@ describe HttpStub::Configurer::Request::Stub do
         request.content_type.should eql("application/json")
       end
 
-      context "when a request header option is provided" do
+      context "when a request header argument is provided" do
 
         it "should format the headers into control values" do
           HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with(request_headers)
@@ -66,7 +66,7 @@ describe HttpStub::Configurer::Request::Stub do
 
       end
 
-      context "when a request parameter option is provided" do
+      context "when a request parameter argument is provided" do
 
         it "should format the request parameters into control values" do
           HttpStub::Configurer::Request::ControllableValue.should_receive(:format).with(request_parameters)
@@ -76,7 +76,7 @@ describe HttpStub::Configurer::Request::Stub do
 
       end
 
-      context "when no request parameter option is provided" do
+      context "when no request parameter argument is provided" do
 
         let(:request_parameters) { nil }
 
@@ -96,7 +96,7 @@ describe HttpStub::Configurer::Request::Stub do
           request_body.should include("uri" => "uri as a string")
         end
 
-        it "should have an entry for the method option" do
+        it "should have an entry for the method argument" do
           request_body.should include("method" => stub_method)
         end
 
@@ -114,15 +114,15 @@ describe HttpStub::Configurer::Request::Stub do
           request_body.should include("parameters" => "request parameters as string")
         end
 
-        context "when a status response option is provided" do
+        context "when a status response argument is provided" do
 
-          it "should have a response entry for the option" do
+          it "should have a response entry for the argument" do
             request_body["response"].should include("status" => response_status)
           end
 
         end
 
-        context "when no status response option is provided" do
+        context "when no status response argument is provided" do
 
           let(:response_status) { nil }
 
@@ -132,19 +132,19 @@ describe HttpStub::Configurer::Request::Stub do
 
         end
 
-        it "should have an entry for the response body option" do
+        it "should have an entry for the response body argument" do
           request_body["response"].should include("body" => response_body)
         end
 
-        context "when a delay option is provided" do
+        context "when a delay argument is provided" do
 
-          it "should have a response entry for the option" do
+          it "should have a response entry for the argument" do
             request_body["response"].should include("delay_in_seconds" => response_delay_in_seconds)
           end
 
         end
 
-        context "when a delay option is not provided" do
+        context "when a delay argument is not provided" do
 
           let(:response_delay_in_seconds) { nil }
 

data/spec/lib/http_stub/configurer_integration_spec.rb

@@ -402,6 +402,96 @@ describe HttpStub::Configurer, "when the server is running" do
 
         end
 
+        context "whose values are numbers" do
+
+          before(:each) do
+            configurer.stub_response!("/stub_with_parameters", method: :get, parameters: { key: 88 },
+                                      response: { status: 203, body: "Body for parameter number" })
+          end
+
+          context "and that request is made" do
+
+            let(:response) { Net::HTTP.get_response(server_host, "/stub_with_parameters?key=88", server_port) }
+
+            it "should replay the stubbed response" do
+              response.code.should eql("203")
+              response.body.should eql("Body for parameter number")
+            end
+
+          end
+
+        end
+
+        context "whose values are regular expressions" do
+
+          before(:each) do
+            configurer.stub_response!(
+              "/stub_with_parameters", method: :get, parameters: { key: /^match.*/ },
+              response: { status: 202, body: "Another stub body" }
+            )
+          end
+
+          context "and a request that matches is made" do
+
+            let(:response) do
+              Net::HTTP.get_response(server_host, "/stub_with_parameters?key=matching_value", server_port)
+            end
+
+            it "should replay the stubbed response" do
+              response.code.should eql("202")
+              response.body.should eql("Another stub body")
+            end
+
+          end
+
+          context "and a request that does not match is made" do
+
+            let(:response) do
+              Net::HTTP.get_response(server_host, "/stub_with_parameters?key=does_not_match_value", server_port)
+            end
+
+            it "should respond with a 404 status code" do
+              response.code.should eql("404")
+            end
+
+          end
+
+        end
+
+        context "whose values indicate the parameters must be omitted" do
+
+          before(:each) do
+            configurer.stub_response!(
+              "/stub_with_omitted_parameters", method: :get, parameters: { key: :omitted },
+              response: { status: 202, body: "Omitted parameter stub body" }
+            )
+          end
+
+          context "and a request that matches is made" do
+
+            let(:response) { Net::HTTP.get_response(server_host, "/stub_with_omitted_parameters", server_port) }
+
+            it "should replay the stubbed response" do
+              response.code.should eql("202")
+              response.body.should eql("Omitted parameter stub body")
+            end
+
+          end
+
+          context "and a request that does not match is made" do
+
+            let(:response) do
+              Net::HTTP.get_response(server_host, "/stub_with_omitted_parameters?key=must_be_omitted", server_port)
+            end
+
+            it "should respond with a 404 status code" do
+              response.code.should eql("404")
+            end
+
+          end
+
+        end
+
       end
 
     end

data/spec/lib/http_stub/models/{hash_with_value_matchers_spec.rb → hash_with_string_value_matchers_spec.rb}

@@ -1,4 +1,4 @@
-describe HttpStub::Models::HashWithValueMatchers do
+describe HttpStub::Models::HashWithStringValueMatchers do
 
   let(:stubbed_hash) do
     (1..3).reduce({}) do |result, i|
@@ -8,13 +8,13 @@ describe HttpStub::Models::HashWithValueMatchers do
   end
 
   let(:value_matchers) do
-    stubbed_hash.values.map { |value| double(HttpStub::Models::ValueMatcher, to_s: value).as_null_object }
+    stubbed_hash.values.map { |value| double(HttpStub::Models::StringValueMatcher, to_s: value).as_null_object }
   end
 
-  let(:value_matcher_hash) { HttpStub::Models::HashWithValueMatchers.new(stubbed_hash) }
+  let(:value_matcher_hash) { HttpStub::Models::HashWithStringValueMatchers.new(stubbed_hash) }
 
   before(:each) do
-    value_matchers.each { |value| HttpStub::Models::ValueMatcher.stub(:new).with(value.to_s).and_return(value) }
+    value_matchers.each { |value| HttpStub::Models::StringValueMatcher.stub(:new).with(value.to_s).and_return(value) }
   end
 
   it "should be hash" do
@@ -25,7 +25,7 @@ describe HttpStub::Models::HashWithValueMatchers do
 
     it "should create a value matcher representation of each value in the hash" do
       value_matchers.each do |value|
-        HttpStub::Models::ValueMatcher.should_receive(:new).with(value.to_s).and_return(value)
+        HttpStub::Models::StringValueMatcher.should_receive(:new).with(value.to_s).and_return(value)
       end
 
       value_matcher_hash.values.should eql(value_matchers)

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

@@ -41,7 +41,7 @@ describe HttpStub::Models::Response do
 
   describe "#status" do
 
-    context "when a value is provided in the options" do
+    context "when a value is provided in the arguments" do
 
       context "that is an integer" do
 
@@ -63,7 +63,7 @@ describe HttpStub::Models::Response do
 
     end
 
-    context "when the status is not provided in the options" do
+    context "when the status is not provided in the arguments" do
 
       let(:response) { HttpStub::Models::Response.new("body" => body, "delay_in_seconds" => delay_in_seconds) }
 
@@ -77,7 +77,7 @@ describe HttpStub::Models::Response do
 
   describe "#body" do
 
-    it "should return the value provided in the options" do
+    it "should return the value provided in the arguments" do
       response.body.should eql("A response body")
     end
 
@@ -85,7 +85,7 @@ describe HttpStub::Models::Response do
 
   describe "#delay_in_seconds" do
 
-    context "when a value is provided in the options" do
+    context "when a value is provided in the arguments" do
 
       context "that is an integer" do
 
@@ -107,7 +107,7 @@ describe HttpStub::Models::Response do
 
     end
 
-    context "when a value is not provided in the options" do
+    context "when a value is not provided in the arguments" do
 
       let(:response) { HttpStub::Models::Response.new("status" => status, "body" => body) }
 

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

@@ -0,0 +1,121 @@
+describe HttpStub::Models::StringValueMatcher do
+
+  let(:stub_value) { "some stub value" }
+
+  let(:string_value_matcher) { HttpStub::Models::StringValueMatcher.new(stub_value) }
+
+  describe "#match?" do
+
+    let(:actual_value) { "some actual value" }
+
+    shared_examples_for "a StringValueMatcher that matches an expected stub value" do
+
+      it "should determine if actual value should be omitted" do
+        HttpStub::Models::OmittedValueMatcher.should_receive(:match?).with(expected_stub_match_value, actual_value)
+
+        perform_match
+      end
+
+      it "should determine if the actual value matches a regular expression" do
+        HttpStub::Models::RegexpValueMatcher.should_receive(:match?).with(expected_stub_match_value, actual_value)
+
+        perform_match
+      end
+
+      it "should determine if the actual value exactly matches the stub value" do
+        HttpStub::Models::ExactValueMatcher.should_receive(:match?).with(expected_stub_match_value, actual_value)
+
+        perform_match
+      end
+
+      it "should determine if actual value should be omitted" do
+        HttpStub::Models::OmittedValueMatcher.should_receive(:match?).with(expected_stub_match_value, actual_value)
+
+        perform_match
+      end
+
+      it "should determine if the actual value matches a regular expression" do
+        HttpStub::Models::RegexpValueMatcher.should_receive(:match?).with(expected_stub_match_value, actual_value)
+
+        perform_match
+      end
+
+      it "should determine if the actual value exactly matches the stub value" do
+        HttpStub::Models::ExactValueMatcher.should_receive(:match?).with(expected_stub_match_value, actual_value)
+
+        perform_match
+      end
+
+    end
+
+    context "when the provided stub value is a string" do
+
+      let(:stub_value) { "some stub value" }
+      let(:expected_stub_match_value) { "some stub value" }
+
+      it_should_behave_like "a StringValueMatcher that matches an expected stub value"
+
+    end
+
+    context "when the provided stub value is not a string" do
+
+      let(:stub_value) { 88 }
+      let(:expected_stub_match_value) { "88" }
+
+      it_should_behave_like "a StringValueMatcher that matches an expected stub value"
+
+    end
+
+    context "when an omitted match occurs" do
+
+      before(:each) { HttpStub::Models::OmittedValueMatcher.should_receive(:match?).and_return(true) }
+
+      it "should return true" do
+        perform_match.should be_true
+      end
+
+    end
+
+    context "when a regular expression match occurs" do
+
+      before(:each) { HttpStub::Models::RegexpValueMatcher.should_receive(:match?).and_return(true) }
+
+      it "should return true" do
+        perform_match.should be_true
+      end
+
+    end
+
+    context "when an exact match occurs" do
+
+      before(:each) { HttpStub::Models::ExactValueMatcher.should_receive(:match?).and_return(true) }
+
+      it "should return true" do
+        perform_match.should be_true
+      end
+
+    end
+
+    context "when no match occurs" do
+
+      it "should return false" do
+        perform_match.should be_false
+      end
+
+    end
+    
+    def perform_match
+      string_value_matcher.match?(actual_value)
+    end
+
+  end
+
+  describe "#to_s" do
+
+    it "should return the stub value provided" do
+      string_value_matcher.to_s.should eql(stub_value)
+    end
+
+  end
+
+end

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

@@ -1,10 +1,10 @@
 describe HttpStub::Models::StubActivator do
 
   let(:activation_uri) { "/some/activation/uri" }
-  let(:options) do
+  let(:args) do
     { "activation_uri" => activation_uri }
   end
-  let(:stub_activator) { HttpStub::Models::StubActivator.new(options) }
+  let(:stub_activator) { HttpStub::Models::StubActivator.new(args) }
 
   before(:each) { HttpStub::Models::Stub.stub(:new).and_return(double(HttpStub::Models::Stub)) }
 
@@ -46,9 +46,9 @@ describe HttpStub::Models::StubActivator do
 
   describe "#the_stub" do
 
-    it "should return a HttpStub::Models::Stub constructed from the activator's options" do
+    it "should return a HttpStub::Models::Stub constructed from the activator's arguments" do
       stub = double(HttpStub::Models::Stub)
-      HttpStub::Models::Stub.should_receive(:new).with(options).and_return(stub)
+      HttpStub::Models::Stub.should_receive(:new).with(args).and_return(stub)
 
       stub_activator.the_stub.should eql(stub)
     end
@@ -65,10 +65,10 @@ describe HttpStub::Models::StubActivator do
 
   describe "#to_s" do
 
-    it "should return the string representation of the activation options" do
-      options.should_receive(:to_s).and_return("activation options string")
+    it "should return the string representation of the activation arguments" do
+      args.should_receive(:to_s).and_return("activation args string")
 
-      stub_activator.to_s.should eql("activation options string")
+      stub_activator.to_s.should eql("activation args string")
     end
 
   end

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

@@ -14,7 +14,7 @@ describe HttpStub::Models::StubHeaders do
     it "should create a regexpable representation of the stubbed headers whose keys are downcased and underscored" do
       downcased_and_underscored_hash = { "another_stub_key" => "value" }
       stubbed_headers.should_receive(:downcase_and_underscore_keys).and_return(downcased_and_underscored_hash)
-      HttpStub::Models::HashWithValueMatchers.should_receive(:new).with(downcased_and_underscored_hash)
+      HttpStub::Models::HashWithStringValueMatchers.should_receive(:new).with(downcased_and_underscored_hash)
 
       stub_headers
     end
@@ -26,7 +26,7 @@ describe HttpStub::Models::StubHeaders do
     let(:stubbed_headers) { nil }
 
     it "should create a regexpable representation of an empty hash" do
-      HttpStub::Models::HashWithValueMatchers.should_receive(:new).with({})
+      HttpStub::Models::HashWithStringValueMatchers.should_receive(:new).with({})
 
       stub_headers
     end
@@ -36,10 +36,10 @@ describe HttpStub::Models::StubHeaders do
   describe "#match?" do
 
     let(:request_headers) { { "request_key" => "value" } }
-    let(:regexpable_stubbed_headers) { double(HttpStub::Models::HashWithValueMatchers).as_null_object }
+    let(:regexpable_stubbed_headers) { double(HttpStub::Models::HashWithStringValueMatchers).as_null_object }
 
     before(:each) do
-      HttpStub::Models::HashWithValueMatchers.stub(:new).and_return(regexpable_stubbed_headers)
+      HttpStub::Models::HashWithStringValueMatchers.stub(:new).and_return(regexpable_stubbed_headers)
       HttpStub::Models::RequestHeaderParser.stub(:parse).with(request).and_return(request_headers)
     end
 

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

@@ -4,14 +4,14 @@ describe HttpStub::Models::StubParameters do
   let(:request) { double("HttpRequest", params: request_parameters) }
 
   let(:stubbed_parameters) { { "key1" => "value1", "key2" => "value2", "key3" => "value3" } }
-  let(:regexpable_stubbed_paremeters) { double(HttpStub::Models::HashWithValueMatchers).as_null_object }
+  let(:regexpable_stubbed_paremeters) { double(HttpStub::Models::HashWithStringValueMatchers).as_null_object }
 
   let(:stub_parameters) { HttpStub::Models::StubParameters.new(stubbed_parameters) }
 
   describe "when stubbed parameters are provided" do
 
     it "should create a regexpable representation of the stubbed parameters" do
-      HttpStub::Models::HashWithValueMatchers.should_receive(:new).with(stubbed_parameters)
+      HttpStub::Models::HashWithStringValueMatchers.should_receive(:new).with(stubbed_parameters)
 
       stub_parameters
     end
@@ -23,7 +23,7 @@ describe HttpStub::Models::StubParameters do
     let(:stubbed_parameters) { nil }
 
     it "should create a regexpable representation of an empty hash" do
-      HttpStub::Models::HashWithValueMatchers.should_receive(:new).with({})
+      HttpStub::Models::HashWithStringValueMatchers.should_receive(:new).with({})
 
       stub_parameters
     end
@@ -33,7 +33,7 @@ describe HttpStub::Models::StubParameters do
   describe "#match?" do
 
     it "should delegate to the regexpable representation of the stubbed parameters to determine a match" do
-      HttpStub::Models::HashWithValueMatchers.stub(:new).and_return(regexpable_stubbed_paremeters)
+      HttpStub::Models::HashWithStringValueMatchers.stub(:new).and_return(regexpable_stubbed_paremeters)
       regexpable_stubbed_paremeters.should_receive(:match?).with(request_parameters).and_return(true)
 
       stub_parameters.match?(request).should be(true)

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

@@ -15,7 +15,7 @@ describe HttpStub::Models::Stub do
     }
   end
   let(:stub_method) { "get" }
-  let(:stub_options) do
+  let(:stub_args) do
     {
       "uri" => "/a_path",
       "method" => stub_method,
@@ -31,7 +31,7 @@ describe HttpStub::Models::Stub do
   let(:stub_parameters) { double(HttpStub::Models::StubParameters, match?: true) }
   let(:stub_headers) { double(HttpStub::Models::StubHeaders, match?: true) }
 
-  let(:the_stub) { HttpStub::Models::Stub.new(stub_options) }
+  let(:the_stub) { HttpStub::Models::Stub.new(stub_args) }
 
   before(:each) do
     HttpStub::Models::StubUri.stub(:new).and_return(stub_uri)
@@ -167,10 +167,10 @@ describe HttpStub::Models::Stub do
 
   describe "#to_s" do
 
-    it "should return a string representation of the stub options" do
-      stub_options.should_receive(:to_s).and_return("stub options string")
+    it "should return a string representation of the stub arguments" do
+      stub_args.should_receive(:to_s).and_return("stub arguments string")
 
-      the_stub.to_s.should eql("stub options string")
+      the_stub.to_s.should eql("stub arguments string")
     end
   end
 

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

@@ -2,15 +2,15 @@ describe HttpStub::Models::StubUri do
 
   let(:stubbed_uri) { "/some/uri" }
   let(:request) { double("HttpRequest", path_info: request_uri) }
-  let(:value_matcher) { double(HttpStub::Models::ValueMatcher).as_null_object }
+  let(:value_matcher) { double(HttpStub::Models::StringValueMatcher).as_null_object }
   let(:stub_uri) { HttpStub::Models::StubUri.new(stubbed_uri) }
 
-  before(:each) { HttpStub::Models::ValueMatcher.stub(:new).and_return(value_matcher) }
+  before(:each) { HttpStub::Models::StringValueMatcher.stub(:new).and_return(value_matcher) }
 
   describe "constructor" do
 
     it "should create a value matcher for the provided uri" do
-      HttpStub::Models::ValueMatcher.should_receive(:new).with(stubbed_uri)
+      HttpStub::Models::StringValueMatcher.should_receive(:new).with(stubbed_uri)
 
       stub_uri
     end

data/spec/lib/http_stub/rake/server_tasks_spec.rb

@@ -2,14 +2,14 @@ describe HttpStub::Rake::ServerTasks do
 
   describe "the configure task" do
 
-    let(:default_options) { { port: 8001 } }
+    let(:default_args) { { port: 8001 } }
 
-    before(:each) { HttpStub::Rake::ServerTasks.new(default_options.merge(options)) }
+    before(:each) { HttpStub::Rake::ServerTasks.new(default_args.merge(args)) }
 
     context "when a configurer is provided" do
 
       let(:configurer) { double(HttpStub::Configurer) }
-      let(:options) { { name: :tasks_configurer_provided_test, configurer: configurer } }
+      let(:args) { { name: :tasks_configurer_provided_test, configurer: configurer } }
 
       context "and the task is executed" do
 
@@ -25,7 +25,7 @@ describe HttpStub::Rake::ServerTasks do
 
     context "when a configurer is not provided" do
 
-      let(:options) { { name: :tasks_configurer_not_provided_test } }
+      let(:args) { { name: :tasks_configurer_not_provided_test } }
 
       it "should not generate a task" do
         lambda { Rake::Task["tasks_configurer_not_provided_test:configure"] }.should

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Matthew Ueckerman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -255,7 +255,7 @@ files:
 - ./lib/http_stub/controllers/stub_controller.rb
 - ./lib/http_stub/hash_extensions.rb
 - ./lib/http_stub/models/exact_value_matcher.rb
-- ./lib/http_stub/models/hash_with_value_matchers.rb
+- ./lib/http_stub/models/hash_with_string_value_matchers.rb
 - ./lib/http_stub/models/headers.rb
 - ./lib/http_stub/models/omitted_value_matcher.rb
 - ./lib/http_stub/models/regexp_value_matcher.rb
@@ -263,12 +263,12 @@ files:
 - ./lib/http_stub/models/request_header_parser.rb
 - ./lib/http_stub/models/request_pipeline.rb
 - ./lib/http_stub/models/response.rb
+- ./lib/http_stub/models/string_value_matcher.rb
 - ./lib/http_stub/models/stub.rb
 - ./lib/http_stub/models/stub_activator.rb
 - ./lib/http_stub/models/stub_headers.rb
 - ./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/server_daemon_tasks.rb
 - ./lib/http_stub/rake/server_tasks.rb
 - ./lib/http_stub/rake/task_generators.rb
@@ -297,7 +297,7 @@ files:
 - ./spec/lib/http_stub/controllers/stub_controller_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
+- ./spec/lib/http_stub/models/hash_with_string_value_matchers_spec.rb
 - ./spec/lib/http_stub/models/headers_spec.rb
 - ./spec/lib/http_stub/models/omitted_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/regexp_value_matcher_spec.rb
@@ -305,12 +305,12 @@ files:
 - ./spec/lib/http_stub/models/request_header_parser_spec.rb
 - ./spec/lib/http_stub/models/request_pipeline_spec.rb
 - ./spec/lib/http_stub/models/response_spec.rb
+- ./spec/lib/http_stub/models/string_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/stub_activator_spec.rb
 - ./spec/lib/http_stub/models/stub_headers_spec.rb
 - ./spec/lib/http_stub/models/stub_parameters_spec.rb
 - ./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/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
@@ -361,7 +361,7 @@ test_files:
 - ./spec/lib/http_stub/controllers/stub_controller_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
+- ./spec/lib/http_stub/models/hash_with_string_value_matchers_spec.rb
 - ./spec/lib/http_stub/models/headers_spec.rb
 - ./spec/lib/http_stub/models/omitted_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/regexp_value_matcher_spec.rb
@@ -369,12 +369,12 @@ test_files:
 - ./spec/lib/http_stub/models/request_header_parser_spec.rb
 - ./spec/lib/http_stub/models/request_pipeline_spec.rb
 - ./spec/lib/http_stub/models/response_spec.rb
+- ./spec/lib/http_stub/models/string_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/stub_activator_spec.rb
 - ./spec/lib/http_stub/models/stub_headers_spec.rb
 - ./spec/lib/http_stub/models/stub_parameters_spec.rb
 - ./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/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

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

@@ -1,81 +0,0 @@
-describe HttpStub::Models::ValueMatcher do
-
-  let(:stub_value) { "some stub value" }
-
-  let(:value_matcher) { HttpStub::Models::ValueMatcher.new(stub_value) }
-
-  describe "#match?" do
-
-    let(:actual_value) { "some actual value" }
-
-    it "should determine if actual value should be omitted" do
-      HttpStub::Models::OmittedValueMatcher.should_receive(:match?).with(stub_value, actual_value)
-
-      perform_match
-    end
-
-    it "should determine if the actual value matches a regular expression" do
-      HttpStub::Models::RegexpValueMatcher.should_receive(:match?).with(stub_value, actual_value)
-
-      perform_match
-    end
-
-    it "should determine if the actual value exactly matches the stub value" do
-      HttpStub::Models::ExactValueMatcher.should_receive(:match?).with(stub_value, actual_value)
-
-      perform_match
-    end
-
-    context "when an omitted match occurs" do
-
-      before(:each) { HttpStub::Models::OmittedValueMatcher.should_receive(:match?).and_return(true) }
-
-      it "should return true" do
-        perform_match.should be_true
-      end
-
-    end
-
-    context "when a regular expression match occurs" do
-
-      before(:each) { HttpStub::Models::RegexpValueMatcher.should_receive(:match?).and_return(true) }
-
-      it "should return true" do
-        perform_match.should be_true
-      end
-
-    end
-
-    context "when an exact match occurs" do
-
-      before(:each) { HttpStub::Models::ExactValueMatcher.should_receive(:match?).and_return(true) }
-
-      it "should return true" do
-        perform_match.should be_true
-      end
-
-    end
-
-    context "when no match occurs" do
-
-      it "should return false" do
-        perform_match.should be_false
-      end
-
-    end
-    
-    def perform_match
-      value_matcher.match?(actual_value)
-    end
-
-  end
-
-  describe "#to_s" do
-
-    it "should return the stub value provided" do
-      value_matcher.to_s.should eql(stub_value)
-    end
-
-  end
-
-end