acfs 0.42.0 → 0.43.0

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Acfs::Model::Validation do
+describe Acfs::Resource::Validation do
   let(:params) { {name: 'john smith', age: 24} }
   let(:model) { MyUserWithValidations.new params }
 
@@ -23,7 +23,7 @@ describe Acfs::Model::Validation do
       after  { Acfs::Stub.disable }
 
       before do
-        Acfs::Stub.resource MyUser, :create, with: {}, return: {errors: {name: ['can\'t be blank']}}, raise: 422
+        Acfs::Stub.resource MyUser, :create, return: {errors: {name: ['can\'t be blank']}}, raise: 422
       end
 
       let(:params)   { {} }
@@ -34,7 +34,7 @@ describe Acfs::Model::Validation do
 
       it 'should not override errors' do
         subject.valid?
-        expect(subject.errors.to_hash).to eq({name: ['can\'t be blank']})
+        expect(subject.errors.to_hash).to eq(name: ['can\'t be blank'])
       end
     end
   end
@@ -73,7 +73,7 @@ describe Acfs::Model::Validation do
       let(:resource) { MyUser.create params }
       subject { resource }
 
-      its(:errors) { expect(subject.errors.to_hash).to eq({name: ['can\'t be blank']}) }
+      its(:errors) { expect(subject.errors.to_hash).to eq(name: ['can\'t be blank']) }
     end
   end
 
@@ -96,7 +96,7 @@ describe Acfs::Model::Validation do
 
     context 'on changed resource' do
       before { model.loaded! }
-      let(:model) { super().tap { |m| m.id = 1 } }
+      let(:model) { super().tap {|m| m.id = 1 } }
 
       it 'should validate with `save` context' do
         expect(model).to receive(:valid?).with(:save).and_call_original
@@ -106,6 +106,5 @@ describe Acfs::Model::Validation do
   end
 
   describe 'validates with context' do
-
   end
 end

data/spec/acfs/response/formats_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Acfs::Response::Formats do
   let(:status)    { 200 }
   let(:mime_type) { 'application/unknown' }
-  let(:headers)   { { 'Content-Type' => mime_type } }
+  let(:headers)   { {'Content-Type' => mime_type} }
   let(:request)   { Acfs::Request.new 'fubar' }
   let(:body)      { nil }
   let(:response)  { Acfs::Response.new request, status: status, headers: headers, body: body }

data/spec/acfs/response/status_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Acfs::Response::Status do
   let(:status)    { 200 }
   let(:mime_type) { 'application/unknown' }
-  let(:headers)   { { 'Content-Type' => mime_type } }
+  let(:headers)   { {'Content-Type' => mime_type} }
   let(:request)   { Acfs::Request.new 'fubar' }
   let(:body)      { nil }
   let(:response)  { Acfs::Response.new request, status: status, headers: headers, body: body }

data/spec/acfs/runner_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 class NullAdapter < Acfs::Adapter::Base
-
   # Start processing queued requests.
   #
   def start
@@ -46,8 +45,8 @@ describe ::Acfs::Runner do
 
   describe '#instrumentation' do
     before do
-      ::ActiveSupport::Notifications.subscribe /^acfs\.runner/, collector
-      ::ActiveSupport::Notifications.subscribe /^acfs\.operation/, collector2
+      ::ActiveSupport::Notifications.subscribe(/^acfs\.runner/, collector)
+      ::ActiveSupport::Notifications.subscribe(/^acfs\.operation/, collector2)
     end
 
     describe '#process' do

data/spec/acfs/service/middleware_spec.rb

@@ -10,7 +10,7 @@ describe Acfs::Service::Middleware do
   let(:middleware) { TestMiddleware }
 
   describe '.use' do
-    let(:options) { { abc: 'cde' } }
+    let(:options) { {abc: 'cde'} }
 
     it 'should add middleware to list' do
       srv_class.use middleware

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,13 +35,11 @@ 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

@@ -5,11 +5,11 @@ describe Acfs::SingletonResource do
 
   describe '.find' do
     before do
