acfs 0.50.0 → 1.0.0.dev.1.b297

data/spec/acfs/service_spec.rb

@@ -10,7 +10,7 @@ describe Acfs::Service do
   end
 
   describe '#initialize' do
-    let(:options) { {path: 'abc', key: 'value'} }
+    let(:options) { { path: 'abc', key: 'value' } }
 
     it 'should set options' do
       expect(service.options).to eq(options)
@@ -19,14 +19,14 @@ describe Acfs::Service do
 
   describe '#location' do
     let(:resource) { Class.new }
-    before { allow(resource).to receive(:location_default_path, &proc{|_a, p| p}) }
+    before { allow(resource).to receive(:location_default_path, &proc{|a, p| p}) }
 
     it 'should extract resource path name from given class' do
       expect(service.location(resource).to_s).to eq('/classes')
     end
 
     context 'with path options' do
-      let(:options) { {path: 'abc'} }
+      let(:options) { { path: 'abc' } }
 
       it 'should have custom resource path' do
         expect(service.location(resource).to_s).to eq('/abc')
@@ -35,11 +35,13 @@ describe Acfs::Service do
   end
 
   describe '.base_url' do
+
     before do
       Acfs::Configuration.current.locate :test, 'http://abc.de/api/v1'
     end
 
     it 'should return configured URI for service' do
+
       expect(srv_class.base_url).to eq('http://abc.de/api/v1')
     end
   end

data/spec/acfs/singleton_resource_spec.rb

@@ -9,7 +9,8 @@ describe Acfs::SingletonResource do
         .to_return response id: 1
     end
 
-    let(:action) { ->(cb) { model.find(&cb) } }
+    let(:action) { ->(cb){ model.find(&cb) } }
     it_should_behave_like 'a query method with multi-callback support'
   end
+
 end

data/spec/acfs/stub_spec.rb

@@ -14,7 +14,7 @@ describe Acfs::Stub do
 
   describe '#called?' do
     context 'without specified number' do
-      let!(:operation) { Acfs::Stub.resource MyUser, :read, with: {id: 1}, return: {id: 1, name: 'John Smith', age: 32} }
+      let!(:operation) { Acfs::Stub.resource MyUser, :read, with: { id: 1 }, return: { id: 1, name: 'John Smith', age: 32 } }
 
       it 'should allow to test if stub was called' do
         MyUser.find 1
@@ -38,8 +38,8 @@ describe Acfs::Stub do
   describe '.resource' do
     context 'with ambiguous stubs' do
       before do
-        Acfs::Stub.resource MyUser, :read, with: {id: 1}, return: {id: 1, name: 'John Smith', age: 32}
-        Acfs::Stub.resource MyUser, :read, with: {id: 1}, raise: :not_found
+        Acfs::Stub.resource MyUser, :read, with: { id: 1 }, return: { id: 1, name: 'John Smith', age: 32 }
+        Acfs::Stub.resource MyUser, :read, with: { id: 1 }, raise: :not_found
       end
 
       it 'should raise error' do
@@ -51,9 +51,9 @@ describe Acfs::Stub do
 
     context 'with read action' do
       before do
-        Acfs::Stub.resource MyUser, :read, with: {id: 1}, return: {id: 1, name: 'John Smith', age: 32}
-        Acfs::Stub.resource MyUser, :read, with: {id: 2}, raise: SpecialCustomError
-        Acfs::Stub.resource MyUser, :read, with: {id: 3}, raise: :not_found
+        Acfs::Stub.resource MyUser, :read, with: { id: 1 }, return: { id: 1, name: 'John Smith', age: 32 }
+        Acfs::Stub.resource MyUser, :read, with: { id: 2 }, raise: SpecialCustomError
+        Acfs::Stub.resource MyUser, :read, with: { id: 3 }, raise: :not_found
       end
 
       it 'should allow to stub resource reads' do
@@ -81,8 +81,8 @@ describe Acfs::Stub do
 
       context 'with type parameter' do
         before do
