restify 1.15.1 → 1.15.2

data/spec/restify/features/request_bodies_spec.rb

@@ -14,6 +14,7 @@ describe Restify do
 
   describe 'Request body' do
     subject { Restify.new('http://localhost:9292/base').post(body, {}, {headers: headers}).value! }
+
     let(:headers) { {} }
 
     context 'with JSON-like data structures' do
@@ -23,7 +24,7 @@ describe Restify do
         subject
 
         expect(
-          request_stub.with(body: '{"a":"b","c":"d"}')
+          request_stub.with(body: '{"a":"b","c":"d"}'),
         ).to have_been_requested
       end
 
@@ -31,7 +32,7 @@ describe Restify do
         subject
 
         expect(
-          request_stub.with(headers: {'Content-Type' => 'application/json'})
+          request_stub.with(headers: {'Content-Type' => 'application/json'}),
         ).to have_been_requested
       end
 
@@ -42,7 +43,7 @@ describe Restify do
           subject
 
           expect(
-            request_stub.with(headers: {'Content-Type' => 'application/vnd.api+json'})
+            request_stub.with(headers: {'Content-Type' => 'application/vnd.api+json'}),
           ).to have_been_requested
         end
       end
@@ -55,7 +56,7 @@ describe Restify do
         subject
 
         expect(
-          request_stub.with(body: 'a=b&c=d')
+          request_stub.with(body: 'a=b&c=d'),
         ).to have_been_requested
       end
 
@@ -63,7 +64,7 @@ describe Restify do
         subject
 
         expect(
-          request_stub.with {|req| req.headers['Content-Type'] !~ /json/ }
+          request_stub.with {|req| req.headers['Content-Type'] !~ /json/ },
         ).to have_been_requested
       end
 
@@ -74,7 +75,7 @@ describe Restify do
           subject
 
           expect(
-            request_stub.with(headers: {'Content-Type' => 'application/text'})
+            request_stub.with(headers: {'Content-Type' => 'application/text'}),
           ).to have_been_requested
         end
       end

data/spec/restify/features/request_headers_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Restify do
   let!(:request_stub) do
-    stub_request(:get, "http://stubserver/base").to_return do
+    stub_request(:get, 'http://stubserver/base').to_return do
       <<~HTTP
         HTTP/1.1 200 OK
         Content-Type: application/json
@@ -21,14 +21,14 @@ describe Restify do
     it 'sends the headers only for that request' do
       root = context.get(
         {},
-        {headers: {'Accept' => 'application/msgpack, application/json'}}
+        {headers: {'Accept' => 'application/msgpack, application/json'}},
       ).value!
 
       root.rel(:self).get.value!
 
       expect(request_stub).to have_been_requested.twice
       expect(
-        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'})
+        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'}),
       ).to have_been_requested.once
     end
   end
@@ -37,7 +37,7 @@ describe Restify do
     let(:context) do
       Restify.new(
         'http://localhost:9292/base',
-        headers: {'Accept' => 'application/msgpack, application/json'}
+        headers: {'Accept' => 'application/msgpack, application/json'},
       )
     end
 
@@ -47,39 +47,39 @@ describe Restify do
       root.rel(:self).get.value!
 
       expect(
-        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'})
+        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'}),
       ).to have_been_requested.twice
     end
 
     it 'can overwrite headers for single requests' do
       root = context.get(
         {},
-        {headers: {'Accept' => 'application/xml'}}
+        {headers: {'Accept' => 'application/xml'}},
       ).value!
 
       root.rel(:self).get.value!
 
       expect(
-        request_stub.with(headers: {'Accept' => 'application/xml'})
+        request_stub.with(headers: {'Accept' => 'application/xml'}),
       ).to have_been_requested.once
       expect(
-        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'})
+        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'}),
       ).to have_been_requested.once
     end
 
     it 'can add additional headers for single requests' do
       root = context.get(
         {},
-        {headers: {'X-Custom' => 'foobar'}}
+        {headers: {'X-Custom' => 'foobar'}},
       ).value!
 
       root.rel(:self).get.value!
 
       expect(
-        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'})
+        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json'}),
       ).to have_been_requested.twice
       expect(
-        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json', 'X-Custom' => 'foobar'})
+        request_stub.with(headers: {'Accept' => 'application/msgpack, application/json', 'X-Custom' => 'foobar'}),
       ).to have_been_requested.once
     end
   end

