pinch_hitter 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c0e017cec57427c43e8e5d00fdbf6f5824a811d
-  data.tar.gz: 4f08b9678da6946f6775d3bf61c874b081982f21
+SHA256:
+  metadata.gz: 45eba7bb747442209e486b0747ad30254f8d40b6c56b6e580f209462bdff2db6
+  data.tar.gz: ac50532874df051f1f66787550261b26c3ed6ef38f28ad5ba180fc074c5ba8c5
 SHA512:
-  metadata.gz: 3132ce9f63afd12c4a4efeb632a8d1d339aba116708f060586090108e3f2d879d1135bf2f35f89122d5c55fe287230c43f333cd1e6f60f50118166e932f5cf99
-  data.tar.gz: b086e13074d4362d6ebd7e910818eaffcb48c9eb1370175970c3fb984f6bba0775437f321132171aa719b743a8092801cc65b5a41bb49137f5632b70ecd72310
+  metadata.gz: 07b7050e60f69ab498294084f174343986f2acbef493c6b102ad7cf7c7121c3d56cc80e6e0b1e2e2ffb374f983ac95c01838f3a15aaec9b0e0bba14a2a107916
+  data.tar.gz: 9e8c48398060dea6ad6b1373295246775d74fbc7bb87ddc654ede2f8b0853465774f647e798e79b319c2cdbdb6daf71f8b523ee71b07aff332fee4c987804569

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.7.0

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 before_install:
   - gem update bundler

data/Changelog

