acfs 1.6.0 → 1.7.0

data/spec/acfs/collection_spec.rb

@@ -6,149 +6,174 @@ describe Acfs::Collection do
   let(:model) { MyUser }
 
   describe 'Pagination' do
+    subject do
+      Acfs.run
+      collection
+    end
+
     let(:params) { {} }
     let!(:collection) { model.all params }
 
-    subject { Acfs.run; collection }
-
     context 'without explicit page parameter' do
       before do
         stub_request(:get, 'http://users.example.org/users')
           .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
             headers: {
               'X-Total-Pages' => '2',
-              'X-Total-Count' => '10'
-            })
+              'X-Total-Count' => '10',
+            },)
       end
 
-      its(:total_pages) { should eq 2 }
-      its(:current_page) { should eq 1 }
-      its(:total_count) { should eq 10 }
+      its(:total_pages) { is_expected.to eq 2 }
+      its(:current_page) { is_expected.to eq 1 }
+      its(:total_count) { is_expected.to eq 10 }
     end
 
     context 'with page parameter' do
       let(:params) { {page: 2} }
+
       before do
         stub_request(:get, 'http://users.example.org/users?page=2')
           .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
             headers: {
               'X-Total-Pages' => '2',
-              'X-Total-Count' => '10'
-            })
+              'X-Total-Count' => '10',
+            },)
       end
 
-      its(:total_pages) { should eq 2 }
-      its(:current_page) { should eq 2 }
-      its(:total_count) { should eq 10 }
+      its(:total_pages) { is_expected.to eq 2 }
+      its(:current_page) { is_expected.to eq 2 }
+      its(:total_count) { is_expected.to eq 10 }
     end
 
     context 'with non-numerical page parameter' do
       let(:params) { {page: 'e546f5'} }
+
       before do
         stub_request(:get, 'http://users.example.org/users?page=e546f5')
           .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
             headers: {
               'X-Total-Pages' => '2',
-              'X-Total-Count' => '10'
-            })
+              'X-Total-Count' => '10',
+            },)
       end
 
-      its(:total_pages) { should eq 2 }
-      its(:current_page) { should eq 'e546f5' }
-      its(:total_count) { should eq 10 }
+      its(:total_pages) { is_expected.to eq 2 }
+      its(:current_page) { is_expected.to eq 'e546f5' }
+      its(:total_count) { is_expected.to eq 10 }
     end
 
     describe '#next_page' do
+      subject(:request_page) do
+        Acfs.run
+        collection.next_page
+      end
+
       before do
         stub_request(:get, 'http://users.example.org/users')
           .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
             headers: {
               'X-Total-Pages' => '2',
-              'Link' => '<http://users.example.org/users?page=2>; rel="next"'
-            })
+              'Link' => '<http://users.example.org/users?page=2>; rel="next"',
+            },)
       end
+
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users?page=2').to_return response([])
       end
       let!(:collection) { model.all }
-      subject { Acfs.run; collection.next_page }
 
-      it { should be_a Acfs::Collection }
+      it { is_expected.to be_a Acfs::Collection }
 
-      it 'should have fetched page 2' do
-        subject
+      it 'has fetched page 2' do
+        request_page
         Acfs.run
         expect(req).to have_been_requested
       end
     end
 
     describe '#prev_page' do
+      subject(:request_page) do
+        Acfs.run
+        collection.prev_page
+      end
+
       before do
         stub_request(:get, 'http://users.example.org/users?page=2')
           .to_return response([{id: 2, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
             headers: {
               'X-Total-Pages' => '2',
-              'Link' => '<http://users.example.org/users>; rel="prev"'
-            })
+              'Link' => '<http://users.example.org/users>; rel="prev"',
+            },)
       end
+
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users').to_return response([])
       end
       let!(:collection) { model.all page: 2 }
-      subject { Acfs.run; collection.prev_page }
 
-      it { should be_a Acfs::Collection }
+      it { is_expected.to be_a Acfs::Collection }
 
-      it 'should have fetched page 1' do
-        subject
+      it 'has fetched page 1' do
+        request_page
         Acfs.run
         expect(req).to have_been_requested
       end
     end
 
     describe '#first_page' do
+      subject(:request_page) do
+        Acfs.run
+        collection.first_page
+      end
+
       before do
         stub_request(:get, 'http://users.example.org/users?page=2')
           .to_return response([{id: 2, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
             headers: {
               'X-Total-Pages' => '2',
-              'Link' => '<http://users.example.org/users>; rel="first"'
-            })
+              'Link' => '<http://users.example.org/users>; rel="first"',
+            },)
       end
+
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users').to_return response([])
       end
       let!(:collection) { model.all page: 2 }
-      subject { Acfs.run; collection.first_page }
 