-      stub_request(:get, 'http://users.example.org/singles').to_return response({id:1})
+      stub_request(:get, 'http://users.example.org/singles')
+        .to_return response id: 1
     end
 
-    let(:action) { lambda{|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: lambda { |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: ->(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 {
+        expect do
           Session.create! ident: 'john@exmaple.org', password: 'wrong'
-        }.to raise_error(::Acfs::InvalidResource)
+        end.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,8 +158,8 @@ 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 }
@@ -172,9 +172,15 @@ describe Acfs::Stub do
 
     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
+        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] }] }
       end
 
       it 'should allow stub resource update' do
@@ -194,9 +200,31 @@ describe Acfs::Stub do
         user.age = 0
         user.save
 
-        expect {
+        expect do
           user.save!
-        }.to raise_error(::Acfs::InvalidResource)
+        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
 
@@ -206,9 +234,9 @@ describe Acfs::Stub do
       end
 
       it 'should allow to raise error' do
-        expect {
-          user = MyUser.create! name: 'John Smith', age: 0
-        }.to raise_error(::Acfs::InvalidResource)
+        expect do
+          MyUser.create! name: 'John Smith', age: 0
+        end.to raise_error(::Acfs::InvalidResource)
       end
     end
   end
@@ -217,7 +245,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

data/spec/acfs_spec.rb

@@ -1,19 +1,18 @@
 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
@@ -34,7 +33,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'
 
@@ -58,11 +57,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
@@ -83,10 +82,12 @@ describe 'Acfs' do
     end
 
     it 'should update singleton resource' do
-      stub = stub_request(:put, 'http://users.example.org/singles').to_return { |request| {
+      stub = stub_request(:put, 'http://users.example.org/singles').to_return do |request|
+        {
           body: request.body,
-          headers: { 'Content-Type' => request.headers['Content-Type'] }
-      } }
+          headers: {'Content-Type' => request.headers['Content-Type']}
+        }
+      end
 
       @single = Single.find user_id: 5
       Acfs.run
@@ -102,10 +103,12 @@ describe 'Acfs' do
     end
 
     it 'should delete singleton resource' do
-      stub = stub_request(:delete, 'http://users.example.org/singles').to_return { |request| {
+      stub = stub_request(:delete, 'http://users.example.org/singles').to_return do |request|
+        {
           body: request.body,
-          headers: { 'Content-Type' => request.headers['Content-Type'] }
-      } }
+          headers: {'Content-Type' => request.headers['Content-Type']}
+        }
+      end
 
       @single = Single.find user_id: 5
       Acfs.run
@@ -118,12 +121,12 @@ describe 'Acfs' do
     end
 
     it 'should raise error when calling `all\'' do
-      expect {Single.all}.to raise_error(NoMethodError)
+      expect { Single.all }.to raise_error ::Acfs::UnsupportedOperation
     end
   end
 
   it 'should load multiple single resources' do
-    @users = MyUser.find(2, 3, 100) do |users|
+    @users = MyUser.find([2, 3, 100]) do |users|
       # This block should be called only after *all* resources are loaded.
       @john = users[0]
       @mirx = users[1]

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ Bundler.require
 
 require 'acfs'
 
-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/hash.rb

@@ -0,0 +1,9 @@
+class ActiveSupport::HashWithIndifferentAccess
+  def ==(other)
+    if other.respond_to? :with_indifferent_access
+      super other.with_indifferent_access
+    else
+      super
+    end
+  end
+end

data/spec/support/service.rb

@@ -33,7 +33,6 @@ class Profile < Acfs::SingletonResource
 end
 
 class Customer < MyUser
-
 end
 
 class MyUserWithValidations < MyUser
@@ -43,9 +42,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
@@ -72,11 +71,9 @@ class Computer < Acfs::Resource
 end
 
 class PC < Computer
-
 end
 
 class Mac < Computer
-
 end
 
 class Single < Acfs::SingletonResource
@@ -91,4 +88,4 @@ class PathArguments < Acfs::Resource
 
   attribute :id,           :integer
   attribute :required_arg, :string
-end
+end