acfs 0.50.0 → 1.0.0.dev.1.b297

data/spec/acfs/resource/query_methods_spec.rb

@@ -14,7 +14,7 @@ describe Acfs::Resource::QueryMethods do
                                 name: 'Clare Customer', age: 24
         end
 
-        let(:action) { ->(cb = nil) { model.find(1, &cb) } }
+        let(:action) { lambda{|cb = nil| model.find(1, &cb) } }
         it_behaves_like 'a query method with multi-callback support'
 
         it 'should load a single remote resource' do
@@ -44,7 +44,7 @@ describe Acfs::Resource::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})
+            .to_return response({error: 'not found'}, status: 404)
         end
 
         it 'should raise a NotFound error' do
@@ -95,7 +95,7 @@ describe Acfs::Resource::QueryMethods do
         end
 
         it 'should invoke callback after all models are loaded' do
-          block = proc {}
+          block = proc{}
           expect(block).to receive(:call) do |users|
             expect(users).to equal @users
             expect(users.size).to be == 2
@@ -107,8 +107,8 @@ describe Acfs::Resource::QueryMethods do
         end
 
         it 'should invoke multiple callback after all models are loaded' do
-          proc1 = proc {}
-          proc2 = proc {}
+          proc1 = proc{}
+          proc2 = proc{}
           expect(proc1).to receive(:call) do |users|
             expect(users).to equal @users
             expect(users.size).to be == 2
@@ -137,7 +137,7 @@ describe Acfs::Resource::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})
+            .to_return response({error: 'not found'}, status: 404)
         end
 
         it 'should raise resource not found error' do
@@ -162,8 +162,8 @@ describe Acfs::Resource::QueryMethods do
     end
 
     it 'should invoke multiple callback after all models are loaded' do
-      proc1 = proc {}
-      proc2 = proc {}
+      proc1 = proc{}
+      proc2 = proc{}
       expect(proc1).to receive(:call) do |computers|
         expect(computers).to equal @computers
         expect(computers.size).to be == 3
@@ -274,7 +274,7 @@ describe Acfs::Resource::QueryMethods do
         end
 
         it 'should invoke callback after model is loaded' do
-          block = proc {}
+          block = proc{}
 
           expect(block).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
@@ -287,8 +287,8 @@ describe Acfs::Resource::QueryMethods do
         end
 
         it 'should invoke multiple callbacks after model is loaded' do
-          proc1 = proc {}
-          proc2 = proc {}
+          proc1 = proc{}
+          proc2 = proc{}
 
           expect(proc1).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
@@ -340,7 +340,7 @@ describe Acfs::Resource::QueryMethods do
         it { should be_nil }
 
         it 'should invoke callback after model is loaded' do
-          block = proc {}
+          block = proc{}
 
           expect(block).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
@@ -352,8 +352,8 @@ describe Acfs::Resource::QueryMethods do
         end
 
         it 'should invoke multiple callbacks after model is loaded' do
-          proc1 = proc {}
-          proc2 = proc {}
+          proc1 = proc{}
+          proc2 = proc{}
 
           expect(proc1).to receive(:call) do |user|
             expect(user).to eql @user.__getobj__
@@ -393,7 +393,7 @@ describe Acfs::Resource::QueryMethods do
         end
 
         it 'should not invoke callback after model could not be loaded' do
-          block = proc {}
+          block = proc{}
 
           expect(block).not_to receive(:call)
 
@@ -406,30 +406,30 @@ describe Acfs::Resource::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
@@ -448,30 +448,30 @@ describe Acfs::Resource::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
@@ -492,48 +492,41 @@ describe Acfs::Resource::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
-          indices = []
+          indecies = []
           model.each_item do |item|
             expect(item).to be_a MyUser
-            indices << item.id
+            indecies << item.id
           end
           Acfs.run
 
-          expect(indices).to eq [1, 2, 3, 4, 5]
-        end
-
-        it 'should pass the collection to the provided block' do
-          model.each_item do |_item, collection|
-            expect(collection).to be_a Acfs::Collection
-          end
-          Acfs.run
+          expect(indecies).to eq [1, 2, 3, 4, 5]
         end
       end
     end

data/spec/acfs/resource/validation_spec.rb

@@ -23,7 +23,7 @@ describe Acfs::Resource::Validation do
       after  { Acfs::Stub.disable }
 
       before do
-        Acfs::Stub.resource MyUser, :create, return: {errors: {name: ['can\'t be blank']}}, raise: 422
+        Acfs::Stub.resource MyUser, :create, with: {}, return: {errors: {name: ['can\'t be blank']}}, raise: 422
       end
 
       let(:params)   { {} }
