acfs 0.42.0 → 0.43.0

data/spec/acfs/{model → resource}/dirty_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
-describe Acfs::Model::Dirty do
+describe Acfs::Resource::Dirty do
   let(:model) { MyUser.new }
   before do
-    stub_request(:get, "http://users.example.org/users/1").to_return response({ id: 1, name: 'Anon', age: 12 })
-    stub_request(:post, 'http://users.example.org/users').to_return response({ id: 5, name: 'dhh', age: 12 })
+    stub_request(:get, 'http://users.example.org/users/1')
+      .to_return response id: 1, name: 'Anon', age: 12
+    stub_request(:post, 'http://users.example.org/users')
+      .to_return response id: 5, name: 'dhh', age: 12
   end
 
   it 'includes ActiveModel::Dirty' do
@@ -25,7 +27,7 @@ describe Acfs::Model::Dirty do
 
     context 'after model load' do
       let(:user) { MyUser.find 1 }
-      before { user; Acfs.run}
+      before { user && Acfs.run }
 
       it { expect(user).to_not be_changed }
     end
@@ -37,7 +39,7 @@ describe Acfs::Model::Dirty do
     end
 
     context 'after model new with attrs' do
-      let(:user) { MyUser.new name: "Uschi" }
+      let(:user) { MyUser.new name: 'Uschi' }
 
       it { expect(user).to be_changed }
     end

data/spec/acfs/{model → resource}/initialization_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-describe 'Acfs::Model::Initialization' do
+describe 'Acfs::Resource::Initialization' do
   let(:model) do
-    Class.new.tap do |c|
+    Class.new(Acfs::Resource).tap do |c|
       c.class_eval do
-        include Acfs::Model
         attr_accessor :name, :age
         private :age=
       end
@@ -13,18 +12,19 @@ describe 'Acfs::Model::Initialization' do
 
   describe '#initialize' do
     it 'should allow to set attributes with initializer' do
-      m = model.new name: "John"
-      expect(m.name).to be == "John"
+      m = model.new name: 'John'
+      expect(m.name).to eq 'John'
     end
 
     it 'should raise error when attributes with private setters are given' do
-      expect { model.new(age: 25) }.to raise_error(NoMethodError)
+      expect { model.new age: 25 }.to raise_error(NoMethodError)
     end
   end
 
   describe '#persisted?' do
+    subject { model.new.persisted? }
     it 'should be false' do
-      expect(model.new.persisted?).to be false
+      should be false
     end
   end
 end

data/spec/acfs/{model → resource}/loadable_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-describe Acfs::Model::Loadable do
+describe Acfs::Resource::Loadable do
   let(:model) { MyUser.find 1 }
   before do
-    stub_request(:get, "http://users.example.org/users/1").to_return response({ id: 1, name: "Anon", age: 12 })
+    stub_request(:get, 'http://users.example.org/users/1')
+      .to_return response id: 1, name: 'Anon', age: 12
   end
 
   describe '#loaded?' do
@@ -12,7 +13,7 @@ describe Acfs::Model::Loadable do
     end
 
     context 'afer Acfs#run' do
-      before { model; Acfs.run}
+      before { model && Acfs.run }
       it { expect(model).to be_loaded }
     end
   end

data/spec/acfs/{model → resource}/locatable_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
-describe Acfs::Model::Locatable do
+describe Acfs::Resource::Locatable do
   let(:model) { MyUser }
   before do
-    stub_request(:get, 'http://users.example.org/users/1').to_return response({id: 1, name: 'Anon', age: 12})
-    stub_request(:get, 'http://users.example.org/users/1/profile').to_return response({user_id: 2, twitter_handle: '@anon'})
+    stub_request(:get, 'http://users.example.org/users/1')
+      .to_return response id: 1, name: 'Anon', age: 12
+    stub_request(:get, 'http://users.example.org/users/1/profile')
+      .to_return response user_id: 2, twitter_handle: '@anon'
   end
 
   describe '.url' do
@@ -20,12 +22,13 @@ describe Acfs::Model::Locatable do
       let(:model) { Profile }
 
       it 'should replace placeholder' do
