restify 1.13.0 → 1.15.2

data/spec/support/stub_server.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require 'puma'
+require 'rack'
+require 'webmock'
+require 'webmock/rspec/matchers'
+
+module Stub
+  # This Rack application matches the request received from rack against the
+  # webmock stub database and returns the response.
+  #
+  # A custom server name is used to
+  #   1) has a stable name without a dynamic port for easier `#stub_request`
+  #      calls, and
+  #   2) to ensure no actual request is intercepted (they are send to
+  #      `localhost:<port>`).
+  #
+  # If no stub is found a special HTTP 599 error code will be returned.
+  class Handler
+    def call(env)
+      signature = WebMock::RequestSignature.new(
+        env['REQUEST_METHOD'].downcase,
+        "http://stubserver#{env['REQUEST_URI']}",
+      )
+
+      # Extract request headers from rack env. Most header should start with
+      # `HTTP_` but at least content type is present as `CONTENT_TYPE`.
+      headers = {}
+      env.each_pair do |key, value|
+        case key
+          when /^HTTP_(.*)$/, /^(CONTENT_.*)$/
+            headers[Regexp.last_match(1)] = value
+        end
+      end
+
+      # Read request body from socket into string
+      signature.body = env['rack.input'].read
+      signature.headers = headers
+
+      WebMock::RequestRegistry.instance.requested_signatures.put(signature)
+      response = ::WebMock::StubRegistry.instance.response_for_request(signature)
+
+      # Return special HTTP 599 with the error message that would normally
+      # appear on missing stubs.
+      unless response
+        return [599, {}, [WebMock::NetConnectNotAllowedError.new(signature).message]]
+      end
+
+      if response.should_timeout
+        sleep 10
+        return [599, {}, ['Timeout']]
+      end
+
+      status = response.status
+      status = status.to_s.split(' ', 2) unless status.is_a?(Array)
+      status = Integer(status[0])
+
+      [status, response.headers || {}, [response.body.to_s]]
+    end
+  end
+
+  class Exception < ::StandardError; end
+
+  # Inject into base adapter to have HTTP 599 (missing stub) error raised as an
+  # extra exception, not just a server error.
+  module Patch
+    def call(request)
+      super.then do |response|
+        next response unless response.code == 599
+
+        raise ::Stub::Exception.new(response.body)
+      end
+    end
+
+    ::Restify::Adapter::Base.prepend(self)
+  end
+
+  class << self
+    def start_server!
+      @server = ::Puma::Server.new(Handler.new)
+      @server.add_tcp_listener('localhost', 9292)
+
+      Thread.new do
+        @server.run
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include WebMock::API
+  config.include WebMock::Matchers
+
+  config.before(:suite) do
+    Stub.start_server!
+
+    # Net::HTTP adapter must be enabled, otherwise webmock fails to create mock
+    # responses from raw strings.
+    WebMock.disable!(except: %i[net_http])
+  end
+
+  config.around do |example|
+    example.run
+    WebMock.reset!
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.15.2
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: hitimes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: hitimes
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -194,8 +194,10 @@ files:
 - spec/restify/context_spec.rb
 - spec/restify/error_spec.rb
 - spec/restify/features/head_requests_spec.rb
+- spec/restify/features/request_bodies_spec.rb
+- spec/restify/features/request_errors_spec.rb
 - spec/restify/features/request_headers_spec.rb
-- spec/restify/features/response_errors.rb
+- spec/restify/features/response_errors_spec.rb
 - spec/restify/global_spec.rb
 - spec/restify/link_spec.rb
 - spec/restify/processors/base_spec.rb
@@ -208,10 +210,12 @@ files:
 - spec/restify/timeout_spec.rb
 - spec/restify_spec.rb
 - spec/spec_helper.rb
+- spec/support/stub_server.rb
 homepage: https://github.com/jgraichen/restify
 licenses:
 - LGPL-3.0+
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -220,14 +224,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An experimental hypermedia REST client.
@@ -236,8 +240,10 @@ test_files:
 - spec/restify/context_spec.rb
 - spec/restify/error_spec.rb
 - spec/restify/features/head_requests_spec.rb
+- spec/restify/features/request_bodies_spec.rb
+- spec/restify/features/request_errors_spec.rb
 - spec/restify/features/request_headers_spec.rb
-- spec/restify/features/response_errors.rb
+- spec/restify/features/response_errors_spec.rb
 - spec/restify/global_spec.rb
 - spec/restify/link_spec.rb
 - spec/restify/processors/base_spec.rb
@@ -250,3 +256,4 @@ test_files:
 - spec/restify/timeout_spec.rb
 - spec/restify_spec.rb
 - spec/spec_helper.rb
+- spec/support/stub_server.rb

data/spec/restify/features/response_errors.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Restify do
-  let!(:request_stub) do
-    stub_request(:get, 'http://localhost/base')
-      .to_return do
-      <<-RESPONSE.gsub(/^ {8}/, '')
-        HTTP/1.1 #{http_status}
-        Content-Length: 333
-        Transfer-Encoding: chunked
-        Link: <http://localhost/other>; rel="neat"
-      RESPONSE
-    end
-  end
-
-  let(:http_status) { '200 OK' }
-
-  describe 'Error handling' do
-    subject(:request) { Restify.new('http://localhost/base').get.value! }
-
-    context 'for 400 status codes' do
-      let(:http_status) { '400 Bad Request' }
-
-      it 'throws a BadRequest exception' do
-        expect { request }.to raise_error Restify::BadRequest
-      end
-    end
-
-    context 'for 401 status codes' do
-      let(:http_status) { '401 Unauthorized' }
-
-      it 'throws an Unauthorized exception' do
-        expect { request }.to raise_error Restify::Unauthorized
-      end
-    end
-
-    context 'for 404 status codes' do
-      let(:http_status) { '404 Not Found' }
-
-      it 'throws a ClientError exception' do
-        expect { request }.to raise_error Restify::NotFoundError
-      end
-    end
-
-    context 'for 406 status codes' do
-      let(:http_status) { '406 Not Acceptable' }
-
-      it 'throws a NotAcceptable exception' do
-        expect { request }.to raise_error Restify::NotAcceptable
-      end
-    end
-
-    context 'for 422 status codes' do
-      let(:http_status) { '422 Unprocessable Entity' }
-
-      it 'throws a UnprocessableEntity exception' do
-        expect { request }.to raise_error Restify::UnprocessableEntity
-      end
-    end
-
-    context 'for any other 4xx status codes' do
-      let(:http_status) { '415 Unsupported Media Type' }
-
-      it 'throws a generic ClientError exception' do
-        expect { request }.to raise_error Restify::ClientError
-      end
-    end
-
-    context 'for any 5xx status codes' do
-      let(:http_status) { '500 Internal Server Error' }
-
-      it 'throws a generic ServerError exception' do
-        expect { request }.to raise_error Restify::ServerError
-      end
-    end
-  end
-end