@@ -1,43 +1,47 @@
-=== Release 0.1 / 2013-1-20
-Initial release of the gem
+=== release 0.7.0 / 2020-02-16
+* Disable request security (#16) - Thanks @nwallace!
+* Return 404 for exhausted/unconfigured endpoints (#14) - Thanks @nwallace!
 
-=== Release 0.2 / 2013-1-27
-Switch json to do overrides by key rather than path (like xml)
+=== release 0.6.0 / 2016-06-14
+* removed references to 1.9.2 which has long been eol'd. - thanks @garyjohnson!
+* remove dependency on nokogiri
 
-=== Release 0.3 / 2013-3-22
-Add ability to register modules for custom message handling
+=== Release 0.5.6 / 2016-03-19
+* Add ability to disable cache control (useful for IE testing)
+* Allow client to register a module that will hydrate the response object.
+* Break apart recording and responding to better support full response payloads
 
-=== Release 0.4 / 2014-3-3
-* Add ability to retrieve requests made by the application
-* Support PUT, PATCH, DELETE
+=== Release 0.5.5 / 2015-11-5
+* Allow Cross-Origin requests
 
-=== Release 0.5 / 2014-7-3
-* Fix issue where priming large messages would cause a 500
+=== Release 0.5.4 / 2015-11-5
+* Add require for Net::HTTP as some rubies can't resolve it properly - Thanks
+@kumichou!
+* Convert JSON back to JSON after applying overrides - Thanks Tim Conner!
 
-=== Release 0.5.1 / 2014-7-3
-* Travis revealed some test issues with newer gems.  Thanks Travis CI!
+=== Release 0.5.3 / 2015-8-14
+* Add ability to silence the sintatra/webrick output and keep it out of the
+test logs.
 
 === Release 0.5.2 / 2014-8-8
 * Fix edge case where storing simple messages would fail without a messages
 directory.  Thanks to Dan Parks and Nathan Wallace for pointing it out!
 
-=== Release 0.5.3 / 2015-8-14
-* Add ability to silence the sintatra/webrick output and keep it out of the
-test logs.
+=== Release 0.5.1 / 2014-7-3
+* Travis revealed some test issues with newer gems.  Thanks Travis CI!
 
-=== Release 0.5.4 / 2015-11-5
-* Add require for Net::HTTP as some rubies can't resolve it properly - Thanks
-@kumichou!
-* Convert JSON back to JSON after applying overrides - Thanks Tim Conner!
+=== Release 0.5 / 2014-7-3
+* Fix issue where priming large messages would cause a 500
 
-=== Release 0.5.5 / 2015-11-5
-* Allow Cross-Origin requests
+=== Release 0.4 / 2014-3-3
+* Add ability to retrieve requests made by the application
+* Support PUT, PATCH, DELETE
 
-=== Release 0.5.6 / 2016-03-19
-* Add ability to disable cache control (useful for IE testing)
-* Allow client to register a module that will hydrate the response object.
-* Break apart recording and responding to better support full response payloads
+=== Release 0.3 / 2013-3-22
+Add ability to register modules for custom message handling
+
+=== Release 0.2 / 2013-1-27
+Switch json to do overrides by key rather than path (like xml)
 
-=== Release 0.6.0 / 2016-06-14
-* Removed references to 1.9.2 which has long been EOL'd. - Thanks @garyjohnson!
-* Remove dependency on nokogiri
+=== Release 0.1 / 2013-1-20
+Initial release of the gem

data/features/replay.feature

@@ -40,3 +40,14 @@ Feature:  Test WS replay
     Given I have a car reservation I want to delete
     When I delete a car reservation
     Then I should see a car reservation cancellation
+
+  Scenario: Unconfigured routes respond with Page Not Found
+    When I make a reservation for a car rental I never set up
+    Then I see that the car reservation was not found
+
+  Scenario: Exhausted routes respond with Page Not Found
+    Given I want a car rental
+    When I make a reservation
+    Then I see a car reservation
+    When I make a reservation again
+    Then I see that the car reservation was not found

data/features/step_definitions/replay_steps.rb

@@ -6,12 +6,16 @@ Given /^I want a car rental$/ do
   mock.prime '/car_rental', :car_rental
 end
 
-When /^I make a reservation$/ do
+When /^I make a reservation(?: again)?$/ do
   @response = app.post '/car_rental', '{"reservation": "yes"}'
 end
 
+When /^I make a reservation for a car rental I never set up$/ do
+  @response = app.post '/car_rental_bogus', '{"reservation": "yes"}'
+end
+
 Then /^I see a car reservation$/ do
-  @response.body.to_s.should == messages.load(:car_rental).squish
+  expect(@response.body.to_s).to eq messages.load(:car_rental).squish
 end
 
 Given /^I want a car rental with a "(.*?)" of "(.*?)"$/ do |tag, text|
@@ -19,7 +23,12 @@ Given /^I want a car rental with a "(.*?)" of "(.*?)"$/ do |tag, text|
 end
 
 Then /^I see a car reservation with a "(.*?)" of "(.*?)"$/ do |tag, text|
-  @response.body.to_s.should == messages.load(:car_rental, { tag => text }).squish
+  expect(@response.body.to_s).to eq messages.load(:car_rental, { tag => text }).squish
+end
+
+Then /^I see that the car reservation was not found$/ do
+  expect(@response.code).to eq "404"
+  expect(@response.body).to eq ""
 end
 
 Given /^I want to lookup a definition$/ do
@@ -31,7 +40,7 @@ When /^I query the glossary$/ do
 end
 
 Then /^I see a definition$/ do
-  @response.body.to_s.should == messages.load(:glossary).squish
+  expect(@response.body.to_s).to eq messages.load(:glossary).squish
 end
 
 Given /^I want to lookup a definition with a "(.*?)" of "(.*?)"$/ do |key, value|
@@ -39,7 +48,7 @@ Given /^I want to lookup a definition with a "(.*?)" of "(.*?)"$/ do |key, value
 end
 
 Then /^I see a definition with a "(.*?)" of "(.*?)"$/ do |key, value|
-  @response.body.to_s.should == messages.load(:glossary, { key => value }).squish
+  expect(@response.body.to_s).to eq messages.load(:glossary, { key => value }).squish
 end
 
 Given(/^I want to do some fancy processing$/) do
@@ -51,7 +60,7 @@ When(/^I query my service with (.*?)$/) do |request|
 end
 
 Then(/^I see (.*?) in the service response$/) do |response|
-  @response.body.to_s.should == "<response>#{response}</response>"
+  expect(@response.body.to_s).to eq "<response>#{response}</response>"
 end
 
 Given(/^I have a car reservation I want to delete$/) do
@@ -63,5 +72,5 @@ When(/^I delete a car reservation$/) do
 end
 
 Then(/^I should see a car reservation cancellation$/) do
-  @response.body.to_s.should == messages.load(:cancelled_reservation).squish
+  expect( @response.body.to_s).to eq messages.load(:cancelled_reservation).squish
 end

data/features/step_definitions/response_steps.rb

@@ -9,5 +9,5 @@ When(/^I make a request$/) do
 end
 
 Then(/^my response has a no\-cache,no\-store Cache\-Control header$/) do
-  @response.header['Cache-Control'].should == 'no-cache, no-store'
+  expect(@response.header['Cache-Control']).to eq 'no-cache, no-store'
 end

data/features/step_definitions/verify_requests_steps.rb

@@ -9,7 +9,7 @@ When /^I make (\d+) posts$/ do |number|
 end
 
 Then /^the service has received (\d+) posts(?:s?)$/ do |number|
-  mock.request_log('/test_post').count.should == number.to_i
+  expect(mock.request_log('/test_post').count).to eq number.to_i
 end
 
 When /^I do a (.*?) on "(.*?)"$/ do |method, endpoint|
@@ -17,12 +17,12 @@ When /^I do a (.*?) on "(.*?)"$/ do |method, endpoint|
 end
 
 Then(/^the service has recieved a request on "(.*?)"$/) do |endpoint|
-  mock.request_log(endpoint).count.should be > 0
+  expect(mock.request_log(endpoint).count).to be > 0
 end
 
 When /^the headers for the request on "(.*?)" should contain:$/ do |endpoint, table|
   headers = mock.request_log(endpoint).first.headers
   table.rows_hash.each do |key, value|
-    headers[key].should == value
+    expect(headers[key]).to eq value
   end
 end

data/lib/pinch_hitter/message/message_store.rb

@@ -3,7 +3,7 @@ require 'pinch_hitter/message/json'
 require 'pinch_hitter/message/content_type'
 
 module PinchHitter::Message
-    class MessageStore
+  class MessageStore
     include Xml
     include Json
     include ContentType

data/lib/pinch_hitter/service/endpoint_handlers.rb

@@ -26,6 +26,10 @@ module PinchHitter::Service
       handlers[endpoint] || store_handler(endpoint)
     end
 
+    def handler_for?(endpoint)
+      handlers.has_key?(endpoint)
+    end
+
     def register_module(endpoint, mod)
       handler = Object.new
       handler.extend(mod)

data/lib/pinch_hitter/service/replay_ws.rb

@@ -21,6 +21,7 @@ module PinchHitter::Service
       mime_type :xml, "text/xml"
       mime_type :json, "application/json"
       disable :no_cache
+      disable :protection
     end
 
 
@@ -40,17 +41,17 @@ module PinchHitter::Service
     end
 
     post '/store' do
-      store request["endpoint"], request.body.read
+      store params["endpoint"], request.body.read
       status 200
     end
 
     post '/register_module' do
-      register_module request["endpoint"], request.body.read
+      register_module params["endpoint"], request.body.read
       status 200
     end
 
     get '/received_requests' do
-      requests request["endpoint"]
+      requests request.params["endpoint"]
     end
 
     post '/respond' do
@@ -86,12 +87,17 @@ module PinchHitter::Service
       endpoint = normalize(endpoint)
       body, request = wrap(request)
       @@recorder.record(endpoint, request)
-      message = @@handlers.respond_to(endpoint, body, request, response)
-      if message.is_a? String
-        content_type determine_content_type message
-        puts "No message found for #{endpoint}" unless message
+      if @@handlers.handler_for?(endpoint)
+        message = @@handlers.respond_to(endpoint, body, request, response)
+        if message
+          content_type determine_content_type message
+          message
+        else
+          status 404
+        end
+      else
+        status 404
       end
-      message
     end
 
     def register_module(endpoint='/', mod='')

data/lib/pinch_hitter/service/runner.rb

@@ -18,7 +18,7 @@ module PinchHitter::Service::Runner
     @app = PinchHitter::Service::ReplayWs.new
     @app.settings.enable :no_cache if @no_cache
     @replay_service = Thread.new do
-      Rack::Handler::WEBrick.run @app, service_options(host, port)
+      Rack::Handler::WEBrick.run @app, **service_options(host, port)
     end
     wait_for_replay(timeout)
   end

data/lib/pinch_hitter/version.rb

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

data/test/message_assertions.rb

@@ -1,6 +1,6 @@
 module MessageAssertions
   def xml_message
-    message = %Q{<?xml version="1.0" encoding="UTF-8"?>
+    %Q{<?xml version="1.0" encoding="UTF-8"?>
       <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:replay="http://www.leandog.com/replay">
         <env:Body>
           <replay:Response>BARK!</replay:Response>

data/test/test_pinch_hitter.rb

@@ -76,6 +76,7 @@ class TestPinchHitter < MiniTest::Test
   def test_request_headers
     session.delete '/foo'
     headers = @test.request_log('/foo').first.headers
+    assert headers.keys.include? 'CONTENT_TYPE'
   end
 
   def test_received_messages

data/test/test_service.rb

@@ -37,7 +37,7 @@ class TestService < MiniTest::Test
     post "/reset", ''
     assert_equal 200, last_response.status
     post "/respond", ''
-    assert_equal 200, last_response.status
+    assert_equal 404, last_response.status
     assert_equal '', last_response.body
   end
 
@@ -148,6 +148,13 @@ class TestService < MiniTest::Test
     app.disable :no_cache
   end
 
+  def test_cors_protections_are_off
+    post "/store", xml_message
+    post "/respond", ''
+
+    assert_nil last_response["X-Frame-Options"]
+  end
+
   def test_request_handler
     post '/register_module?endpoint=stuff', Marshal.dump(TestRequestHandler)
     post '/stuff', ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinch_hitter
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Steve Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -192,8 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Test utility for mocking out external web responses