-      it { should be_a Acfs::Collection }
+      it { is_expected.to be_a Acfs::Collection }
 
-      it 'should have fetched page 1' do
-        subject
+      it 'has fetched page 1' do
+        request_page
         Acfs.run
         expect(req).to have_been_requested
       end
     end
 
     describe '#last_page' do
+      subject(:request_page) do
+        Acfs.run
+        collection.last_page
+      end
+
       before do
         stub_request(:get, 'http://users.example.org/users?page=2')
           .to_return response([{id: 2, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
             headers: {
               'X-Total-Pages' => '2',
-              'Link' => '<http://users.example.org/users?page=12>; rel="last"'
-            })
+              'Link' => '<http://users.example.org/users?page=12>; rel="last"',
+            },)
       end
+
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users?page=12').to_return response([])
       end
       let!(:collection) { model.all page: 2 }
-      subject { Acfs.run; collection.last_page }
 
-      it { should be_a Acfs::Collection }
+      it { is_expected.to be_a Acfs::Collection }
 
-      it 'should have fetched page 1' do
-        subject
+      it 'has fetched page 1' do
+        request_page
         Acfs.run
         expect(req).to have_been_requested
       end

data/spec/acfs/configuration_spec.rb

@@ -4,11 +4,16 @@ require 'spec_helper'
 
 describe Acfs::Configuration do
   let(:cfg) { Acfs::Configuration.new }
-  before { @configuration = Acfs::Configuration.current.dup }
-  after { Acfs::Configuration.set @configuration }
+
+  around do |example|
+    configuration = Acfs::Configuration.current.dup
+    example.run
+  ensure
+    Acfs::Configuration.set(configuration)
+  end
 
   describe 'Acfs.configure' do
-    it 'should invoke configure on current configuration' do
+    it 'invokes configure on current configuration' do
       expect(Acfs::Configuration.current).to receive(:configure).once.and_call_original
 
       Acfs.configure do |c|
@@ -18,26 +23,31 @@ describe Acfs::Configuration do
   end
 
   describe '.load' do
-    it 'should be able to load YAML' do
+    it 'is able to load YAML' do
       cfg.configure do
         load 'spec/fixtures/config.yml'
       end
 
-      expect(cfg.locate(UserService).to_s).to be == 'http://localhost:3001/'
-      expect(cfg.locate(CommentService).to_s).to be == 'http://localhost:3002/'
+      expect(cfg.locate(UserService).to_s).to eq 'http://localhost:3001/'
+      expect(cfg.locate(CommentService).to_s).to eq 'http://localhost:3002/'
     end
 
     context 'with RACK_ENV' do
-      before { @env = ENV['RACK_ENV']; ENV['RACK_ENV'] = 'production' }
-      after  { ENV['RACK_ENV'] = @env }
+      around do |example|
+        env = ENV['RACK_ENV']
+        ENV['RACK_ENV'] = 'production'
+        example.run
+      ensure
+        ENV['RACK_ENV'] = env
+      end
 
-      it 'should load ENV block' do
+      it 'loads ENV block' do
         cfg.configure do
           load 'spec/fixtures/config.yml'
         end
 
-        expect(cfg.locate(UserService).to_s).to be == 'http://user.example.org/'
-        expect(cfg.locate(CommentService).to_s).to be == 'http://comment.example.org/'
+        expect(cfg.locate(UserService).to_s).to eq 'http://user.example.org/'
+        expect(cfg.locate(CommentService).to_s).to eq 'http://comment.example.org/'
       end
     end
   end
@@ -45,7 +55,7 @@ describe Acfs::Configuration do
   describe '#adapter' do
     let(:object) { Object.new }
 
-    it 'should be a accessor' do
+    it 'is a accessor' do
       cfg.adapter = object
       expect(cfg.adapter).to eq object
     end

data/spec/acfs/global_spec.rb

@@ -28,7 +28,8 @@ describe ::Acfs::Global do
       before do
         ::ActiveSupport::Notifications.subscribe 'acfs.run', collector
       end
-      it 'should trigger event' do
+
+      it 'triggers event' do
         Acfs.run
         expect(collector.events).to have(1).items
       end
@@ -38,7 +39,8 @@ describe ::Acfs::Global do
       before do
         ::ActiveSupport::Notifications.subscribe 'acfs.reset', collector
       end
-      it 'should trigger event' do
+
+      it 'triggers event' do
         Acfs.reset
         expect(collector.events).to have(1).items
       end