data/spec/restify/features/response_errors_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Restify do
-  let!(:request_stub) do
+  before do
     stub_request(:get, 'http://stubserver/base')
       .to_return(status: http_status, headers: headers)
   end

data/spec/restify/global_spec.rb

@@ -7,11 +7,11 @@ describe Restify::Global do
 
   describe '#new' do
     context 'with string URI' do
+      subject { global.new uri, **options }
+
       let(:uri)     { 'http://api.github.com/' }
       let(:options) { {accept: 'application.vnd.github.v3+json'} }
 
-      subject { global.new uri, **options }
-
       it 'returns relation for URI' do
         expect(subject).to be_a Restify::Relation
         expect(subject.pattern).to eq uri
@@ -21,13 +21,13 @@ describe Restify::Global do
     end
 
     context 'with registry symbol' do
-      let(:name)  { :registry_item_name }
+      subject { global.new(name, **options) }
+
+      let(:name) { :registry_item_name }
       let(:uri)     { 'http://api.github.com/' }
       let(:options) { {accept: 'application.vnd.github.v3+json'} }
       let(:context) { Restify::Context.new uri, **options }
 
-      subject { global.new(name, **options) }
-
       it 'returns relation for stored registry item' do
         Restify::Registry.store(name, uri, **options)
 

data/spec/restify/link_spec.rb

@@ -5,27 +5,27 @@ require 'spec_helper'
 describe Restify::Link do
   describe 'class' do
     describe '#parse' do
-      it 'should parse link with quotes' do
+      it 'parses link with quotes' do
         links = described_class
-                .parse('<http://example.org/search{?query}>; rel="search"')
+          .parse('<http://example.org/search{?query}>; rel="search"')
 
         expect(links).to have(1).item
         expect(links[0].uri).to eq 'http://example.org/search{?query}'
         expect(links[0].metadata).to eq 'rel' => 'search'
       end
 
-      it 'should parse link without quotes' do
+      it 'parses link without quotes' do
         links = described_class
-                .parse('<http://example.org/search{?query}>; rel=search')
+          .parse('<http://example.org/search{?query}>; rel=search')
 
         expect(links).to have(1).item
         expect(links[0].uri).to eq 'http://example.org/search{?query}'
         expect(links[0].metadata).to eq 'rel' => 'search'
       end
 
-      it 'should parse multiple links' do
+      it 'parses multiple links' do
         links = described_class
-                .parse('<p://h.tld/p>; rel=abc, <p://h.tld/b>; a=b; c="d"')
+          .parse('<p://h.tld/p>; rel=abc, <p://h.tld/b>; a=b; c="d"')
 
         expect(links).to have(2).item
         expect(links[0].uri).to eq 'p://h.tld/p'
@@ -34,19 +34,19 @@ describe Restify::Link do
         expect(links[1].metadata).to eq 'a' => 'b', 'c' => 'd'
       end
 
-      it 'should parse link w/o meta' do
+      it 'parses link w/o meta' do
         links = described_class.parse('<p://h.tld/b>')
 
         expect(links[0].uri).to eq 'p://h.tld/b'
       end
 
-      it 'should parse on invalid URI' do
+      it 'parses on invalid URI' do
         links = described_class.parse('<hp://:&*^/fwbhg3>')
 
         expect(links[0].uri).to eq 'hp://:&*^/fwbhg3'
       end
 
-      it 'should error on invalid header' do
+      it 'errors on invalid header' do
         expect { described_class.parse('</>; rel="s", abc-invalid') }
           .to raise_error ArgumentError, /Invalid token at \d+:/i
       end

data/spec/restify/processors/base_spec.rb

@@ -25,6 +25,7 @@ describe Restify::Processors::Base do
 
   describe '#resource' do
     subject { described_class.new(context, response).resource }
+
     before { allow(response).to receive(:body).and_return(body) }
 
     describe 'parsing' do

data/spec/restify/processors/json_spec.rb

@@ -29,6 +29,7 @@ describe Restify::Processors::Json do
 
   describe '#resource' do
     subject { described_class.new(context, response).resource }