-          Acfs::Stub.resource Computer, :read, with: {id: 1}, return: {id: 1, type: 'PC'}
-          Acfs::Stub.resource Computer, :read, with: {id: 2}, return: {id: 2, type: 'Mac'}
+          Acfs::Stub.resource Computer, :read, with: { id: 1 }, return: { id: 1, type: 'PC' }
+          Acfs::Stub.resource Computer, :read, with: { id: 2 }, return: { id: 2, type: 'Mac' }
         end
 
         it 'should create inherited type' do
@@ -99,8 +99,8 @@ describe Acfs::Stub do
 
     context 'with create action' do
       before do
-        Acfs::Stub.resource Session, :create, with: {ident: 'john@exmaple.org', password: 's3cr3t'}, return: {id: 'longhash', user: 1}
-        Acfs::Stub.resource Session, :create, with: ->(op) { op.data[:ident] == 'john@exmaple.org' && op.data[:password] == 'wrong' }, raise: 422
+        Acfs::Stub.resource Session, :create, with: { ident: 'john@exmaple.org', password: 's3cr3t' }, return: { id: 'longhash', user: 1 }
+        Acfs::Stub.resource Session, :create, with: lambda { |op| op.data[:ident] == 'john@exmaple.org' && op.data[:password] == 'wrong' }, raise: 422
       end
 
       it 'should allow stub resource creation' do
@@ -111,16 +111,16 @@ describe Acfs::Stub do
       end
 
       it 'should allow to raise error' do
-        expect do
+        expect {
           Session.create! ident: 'john@exmaple.org', password: 'wrong'
-        end.to raise_error(::Acfs::InvalidResource)
+        }.to raise_error(::Acfs::InvalidResource)
       end
     end
 
     context 'with list action' do
       before do
         Acfs::Stub.resource MyUser, :list,
-          return: [{id: 1, name: 'John Smith', age: 32}, {id: 2, name: 'Anon', age: 12}]
+          return: [{ id: 1, name: 'John Smith', age: 32 }, { id: 2, name: 'Anon', age: 12 }]
       end
 
       it 'should return collection' do
@@ -158,35 +158,23 @@ describe Acfs::Stub do
       context 'with header' do
         before do
           Acfs::Stub.resource Comment, :list,
-            return: [{id: 1, text: 'Foo'}, {id: 2, text: 'Bar'}],
-            headers: headers
+          return: [{ id: 1, text: 'Foo' }, { id: 2, text: 'Bar' }],
+          headers: headers
         end
 
         let!(:comments) { Comment.all }
-        let(:headers) do
-          {
-            'X-Total-Pages' => '2',
-            'X-Total-Count' => '10'
-          }
-        end
+        let(:headers) { {'X-Total-Pages' => '2'} }
         subject { Acfs.run; comments }
 
         its(:total_pages) { should eq 2 }
-        its(:total_count) { should eq 10 }
       end
     end
 
     context 'with update action' do
       before do
-        Acfs::Stub.resource MyUser, :read, with: {id: 1}, return: {id: 1, name: 'John Smith', age: 32}
-        Acfs::Stub.resource MyUser, :update, with: {id: 1, name: 'John Smith', age: 22}, return: {id: 1, name: 'John Smith', age: 23}
-        Acfs::Stub.resource MyUser, :update, with: {id: 1, name: 'John Smith', age: 0}, raise: 422
-      end
-
-      let!(:update_stub) do
-        Acfs::Stub.resource MyUser, :update,
-          with: {id: 1, name: 'Jane Smith'},
-          return: ->(op) { Hash[op.data.map {|k, v| [k, v.to_s.upcase] }] }
+        Acfs::Stub.resource MyUser, :read, with: { id: 1 }, return: { id: 1, name: 'John Smith', age: 32 }
+        Acfs::Stub.resource MyUser, :update, with: { id: 1, name: 'John Smith', age: 22 }, return: { id: 1, name: 'John Smith', age: 23 }
+        Acfs::Stub.resource MyUser, :update, with: { id: 1, name: 'John Smith', age: 0 }, raise: 422
       end
 
       it 'should allow stub resource update' do
