http_stub 0.5.7 → 0.6.0

data/lib/http_stub.rb

@@ -12,6 +12,7 @@ require 'json'
 require File.expand_path('../http_stub/hash_extensions', __FILE__)
 require File.expand_path('../http_stub/models/response', __FILE__)
 require File.expand_path('../http_stub/models/request_header_parser', __FILE__)
+require File.expand_path('../http_stub/models/stub_uri', __FILE__)
 require File.expand_path('../http_stub/models/stub_headers', __FILE__)
 require File.expand_path('../http_stub/models/stub_parameters', __FILE__)
 require File.expand_path('../http_stub/models/stub', __FILE__)

data/lib/http_stub/configurer/stub_request.rb

@@ -7,7 +7,7 @@ module HttpStub
         super("/stubs")
         self.content_type = "application/json"
         self.body = {
-            "uri" => uri,
+            "uri" => uri.is_a?(Regexp) ? "regexp:#{uri.source.gsub(/\\/, "")}" : uri,
             "method" => options[:method],
             "headers" => options[:headers] || {},
             "parameters" => options[:parameters] || {},

data/lib/http_stub/models/stub.rb

@@ -3,26 +3,23 @@ module HttpStub
 
     class Stub
 
-      attr_reader :headers, :parameters, :response
+      attr_reader :uri, :headers, :parameters, :response
 
       def initialize(options)
         @stub_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"])
       end
 
       def satisfies?(request)
-        uri == request.path_info &&
+        @uri.match?(request) &&
             method.downcase == request.request_method.downcase &&
             @headers.match?(request) &&
             @parameters.match?(request)
       end
 
-      def uri
-        @stub_options["uri"]
-      end
-
       def method
         @stub_options["method"]
       end

data/lib/http_stub/models/stub_uri.rb

@@ -0,0 +1,22 @@
+module HttpStub
+  module Models
+
+    class StubUri
+
+      def initialize(uri)
+        @uri = uri
+      end
+
+      def match?(request)
+        match_data = @uri.match(/^regexp:(.*)/)
+        match_data ? !!Regexp.new(match_data[1]).match(request.path_info) : request.path_info == @uri
+      end
+
+      def to_s
+        @uri
+      end
+
+    end
+
+  end
+end

data/lib/http_stub/version.rb

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

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

@@ -4,7 +4,7 @@ describe HttpStub::Configurer::StubRequest do
 
     describe "when provided a uri and stub options" do
 
-      let(:uri) { "Some URI" }
+      let(:uri) { "/some/uri" }
       let(:stub_method) { "Some Method" }
       let(:headers) { { "header_name" => "value" } }
       let(:parameters) { { "parameter_name" => "value" } }
@@ -40,8 +40,22 @@ describe HttpStub::Configurer::StubRequest do
 
       describe "generates a JSON body which" do
 
-        it "should have an entry for the provided URI" do
-          request_body.should include({ "uri" => uri })
+        describe "when the uri is a string" do
+
+          it "should have an entry containing the provided URI unaltered" do
+            request_body.should include({ "uri" => uri })
+          end
+
+        end
+
+        describe "when the uri is a regular expression" do
+
+          let(:uri) { /\/some\/uri/ }
+
+          it "should have an entry containing the provided URI converted to a string and prefixed with 'regexp:'" do
+            request_body.should include({ "uri" => "regexp:/some/uri" })
+          end
+
         end
 
         it "should have an entry for the method option" do

data/spec/lib/http_stub/configurer_integration_spec.rb

@@ -135,6 +135,35 @@ describe HttpStub::Configurer, "when the server is running" do
 
           end
 
+          describe "and the stub uri is regular expression" do
+
+            before(:each) do
+              configurer.stub_response!(/\/stub\/regexp\/.*/, method: :get, response: { body: "Stub body" })
+            end
+
+            describe "and a request is made whose uri matches the regular expression" do
+
+              let(:response) { Net::HTTP.get_response("localhost", "/stub/regexp/match", 8001) }
+
+              it "should respond with the stubbed body" do
+                response.body.should eql("Stub body")
+              end
+
+            end
+
+            describe "and a request is made whose uri does not match the regular expression" do
+
+              let(:response) { Net::HTTP.get_response("localhost", "/stub/no_match/regexp", 8001) }
+
+              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/stub_spec.rb

@@ -1,42 +1,54 @@
 describe HttpStub::Models::Stub do
 
-  let(:stub_uri) { "/a_path" }
-  let(:stub_method) { "get" }
-  let(:stub_parameters) do
-    { "param" => "param_value" }
+  let(:raw_stub_headers) do
+    {
+        "header1" => "header_value1",
+        "header2" => "header_value2",
+        "header3" => "header_value3"
+    }
   end
-  let(:stub_headers) do
-    { "header" => "header_value" }
+  let(:raw_stub_parameters) do
+    {
+        "param1" => "param_value1",
+        "param2" => "param_value2",
+        "param3" => "param_value3"
+    }
   end
+  let(:stub_method) { "get" }
   let(:stub_options) do
     {
-      "uri" => stub_uri,
+      "uri" => "/a_path",
       "method" => stub_method,
-      "parameters" => stub_parameters,
-      "headers" => stub_headers,
+      "headers" => raw_stub_headers,
+      "parameters" => raw_stub_parameters,
       "response" => {
         "status" => 201,
         "body" => "Foo"
       }
     }
   end
-  let(:the_stub) { HttpStub::Models::Stub.new(stub_options) }
+  let(:stub_uri) { double(HttpStub::Models::StubUri, match?: true) }
   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) }