@@ -50,11 +52,11 @@ describe ::Acfs::Global do
       stub_request(:get, %r{http://users.example.org/users/\d+}).to_return(
         status: 200,
         body: '{}',
-        headers: {'Content-Type' => 'application/json'}
+        headers: {'Content-Type' => 'application/json'},
       )
     end
 
-    it 'should invoke when both resources' do
+    it 'invokes when both resources' do
       user1 = MyUser.find 1
       user2 = MyUser.find 2
 
@@ -64,7 +66,7 @@ describe ::Acfs::Global do
       end.to yield_with_args(user1, user2)
     end
 
-    it 'should invoke when both resources when loaded' do
+    it 'invokes when both resources when loaded' do
       user1 = MyUser.find 1
       user2 = MyUser.find 2
 
@@ -82,7 +84,7 @@ describe ::Acfs::Global do
           .to_return(
             status: 200,
             body: '{}',
-            headers: {'Content-Type' => 'application/json'}
+            headers: {'Content-Type' => 'application/json'},
           )
       end
 
@@ -125,7 +127,7 @@ describe ::Acfs::Global do
       runner1 = Thread.new { acfs.runner }.value
       runner2 = Thread.new { acfs.runner }.value
 
-      expect(runner1).to_not equal runner2
+      expect(runner1).not_to equal runner2
     end
 
     it 'uses configurated adapter' do

data/spec/acfs/middleware/json_spec.rb

@@ -16,15 +16,15 @@ describe Acfs::Middleware::JSON do
 
   describe 'encode' do
     context 'with not serialized request' do
-      it 'should set Content-Type' do
+      it 'sets Content-Type' do
         expect(request.headers['Content-Type']).to eq 'application/json'
       end
 
-      it 'should append Accept header' do
+      it 'appends Accept header' do
         expect(request.headers['Accept']).to eq 'application/json;q=1'
       end
 
-      it 'should serialize data to JSON' do
+      it 'serializes data to JSON' do
         expect(JSON.parse(request.body)).to eq data.map(&:stringify_keys)
       end
     end
@@ -38,7 +38,7 @@ describe Acfs::Middleware::JSON do
         end.new
       end
 
-      it 'should serialize data with #to_json' do
+      it 'serializes data with #to_json' do
         expect(JSON.parse(request.body)).to eq 'a' => 1, 'b' => 2
       end
     end
@@ -49,10 +49,10 @@ describe Acfs::Middleware::JSON do
       let(:headers) { {'Content-Type' => 'application/json; charset=utf-8'} }
       let(:body)    { data.to_json }
 
-      it 'should decode body data' do
+      it 'decodes body data' do
         request.complete! response
 
-        expect(response.data).to be == data.map(&:stringify_keys)
+        expect(response.data).to eq data.map(&:stringify_keys)
       end
     end
 
@@ -60,7 +60,7 @@ describe Acfs::Middleware::JSON do
       let(:headers) { {'Content-Type' => 'application/json'} }
       let(:body)    { data.to_json[4..-4] }
 
-      it 'should raise an error' do
+      it 'raises an error' do
         expect { request.complete! response }.to raise_error(::JSON::ParserError)
       end
     end
@@ -69,7 +69,7 @@ describe Acfs::Middleware::JSON do
       let(:headers) { {'Content-Type' => 'application/text'} }
       let(:body)    { data.to_json }
 
-      it 'should not decode non-JSON encoded responses' do
+      it 'does not decode non-JSON encoded responses' do
         request.complete! response
 
         expect(response.data).to be_nil

data/spec/acfs/middleware/{msgpack_spec.rb → message_pack_spec.rb}

@@ -16,23 +16,23 @@ describe Acfs::Middleware::MessagePack do
 
   describe 'encode' do
     context 'with not serialized request' do
-      it 'should set Content-Type' do
+      it 'sets Content-Type' do
         expect(request.headers['Content-Type']).to eq 'application/x-msgpack'
       end
 
-      it 'should append Accept header' do
+      it 'appends Accept header' do
         expect(request.headers['Accept']).to eq 'application/x-msgpack;q=1'
       end
 
       context 'with JSON chained' do
         let(:decoder) { Acfs::Middleware::JSON.new super(), q: 0.5 }
 
-        it 'should append to Accept header' do
+        it 'appends to Accept header' do
           expect(request.headers['Accept']).to eq 'application/json;q=0.5,application/x-msgpack;q=1'
         end
       end
 
-      it 'should serialize data to MessagePack' do
+      it 'serializes data to MessagePack' do
         expect(MessagePack.unpack(request.body)).to eq data.map(&:stringify_keys)
       end
     end
@@ -42,7 +42,7 @@ describe Acfs::Middleware::MessagePack do
     let(:headers) { {'Content-Type' => 'application/x-msgpack'} }
     let(:body)    { MessagePack.pack data }
 
-    it 'should decode body data' do
+    it 'decodes body data' do
       request.complete! response
 
       expect(response.data).to be == data.map(&:stringify_keys)
@@ -53,7 +53,7 @@ describe Acfs::Middleware::MessagePack do
     let(:headers) { {'Content-Type' => 'application/text'} }
     let(:body)    { data.to_json }
 
-    it 'should not decode non-MessagePack encoded responses' do
+    it 'does not decode non-MessagePack encoded responses' do
       request.complete! response
 
       expect(response.data).to be_nil

data/spec/acfs/operation_spec.rb

@@ -5,8 +5,9 @@ require 'spec_helper'
 describe ::Acfs::Operation do
   let(:operation) { described_class.new MyUser, :read, params: {id: 0} }
 
-  context '#request' do
+  describe '#request' do
     subject { operation.request }
-    its(:operation) { should eq operation }
+
+    its(:operation) { is_expected.to eq operation }
   end
 end

data/spec/acfs/request/callbacks_spec.rb

@@ -7,42 +7,51 @@ describe Acfs::Request::Callbacks do
   let(:request)  { Acfs::Request.new('fubar') }
 
   describe '#on_complete' do
-    it 'should store a given callback' do
+    it 'stores a given callback' do
       request.on_complete(&callback)
 
       expect(request.callbacks).to have(1).item
-      expect(request.callbacks[0]).to be == callback
+      expect(request.callbacks[0]).to eq callback
     end
 
-    it 'should store multiple callback' do
+    it 'stores multiple callback' do
       request.on_complete {|_res| 'abc' }
       request.on_complete(&callback)
 
       expect(request.callbacks).to have(2).item
-      expect(request.callbacks[0]).to be == callback
+      expect(request.callbacks[0]).to eq callback
     end
   end
 
   describe '#complete!' do
     let(:response) { Acfs::Response.new(request) }
 
-    it 'should trigger registered callbacks with given response' do
+    it 'triggers registered callbacks with given response' do
       expect(callback).to receive(:call).with(response, kind_of(Proc))
 
       request.on_complete(&callback)
       request.complete! response
     end
 
-    it 'should trigger multiple callback in reverted insertion order' do
+    it 'triggers multiple callback in reverted insertion order' do
       check = []
 
-      request.on_complete {|res, nxt| check << 1; nxt.call res }
-      request.on_complete {|res, nxt| check << 2; nxt.call res }
-      request.on_complete {|res, nxt| check << 3; nxt.call res }
+      request.on_complete do |res, nxt|
+        check << 1
+        nxt.call res
+      end
+      request.on_complete do |res, nxt|
+        check << 2
+        nxt.call res
+      end
+      request.on_complete do |res, nxt|
+        check << 3
+        nxt.call res
+      end
 
       request.complete! response
 
-      expect(check).to be == [3, 2, 1]
+      expect(check).to eq [3, 2, 1]
     end
   end
 end

data/spec/acfs/request_spec.rb

@@ -12,15 +12,15 @@ describe Acfs::Request do
   let(:request) { Acfs::Request.new(url, **options) }
 
   describe '#url' do
-    it 'should return request URL' do
-      expect(request.url).to be == url
+    it 'returns request URL' do
+      expect(request.url).to eq url
     end
 
     context 'with parameters' do
       let(:params) { {id: 10} }
 
-      it 'should return URL without query' do
-        expect(request.url).to be == url.to_s
+      it 'returns URL without query' do
+        expect(request.url).to eq url.to_s
       end
     end
   end
@@ -28,8 +28,8 @@ describe Acfs::Request do
   describe '#headers' do
     let(:headers) { {'Accept' => 'application/json'} }
 
-    it 'should return request headers' do
-      expect(request.headers).to be == headers
+    it 'returns request headers' do
+      expect(request.headers).to eq headers
     end
   end
 
@@ -37,43 +37,39 @@ describe Acfs::Request do
     context 'when nil given' do
       let(:method) { nil }
 
-      it 'should default to :get' do
-        expect(request.method).to be == :get
+      it 'defaults to :get' do
+        expect(request.method).to eq :get
       end
     end
 
-    it 'should return request method' do
-      expect(request.method).to be == method
+    it 'returns request method' do
+      expect(request.method).to eq method
     end
   end
 
   describe '#params' do
     let(:params) { {id: 10} }
 
-    it 'should return request headers' do
-      expect(request.params).to be == params
+    it 'returns request headers' do
+      expect(request.params).to eq params
     end
   end
 
   describe '#data' do
     let(:data) { {id: 10, name: 'Anon'} }
 
-    it 'should return request data' do
-      expect(request.data).to be == data
+    it 'returns request data' do
+      expect(request.data).to eq data
     end
-  end
 
-  describe '#data' do
     context 'with data' do
-      let(:data) { {id: 10, name: 'Anon'} }
-
       it { expect(request).to be_data }
     end
 
     context 'without data' do
       let(:data) { nil }
 
-      it { expect(request).to_not be_data }
+      it { expect(request).not_to be_data }
     end
   end
 end