+
     before { allow(response).to receive(:body).and_return(body) }
 
     describe 'parsing' do
@@ -52,7 +53,7 @@ describe Restify::Processors::Json do
         end
 
         it do
-          is_expected.to eq \
+          expect(subject).to eq \
             'json' => 'value', 'search_url' => 'https://google.com{?q}'
         end
 

data/spec/restify/processors/msgpack_spec.rb

@@ -39,6 +39,7 @@ describe Restify::Processors::Msgpack do
 
   describe '#resource' do
     subject { described_class.new(context, response).resource }
+
     before { allow(response).to receive(:body).and_return(body) }
 
     describe 'parsing' do
@@ -56,12 +57,12 @@ describe Restify::Processors::Msgpack do
         let(:body) do
           ::MessagePack.dump(
             'msg' => 'value',
-            'search_url' => 'https://google.com{?q}'
+            'search_url' => 'https://google.com{?q}',
           )
         end
 
         it do
-          is_expected.to eq \
+          expect(subject).to eq \
             'msg' => 'value', 'search_url' => 'https://google.com{?q}'
         end
 
@@ -72,7 +73,7 @@ describe Restify::Processors::Msgpack do
       context 'object with implicit self relation' do
         let(:body) do
           ::MessagePack.dump(
-            'url' => '/self'
+            'url' => '/self',
           )
         end
 
@@ -100,9 +101,9 @@ describe Restify::Processors::Msgpack do
       context 'array with resources' do
         let(:body) do
           ::MessagePack.dump([
-                               {'name' => 'John', 'self_url' => '/users/john'},
-                               {'name' => 'Jane', 'self_url' => '/users/jane'}
-                             ])
+            {'name' => 'John', 'self_url' => '/users/john'},
+            {'name' => 'Jane', 'self_url' => '/users/jane'},
+          ])
         end
 
         it 'parses objects as resources' do
@@ -119,7 +120,7 @@ describe Restify::Processors::Msgpack do
         let(:body) do
           ::MessagePack.dump(
             'john' => {'name' => 'John'},
-            'jane' => {'name' => 'Jane'}
+            'jane' => {'name' => 'Jane'},
           )
         end
 

data/spec/restify/promise_spec.rb

@@ -8,6 +8,7 @@ describe Restify::Promise do
   describe 'factory methods' do
     describe '#fulfilled' do
       subject { described_class.fulfilled(fulfill_value) }
+
       let(:fulfill_value) { 42 }
 
       it 'returns a fulfilled promise' do
@@ -22,6 +23,7 @@ describe Restify::Promise do
 
     describe '#rejected' do
       subject { described_class.rejected(rejection_reason) }
+
       let(:rejection_reason) { ArgumentError }
 
       it 'returns a rejected promise' do
@@ -104,6 +106,7 @@ describe Restify::Promise do
 
   describe 'result' do
     subject { described_class.new(*dependencies, &task).value! }
+
     let(:dependencies) { [] }
     let(:task) { nil }
 
@@ -125,7 +128,7 @@ describe Restify::Promise do
         [
           Restify::Promise.fulfilled(1),
           Restify::Promise.fulfilled(2),
-          Restify::Promise.fulfilled(3)
+          Restify::Promise.fulfilled(3),
         ]
       end
 
@@ -139,7 +142,7 @@ describe Restify::Promise do
         [[
           Restify::Promise.fulfilled(1),
           Restify::Promise.fulfilled(2),
-          Restify::Promise.fulfilled(3)
+          Restify::Promise.fulfilled(3),
         ]]
       end
 
@@ -152,7 +155,7 @@ describe Restify::Promise do
       let(:dependencies) do
         [
           Restify::Promise.fulfilled(5),
-          Restify::Promise.fulfilled(12)
+          Restify::Promise.fulfilled(12),
         ]
       end
       let(:task) do
@@ -168,6 +171,7 @@ describe Restify::Promise do
     # dependencies is built dynamically.
     context 'with an empty array of dependencies and without task' do
       subject { described_class.new([]).value! }
+
       it { is_expected.to eq [] }
     end
   end
@@ -180,7 +184,7 @@ describe Restify::Promise do
 
   describe '#value' do
     it 'can time out' do