+
   before(:each) do
+    HttpStub::Models::StubUri.stub!(:new).and_return(stub_uri)
     HttpStub::Models::StubParameters.stub!(:new).and_return(stub_parameters)
     HttpStub::Models::StubHeaders.stub!(:new).and_return(stub_headers)
   end
 
   describe "#satisfies?" do
 
-    let(:request_uri) { stub_uri }
+    let(:request_uri) { "/a_request_uri" }
     let(:request_method) { stub_method }
-    let(:request) { double("HttpRequest", :path_info => request_uri, :request_method => request_method) }
+    let(:request) { double("HttpRequest", :request_method => request_method) }
 
     describe "when the request uri matches" do
 
+      before(:each) { stub_uri.stub!(:match?).with(request).and_return(true) }
+
       describe "and the request method matches" do
 
         describe "and a header match is configured" do
@@ -57,16 +69,6 @@ describe HttpStub::Models::Stub do
 
               end
 
-              describe "that does not match" do
-
-                before(:each) { stub_parameters.stub!(:match?).with(request).and_return(false) }
-
-                it "should return false" do
-                  the_stub.satisfies?(request).should be_false
-                end
-
-              end
-
             end
 
           end
@@ -79,7 +81,7 @@ describe HttpStub::Models::Stub do
 
     describe "when the request uri does not match" do
 
-      let(:request_uri) { "/a_different_path" }
+      before(:each) { stub_uri.stub!(:match?).with(request).and_return(false) }
 
       it "should return false" do
         the_stub.satisfies?(request).should be_false
@@ -107,11 +109,21 @@ describe HttpStub::Models::Stub do
 
     end
 
+    describe "when the parameters do not match" do
+
+      before(:each) { stub_parameters.stub!(:match?).with(request).and_return(false) }
+
+      it "should return false" do
+        the_stub.satisfies?(request).should be_false
+      end
+
+    end
+
   end
 
   describe "#uri" do
 
-    it "should return the value provided in the request body" do
+    it "should return the parameters model encapsulating the uri provided in the request body" do
       the_stub.uri.should eql(stub_uri)
     end
 
@@ -155,22 +167,6 @@ describe HttpStub::Models::Stub do
 
   describe "#to_s" do
 
-    let(:stub_headers) do
-      {
-          "header1" => "header_value1",
-          "header2" => "header_value2",
-          "header3" => "header_value3"
-      }
-    end
-
-    let(:stub_parameters) do
-      {
-          "param1" => "param_value1",
-          "param2" => "param_value2",
-          "param3" => "param_value3"
-      }
-    end
-
     it "should return a string containing the stubbed uri" do
       the_stub.to_s.should match(/\/a_path/)
     end
@@ -180,14 +176,14 @@ describe HttpStub::Models::Stub do
     end
 
     it "should return a string containing the stubbed headers" do
