http_stub 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a6a02a024a22ad07ff458e4076ac6b3edae3c9
-  data.tar.gz: 2a8a5a9f5d0e4dd10e1e6e8471f7e263045b72d9
+  metadata.gz: ae298667f0d24ef61eee93ad2a8a9daa92d5ed87
+  data.tar.gz: 82479a4ed23ef2173f90a9f19504fdaa72377f50
 SHA512:
-  metadata.gz: 2c427195bbf661e6a9717658b1ca3a6f2b4cc286194fe3f2a8a677356da3f73bb187c336c14248ce4f37105ae3f78df2becc33dcb599b3854581f3008b6a7431
-  data.tar.gz: ddab90edb0e73220865ab2378295e90331d2e1692833c997380521e22217a817fc64ad6c4472563424f7fca79de85331e4795a097d0ad9892db51381221dae86
+  metadata.gz: 5f81e67a3de971f554b81ce98e0d0fdd49534d855ae524466ee030ea46eedfd63baafd5900f37795daabddfbe4ef75071834dcf2d5e6110b01a826c1e9358b2a
+  data.tar.gz: b0858d659ce4bacb911d4b16e7ab870219384901881668ee181c7a68285b6d6291114f568c4be25ecdcca8318b1b4b5af796495bc411ddd92f3bf0d40b2d7ae3

data/lib/http_stub/configurer/dsl/stub_builder.rb

@@ -35,7 +35,7 @@ module HttpStub
         end
 
         def invoke(&block)
-          block.arity == 0 ? self.instance_eval(&block) : (yield self)
+          block.arity.zero? ? self.instance_eval(&block) : (yield self)
         end
 
         def merge!(stub_builder)

data/lib/http_stub/configurer/part.rb

@@ -10,7 +10,11 @@ module HttpStub
       end
 
       def method_missing(name, *args, &block)
-        @configurer.send(name, *args, &block)
+        @configurer.respond_to?(name, true) ? @configurer.send(name, *args, &block) : super
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        @configurer.respond_to?(name, include_private)
       end
 
     end

data/lib/http_stub/extensions/core/hash/indifferent_and_insensitive_access.rb

@@ -12,7 +12,7 @@ module HttpStub
           private
 
           def indifferent_and_insensitive_find(key)
-            entry = self.find { |entry_key, _entry_value| entry_key.to_s.casecmp(key.to_s) == 0 }
+            entry = self.find { |entry_key, _entry_value| entry_key.to_s.casecmp(key.to_s).zero? }
             entry ? entry[1] : nil
           end
 

data/lib/http_stub/server/stub/match/rule/method.rb

@@ -11,7 +11,7 @@ module HttpStub
             end
 
             def matches?(request, _logger)
-              @method.blank? || @method.casecmp(request.method) == 0
+              @method.blank? || @method.casecmp(request.method).zero?
             end
 
             def to_s

data/lib/http_stub/server/stub/response/file.rb

@@ -26,7 +26,7 @@ module HttpStub
           private
 
           def send_options
-            { status: @status, type: @headers["content-type"] }.tap do |options|
+            { type: @headers["content-type"] }.tap do |options|
               options[:last_modified] = @headers["last-modified"]       if @headers["last-modified"]
               options[:disposition]   = @headers["content-disposition"] if @headers["content-disposition"]
             end

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.24.2".freeze
+  VERSION = "0.24.3".freeze
 end

data/spec/acceptance/stub_spec.rb

@@ -237,11 +237,11 @@ describe "Stub basics acceptance" do
 
       context "and a request that matches is made" do
 
-        context "that matches a stub with a custom content-type" do
+        context "matching a stub with a custom content-type" do
 
-          let(:response) { HTTParty.get("#{server_uri}/stub_response_with_file") }
+          let(:response) { issue_request }
 
-          it "responds with the configured status code" do
+          it "responds with a status code of 200" do
             expect(response.code).to eql(200)
           end
 
@@ -253,9 +253,34 @@ describe "Stub basics acceptance" do
             expect_response_to_contain_file(HttpStub::Examples::ConfigurerWithFileResponses::FILE_PATH)
           end
 
+          context "and a subsequent request is made that requests the file if it has been modified" do
+
+            let(:first_response)          { issue_request }
+            let(:file_last_modified_time) { first_response.headers["Last-Modified"] }
+
+            let(:second_response) { issue_request("if_modified_since" => file_last_modified_time) }
+
+            it "responds with a status code of 304 to indicate the file is unchanged" do
+              expect(second_response.code).to eql(304)
+            end
+
+            it "responds with no content type" do
+              expect(second_response.content_type).to be(nil)
+            end
+
+            it "responds with an empty body" do
+              expect(second_response.body).to be(nil)
+            end
+
+          end
+
+          def issue_request(headers={})
+            HTTParty.get("#{server_uri}/stub_response_with_file", headers: headers)
+          end
+
         end
 
-        context "that matches a stub with no content-type" do
+        context "matching a stub with no content-type" do
 
           let(:response) { HTTParty.get("#{server_uri}/stub_response_with_file_and_no_content_type") }
 

data/spec/acceptance/stub_trigger_spec.rb

@@ -61,9 +61,8 @@ describe "Stub trigger acceptance" do
         stub_server.build_stub do |stub|
           stub.match_requests(uri: "/triggered_stub_pdf_file", method: :get)
           stub.respond_with(
-            status: 201,
             headers: { "content-type" => "application/pdf" },
-            body: { file: { path: pdf_file_path, name: ::File.basename(pdf_file_path) } }
+            body:    { file: { path: pdf_file_path, name: ::File.basename(pdf_file_path) } }
           )
         end
       end