-      expect { promise.value!(0.1) }.to raise_error ::Timeout::Error
+      expect { promise.value(0.1) }.to raise_error ::Timeout::Error
     end
   end
 

data/spec/restify/registry_spec.rb

@@ -36,12 +36,12 @@ describe Restify::Registry do
   end
 
   describe '#store / #fetch' do
+    subject { registry.store name, uri, **opts }
+
     let(:name) { 'remote' }
     let(:uri)  { 'http://remote/entry/point' }
     let(:opts) { {accept: 'application/vnd.remote+json'} }
 
-    subject { registry.store name, uri, **opts }
-
     it 'stores registry item' do
       subject
 

data/spec/restify/relation_spec.rb

@@ -3,53 +3,54 @@
 require 'spec_helper'
 
 describe Restify::Relation do
+  subject(:relation) { described_class.new context, pattern }
+
   let(:context)  { Restify::Context.new('http://test.host/') }
   let(:pattern)  { '/resource/{id}' }
-  let(:relation) { described_class.new context, pattern }
-  subject { relation }
 
   describe '#==' do
-    it 'should equal pattern' do
+    it 'equals pattern' do
       expect(subject).to eq pattern
     end
   end
 
   describe '#expand' do
-    let(:params) { {id: 1337} }
-
-    subject { relation.expand params }
-
-    it { is_expected.to be_a Addressable::URI }
+    subject(:expaned) { relation.expand params }
 
-    class ParamObject
-      def to_param
-        42
+    let(:params) { {id: 1337} }
+    let(:cls_to_param) do
+      Class.new do
+        def to_param
+          42
+        end
       end
     end
 
+    it { is_expected.to be_a Addressable::URI }
+
     context 'with #to_param object' do
-      let(:params) { {id: ParamObject.new} }
+      let(:params) { {id: cls_to_param.new} }
 
-      it { expect(subject.to_s).to eq 'http://test.host/resource/42' }
+      it { expect(expaned.to_s).to eq 'http://test.host/resource/42' }
     end
 
     context 'with unknown additional query parameter' do
       let(:pattern) { '/resource{?a,b}' }
       let(:params) { {a: 1, b: 2, c: 3} }
 
-      it { expect(subject.to_s).to eq 'http://test.host/resource?a=1&b=2&c=3' }
+      it { expect(expaned.to_s).to eq 'http://test.host/resource?a=1&b=2&c=3' }
     end
 
     context 'with additional parameters' do
       let(:params) { {id: '5', abc: 'cde'} }
 
-      it { expect(subject.to_s).to eq 'http://test.host/resource/5?abc=cde' }
+      it { expect(expaned.to_s).to eq 'http://test.host/resource/5?abc=cde' }
     end
 
     context 'with additional #to_param parameter' do
-      let(:params) { {id: '5', abc: ParamObject.new} }
+      let(:params) { {id: '5', abc: cls_to_param.new} }
 
-      it { expect(subject.to_s).to eq 'http://test.host/resource/5?abc=42' }
+      it { expect(expaned.to_s).to eq 'http://test.host/resource/5?abc=42' }
     end
   end
 end

data/spec/restify/resource_spec.rb

@@ -3,12 +3,13 @@
 require 'spec_helper'
 
 describe Restify::Resource do
+  subject { resource }
+
   let(:data)      { {} }
   let(:relations) { {} }
   let(:context)   { double 'context' }
   let(:response)  { double 'response' }
   let(:resource)  { described_class.new(context, response: response, data: data, relations: relations) }
-  subject { resource }
 
   before do
     allow(context).to receive(:relation?).and_return(false)
@@ -19,12 +20,12 @@ describe Restify::Resource do
     let(:relations) do
       {
         'users' => 'http://example.org/users',
-        'projects' => 'http://example.org/projects'
+        'projects' => 'http://example.org/projects',
       }
     end
 
     describe '#relation?' do
-      it 'should match relations' do
+      it 'matches relations' do
         expect(subject.relation?(:users)).to eq true
         expect(subject.relation?('users')).to eq true
         expect(subject.relation?(:projects)).to eq true
@@ -46,7 +47,7 @@ describe Restify::Resource do
     end
 
     describe '#relation' do