@@ -34,7 +34,7 @@ describe Acfs::Resource::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::Resource::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::Resource::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,5 +106,6 @@ describe Acfs::Resource::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 }
@@ -12,7 +12,7 @@ describe Acfs::Response::Formats do
     let(:headers)   { {} }
 
     it "should fallback on 'text/plain'" do
-      expect(response.content_type).to be == Mime[:text]
+      expect(response.content_type).to be == Mime::TEXT
     end
   end
 
@@ -21,7 +21,7 @@ describe Acfs::Response::Formats do
 
     describe '#content_type' do
       it 'should return Mime::JSON' do
-        expect(response.content_type).to be == Mime[:json]
+        expect(response.content_type).to be == Mime::JSON
       end
     end
 
@@ -36,7 +36,7 @@ describe Acfs::Response::Formats do
 
       describe '#content_type' do
         it 'should return Mime::JSON' do
-          expect(response.content_type).to be == Mime[:json]
+          expect(response.content_type).to be == Mime::JSON
         end
       end
 

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,6 +1,7 @@
 require 'spec_helper'
 
 class NullAdapter < Acfs::Adapter::Base
+
   # Start processing queued requests.
   #
   def start
@@ -36,7 +37,6 @@ describe ::Acfs::Runner do
   let(:adapter) { ::NullAdapter.new }
   let(:runner) { ::Acfs::Runner.new adapter }
   let(:collector) { NotificationCollector.new }
-  let(:collector2) { NotificationCollector.new }
 
   after do
     ::ActiveSupport::Notifications.notifier = \
@@ -45,15 +45,13 @@ 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
     end
 
     describe '#process' do
       it 'should trigger event' do
         runner.process ::Acfs::Operation.new MyUser, :read, params: {id: 0}
         expect(collector.events).to have(1).items
-        expect(collector2.events).to have(1).items
       end
     end
 
@@ -61,37 +59,14 @@ describe ::Acfs::Runner do
       it 'should trigger event' do
         runner.run ::Acfs::Operation.new MyUser, :read, params: {id: 0}
         expect(collector.events).to have(1).items
-        expect(collector2.events).to have(0).items
       end
     end
 
     describe '#enqueue' do
       it 'should trigger event' do
-        runner.enqueue ::Acfs::Operation.new MyUser, :read, params: {id: 0}
+        runner.run ::Acfs::Operation.new MyUser, :read, params: {id: 0}
         expect(collector.events).to have(1).items
-        expect(collector2.events).to have(0).items
       end
     end
   end
-
-  describe '#run' do
-    before do
-      expect_any_instance_of(UserService).to receive(:prepare).and_return nil
-    end
-    it 'it should not do requests when a middleware aborted' do
-      expect(adapter).to_not receive :run
-      runner.run ::Acfs::Operation.new MyUser, :read, params: {id: 0}
-    end
-  end
-
-  describe '#enqueue' do
-    before do
-      expect_any_instance_of(UserService).to receive(:prepare).and_return nil
-    end
-    it 'it should not do requests when a middleware aborted' do
-      expect(adapter).to_not receive :queue
-      runner.enqueue ::Acfs::Operation.new MyUser, :read, params: {id: 0}
-      runner.start
-    end
-  end
 end

data/spec/acfs/service/middleware_spec.rb

@@ -6,28 +6,44 @@ end
 describe Acfs::Service::Middleware do
   let(:srv_class) { Class.new(Acfs::Service) }
   let(:options) { {} }
+  let(:service) { srv_class.new options }
   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
 
-      expect(srv_class.middleware).to include(middleware)
+      expect(srv_class.instance_variable_get(:@middlewares)).to include(middleware)
     end
 
     it 'should add middleware to stack' do
       srv_class.use middleware
 
-      expect(srv_class.middleware.build(1)).to be_a(middleware)
+      expect(srv_class.middleware).to be_a(middleware)
     end
 
     it 'should instantiate middleware object' do
       expect(middleware).to receive(:new).with(anything, options)
 
       srv_class.use middleware, options
-      srv_class.middleware.build
+    end
+  end
+
+  describe '.clear' do
+    before { srv_class.use middleware }
+
+    it 'should clear middleware list' do
+      srv_class.clear
+
+      expect(srv_class.instance_variable_get(:@middlewares)).to be_empty
+    end
+
+    it 'should reset middleware stack' do
+      srv_class.clear
+
+      expect(srv_class.instance_variable_get(:@middleware)).to be_nil
     end
   end
 end