@@ -206,43 +194,9 @@ describe Acfs::Stub do
         user.age = 0
         user.save
 
-        expect do
+        expect {
           user.save!
-        end.to raise_error(::Acfs::InvalidResource)
-      end
-
-      it 'should match partial :with' do
-        user = MyUser.find 1
-        Acfs.run
-
-        user.age = 5
-        user.name = 'Jane Smith'
-        user.save!
-
-        expect(update_stub).to be_called
-      end
-
-      it 'should process response body' do
-        user = MyUser.find 1
-        Acfs.run
-
-        user.age = 5
-        user.name = 'Jane Smith'
-        user.save!
-
-        expect(user.name).to eq 'JANE SMITH'
-      end
-    end
-
-    context 'with create action' do
-      before do
-        Acfs::Stub.resource MyUser, :create, with: {name: 'John Smith', age: 0}, raise: 422
-      end
-
-      it 'should allow to raise error' do
-        expect do
-          MyUser.create! name: 'John Smith', age: 0
-        end.to raise_error(::Acfs::InvalidResource)
+        }.to raise_error(::Acfs::InvalidResource)
       end
     end
   end
@@ -251,7 +205,7 @@ describe Acfs::Stub do
     context 'when enabled' do
       before do
         Acfs::Stub.allow_requests = true
-        stub_request(:get, 'http://users.example.org/users/2').to_return response(id: 2, name: 'John', age: 26)
+        stub_request(:get, 'http://users.example.org/users/2').to_return response({ id: 2, name: 'John', age: 26 })
       end
 
       it 'should allow real requests' do
@@ -271,73 +225,4 @@ describe Acfs::Stub do
       end
     end
   end
-
-  describe 'accept?' do
-    subject { stub.accept?(op) }
-
-    context 'with a match in params' do
-      let(:op) do
-        double('operation').tap do |op|
-          allow(op).to receive(:full_params).and_return(id: 1337, blub: 'abc')
-          allow(op).to receive(:data).and_return({})
-        end
-      end
-
-      let(:stub) { Acfs::Stub.resource MyUser, :read, with: {id: 1337} }
-
-      it { is_expected.to be true }
-    end
-
-    context 'with a match in data' do
-      let(:op) do
-        double('operation').tap do |op|
-          allow(op).to receive(:full_params).and_return({})
-          allow(op).to receive(:data).and_return(id: 1337, blub: 'abc')
-        end
-      end
-
-      let(:stub) { Acfs::Stub.resource MyUser, :read, with: {id: 1337} }
-
-      it { is_expected.to be true }
-    end
-
-    context 'with no match in params nor data' do
-      let(:op) do
-        double('operation').tap do |op|
-          allow(op).to receive(:full_params).and_return(id: 1337)
-          allow(op).to receive(:data).and_return({})
-        end
-      end
-
-      let(:stub) { Acfs::Stub.resource MyUser, :read, with: {abc: '123'} }
-
-      it { is_expected.to be false }
-    end
-
-    context 'with a wrong match' do
-      let(:op) do
-        double('operation').tap do |op|
-          allow(op).to receive(:full_params).and_return(id: 1337, blub: 'abc')
-          allow(op).to receive(:data).and_return({})
-        end
-      end
-
-      let(:stub) { Acfs::Stub.resource MyUser, :read, with: {id: 1337, blub: '123'} }
-
-      it { is_expected.to be false }
-    end
-
-    context 'with a missing match' do
-      let(:op) do
-        double('operation').tap do |op|
-          allow(op).to receive(:full_params).and_return(id: 1337, blub: 'abc')
-          allow(op).to receive(:data).and_return({})
-        end
-      end
-
-      let(:stub) { Acfs::Stub.resource MyUser, :read, with: {id: 1337, answer: 42} }
-
-      it { is_expected.to be false }
-    end
-  end
 end

data/spec/acfs_spec.rb

@@ -1,18 +1,19 @@
 require 'spec_helper'
 
 describe 'Acfs' do