-        expect(model.url(user_id: 1)).to eq 'http://users.example.org/users/1/profile'
+        expect(model.url(user_id: 1))
+          .to eq 'http://users.example.org/users/1/profile'
       end
 
       context 'without attributes' do
         it 'should raise an error if attribute is missing' do
-          expect{ model.url }.to raise_error ArgumentError
+          expect { model.url }.to raise_error ArgumentError
         end
       end
     end
@@ -37,7 +40,10 @@ describe Acfs::Model::Locatable do
 
       context ':list location' do
         let(:action) { :list }
-        its(:raw_uri) { should eq 'http://users.example.org/users/:user_id/sessions' }
+
+        its(:raw_uri) do
+          should eq 'http://users.example.org/users/:user_id/sessions'
+        end
       end
 
       context ':create location' do
@@ -52,12 +58,16 @@ describe Acfs::Model::Locatable do
 
       context ':update location' do
         let(:action) { :update }
-        its(:raw_uri) { expect{ subject }.to raise_error(ArgumentError, /update.*disabled/)}
+        its(:raw_uri) do
+          expect { subject }.to raise_error ArgumentError, /update.*disabled/
+        end
       end
 
       context ':delete location' do
         let(:action) { :delete }
-        its(:raw_uri) { should eq 'http://users.example.org/users/:user_id/sessions/del/:id' }
+        its(:raw_uri) do
+          should eq 'http://users.example.org/users/:user_id/sessions/del/:id'
+        end
       end
     end
   end
@@ -67,30 +77,30 @@ describe Acfs::Model::Locatable do
       let(:m) { model.new }
 
       it 'should return nil' do
-        expect(m.url).to be == nil
+        expect(m.url).to be_nil
       end
 
       context 'new resource with id' do
         let(:m) { model.new id: 475 }
 
         it 'should return resource URL' do
-          expect(m.url).to be == 'http://users.example.org/users/475'
+          expect(m.url).to eq 'http://users.example.org/users/475'
         end
       end
 
       context 'with attribute in path' do
         it 'should return nil' do
-          expect(m.url).to be == nil
+          expect(m.url).to be_nil
         end
       end
     end
 
     context 'loaded resource' do
       let(:m) { model.find 1 }
-      before { m; Acfs.run }
+      before { m && Acfs.run }
 
       it "should return resource's URL" do
-        expect(m.url).to be == 'http://users.example.org/users/1'
+        expect(m.url).to eq 'http://users.example.org/users/1'
       end
 
       context 'with attribute in path' do
@@ -98,7 +108,7 @@ describe Acfs::Model::Locatable do
         let(:m) { model.find user_id: 1 }
 
         it "should return resource's URL" do
-          expect(m.url).to be == 'http://users.example.org/users/2/profile'
+          expect(m.url).to eq 'http://users.example.org/users/2/profile'
         end
       end
     end

data/spec/acfs/{model → resource}/persistance_spec.rb

@@ -1,33 +1,33 @@
 require 'spec_helper'
 
-describe Acfs::Model::Persistence do
+describe Acfs::Resource::Persistence do
   let(:model_class) { MyUser }
   before do
-    @get_stub = stub_request(:get, 'http://users.example.org/users/1').to_return response({ id: 1, name: 'Anon', age: 12 })
+    @get_stub = stub_request(:get, 'http://users.example.org/users/1').to_return response(id: 1, name: 'Anon', age: 12)
 
     @patch_stub = stub_request(:put, 'http://users.example.org/users/1')
-      .with(body: '{"id":1,"name":"Idefix","age":12}')
-      .to_return response({ id: 1, name: 'Idefix', age: 12 })
+                  .with(body: '{"id":1,"name":"Idefix","age":12}')
+                  .to_return response(id: 1, name: 'Idefix', age: 12)
 
     @post_stub = stub_request(:post, 'http://users.example.org/users')
-      .with(body: '{"id":null,"name":"Idefix","age":12}')
-      .to_return response({ id: 5, name: 'Idefix', age: 12 })
+                 .with(body: '{"id":null,"name":"Idefix","age":12}')
+                 .to_return response(id: 5, name: 'Idefix', age: 12)
 
     stub_request(:post, 'http://users.example.org/users')
       .with(body: '{"id":null,"name":"Anon","age":null}')