-      stub_headers.each_pair do |key, value|
+      raw_stub_headers.each_pair do |key, value|
         the_stub.to_s.should match(/#{Regexp.escape(key)}/)
         the_stub.to_s.should match(/#{Regexp.escape(value)}/)
       end
     end
 
     it "should return a string containing the stubbed parameters" do
-      stub_parameters.each_pair do |key, value|
+      raw_stub_parameters.each_pair do |key, value|
         the_stub.to_s.should match(/#{Regexp.escape(key)}/)
         the_stub.to_s.should match(/#{Regexp.escape(value)}/)
       end

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

@@ -0,0 +1,73 @@
+describe HttpStub::Models::StubUri do
+
+  let(:request) { double("HttpRequest", path_info: request_uri) }
+
+  let(:stub_uri) { HttpStub::Models::StubUri.new(stubbed_uri) }
+
+  describe "#match?" do
+
+    describe "when the uri provided has no 'regexp' prefix" do
+
+      let(:stubbed_uri) { "/some/uri" }
+
+      describe "and the request uri is equal" do
+
+        let(:request_uri) { "/some/uri" }
+
+        it "should return true" do
+          stub_uri.match?(request).should be_true
+        end
+
+      end
+
+      describe "and the request uri is not equal" do
+
+        let(:request_uri) { "/some/other/uri" }
+
+        it "should return false" do
+          stub_uri.match?(request).should be_false
+        end
+
+      end
+
+    end
+
+    describe "when the uri provided has a 'regexp' prefix" do
+
+      let(:stubbed_uri) { "regexp:/some/regexp/uri/.+" }
+
+      describe "and the request uri matches the regular expression" do
+
+        let(:request_uri) { "/some/regexp/uri/match" }
+
+        it "should return true" do
+          stub_uri.match?(request).should be_true
+        end
+
+      end
+
+      describe "and the request uri does not match the regular expression" do
+
+        let(:request_uri) { "/some/other/uri" }
+
+        it "should return false" do
+          stub_uri.match?(request).should be_false
+        end
+
+      end
+
+    end
+
+  end
+
+  describe "#to_s" do
+
+    let(:stubbed_uri) { "some/uri" }
+
+    it "should return the uri" do
+      stub_uri.to_s.should eql(stubbed_uri)
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,13 +1,14 @@
 require 'simplecov'
 SimpleCov.start do
   add_filter "/spec/"
-  minimum_coverage 97.1
+  minimum_coverage 97.2
   refuse_coverage_drop
 end if ENV["coverage"]
 
-require 'rack/test'
 require 'httparty'
 require 'nokogiri'
+require 'rack/test'
+require 'wait_until'
 
 require File.expand_path('../../lib/http_stub/rake/task_generators', __FILE__)
 require File.expand_path('../../lib/http_stub', __FILE__)

data/spec/support/server_integration.rb

@@ -1,28 +1,12 @@
 shared_context "server integration" do
 
-  FIVE_SECONDS = 5
-
   before(:all) do
     @pid = Process.spawn("rake start_example_server --trace")
-    wait_until("http stub server started") { Net::HTTP.get_response("localhost", "/", 8001) }
+    ::Wait.until!("http stub server started") { Net::HTTP.get_response("localhost", "/", 8001) }
   end
 
   after(:all) do
     Process.kill(9, @pid)
   end
 
-  def wait_until(description, &block)
-    start_time = Time.now
-    while true
-      begin
-        block.call
-        return
-      rescue
-        if Time.now - start_time > FIVE_SECONDS
-          raise "Timed out waiting until #{description}"
-        end
-      end
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -93,13 +93,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,15 +107,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: flog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: travis-lint
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,13 +157,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,15 +171,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: flog
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 1.5.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,15 +187,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
-  name: travis-lint
+  name: wait_until
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +203,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.0.1
 description: fakeweb for a HTTP server, informing it to stub / fake responses.
 email: matthew.ueckerman@myob.com
 executables: []
@@ -210,6 +226,7 @@ files:
 - ./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/rake/start_server_task.rb
 - ./lib/http_stub/rake/task_generators.rb
 - ./lib/http_stub/server.rb
@@ -237,6 +254,7 @@ files:
 - ./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/rake/start_server_rake_integration_spec.rb
 - ./spec/lib/http_stub/server_integration_spec.rb
 - ./spec/lib/http_stub/server_spec.rb
@@ -263,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1104906034138605574
+      hash: 3857634377426384844
 requirements: []
 rubyforge_project: http_stub
 rubygems_version: 1.8.25
@@ -288,6 +306,7 @@ test_files:
 - ./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/rake/start_server_rake_integration_spec.rb
 - ./spec/lib/http_stub/server_integration_spec.rb
 - ./spec/lib/http_stub/server_spec.rb