restify 1.15.2 → 2.0.0

data/spec/restify/error_spec.rb

@@ -2,16 +2,13 @@
 
 require 'spec_helper'
 
-describe Restify::ResponseError do
-  let(:response) { double 'response' }
+describe Restify::ResponseError do # rubocop:disable RSpec/SpecFilePathFormat
+  let(:response) { instance_double(Restify::Response) }
   let(:message) { 'Error' }
   let(:uri) { 'http://localhost' }
 
   before do
-    allow(response).to receive(:uri).and_return(uri)
-    allow(response).to receive(:code).and_return(code)
-    allow(response).to receive(:message).and_return(message)
-    allow(response).to receive(:decoded_body).and_return({})
+    allow(response).to receive_messages(uri: uri, code: code, message: message, decoded_body: {})
   end
 
   describe '.from_code' do
@@ -20,61 +17,61 @@ describe Restify::ResponseError do
     context 'with 400 Bad Request' do
       let(:code) { 400 }
 
-      it { is_expected.to be_a ::Restify::BadRequest }
+      it { is_expected.to be_a Restify::BadRequest }
     end
 
     context 'with 401 Unauthorized' do
       let(:code) { 401 }
 
-      it { is_expected.to be_a ::Restify::Unauthorized }
+      it { is_expected.to be_a Restify::Unauthorized }
     end
 
     context 'with 404 Unauthorized' do
       let(:code) { 404 }
 
-      it { is_expected.to be_a ::Restify::NotFound }
+      it { is_expected.to be_a Restify::NotFound }
     end
 
     context 'with 406 Not Acceptable' do
       let(:code) { 406 }
 
-      it { is_expected.to be_a ::Restify::NotAcceptable }
+      it { is_expected.to be_a Restify::NotAcceptable }
     end
 
     context 'with 410 Gone' do
       let(:code) { 410 }
 
-      it { is_expected.to be_a ::Restify::Gone }
+      it { is_expected.to be_a Restify::Gone }
     end
 
     context 'with 422 Unprocessable Entity' do
       let(:code) { 422 }
 
-      it { is_expected.to be_a ::Restify::UnprocessableEntity }
+      it { is_expected.to be_a Restify::UnprocessableEntity }
     end
 
     context 'with 500 Internal Server Error' do
       let(:code) { 500 }
 
-      it { is_expected.to be_a ::Restify::InternalServerError }
+      it { is_expected.to be_a Restify::InternalServerError }
     end
 
     context 'with 502 Bad Gateway' do
       let(:code) { 502 }
 
-      it { is_expected.to be_a ::Restify::BadGateway }
+      it { is_expected.to be_a Restify::BadGateway }
     end
 
     context 'with 503 Service Unavailable' do
       let(:code) { 503 }
 
-      it { is_expected.to be_a ::Restify::ServiceUnavailable }
+      it { is_expected.to be_a Restify::ServiceUnavailable }
     end
 
     context 'with 504 Gateway Timeout' do
       let(:code) { 504 }
 
-      it { is_expected.to be_a ::Restify::GatewayTimeout }
+      it { is_expected.to be_a Restify::GatewayTimeout }
     end
   end
 end

data/spec/restify/features/head_requests_spec.rb

@@ -16,23 +16,24 @@ describe Restify do
   end
 
   describe 'HEAD requests' do
-    subject { Restify.new('http://localhost:9292/base').head(params).value! }
+    subject(:value) { Restify.new('http://localhost:9292/base').head(params:).value! }
 
     let(:params) { {} }
 
     it 'returns a resource with access to headers' do
-      expect(subject.response.headers).to include('CONTENT_LENGTH' => '333')
+      expect(value.response.headers).to include('CONTENT_LENGTH' => '333')
     end
 
     it 'parses Link headers into relations' do
-      expect(subject).to have_relation :neat
+      expect(value).to have_relation :neat
     end
 
     context 'with params' do
       let(:params) { {foo: 'bar'} }
 
       it 'adds them to the query string' do
-        subject
+        value
+
         expect(
           request_stub.with(query: {foo: 'bar'}),
         ).to have_been_requested

data/spec/restify/features/request_bodies_spec.rb

@@ -13,7 +13,7 @@ describe Restify do
   end
 
   describe 'Request body' do
-    subject { Restify.new('http://localhost:9292/base').post(body, {}, {headers: headers}).value! }
+    subject(:value) { Restify.new('http://localhost:9292/base').post(body, headers:).value! }
 
     let(:headers) { {} }
 
@@ -21,7 +21,7 @@ describe Restify do
       let(:body) { {a: 'b', c: 'd'} }
 
       it 'is serialized as JSON' do