-      it 'should return relation' do
+      it 'returns relation' do
         expect(subject.rel(:users)).to be_a Restify::Relation
 
         expect(subject.rel(:users)).to eq 'http://example.org/users'
@@ -80,7 +81,7 @@ describe Restify::Resource do
       end
     end
 
-    context '#follow!' do
+    describe '#follow!' do
       let(:relations) { {_restify_follow: 'http://localhost/10'} }
 
       it 'returns follow relation' do
@@ -103,14 +104,14 @@ describe Restify::Resource do
   context 'data' do
     let(:data) { double 'data' }
 
-    it 'should delegate methods (I)' do
+    it 'delegates methods (I)' do
       expect(data).to receive(:some_method).and_return(42)
 
       expect(subject).to respond_to :some_method
       expect(subject.some_method).to eq 42
     end
 
-    it 'should delegate methods (II)' do
+    it 'delegates methods (II)' do
       expect(data).to receive(:[]).with(1).and_return(2)
 
       expect(subject).to respond_to :[]
@@ -118,7 +119,7 @@ describe Restify::Resource do
     end
 
     describe '#data' do
-      it 'should return data' do
+      it 'returns data' do
         expect(subject.data).to equal data
       end
     end

data/spec/restify/timeout_spec.rb

@@ -8,13 +8,13 @@ describe Restify::Timeout do
   describe '#timeout!' do
     context 'before having timed out' do
       it 'do nothing' do
-        expect { timer.timeout! }.to_not raise_error
+        expect { timer.timeout! }.not_to raise_error
       end
     end
 
     context 'after having timed out' do
       it 'calls given block' do
-        expect { timer.timeout! }.to_not raise_error
+        expect { timer.timeout! }.not_to raise_error
         sleep timer.send(:wait_interval)
         expect { timer.timeout! }.to raise_error ::Restify::Timeout::Error
       end
@@ -40,7 +40,7 @@ describe Restify::Timeout do
           Thread.new { ivar.set :success }
           expect(timer.wait_on!(ivar)).to eq :success
         end
-      end.to_not raise_error
+      end.not_to raise_error
     end
 
     it 'does nothing on successful Promise' do
@@ -48,7 +48,7 @@ describe Restify::Timeout do
         Restify::Promise.fulfilled(:success).tap do |p|
           expect(timer.wait_on!(p)).to eq :success
         end
-      end.to_not raise_error
+      end.not_to raise_error
     end
   end
 end

data/spec/restify_spec.rb

@@ -97,7 +97,7 @@ describe Restify do
     end
 
     context 'within threads' do
-      it 'should consume the API' do
+      it 'consumes the API' do
         # Let's get all users
 
         # First request the entry resource usually the
@@ -185,7 +185,7 @@ describe Restify do
     end
 
     context 'within EM-synchrony' do
-      it 'should consume the API' do
+      it 'consumes the API' do
         skip 'Seems to be impossible to detect EM scheduled fibers from within'
 
         EM.synchrony do

data/spec/spec_helper.rb

@@ -43,14 +43,14 @@ RSpec.configure do |config|
     ::Restify::Timeout.default_timeout = 1.0
   end
 
-  config.before(:each) do |example|
+  config.before do |example|
     next unless (adapter = example.metadata[:adapter])
     next if Restify.adapter.is_a?(adapter)
 
     skip 'Spec not enabled for current adapter'
   end
 
-  config.before(:each) do
+  config.before do
     Ethon.logger = ::Logging.logger[Ethon] if defined?(Ethon)
 
     ::Logging.logger.root.level = :debug

data/spec/support/stub_server.rb

@@ -17,10 +17,10 @@ module Stub
   #
   # If no stub is found a special HTTP 599 error code will be returned.
   class Handler
-    def call(env) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def call(env)
       signature = WebMock::RequestSignature.new(
         env['REQUEST_METHOD'].downcase,
-        "http://stubserver#{env['REQUEST_URI']}"
+        "http://stubserver#{env['REQUEST_URI']}",
       )
 
       # Extract request headers from rack env. Most header should start with
@@ -99,7 +99,7 @@ RSpec.configure do |config|
     WebMock.disable!(except: %i[net_http])
   end
 
-  config.around(:each) do |example|
+  config.around do |example|
     example.run
     WebMock.reset!
   end