-      .to_return response({ id: 5, name: 'Anon', age: 12 })
+      .to_return response(id: 5, name: 'Anon', age: 12)
 
     stub_request(:post, 'http://users.example.org/users')
       .with(body: '{id:null,"name":"Idefix","age":12}')
-      .to_return response({ id: 5, name: 'Idefix', age: 12 })
+      .to_return response(id: 5, name: 'Idefix', age: 12)
 
     stub_request(:post, 'http://users.example.org/users')
       .with(body: '{"id":null,"name":null,"age":12}')
-      .to_return response({ errors: { name: [ 'required' ] }}, status: 422)
+      .to_return response({errors: {name: ['required']}}, {status: 422})
 
     @del = stub_request(:delete, 'http://users.example.org/users/1')
-      .with(body: '{}')
-      .to_return response({ id: 1, name: 'Idefix', age: 12 }, status: 200)
+           .with(body: '{}')
+           .to_return response({id: 1, name: 'Idefix', age: 12}, {status: 200})
   end
 
   context 'new model' do
@@ -65,7 +65,7 @@ describe Acfs::Model::Persistence do
           let!(:req) do
             stub_request(:post, 'http://users.example.org/users')
               .with(body: '{"id":null,"name":"Idefix","age":null,"born_at":"Berlin"}')
-              .to_return response({id: 5, name: 'Idefix', age: 12, wuff: 'woa'})
+              .to_return response(id: 5, name: 'Idefix', age: 12, wuff: 'woa')
           end
           let(:model) { model_class.new name: 'Idefix', born_at: 'Berlin' }
 
@@ -100,12 +100,12 @@ describe Acfs::Model::Persistence do
 
     describe '#update_attributes' do
       subject { -> { model.update_attributes name: 'John' } }
-      it { expect{ subject.call }.to raise_error Acfs::ResourceNotLoaded }
+      it { expect { subject.call }.to raise_error Acfs::ResourceNotLoaded }
     end
 
     describe '#update_attributes!' do
       subject { -> { model.update_attributes! name: 'John' } }
-      it { expect{ subject.call }.to raise_error Acfs::ResourceNotLoaded }
+      it { expect { subject.call }.to raise_error Acfs::ResourceNotLoaded }
     end
   end
 
@@ -145,24 +145,24 @@ describe Acfs::Model::Persistence do
       end
 
       describe 'correct URL generation' do
-        let(:model_class) {PathArguments}
-        let(:model) {model_class.find 1, params: {required_arg: 'some_value'}}
+        let(:model_class) { PathArguments }
+        let(:model) { model_class.find 1, params: {required_arg: 'some_value'} }
 
         before :each do
           resource_url = 'http://users.example.org/some_value/users/1'
           @my_get_stub = stub_request(:get, resource_url)
-          .to_return response({ id: 1, required_arg: 'some_value' })
+                         .to_return response(id: 1, required_arg: 'some_value')
           @my_delete_stub = stub_request(:delete, resource_url)
-          .with(body: '{}')
-          .to_return response({ id: 1, required_arg: 'some_value'  }, status: 200)
+                            .with(body: '{}')
+                            .to_return response({id: 1, required_arg: 'some_value'}, {status: 200})
           model
           Acfs.run
         end
 
         it 'should not raise an error on URL generation' do
-          expect {
+          expect do
             model.delete!
-          }.not_to raise_error
+          end.not_to raise_error
         end
 
         it 'should request the delete' do
@@ -187,8 +187,8 @@ describe Acfs::Model::Persistence do
       end
 
       it 'should pass second hash to save' do
-        expect(model.__getobj__).to receive(:save).with({ bla: 'blub' })
-        model.update_attributes({ name: 'Idefix' }, { bla: 'blub' })
+        expect(model.__getobj__).to receive(:save).with(bla: 'blub')
+        model.update_attributes({name: 'Idefix'}, {bla: 'blub'})
       end
     end
 
@@ -207,8 +207,8 @@ describe Acfs::Model::Persistence do
       end
 
       it 'should pass second hash to save' do
-        expect(model.__getobj__).to receive(:save!).with({ bla: 'blub' })
-        model.update_attributes!({ name: 'Idefix' }, { bla: 'blub' })
+        expect(model.__getobj__).to receive(:save!).with(bla: 'blub')
+        model.update_attributes!({name: 'Idefix'}, {bla: 'blub'})
       end
     end
   end