+
   before do
-    stub_request(:get, 'http://users.example.org/users').to_return response([{id: 1, name: 'Anon', age: 12}, {id: 2, name: 'John', age: 26}])
-    stub_request(:get, 'http://users.example.org/users/2').to_return response(id: 2, name: 'John', age: 26)
-    stub_request(:get, 'http://users.example.org/users/3').to_return response(id: 3, name: 'Miraculix', age: 122)
-    stub_request(:get, 'http://users.example.org/users/100').to_return response(id: 100, name: 'Jimmy', age: 45)
-    stub_request(:get, 'http://users.example.org/users/2/friends').to_return response([{id: 1, name: 'Anon', age: 12}])
-    stub_request(:get, 'http://comments.example.org/comments?user=2').to_return response([{id: 1, text: 'Comment #1'}, {id: 2, text: 'Comment #2'}])
+    stub_request(:get, 'http://users.example.org/users').to_return response([{ id: 1, name: 'Anon', age: 12 }, { id: 2, name: 'John', age: 26 }])
+    stub_request(:get, 'http://users.example.org/users/2').to_return response({ id: 2, name: 'John', age: 26 })
+    stub_request(:get, 'http://users.example.org/users/3').to_return response({ id: 3, name: 'Miraculix', age: 122 })
+    stub_request(:get, 'http://users.example.org/users/100').to_return response({ id:100, name: 'Jimmy', age: 45 })
+    stub_request(:get, 'http://users.example.org/users/2/friends').to_return response([{ id: 1, name: 'Anon', age: 12 }])
+    stub_request(:get, 'http://comments.example.org/comments?user=2').to_return response([{ id: 1, text: 'Comment #1' }, { id: 2, text: 'Comment #2' }])
   end
 
   it 'should update single resource synchronously' do
     stub = stub_request(:put, 'http://users.example.org/users/2')
-           .to_return {|request| {body: request.body, headers: {'Content-Type' => request.headers['Content-Type']}} }
+      .to_return { |request| { body: request.body, headers: {'Content-Type' => request.headers['Content-Type']}} }
 
     @user = MyUser.find 2
     Acfs.run
@@ -23,7 +24,7 @@ describe 'Acfs' do
     @user.name = 'Johnny'
 
     expect(@user).to be_changed
-    expect(@user).to be_persisted
+    expect(@user).to_not be_persisted
 
     @user.save
 
@@ -33,7 +34,7 @@ describe 'Acfs' do
   end
 
   it 'should create a single resource synchronously' do
-    stub = stub_request(:post, 'http://users.example.org/sessions').to_return response(id: 'sessionhash', user: 1)
+    stub = stub_request(:post, 'http://users.example.org/sessions').to_return response({id: 'sessionhash', user: 1})
 
     session = Session.create ident: 'Anon'
 
@@ -57,11 +58,11 @@ describe 'Acfs' do
 
   describe 'singleton' do
     before do
-      stub_request(:get, 'http://users.example.org/singles?user_id=5').to_return response(score: 250, user_id: 5)
+      stub_request(:get, 'http://users.example.org/singles?user_id=5').to_return response({ score: 250, user_id: 5 })
     end
 
     it 'should create a singleton resource' do
-      stub = stub_request(:post, 'http://users.example.org/singles').to_return response(score: 250, user_id: 5)
+      stub = stub_request(:post, 'http://users.example.org/singles').to_return response({ score: 250, user_id: 5 })
 
       @single = Single.new user_id: 5, score: 250
       expect(@single.new?).to eq true
@@ -82,12 +83,10 @@ describe 'Acfs' do
     end
 
     it 'should update singleton resource' do
-      stub = stub_request(:put, 'http://users.example.org/singles').to_return do |request|
-        {
+      stub = stub_request(:put, 'http://users.example.org/singles').to_return { |request| {
           body: request.body,
-          headers: {'Content-Type' => request.headers['Content-Type']}
-        }
-      end
+          headers: { 'Content-Type' => request.headers['Content-Type'] }
+      } }
 
       @single = Single.find user_id: 5
       Acfs.run
