http_stub 0.7.2 → 0.7.3

data/lib/http_stub.rb

@@ -23,8 +23,7 @@ require File.expand_path('../http_stub/models/registry', __FILE__)
 require File.expand_path('../http_stub/controllers/stub_controller', __FILE__)
 require File.expand_path('../http_stub/controllers/stub_activator_controller', __FILE__)
 require File.expand_path('../http_stub/server', __FILE__)
-require File.expand_path('../http_stub/configurer/request/regexpable_value', __FILE__)
-require File.expand_path('../http_stub/configurer/request/hash_with_regexpable_values', __FILE__)
+require File.expand_path('../http_stub/configurer/request/regexpable', __FILE__)
 require File.expand_path('../http_stub/configurer/request/stub', __FILE__)
 require File.expand_path('../http_stub/configurer/request/stub_activator', __FILE__)
 require File.expand_path('../http_stub/configurer/command', __FILE__)

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

@@ -0,0 +1,43 @@
+module HttpStub
+  module Configurer
+    module Request
+
+      class Regexpable
+
+        class << self
+
+          private
+
+          FORMATTERS = { String => :format_string, Regexp => :format_regexp, Hash => :format_hash }
+
+          public
+
+          def format(value)
+            formatter = FORMATTERS.find { |formatter_entry| value.is_a?(formatter_entry[0]) }
+            raise "No Regexp formatter found for #{value}" unless formatter
+            self.send(formatter[1], value)
+          end
+
+          private
+
+          def format_string(string)
+            string
+          end
+
+          def format_regexp(regexp)
+            "regexp:#{regexp.source.gsub(/\\/, "")}"
+          end
+
+          def format_hash(hash)
+            hash.reduce({}) do |result, entry|
+              result[entry[0]] = format(entry[1])
+              result
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -8,10 +8,10 @@ module HttpStub
           super("/stubs")
           self.content_type = "application/json"
           self.body = {
-              "uri" => HttpStub::Configurer::Request::RegexpableValue.new(uri),
+              "uri" => HttpStub::Configurer::Request::Regexpable.format(uri),
               "method" => options[:method],
-              "headers" => HttpStub::Configurer::Request::HashWithRegexpableValues.new(options[:headers] || {}),
-              "parameters" => HttpStub::Configurer::Request::HashWithRegexpableValues.new(options[:parameters] || {}),
+              "headers" => HttpStub::Configurer::Request::Regexpable.format(options[:headers] || {}),
+              "parameters" => HttpStub::Configurer::Request::Regexpable.format(options[:parameters] || {}),
               "response" => {
                   "status" => options[:response][:status] || 200,
                   "body" => options[:response][:body]

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

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

@@ -0,0 +1,67 @@
+describe HttpStub::Configurer::Request::Regexpable do
+
+  describe "#format" do
+
+    describe "when the value is a string" do
+
+      let(:value) { "some string value" }
+
+      it "should return the value unaltered" do
+        HttpStub::Configurer::Request::Regexpable.format(value).should eql(value)
+      end
+
+    end
+
+    describe "when the value is a regular expression" do
+
+      let(:value) { /.+?[a-z]/ }
+
+      it "should return a string prefixed by 'regexp:'" do
+        HttpStub::Configurer::Request::Regexpable.format(value).should start_with("regexp:")
+      end
+
+      it "should contain the regular expression converted to a string" do
+        HttpStub::Configurer::Request::Regexpable.format(value).should end_with(".+?[a-z]")
+      end
+
+      describe "and the regular expression contain path separators" do
+
+        let(:value) { /\/some\/path/ }
+
+        it "should represent the path separators as a single forward-slash" do
+          HttpStub::Configurer::Request::Regexpable.format(value).should end_with("/some/path")
+        end
+
+      end
+
+    end
+
+    describe "when the value is a hash" do
+
+      describe "and the hash has multiple entries" do
+
+        let(:value) { { key1: "value1", key2: /^.*value2$/, key3: "value3" } }
+
+        it "should return a json representation of the hash whose values are their regexpable form" do
+          expected_formatted_hash = {key1: "value1", key2: "regexp:^.*value2$", key3: "value3"}
+
+          HttpStub::Configurer::Request::Regexpable.format(value).should eql(expected_formatted_hash)
+        end
+
+      end
+
+      describe "and the hash is empty" do
+
+        let(:value) { {} }
+
+        it "should return an empty hash" do
+          HttpStub::Configurer::Request::Regexpable.format(value).should eql({})
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -26,11 +26,7 @@ describe HttpStub::Configurer::Request::Stub do
       let(:request) { HttpStub::Configurer::Request::Stub.new(uri, stub_options) }
       let(:request_body) { JSON.parse(request.body) }
 
-      before(:each) do
-        HttpStub::Configurer::Request::HashWithRegexpableValues.stub!(:new).and_return(
-            double(HttpStub::Configurer::Request::HashWithRegexpableValues).as_null_object
-        )
-      end
+      before(:each) { HttpStub::Configurer::Request::Regexpable.stub!(:format) }
 
       it "should create a HTTP POST request" do
         request.method.should eql("POST")
@@ -44,16 +40,10 @@ describe HttpStub::Configurer::Request::Stub do
         request.content_type.should eql("application/json")
       end
 
-      it "should create a regexpable representation of the uri" do
-        HttpStub::Configurer::Request::RegexpableValue.should_receive(:new).with(uri)
-
-        request
-      end
-
       describe "when a header option is provided" do
 
-        it "should create a regexpable representation of the headers" do
-          HttpStub::Configurer::Request::HashWithRegexpableValues.should_receive(:new).with(headers)
+        it "should format the headers with regexp support" do
+          HttpStub::Configurer::Request::Regexpable.should_receive(:format).with(headers)
 
           request
         end
@@ -64,8 +54,8 @@ describe HttpStub::Configurer::Request::Stub do
 
         let(:headers) { nil }
 
-        it "should create a regexpable representation of an empty header hash" do
-          HttpStub::Configurer::Request::HashWithRegexpableValues.should_receive(:new).with({})
+        it "should format an empty header hash" do
+          HttpStub::Configurer::Request::Regexpable.should_receive(:format).with({})
 
           request
         end
@@ -74,8 +64,8 @@ describe HttpStub::Configurer::Request::Stub do
 
       describe "when a parameter option is provided" do
 
-        it "should create a regexpable representation of the parameters" do
-          HttpStub::Configurer::Request::HashWithRegexpableValues.should_receive(:new).with(parameters)
+        it "should format the parameters with regexp support" do
+          HttpStub::Configurer::Request::Regexpable.should_receive(:format).with(parameters)
 
           request
         end
@@ -86,8 +76,8 @@ describe HttpStub::Configurer::Request::Stub do
 
         let(:parameters) { nil }
 
-        it "should create a regexpable representation of an empty parameter hash" do
-          HttpStub::Configurer::Request::HashWithRegexpableValues.should_receive(:new).with({})
+        it "should format an empty parameter hash" do
+          HttpStub::Configurer::Request::Regexpable.should_receive(:format).with({})
 
           request
         end
@@ -96,9 +86,8 @@ describe HttpStub::Configurer::Request::Stub do
 
       describe "generates a JSON body which" do
 
-        it "should have an entry containing the string representation of the uri" do
-          uri_value = double(HttpStub::Configurer::Request::RegexpableValue, to_s: "uri as a string")
-          HttpStub::Configurer::Request::RegexpableValue.stub!(:new).and_return(uri_value)
+        it "should have an entry containing the regexpable representation of the uri" do
+          HttpStub::Configurer::Request::Regexpable.should_receive(:format).with(uri).and_return("uri as a string")
 
           request_body.should include({ "uri" => "uri as a string" })
         end
@@ -108,15 +97,15 @@ describe HttpStub::Configurer::Request::Stub do
         end
 
         it "should have an entry containing the string representation of the headers" do
-          hash_value = double(HttpStub::Configurer::Request::HashWithRegexpableValues, to_s: "headers as string")
-          HttpStub::Configurer::Request::HashWithRegexpableValues.stub!(:new).with(headers).and_return(hash_value)
+          HttpStub::Configurer::Request::Regexpable.should_receive(:format)
+            .with(headers).and_return("headers as string")
 
           request_body.should include({ "headers" => "headers as string" })
         end
 
         it "should have an entry containing the string representation of the parameters" do
-          hash_value = double(HttpStub::Configurer::Request::HashWithRegexpableValues, to_s: "parameters as string")
-          HttpStub::Configurer::Request::HashWithRegexpableValues.stub!(:new).with(parameters).and_return(hash_value)
+          HttpStub::Configurer::Request::Regexpable.should_receive(:format)
+            .with(parameters).and_return("parameters as string")
 
           request_body.should include({ "parameters" => "parameters as string" })
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -213,8 +213,7 @@ files:
 - ./lib/http_stub/configurer/command.rb
 - ./lib/http_stub/configurer/impatient_command_chain.rb
 - ./lib/http_stub/configurer/patient_command_chain.rb
-- ./lib/http_stub/configurer/request/hash_with_regexpable_values.rb
-- ./lib/http_stub/configurer/request/regexpable_value.rb
+- ./lib/http_stub/configurer/request/regexpable.rb
 - ./lib/http_stub/configurer/request/stub.rb
 - ./lib/http_stub/configurer/request/stub_activator.rb
 - ./lib/http_stub/configurer.rb
@@ -246,8 +245,7 @@ files:
 - ./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/request/hash_with_regexpable_values_spec.rb
-- ./spec/lib/http_stub/configurer/request/regexpable_value_spec.rb
+- ./spec/lib/http_stub/configurer/request/regexpable_spec.rb
 - ./spec/lib/http_stub/configurer/request/stub_activator_spec.rb
 - ./spec/lib/http_stub/configurer/request/stub_spec.rb
 - ./spec/lib/http_stub/configurer_integration_spec.rb
@@ -290,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1625561209117934809
+      hash: 2072585349946261127
 requirements: []
 rubyforge_project: http_stub
 rubygems_version: 1.8.25
@@ -303,8 +301,7 @@ test_files:
 - ./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/request/hash_with_regexpable_values_spec.rb
-- ./spec/lib/http_stub/configurer/request/regexpable_value_spec.rb
+- ./spec/lib/http_stub/configurer/request/regexpable_spec.rb
 - ./spec/lib/http_stub/configurer/request/stub_activator_spec.rb
 - ./spec/lib/http_stub/configurer/request/stub_spec.rb
 - ./spec/lib/http_stub/configurer_integration_spec.rb

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

@@ -1,22 +0,0 @@
-module HttpStub
-  module Configurer
-    module Request
-
-      class HashWithRegexpableValues
-
-        def initialize(hash)
-          @hash = hash.reduce({}) do |result, entry|
-            result[entry[0]] = HttpStub::Configurer::Request::RegexpableValue.new(entry[1])
-            result
-          end
-        end
-
-        def to_json(*args)
-          @hash.to_json(args)
-        end
-
-      end
-
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-module HttpStub
-  module Configurer
-    module Request
-
-      class RegexpableValue
-
-        def initialize(value)
-          @value = value
-        end
-
-        def to_s
-          @value.is_a?(Regexp) ? "regexp:#{@value.source.gsub(/\\/, "")}" : @value
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,35 +0,0 @@
-describe HttpStub::Configurer::Request::HashWithRegexpableValues do
-
-  let(:hash_with_regexpable_values) { HttpStub::Configurer::Request::HashWithRegexpableValues.new(raw_hash) }
-
-  describe "#to_json" do
-
-    describe "when provided a hash with multiple entries" do
-
-      let(:raw_hash) { { key1: "value1", key2: "value2", key3: "value3" } }
-
-      it "should return a json representation of the hash whose values are their regexpable form" do
-        raw_hash.values.each do |value|
-          regexpable_value = double(HttpStub::Configurer::Request::RegexpableValue, to_s: "regexpable_#{value}")
-          HttpStub::Configurer::Request::RegexpableValue.stub!(:new).with(value).and_return(regexpable_value)
-        end
-
-        expected_json = { key1: "regexpable_value1", key2: "regexpable_value2", key3: "regexpable_value3" }.to_json
-        hash_with_regexpable_values.to_json.should eql(expected_json)
-      end
-
-    end
-
-    describe "when provided an empty hash" do
-
-      let(:raw_hash) { {} }
-
-      it "should return a json representation of an empty hash" do
-        hash_with_regexpable_values.to_json.should eql({}.to_json)
-      end
-
-    end
-
-  end
-
-end

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

@@ -1,55 +0,0 @@
-describe HttpStub::Configurer::Request::RegexpableValue do
-
-  let(:regexpable_value) { HttpStub::Configurer::Request::RegexpableValue.new(raw_value) }
-
-  describe "#to_s" do
-
-    describe "when the option's value is a regular expression" do
-
-      let(:raw_value) { /.+?[a-z]/ }
-
-      it "should return a string prefixed by 'regexp:'" do
-        regexpable_value.to_s.should start_with("regexp:")
-      end
-
-      it "should contain the regular expression converted to a string" do
-        regexpable_value.to_s.should end_with(".+?[a-z]")
-      end
-
-      describe "and the regular expression contain path separators" do
-
-        let(:raw_value) { /\/some\/path/ }
-
-        it "should represent the path separators as a single forward-slash" do
-          regexpable_value.to_s.should end_with("/some/path")
-        end
-
-      end
-
-    end
-
-    describe "when the option's value is a string" do
-
-      let(:raw_value) { "some string value" }
-
-      it "should return the value unaltered" do
-        regexpable_value.to_s.should eql(raw_value)
-      end
-
-    end
-
-  end
-
-  describe "#inspect" do
-
-    let(:raw_value) { "some raw value" }
-
-    it "should delegate to #to_s" do
-      regexpable_value.should_receive(:to_s).and_return("some raw value as a string")
-
-      regexpable_value.inspect.should eql("some raw value as a string")
-    end
-
-  end
-
-end