@@ -221,13 +221,13 @@ describe Acfs::Model::Persistence do
       before do
         stub_request(:put, 'http://users.example.org/users/1')
           .with(body: '{"id":1,"name":"","age":12}')
-          .to_return response({ errors: { name: [ 'required' ] }}, status: 422)
+          .to_return response({errors: {name: ['required']}}, {status: 422})
       end
 
       it 'should set local errors hash' do
         model.name = ''
         model.save! rescue nil
-        expect(model.errors.to_hash).to be == { name: %w(required) }
+        expect(model.errors.to_hash).to be == {name: %w(required)}
       end
     end
 
@@ -237,15 +237,15 @@ describe Acfs::Model::Persistence do
 
       before do
         stub_request(:put, 'http://users.example.org/users/1')
-        .with(body: '{"id":1,"name":"","age":12}')
-        .to_return response({ errors: { name: [ 'required' ] }}, status: 422)
+          .with(body: '{"id":1,"name":"","age":12}')
+          .to_return response({errors: {name: ['required']}}, {status: 422})
       end
     end
   end
 
   describe '.create!' do
     context 'with valid data' do
-      let(:data) { { name: 'Idefix', age: 12 } }
+      let(:data) { {name: 'Idefix', age: 12} }
 
       it 'should create new resource' do
         model = model_class.create! data
@@ -263,9 +263,9 @@ describe Acfs::Model::Persistence do
       let(:data) { {name: nil, age: 12} }
 
       it 'should raise an error' do
-        expect{ model_class.create! data }.to \
+        expect { model_class.create! data }.to \
           raise_error(::Acfs::InvalidResource) do |error|
-            expect(error.errors).to be == { 'name' => %w(required) }
+            expect(error.errors).to be == {'name' => %w(required)}
           end
       end
     end
@@ -303,13 +303,13 @@ describe Acfs::Model::Persistence do
       let!(:req) do
         stub_request(:post, 'http://users.example.org/users')
           .with(body: '{"id":null,"name":"Anon","age":9,"born_at":"today"}')
-          .to_return response({id: 5, name: 'Anon', age: 9})
+          .to_return response(id: 5, name: 'Anon', age: 9)
       end
       let(:data) { {age: 9, born_at: 'today'} }
 
       it 'should store them in attributes' do
         expect(subject.attributes).to eq 'id' => 5, 'name' => 'Anon',
-          'age' => 9, 'born_at' => 'today'
+                                         'age' => 9, 'born_at' => 'today'
       end
     end
   end

data/spec/acfs/{model → resource}/query_methods_spec.rb

@@ -1,25 +1,28 @@
 require 'spec_helper'
 
-describe Acfs::Model::QueryMethods do
+describe Acfs::Resource::QueryMethods do
   let(:model) { MyUser }
 
   describe '.find' do
     context 'with single id' do
       context 'with successful response' do
         before do
-          stub_request(:get, 'http://users.example.org/users/1').to_return response({id: 1, name: 'Anon', age: 12, born_at: 'Berlin'})
-          stub_request(:get, 'http://users.example.org/users/2').to_return response({id: 2, type: 'Customer', name: 'Clare Customer', age: 24})
+          stub_request(:get, 'http://users.example.org/users/1')
+            .to_return response id: 1, name: 'Anon', age: 12, born_at: 'Berlin'
+          stub_request(:get, 'http://users.example.org/users/2')
+            .to_return response id: 2, type: 'Customer',
+                                name: 'Clare Customer', age: 24
         end
 
-        let(:action) { lambda { |cb=nil| model.find 1, &cb } }
+        let(:action) { ->(cb = nil) { model.find(1, &cb) } }
         it_behaves_like 'a query method with multi-callback support'
 
         it 'should load a single remote resource' do
           user = action.call
           Acfs.run
 
-          expect(user.attributes).to eq(
-                                         {id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}.stringify_keys)
+          expect(user.attributes).to eq id: 1, name: 'Anon',
+                                        age: 12, born_at: 'Berlin'
         end
 
         context 'with resource type inheritance' do
@@ -40,7 +43,8 @@ describe Acfs::Model::QueryMethods do
 
       context 'with 404 response' do
         before do
-          stub_request(:get, 'http://users.example.org/users/1').to_return response({error: 'not found'}, status: 404)
+          stub_request(:get, 'http://users.example.org/users/1')
+            .to_return response({error: 'not found'}, {status: 404})
         end
 
         it 'should raise a NotFound error' do
@@ -54,7 +58,8 @@ describe Acfs::Model::QueryMethods do
 
       context 'with 500 response' do
         before do
-          stub_request(:get, 'http://users.example.org/users/1').to_return response(nil, status: 500)
+          stub_request(:get, 'http://users.example.org/users/1')
+            .to_return response(nil, status: 500)
         end
 
         it 'should raise a response error' do
@@ -69,55 +74,59 @@ describe Acfs::Model::QueryMethods do
 
     context 'with multiple ids' do
       before do
-        stub_request(:get, 'http://users.example.org/users/1').to_return response({id: 1, name: 'Anon', age: 12})
-        stub_request(:get, 'http://users.example.org/users/2').to_return response({id: 2, name: 'Johnny', age: 42})
-        stub_request(:get, 'http://users.example.org/users/3').to_return response({id: 3, type: 'Customer', name: 'Anon', age: 12})
-        stub_request(:get, 'http://users.example.org/users/4').to_return response({id: 4, name: 'Johnny', age: 42})
+        stub_request(:get, 'http://users.example.org/users/1')
+          .to_return response id: 1, name: 'Anon', age: 12
+        stub_request(:get, 'http://users.example.org/users/2')
+          .to_return response id: 2, name: 'Johnny', age: 42
+        stub_request(:get, 'http://users.example.org/users/3')
+          .to_return response id: 3, type: 'Customer', name: 'Anon', age: 12
+        stub_request(:get, 'http://users.example.org/users/4')
+          .to_return response id: 4, name: 'Johnny', age: 42
       end
 
       context 'with successful response' do
         it 'should load a multiple remote resources' do
-          users = model.find 1, 2
+          users = model.find([1, 2])
           Acfs.run
 
           expect(users.size).to be == 2
-          expect(users[0].attributes).to be == {id: 1, name: 'Anon', age: 12}.stringify_keys
-          expect(users[1].attributes).to be == {id: 2, name: 'Johnny', age: 42}.stringify_keys
+          expect(users[0].attributes).to eq id: 1, name: 'Anon', age: 12
+          expect(users[1].attributes).to eq id: 2, name: 'Johnny', age: 42
         end
 
         it 'should invoke callback after all models are loaded' do
-          proc = Proc.new {}
-          expect(proc).to receive(:call) do |users|
-            expect(users).to be === @users
+          block = proc {}
+          expect(block).to receive(:call) do |users|
+            expect(users).to equal @users
             expect(users.size).to be == 2
             expect(users).to be_loaded
           end
 
-          @users = model.find 1, 2, &proc
+          @users = model.find([1, 2], &block)
           Acfs.run
         end
 
         it 'should invoke multiple callback after all models are loaded' do
-          proc1 = Proc.new {}
-          proc2 = Proc.new {}
+          proc1 = proc {}
+          proc2 = proc {}
           expect(proc1).to receive(:call) do |users|
-            expect(users).to be === @users
+            expect(users).to equal @users
             expect(users.size).to be == 2
             expect(users).to be_loaded
           end
           expect(proc2).to receive(:call) do |users|
-            expect(users).to be === @users
+            expect(users).to equal @users
             expect(users.size).to be == 2
             expect(users).to be_loaded
           end
 
-          @users = model.find 1, 2, &proc1
+          @users = model.find([1, 2], &proc1)
           Acfs.add_callback(@users, &proc2)
           Acfs.run
         end
 
         it 'should respect resource type inheritance' do
-          customers = MyUser.find 3, 4
+          customers = MyUser.find [3, 4]
           Acfs.run
 
           expect(customers[0]).to be_a Customer
@@ -127,11 +136,12 @@ describe Acfs::Model::QueryMethods do
 
       context 'with one 404 response' do
         before do
-          stub_request(:get, 'http://users.example.org/users/1').to_return response({error: 'not found'}, status: 404)
+          stub_request(:get, 'http://users.example.org/users/1')
+            .to_return response({error: 'not found'}, {status: 404})
         end
 
         it 'should raise resource not found error' do