-        subject
+        value
 
         expect(
           request_stub.with(body: '{"a":"b","c":"d"}'),
@@ -29,7 +29,7 @@ describe Restify do
       end
 
       it 'gets a JSON media type for free' do
-        subject
+        value
 
         expect(
           request_stub.with(headers: {'Content-Type' => 'application/json'}),
@@ -40,7 +40,7 @@ describe Restify do
         let(:headers) { {'Content-Type' => 'application/vnd.api+json'} }
 
         it 'respects the override' do
-          subject
+          value
 
           expect(
             request_stub.with(headers: {'Content-Type' => 'application/vnd.api+json'}),
@@ -53,7 +53,7 @@ describe Restify do
       let(:body) { 'a=b&c=d' }
 
       it 'is sent as provided' do
-        subject
+        value
 
         expect(
           request_stub.with(body: 'a=b&c=d'),
@@ -61,10 +61,10 @@ describe Restify do
       end
 
       it 'does not get a JSON media type' do
-        subject
+        value
 
         expect(
-          request_stub.with {|req| req.headers['Content-Type'] !~ /json/ },
+          request_stub.with {|req| !req.headers['Content-Type'].include?('json') },
         ).to have_been_requested
       end
 
@@ -72,7 +72,7 @@ describe Restify do
         let(:headers) { {'Content-Type' => 'application/text'} }
 
         it 'respects the override' do
-          subject
+          value
 
           expect(
             request_stub.with(headers: {'Content-Type' => 'application/text'}),

data/spec/restify/features/request_errors_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe Restify, adapter: ::Restify::Adapter::Typhoeus do
+describe Restify, adapter: 'Restify::Adapter::Typhoeus' do
   before do
     stub_request(:get, 'http://stubserver/base').to_timeout
   end
 
   describe 'Timeout' do
-    subject(:request) { Restify.new('http://localhost:9292/base').get({}, timeout: 0.1).value! }
+    subject(:request) { Restify.new('http://localhost:9292/base').get(timeout: 0.1).value! }
 
     it 'throws a network error' do
       expect { request }.to raise_error Restify::NetworkError do |error|

data/spec/restify/features/request_headers_spec.rb

@@ -20,8 +20,7 @@ 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!
@@ -53,8 +52,7 @@ describe Restify do
 
     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!
@@ -69,8 +67,7 @@ describe Restify do
 
     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!

data/spec/restify/features/response_errors_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Restify do
   before do
     stub_request(:get, 'http://stubserver/base')
-      .to_return(status: http_status, headers: headers)
+      .to_return(status: http_status, headers:)
   end
 
   let(:http_status) { '200 OK' }

data/spec/restify/global_spec.rb

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

data/spec/restify/processors/base_spec.rb

@@ -4,27 +4,26 @@ require 'spec_helper'
 
 describe Restify::Processors::Base do
   let(:context)  { Restify::Context.new('http://test.host/') }
-  let(:response) { double 'response' }
+  let(:response) { instance_double(Restify::Response) }
 
   before do
-    allow(response).to receive(:links).and_return []
-    allow(response).to receive(:follow_location).and_return nil
+    allow(response).to receive_messages(links: [], follow_location: nil)
   end
 
   describe 'class' do
     describe '#accept?' do
-      subject { described_class.accept? response }
+      subject(:accept) { described_class.accept?(response) }
 
       # If no other processor accepts the request, we have an explicit fallback
       # to the base processor.
       it 'does not accept any responses' do
-        expect(subject).to be_falsey
+        expect(accept).to be_falsey
       end
     end
   end
 
   describe '#resource' do
-    subject { described_class.new(context, response).resource }
+    subject(:resource) { described_class.new(context, response).resource }
 
     before { allow(response).to receive(:body).and_return(body) }
 
@@ -37,7 +36,7 @@ describe Restify::Processors::Base do
         end
 
         it { is_expected.to be_a Restify::Resource }
-        it { expect(subject.response).to be response }
+        it { expect(resource.response).to be response }
         it { is_expected.to eq body }
       end
     end

data/spec/restify/processors/json_spec.rb

@@ -4,31 +4,30 @@ require 'spec_helper'
 
 describe Restify::Processors::Json do
   let(:context)  { Restify::Context.new('http://test.host/') }
-  let(:response) { double 'response' }
+  let(:response) { instance_double(Restify::Response) }
 
   before do
-    allow(response).to receive(:links).and_return []
-    allow(response).to receive(:follow_location).and_return nil
+    allow(response).to receive_messages(links: [], follow_location: nil)
   end
 
   describe 'class' do
     describe '#accept?' do
-      subject { described_class.accept? response }
+      subject(:accept) { described_class.accept?(response) }
 
       it 'accepts JSON mime type (I)' do
-        expect(response).to receive(:content_type).and_return('application/json')
-        expect(subject).to be_truthy
+        allow(response).to receive(:content_type).and_return('application/json')
+        expect(accept).to be_truthy
       end
 
       it 'accepts JSON mime type (II)' do
-        expect(response).to receive(:content_type).and_return('application/json; abc')
-        expect(subject).to be_truthy
+        allow(response).to receive(:content_type).and_return('application/json; abc')
+        expect(accept).to be_truthy
       end
     end
   end
 
   describe '#resource' do
-    subject { described_class.new(context, response).resource }
+    subject(:resource) { described_class.new(context, response).resource }
 
     before { allow(response).to receive(:body).and_return(body) }
 
@@ -41,7 +40,7 @@ describe Restify::Processors::Json do
         end
 
         it { is_expected.to be_a Restify::Resource }
-        it { expect(subject.response).to be response }
+        it { expect(resource.response).to be response }
         it { is_expected.to eq 'json' => 'value' }
       end
 
@@ -53,12 +52,12 @@ describe Restify::Processors::Json do
         end
 
         it do
-          expect(subject).to eq \
+          expect(resource).to eq \
             'json' => 'value', 'search_url' => 'https://google.com{?q}'
         end
 
         it { is_expected.to have_relation :search }
-        it { expect(subject.relation(:search)).to eq 'https://google.com{?q}' }
+        it { expect(resource.relation(:search)).to eq 'https://google.com{?q}' }
       end
 
       context 'object with implicit self relation' do
@@ -68,7 +67,7 @@ describe Restify::Processors::Json do
           JSON
         end
 
-        it { expect(subject.relation(:self)).to eq '/self' }
+        it { expect(resource.relation(:self)).to eq '/self' }
       end
 
       context 'single array' do
@@ -79,7 +78,7 @@ describe Restify::Processors::Json do
         end
 
         it { is_expected.to be_a Restify::Resource }
-        it { expect(subject.response).to be response }
+        it { expect(resource.response).to be response }
         it { is_expected.to eq [1, 2, nil, 'STR'] }
       end
 
@@ -102,11 +101,11 @@ describe Restify::Processors::Json do
         end
 
         it 'parses objects as resources' do
-          expect(subject).to all(be_a(Restify::Resource))
+          expect(resource).to all(be_a(Restify::Resource))
         end
 
         it 'parses relations of resources' do
-          expect(subject.map {|r| r.relation :self }).to eq \
+          expect(resource.map {|r| r.relation :self }).to eq \
             ['/users/john', '/users/jane']
         end
       end
@@ -120,14 +119,14 @@ describe Restify::Processors::Json do
         end
 
         it { is_expected.to be_a Restify::Resource }
-        it { expect(subject.response).to be response }
+        it { expect(resource.response).to be response }
 
         it 'parses objects as resources' do
-          expect(subject['john']).to be_a Restify::Resource
-          expect(subject['jane']).to be_a Restify::Resource
+          expect(resource['john']).to be_a Restify::Resource
+          expect(resource['jane']).to be_a Restify::Resource
 
-          expect(subject['john']['name']).to eq 'John'
-          expect(subject['jane']['name']).to eq 'Jane'
+          expect(resource['john']['name']).to eq 'John'
+          expect(resource['jane']['name']).to eq 'Jane'
         end
       end
 
@@ -139,49 +138,9 @@ describe Restify::Processors::Json do
         end
 
         it { is_expected.to be_a Restify::Resource }
-        it { expect(subject.response).to be response }
+        it { expect(resource.response).to be response }
         it { is_expected.to eq 'BLUB' }
       end
-
-      context 'with indifferent access' do
-        let(:body) do
-          <<-JSON
-            {"name": "John", "age": 24}
-          JSON
-        end
-
-        it '#key?' do
-          expect(subject).to have_key 'name'
-          expect(subject).to have_key 'age'
-
-          expect(subject).to have_key :name
-          expect(subject).to have_key :age
-        end
-
-        it '#[]' do
-          expect(subject['name']).to eq 'John'
-          expect(subject['age']).to eq 24
-
-          expect(subject[:name]).to eq 'John'
-          expect(subject[:age]).to eq 24
-        end
-      end
-
-      context 'with method getter access' do
-        let(:body) do
-          <<-JSON
-            {"name": "John", "age": 24}
-          JSON
-        end
-
-        it '#<method getter>' do
-          expect(subject).to respond_to :name
-          expect(subject).to respond_to :age
-
-          expect(subject.name).to eq 'John'
-          expect(subject.age).to eq 24
-        end
-      end
     end
   end
 end