@@ -103,12 +102,10 @@ describe 'Acfs' do
     end
 
     it 'should delete singleton resource' do
-      stub = stub_request(:delete, 'http://users.example.org/singles').to_return do |request|
-        {
+      stub = stub_request(:delete, 'http://users.example.org/singles').to_return { |request| {
           body: request.body,
-          headers: {'Content-Type' => request.headers['Content-Type']}
-        }
-      end
+          headers: { 'Content-Type' => request.headers['Content-Type'] }
+      } }
 
       @single = Single.find user_id: 5
       Acfs.run
@@ -121,7 +118,7 @@ describe 'Acfs' do
     end
 
     it 'should raise error when calling `all\'' do
-      expect { Single.all }.to raise_error ::Acfs::UnsupportedOperation
+      expect{ Single.all }.to raise_error ::Acfs::UnsupportedOperation
     end
   end
 

data/spec/spec_helper.rb

@@ -9,12 +9,11 @@ if ENV['CI'] || (defined?(:RUBY_ENGINE) && RUBY_ENGINE != 'rbx')
 end
 
 require 'bundler'
-Bundler.require(:default, :test)
+Bundler.require
 
 require 'acfs'
-require 'webmock/rspec'
 
-Dir[File.expand_path('spec/support/**/*.rb')].each {|f| require f }
+Dir[File.expand_path('spec/support/**/*.rb')].each {|f| require f}
 
 RSpec.configure do |config|
   # ## Mock Framework

data/spec/support/service.rb

@@ -33,6 +33,7 @@ class Profile < Acfs::SingletonResource
 end
 
 class Customer < MyUser
+
 end
 
 class MyUserWithValidations < MyUser
@@ -42,9 +43,9 @@ end
 
 class Session < Acfs::Resource
   service UserService, path: {
-    list: 'users/:user_id/sessions',
-    delete: 'users/:user_id/sessions/del/:id',
-    update: nil
+      list: 'users/:user_id/sessions',
+      delete: 'users/:user_id/sessions/del/:id',
+      update: nil
   }
 
   attribute :id, :string
@@ -71,9 +72,11 @@ class Computer < Acfs::Resource
 end
 
 class PC < Computer
+
 end
 
 class Mac < Computer
+
 end
 
 class Single < Acfs::SingletonResource
@@ -82,10 +85,3 @@ class Single < Acfs::SingletonResource
   attribute :score, :integer
   attribute :user_id, :integer
 end
-
-class PathArguments < Acfs::Resource
-  service UserService, path: ':required_arg/users/'
-
-  attribute :id,           :integer
-  attribute :required_arg, :string
-end

data/spec/support/shared/find_callbacks.rb

@@ -2,23 +2,23 @@ shared_examples 'a query method with multi-callback support' do
   let(:cb) { Proc.new }
 
   it 'should invoke callback' do
-    expect do |cb|
+    expect { |cb|
       action.call cb
       Acfs.run
-    end.to yield_with_args
+    }.to yield_with_args
   end
 
   it 'should invoke multiple callbacks' do
-    expect do |cb|
+    expect { |cb|
       object = action.call cb
       Acfs.add_callback object, &cb
       Acfs.run
-    end.to yield_control.exactly(2).times
+    }.to yield_control.exactly(2).times
   end
 
   describe 'callback' do
     it 'should be invoked with resource' do
-      proc = proc {}
+      proc = Proc.new { }
       expect(proc).to receive(:call) do |res|
         expect(res).to equal @object
         expect(res).to be_loaded
@@ -29,8 +29,8 @@ shared_examples 'a query method with multi-callback support' do
     end
 
     it 'should invoke multiple callback with loaded resource' do
-      proc1 = proc {}
-      proc2 = proc {}
+      proc1 = Proc.new { }
+      proc2 = Proc.new { }
       expect(proc1).to receive(:call) do |user|
         expect(user).to equal @object
         expect(user).to be_loaded