@@ -72,7 +71,7 @@ describe "Stub trigger acceptance" do
       let(:text_trigger) do
         stub_server.build_stub do |stub|
           stub.match_requests(uri: "/triggered_stub_text", method: :get)
-          stub.respond_with(status: 202, body: "Sample trigger stub body")
+          stub.respond_with(status: 201, body: "Sample trigger stub body")
         end
       end
 
@@ -81,9 +80,8 @@ describe "Stub trigger acceptance" do
         stub_server.build_stub do |stub|
           stub.match_requests(uri: "/triggered_stub_txt_file", method: :get)
           stub.respond_with(
-            status: 203,
             headers: { "content-type" => "text/plain" },
-            body: { file: { path: txt_file_path, name: ::File.basename(txt_file_path) } }
+            body:    { file: { path: txt_file_path, name: ::File.basename(txt_file_path) } }
           )
         end
       end
@@ -107,7 +105,7 @@ describe "Stub trigger acceptance" do
           let(:response) { HTTParty.get("#{server_uri}/triggered_stub_pdf_file") }
 
           it "replays the triggered response" do
-            expect(response.code).to eql(201)
+            expect(response.code).to eql(200)
             expect_response_to_contain_file(pdf_file_path)
           end
 
@@ -118,7 +116,7 @@ describe "Stub trigger acceptance" do
           let(:response) { HTTParty.get("#{server_uri}/triggered_stub_text") }
 
           it "replays the triggered response" do
-            expect(response.code).to eql(202)
+            expect(response.code).to eql(201)
             expect(response.body).to eql(text_body)
           end
 
@@ -129,7 +127,7 @@ describe "Stub trigger acceptance" do
           let(:response) { HTTParty.get("#{server_uri}/triggered_stub_txt_file") }
 
           it "replays the triggered response" do
-            expect(response.code).to eql(203)
+            expect(response.code).to eql(200)
             expect(response.parsed_response).to eql(::File.read(txt_file_path))
           end
 

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

@@ -8,7 +8,7 @@ describe HttpStub::Configurer::Part do
     Class.new.tap { |part_class| part_class.send(:include, HttpStub::Configurer::Part) }
   end
 
-  let(:part)       { part_class.new }
+  let(:part) { part_class.new }
 
   describe "#configure" do
 
@@ -66,4 +66,38 @@ describe HttpStub::Configurer::Part do
 
   end
 
+  context "when configured" do
+
+    before(:example) { part.configure(configurer) }
+
+    describe "other methods on the part" do
+
+      context "when defined in the configurer" do
+
+        it "are defined on the part" do
+          expect(part.respond_to?(:stub_server)).to be(true)
+        end
+
+        it "are delegated to the configurer" do
+          expect(part.stub_server).to eql(configurer.stub_server)
+        end
+
+      end
+
+      context "when not defined in the configurer" do
+
+        it "are not defined on the part" do
+          expect(part.respond_to?(:not_in_configurer)).to be(false)
+        end
+
+        it "raise an error on the part when invoked" do
+          expect { part.not_in_configurer }.to raise_error(/#{part_class}/)
+        end
+
+      end
+
+    end
+
+  end
+
 end

data/spec/lib/http_stub/server/stub/response/file_spec.rb

@@ -1,11 +1,11 @@
 describe HttpStub::Server::Stub::Response::File do
 
-  let(:status)         { 321 }
-  let(:headers)        { {} }
-  let(:file_name)      { "sample.txt" }
-  let(:temp_file_path) { "#{HttpStub::Spec::RESOURCES_DIR}/#{file_name}" }
-  let(:body)           { { filename: file_name, tempfile: File.new(temp_file_path) } }
-  let(:args)           { { "status" => status, "headers" => headers, "body" => body } }
+  let(:headers)         { {} }
+  let(:file_name)       { "sample.txt" }
+  let(:temp_file_path)  { "#{HttpStub::Spec::RESOURCES_DIR}/#{file_name}" }
+  let(:body)            { { filename: file_name, tempfile: File.new(temp_file_path) } }
+  let(:additional_args) { {} }
+  let(:args)            { { "headers" => headers, "body" => body }.merge(additional_args) }
 
   let(:response_file) { HttpStub::Server::Stub::Response::File.new(args) }
 
@@ -55,7 +55,7 @@ describe HttpStub::Server::Stub::Response::File do
     end
 
     it "creates a new response file with other arguments preserved" do
-      expect(described_class).to receive(:new).with(hash_including("status" => status, "body" => body))
+      expect(described_class).to receive(:new).with(hash_including("body" => body))
 
       subject
     end
@@ -75,7 +75,9 @@ describe HttpStub::Server::Stub::Response::File do
 
   describe "#serve_on" do
 
-    let(:server) { instance_double(Sinatra::Base) }
+    let(:status)          { 321 }
+    let(:additional_args) { { "status" => status } }
+    let(:server)          { instance_double(Sinatra::Base) }
 
     subject { response_file.serve_on(server) }
 
@@ -85,8 +87,8 @@ describe HttpStub::Server::Stub::Response::File do
       subject
     end
 
-    it "sends the file with the responses status" do
-      expect(server).to receive(:send_file).with(anything, hash_including(status: status))
+    it "sends the file without any provided response status to ensure that 304 responses are honoured" do
+      expect(server).to receive(:send_file).with(anything, hash_excluding(:status))
 
       subject
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - dueckes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -146,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.42'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.42'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +188,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement