acfs 1.6.0 → 1.7.0

data/spec/acfs/resource/initialization_spec.rb

@@ -17,20 +17,19 @@ describe 'Acfs::Resource::Initialization' do
   end
 
   describe '#initialize' do
-    it 'should allow to set attributes with initializer' do
+    it 'allows to set attributes with initializer' do
       m = model.new name: 'John'
       expect(m.name).to eq 'John'
     end
 
-    it 'should raise error when attributes with private setters are given' do
+    it 'raises error when attributes with private setters are given' do
       expect { model.new age: 25 }.to raise_error(NoMethodError)
     end
   end
 
   describe '#persisted?' do
-    subject { model.new.persisted? }
-    it 'should be false' do
-      should be false
+    it 'is false' do
+      expect(model.new.persisted?).to be false
     end
   end
 end

data/spec/acfs/resource/loadable_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 
 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
@@ -11,11 +12,12 @@ describe Acfs::Resource::Loadable do
 
   describe '#loaded?' do
     context 'before Acfs#run' do
-      it { expect(model).to_not be_loaded }
+      it { expect(model).not_to be_loaded }
     end
 
     context 'afer Acfs#run' do
       before { model && Acfs.run }
+
       it { expect(model).to be_loaded }
     end
   end

data/spec/acfs/resource/locatable_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 
 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
@@ -12,63 +13,67 @@ describe Acfs::Resource::Locatable do
   end
 
   describe '.url' do
-    it 'should return URL' do
-      expect(model.url).to be == 'http://users.example.org/users'
+    it 'returns URL' do
+      expect(model.url).to eq 'http://users.example.org/users'
     end
 
-    it 'should return URL with id path part if specified' do
-      expect(model.url(5)).to be == 'http://users.example.org/users/5'
+    it 'returns URL with id path part if specified' do
+      expect(model.url(5)).to eq 'http://users.example.org/users/5'
     end
 
     context 'with attribute in path' do
       let(:model) { Profile }
 
-      it 'should replace placeholder' do
+      it 'replaces placeholder' do
         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
+        it 'raises an error if attribute is missing' do
           expect { model.url }.to raise_error ArgumentError
         end
       end
     end
 
     describe 'custom paths' do
+      subject(:location) { Session.location(action: action) }
+
       let(:model) { Session }
-      let(:location) { Session.location action: action }
-      subject { location }
 
       context ':list location' do
         let(:action) { :list }
 
         its(:raw_uri) do
-          should eq 'http://users.example.org/users/:user_id/sessions'
+          is_expected.to eq 'http://users.example.org/users/:user_id/sessions'
         end
       end
 
       context ':create location' do
         let(:action) { :create }
-        its(:raw_uri) { should eq 'http://users.example.org/sessions' }
+
+        its(:raw_uri) { is_expected.to eq 'http://users.example.org/sessions' }
       end
 
       context ':read location' do
         let(:action) { :read }
-        its(:raw_uri) { should eq 'http://users.example.org/sessions/:id' }
+
+        its(:raw_uri) { is_expected.to eq 'http://users.example.org/sessions/:id' }
       end
 
       context ':update location' do
         let(:action) { :update }
+
         its(:raw_uri) do
-          expect { subject }.to raise_error ArgumentError, /update.*disabled/
+          expect { location }.to raise_error ArgumentError, /update.*disabled/
         end
       end
 
       context ':delete location' do
         let(:action) { :delete }
+
         its(:raw_uri) do
-          should eq 'http://users.example.org/users/:user_id/sessions/del/:id'
+          is_expected.to eq 'http://users.example.org/users/:user_id/sessions/del/:id'
         end
       end
     end
@@ -78,20 +83,20 @@ describe Acfs::Resource::Locatable do
     context 'new resource' do
       let(:m) { model.new }
 
-      it 'should return nil' do
+      it 'returns nil' do
         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
+        it 'returns resource URL' do
           expect(m.url).to eq 'http://users.example.org/users/475'
         end
       end
 
       context 'with attribute in path' do
-        it 'should return nil' do
+        it 'returns nil' do
           expect(m.url).to be_nil
         end
       end
@@ -99,9 +104,10 @@ describe Acfs::Resource::Locatable do
 
     context 'loaded resource' do
       let(:m) { model.find 1 }
+
       before { m && Acfs.run }
 
-      it "should return resource's URL" do
+      it "returns resource's URL" do
         expect(m.url).to eq 'http://users.example.org/users/1'
       end
 
@@ -109,7 +115,7 @@ describe Acfs::Resource::Locatable do
         let(:model) { Profile }
         let(:m) { model.find user_id: 1 }
 
-        it "should return resource's URL" do
+        it "returns resource's URL" do
           expect(m.url).to eq 'http://users.example.org/users/2/profile'
         end
       end

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

@@ -4,16 +4,28 @@ require 'spec_helper'
 
 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)
 
-    @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)
+  let!(:patch_stub) do
+    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)
+  end
 
-    @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)
+  let!(:post_stub) do
+    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)
+  end
+
+  let!(:delete_stub) do
+    stub_request(:delete, 'http://users.example.org/users/1')
+      .with(body: '{}')
+      .to_return response({id: 1, name: 'Idefix', age: 12}, {status: 200})
+  end
+
+  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')
       .with(body: '{"id":null,"name":"Anon","age":null}')
@@ -26,41 +38,38 @@ describe Acfs::Resource::Persistence do
     stub_request(:post, 'http://users.example.org/users')
       .with(body: '{"id":null,"name":null,"age":12}')
       .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})
   end
 
   context 'new model' do
     let(:model) { model_class.new }
 
-    it { expect(model).to_not be_persisted }
+    it { expect(model).not_to be_persisted }
     it { expect(model).to be_new }
 
     describe '#save!' do
       context 'when modified' do
         let(:model) { model_class.find 1 }
+
         before do
           model
           Acfs.run
           model.name = 'Idefix'
         end
 
-        it 'should PUT to model URL' do
+        it 'PUTS to model URL' do
           model.save!
 
-          expect(@patch_stub).to have_been_requested
+          expect(patch_stub).to have_been_requested
         end
       end
 
       context 'when new' do
         let(:model) { model_class.new name: 'Idefix', age: 12 }
 
-        it 'should POST to collection URL' do
+        it 'POSTS to collection URL' do
           model.save!
 
-          expect(@post_stub).to have_been_requested
+          expect(post_stub).to have_been_requested
         end
 
         context 'with unknown attributes' do
@@ -71,17 +80,17 @@ describe Acfs::Resource::Persistence do
           end
           let(:model) { model_class.new name: 'Idefix', born_at: 'Berlin' }
 
-          it 'should POST to collection URL' do
+          it 'POSTS to collection URL' do
             model.save!
             expect(req).to have_been_requested
           end
 
-          it 'should still have unknown attribute' do
+          it 'stills have unknown attribute' do
             model.save!
             expect(model.attributes).to include 'born_at' => 'Berlin'
           end
 
-          it 'should include server send unknown attribute' do
+          it 'includes server send unknown attribute' do
             model.save!
             expect(model.attributes).to include 'wuff' => 'woa'
           end
@@ -93,7 +102,7 @@ describe Acfs::Resource::Persistence do
       before { model.save! }
 
       it { expect(model).to be_persisted }
-      it { expect(model).to_not be_new }
+      it { expect(model).not_to be_new }
     end
   end
 
@@ -101,46 +110,63 @@ describe Acfs::Resource::Persistence do
     let!(:model) { model_class.find 1 }
 
     describe '#update_attributes' do
-      subject { -> { model.update_attributes({name: 'John'}) } }
-      it { expect { subject.call }.to raise_error Acfs::ResourceNotLoaded }
+      it 'to raise error' do
+        expect do
+          model.update_attributes({name: 'John'})
+        end.to raise_error Acfs::ResourceNotLoaded
+      end
     end
 
     describe '#update_attributes!' do
-      subject { -> { model.update_attributes!({name: 'John'}) } }
-      it { expect { subject.call }.to raise_error Acfs::ResourceNotLoaded }
+      it 'to raise error' do
+        expect do
+          model.update_attributes!({name: 'John'})
+        end.to raise_error Acfs::ResourceNotLoaded
+      end
     end
   end
 
   context 'loaded model' do
     context 'without changes' do
       let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
+
+      before do
+        model
+        Acfs.run
+      end
 
       it { expect(model).to be_persisted }
-      it { expect(model).to_not be_new }
+      it { expect(model).not_to be_new }
     end
 
     context 'with changes' do
       let(:model) { model_class.find 1 }
-      before { model; Acfs.run; model.name = 'dhh' }
+
+      before do
+        model
+        Acfs.run
+        model.name = 'dhh'
+      end
 
       it { expect(model).to be_persisted }
-      it { expect(model).to_not be_new }
+      it { expect(model).not_to be_new }
     end
 
     describe '#delete!' do
       let(:model) { model_class.find 1 }
-      let(:before_acfs_run) {}
 
       describe 'normal delete actions' do
-        before { model; Acfs.run }
+        before do
+          model
+          Acfs.run
+        end
 
-        it 'should trigger DELETE request' do
+        it 'triggers DELETE request' do
           model.delete!
-          expect(@del).to have_been_requested
+          expect(delete_stub).to have_been_requested
         end
 
-        it 'should be frozen after DELETE' do
+        it 'is frozen after DELETE' do
           model.delete!
           expect(model.__getobj__).to be_frozen
         end
@@ -149,46 +175,54 @@ describe Acfs::Resource::Persistence do
       describe 'correct URL generation' do
         let(:model_class) { PathArguments }
         let(:model) { model_class.find 1, params: {required_arg: 'some_value'} }