-          model.find 1, 2
+          model.find [1, 2]
 
           expect { Acfs.run }.to raise_error(Acfs::ResourceNotFound)
         end
@@ -144,24 +154,28 @@ describe Acfs::Model::QueryMethods do
     let(:pc) { PC }
     let(:mac) { Mac }
     before do
-      stub_request(:get, 'http://computers.example.org/computers').to_return response([{id: 1, type: 'PC'}, {id: 2, type: 'Computer'}, {id: 3, type: 'Mac'}])
+      stub_request(:get, 'http://computers.example.org/computers')
+        .to_return response [
+          {id: 1, type: 'PC'},
+          {id: 2, type: 'Computer'},
+          {id: 3, type: 'Mac'}]
     end
 
     it 'should invoke multiple callback after all models are loaded' do
-      proc1 = Proc.new {}
-      proc2 = Proc.new {}
+      proc1 = proc {}
+      proc2 = proc {}
       expect(proc1).to receive(:call) do |computers|
-        expect(computers).to be === @computers
+        expect(computers).to equal @computers
         expect(computers.size).to be == 3
         expect(computers).to be_loaded
       end
       expect(proc2).to receive(:call) do |computers|
-        expect(computers).to be === @computers
+        expect(computers).to equal @computers
         expect(computers.size).to be == 3
         expect(computers).to be_loaded
       end
 
-      @computers = computer.all &proc1
+      @computers = computer.all(&proc1)
       Acfs.add_callback(@computers, &proc2)
       Acfs.run
     end
@@ -191,21 +205,33 @@ describe Acfs::Model::QueryMethods do
 
         context 'with another resource as type instead' do
           before do
-            stub_request(:get, 'http://computers.example.org/computers').to_return response([{id: 1, type: 'MyUser'}, {id: 2, type: 'Computer'}, {id: 3, type: 'Mac'}])
+            stub_request(:get, 'http://computers.example.org/computers')
+              .to_return response [
+                {id: 1, type: 'MyUser'},
+                {id: 2, type: 'Computer'},
+                {id: 3, type: 'Mac'}]
           end
           it_behaves_like 'with invalid type'
         end
 
         context 'with a random string as type instead' do
           before do
-            stub_request(:get, 'http://computers.example.org/computers').to_return response([{id: 1, type: 'PC'}, {id: 2, type: 'noValidType'}, {id: 3, type: 'Mac'}])
+            stub_request(:get, 'http://computers.example.org/computers')
+              .to_return response [
+                {id: 1, type: 'PC'},
+                {id: 2, type: 'noValidType'},
+                {id: 3, type: 'Mac'}]
           end
           it_behaves_like 'with invalid type'
         end
 
         context 'with a non-string as type instead' do
           before do
-            stub_request(:get, 'http://computers.example.org/computers').to_return response([{id: 1, type: 'PC'}, {id: 2, type: 'Computer'}, {id: 3, type: 42}])
+            stub_request(:get, 'http://computers.example.org/computers')
+              .to_return response [
+                {id: 1, type: 'PC'},
+                {id: 2, type: 'Computer'},
+                {id: 3, type: 42}]
           end
           it_behaves_like 'with invalid type'
         end
@@ -217,7 +243,7 @@ describe Acfs::Model::QueryMethods do
     context 'standard resource' do
       let(:model) { MyUser }
       let!(:user) { model.send described_method, age: 24 }
-      subject { Acfs.run; user }
+      subject { Acfs.run && user }
 
       context 'return value' do
         subject { user }
@@ -227,7 +253,10 @@ describe Acfs::Model::QueryMethods do
       end
 
       context 'with params' do
-        let!(:request) { stub_request(:get, 'http://users.example.org/users?age=24').to_return response([{id: 1, name: 'Mike', age: 24}]) }
+        let!(:request) do
+          stub_request(:get, 'http://users.example.org/users?age=24')
+            .to_return response([{id: 1, name: 'Mike', age: 24}])
+        end
 
         it 'should include params in URI to index action' do
           subject
@@ -236,24 +265,30 @@ describe Acfs::Model::QueryMethods do
       end
 
       context 'with non-empty response' do