+        let(:resource_url) { 'http://users.example.org/some_value/users/1' }
+
+        let!(:delete_stub) do
+          stub_request(:delete, resource_url)
+            .with(body: '{}')
+            .to_return response({id: 1, required_arg: 'some_value'}, {status: 200})
+        end
+
+        before do
+          stub_request(:get, resource_url)
+            .to_return response(id: 1, 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')
-          @my_delete_stub = stub_request(:delete, resource_url)
-                            .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
+        it 'does not raise an error on URL generation' do
           expect do
             model.delete!
           end.not_to raise_error
         end
 
-        it 'should request the delete' do
+        it 'requests the delete' do
           model.delete!
-          expect(@my_delete_stub).to have_been_requested
+          expect(delete_stub).to have_been_requested
         end
       end
     end
 
     describe '#update_atributes!' do
       let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
 
-      it 'should set attributes' do
+      before do
+        model
+        Acfs.run
+      end
+
+      it 'sets attributes' do
         model.update_attributes({name: 'Idefix'})
         expect(model.attributes.symbolize_keys).to eq id: 1, name: 'Idefix', age: 12
       end
 
-      it 'should save resource' do
+      it 'saves resource' do
         expect(model.__getobj__).to receive(:save)
         model.update_attributes({name: 'Idefix'})
       end
 
-      it 'should kwargs to save' do
+      it 'kwargses to save' do
         expect(model.__getobj__).to receive(:save).with(bla: 'blub')
         model.update_attributes({name: 'Idefix'}, bla: 'blub')
       end
@@ -196,19 +230,23 @@ describe Acfs::Resource::Persistence do
 
     describe '#update_atributes' do
       let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
 
-      it 'should set attributes' do
+      before do
+        model
+        Acfs.run
+      end
+
+      it 'sets attributes' do
         model.update_attributes!({name: 'Idefix'})
         expect(model.attributes.symbolize_keys).to eq id: 1, name: 'Idefix', age: 12
       end
 
-      it 'should save resource' do
+      it 'saves resource' do
         expect(model.__getobj__).to receive(:save!)
         model.update_attributes!({name: 'Idefix'})
       end
 
-      it 'should pass second hash to save' do
+      it 'passes second hash to save' do
         expect(model.__getobj__).to receive(:save!).with(bla: 'blub')
         model.update_attributes!({name: 'Idefix'}, bla: 'blub')
       end
@@ -218,7 +256,11 @@ describe Acfs::Resource::Persistence do
   describe '.save!' do
     context 'with invalid data validated on server side' do
       let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
+
+      before do
+        model
+        Acfs.run
+      end
 
       before do
         stub_request(:put, 'http://users.example.org/users/1')
@@ -226,7 +268,7 @@ describe Acfs::Resource::Persistence do
           .to_return response({errors: {name: ['required']}}, {status: 422})
       end
 
-      it 'should set local errors hash' do
+      it 'sets local errors hash' do
         model.name = ''
         begin
           model.save!
@@ -236,30 +278,19 @@ describe Acfs::Resource::Persistence do
         expect(model.errors.to_hash).to be == {name: %w[required]}
       end
     end
-
-    context 'hash modification on iteration in ActiveModel when errors on field is nil' do
-      let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
-
-      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})
-      end
-    end
   end
 
   describe '.create!' do
     context 'with valid data' do
       let(:data) { {name: 'Idefix', age: 12} }
 
-      it 'should create new resource' do
+      it 'creates new resource' do
         model = model_class.create! data
         expect(model.name).to be == 'Idefix'
         expect(model.age).to be == 12
       end
 
-      it 'should be persisted' do
+      it 'is persisted' do
         model = model_class.create! data
         expect(model).to be_persisted
       end
@@ -268,7 +299,7 @@ describe Acfs::Resource::Persistence do
     context 'with invalid data' do
       let(:data) { {name: nil, age: 12} }
 
-      it 'should raise an error' do
+      it 'raises an error' do
         expect { model_class.create! data }.to \
           raise_error(::Acfs::InvalidResource) do |error|
             expect(error.errors).to be == {'name' => %w[required]}
@@ -278,44 +309,45 @@ describe Acfs::Resource::Persistence do
   end
 
   describe '.create' do
-    subject { model_class.create data }
+    subject(:model) { model_class.create data }
 
     context 'with valid data' do
       let(:data) { {name: 'Idefix', age: 12} }
 
-      it 'should create new resource' do
-        expect(subject.name).to be == 'Idefix'
-        expect(subject.age).to be == 12
+      it 'creates new resource' do
+        expect(model.name).to be == 'Idefix'
+        expect(model.age).to be == 12
       end
 
-      it 'should be persisted' do
-        expect(subject).to be_persisted
+      it 'is persisted' do
+        expect(model).to be_persisted
       end
     end
 
     context 'with invalid data' do
       let(:data) { {name: nil, age: 12} }
 
-      it 'should return not persisted resource' do
-        expect(subject).to_not be_persisted
+      it 'returns not persisted resource' do
+        expect(model).not_to be_persisted
       end
 
-      it 'should contain error hash' do
-        expect(subject.errors.to_hash).to eq name: %w[required]
+      it 'contains error hash' do
+        expect(model.errors.to_hash).to eq name: %w[required]
       end
     end
 
     context 'with additional data' do
-      let!(:req) do
+      before 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)
       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'
+      it 'stores them in attributes' do
+        expect(model.attributes).to eq 'id' => 5, 'name' => 'Anon',
+          'age' => 9, 'born_at' => 'today'
       end
     end
   end