-        before { stub_request(:get, 'http://users.example.org/users?age=24').to_return response([{id: 1, name: 'Mike', age: 24}, {id: 4, type: 'Maria', age: 24}, {id: 7, type: 'James', age: 24}]) }
+        before do
+          stub_request(:get, 'http://users.example.org/users?age=24')
+            .to_return response [
+              {id: 1, name: 'Mike', age: 24},
+              {id: 4, type: 'Maria', age: 24},
+              {id: 7, type: 'James', age: 24}]
+        end
 
         it 'should invoke callback after model is loaded' do
-          proc = Proc.new {}
+          block = proc {}
 
-          expect(proc).to receive(:call) do |user|
+          expect(block).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
             expect(user).to be_a MyUser
             expect(user).to be_loaded
           end
 
-          @user = model.send described_method, age: 24, &proc
+          @user = model.send described_method, age: 24, &block
           Acfs.run
         end
 
         it 'should invoke multiple callbacks after model is loaded' do
-          proc1 = Proc.new {}
-          proc2 = Proc.new {}
+          proc1 = proc {}
+          proc2 = proc {}
 
           expect(proc1).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
@@ -282,7 +317,7 @@ describe Acfs::Model::QueryMethods do
       let(:model) { Single }
 
       it '.find_by should not be defined' do
-        expect { model.find_by }.to raise_error NoMethodError
+        expect { model.find_by }.to raise_error ::Acfs::UnsupportedOperation
       end
     end
   end
@@ -294,28 +329,31 @@ describe Acfs::Model::QueryMethods do
     context 'standard resource' do
       let(:model) { MyUser }
       let!(:user) { model.send described_method, age: 24 }
-      subject { Acfs.run; user }
+      subject { Acfs.run && user }
 
       context 'with empty response' do
-        before { stub_request(:get, 'http://users.example.org/users?age=24').to_return response([]) }
+        before do
+          stub_request(:get, 'http://users.example.org/users?age=24')
+            .to_return response []
+        end
 
         it { should be_nil }
 
         it 'should invoke callback after model is loaded' do
-          proc = Proc.new {}
+          block = proc {}
 
-          expect(proc).to receive(:call) do |user|
+          expect(block).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
             expect(user).to be_a NilClass
           end
 
-          @user = model.find_by age: 24, &proc
+          @user = model.find_by age: 24, &block
           Acfs.run
         end
 
         it 'should invoke multiple callbacks after model is loaded' do
-          proc1 = Proc.new {}
-          proc2 = Proc.new {}
+          proc1 = proc {}
+          proc2 = proc {}
 
           expect(proc1).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
@@ -341,10 +379,13 @@ describe Acfs::Model::QueryMethods do
     context 'standard resource' do
       let(:model) { MyUser }
       let!(:user) { model.send described_method, age: 24 }
-      subject { Acfs.run; user }
+      subject { Acfs.run && user }
 
       context 'with empty response' do
-        before { stub_request(:get, 'http://users.example.org/users?age=24').to_return response([]) }
+        before do
+          stub_request(:get, 'http://users.example.org/users?age=24')
+            .to_return response []
+        end
 
         it 'should raise an ResourceNotFound error' do
           model.find_by! age: 24
@@ -352,11 +393,11 @@ describe Acfs::Model::QueryMethods do
         end
 
         it 'should not invoke callback after model could not be loaded' do
-          proc = Proc.new {}
+          block = proc {}
 
-          expect(proc).not_to receive(:call)
+          expect(block).not_to receive(:call)
 
-          model.find_by! age: 24, &proc
+          model.find_by! age: 24, &block
           expect { Acfs.run }.to raise_error
         end
       end
@@ -365,30 +406,30 @@ describe Acfs::Model::QueryMethods do
     describe '#each_page' do
       context 'without parameters' do
         before do
-          stub_request(:get, 'http://users.example.org/users').
-              to_return response([{id: 1, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=2>; rel="next"'
-                                 })
-          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' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=3>; rel="next"'
-                                 })
-          stub_request(:get, 'http://users.example.org/users?page=3').
-              to_return response([{id: 3, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=4>; rel="next"'
-                                 })
-          stub_request(:get, 'http://users.example.org/users?page=4').
-              to_return response([{id: 4, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => ''
-                                 })
+          stub_request(:get, 'http://users.example.org/users')
+            .to_return response([{id: 1, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => '<http://users.example.org/users?page=2>; rel="next"'
+              })
+          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' => '4',
+                'Link'          => '<http://users.example.org/users?page=3>; rel="next"'
+              })
+          stub_request(:get, 'http://users.example.org/users?page=3')
+            .to_return response([{id: 3, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => '<http://users.example.org/users?page=4>; rel="next"'
+              })
+          stub_request(:get, 'http://users.example.org/users?page=4')
+            .to_return response([{id: 4, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => ''
+              })
         end
 
         it 'should iterate all pages' do
@@ -407,30 +448,30 @@ describe Acfs::Model::QueryMethods do
 
       context 'with parameters' do
         before do
-          stub_request(:get, 'http://users.example.org/users?param=bla').
-              to_return response([{id: 1, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => '<http://users.example.org/users?where=fuu&page=2>; rel="next"'
-                                 })
-          stub_request(:get, 'http://users.example.org/users?where=fuu&page=2').
-              to_return response([{id: 2, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=3>; rel="next"'
-                                 })
-          stub_request(:get, 'http://users.example.org/users?page=3').
-              to_return response([{id: 3, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=4>; rel="next"'
-                                 })
-          stub_request(:get, 'http://users.example.org/users?page=4').
-              to_return response([{id: 4, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => ''
-                                 })
+          stub_request(:get, 'http://users.example.org/users?param=bla')
+            .to_return response([{id: 1, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => '<http://users.example.org/users?where=fuu&page=2>; rel="next"'
+              })
+          stub_request(:get, 'http://users.example.org/users?where=fuu&page=2')
+            .to_return response([{id: 2, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => '<http://users.example.org/users?page=3>; rel="next"'
+              })
+          stub_request(:get, 'http://users.example.org/users?page=3')
+            .to_return response([{id: 3, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => '<http://users.example.org/users?page=4>; rel="next"'
+              })
+          stub_request(:get, 'http://users.example.org/users?page=4')
+            .to_return response([{id: 4, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => ''
+              })
         end
 
         it 'should call first page with params and follow relations' do
@@ -451,30 +492,30 @@ describe Acfs::Model::QueryMethods do
     describe '#each_item' do
       context 'without parameters' do
         before do
-          stub_request(:get, 'http://users.example.org/users').
-              to_return response([{id: 1, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=2>; rel="next"'
-                                 })
-          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' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=3>; rel="next"'
-                                 })
-          stub_request(:get, 'http://users.example.org/users?page=3').
-              to_return response([{id: 3, name: 'Anno', age: 1604, born_at: 'Santa Maria'},{id: 4, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => '<http://users.example.org/users?page=4>; rel="next"'
-                                 })
-          stub_request(:get, 'http://users.example.org/users?page=4').
-              to_return response([{id: 5, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
-                                 headers: {
-                                     'X-Total-Pages' => '4',
-                                     'Link'          => ''
-                                 })
+          stub_request(:get, 'http://users.example.org/users')
+            .to_return response([{id: 1, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => '<http://users.example.org/users?page=2>; rel="next"'
+              })
+          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' => '4',
+                'Link'          => '<http://users.example.org/users?page=3>; rel="next"'
+              })
+          stub_request(:get, 'http://users.example.org/users?page=3')
+            .to_return response([{id: 3, name: 'Anno', age: 1604, born_at: 'Santa Maria'}, {id: 4, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => '<http://users.example.org/users?page=4>; rel="next"'
+              })
+          stub_request(:get, 'http://users.example.org/users?page=4')
+            .to_return response([{id: 5, name: 'Anno', age: 1604, born_at: 'Santa Maria'}],
+              headers: {
+                'X-Total-Pages' => '4',
+                'Link'          => ''
+              })
         end
 
         it 'should iterate all pages' do
@@ -485,7 +526,7 @@ describe Acfs::Model::QueryMethods do
           end
           Acfs.run
 
-          expect(indecies).to eq [1,2,3,4,5]
+          expect(indecies).to eq [1, 2, 3, 4, 5]
         end
       end
     end