acfs 0.42.0 → 0.43.0

data/spec/acfs/adapter/typhoeus_spec.rb

@@ -5,16 +5,16 @@ describe Acfs::Adapter::Typhoeus do
   before { WebMock.allow_net_connect! }
 
   it 'raises an error' do
-    request1 = Acfs::Request.new 'http://altimos.de/404.1' do |rsp|
+    request1 = Acfs::Request.new 'http://altimos.de/404.1' do |_rsp|
       raise '404-1'
     end
-    request2 = Acfs::Request.new 'http://altimos.de/404.2' do |rsp|
+    request2 = Acfs::Request.new 'http://altimos.de/404.2' do |_rsp|
       raise '404-2'
     end
     adapter.queue request1
     adapter.queue request2
 
-    expect{ adapter.start }.to raise_error /404\-[12]/
-    expect{ adapter.start }.to_not raise_error
+    expect { adapter.start }.to raise_error(/404\-[12]/)
+    expect { adapter.start }.to_not raise_error
   end
 end

data/spec/acfs/collection_spec.rb

@@ -11,9 +11,9 @@ describe Acfs::Collection do
 
     context 'without explicit page parameter' do
       before do
-        stub_request(:get, 'http://users.example.org/users').
-            to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
-                               headers: {'X-Total-Pages' => '2'})
+        stub_request(:get, 'http://users.example.org/users')
+          .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
+            headers: {'X-Total-Pages' => '2'})
       end
 
       its(:total_pages) { should eq 2 }
@@ -23,9 +23,9 @@ describe Acfs::Collection do
     context 'with page parameter' do
       let(:params) { {page: 2} }
       before do
-        stub_request(:get, 'http://users.example.org/users?page=2').
-            to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
-                               headers: {'X-Total-Pages' => '2'})
+        stub_request(:get, 'http://users.example.org/users?page=2')
+          .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
+            headers: {'X-Total-Pages' => '2'})
       end
 
       its(:total_pages) { should eq 2 }
@@ -35,9 +35,9 @@ describe Acfs::Collection do
     context 'with non-numerical page parameter' do
       let(:params) { {page: 'e546f5'} }
       before do
-        stub_request(:get, 'http://users.example.org/users?page=e546f5').
-            to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
-                               headers: {'X-Total-Pages' => '2'})
+        stub_request(:get, 'http://users.example.org/users?page=e546f5')
+          .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
+            headers: {'X-Total-Pages' => '2'})
       end
 
       its(:total_pages) { should eq 2 }
@@ -46,12 +46,12 @@ describe Acfs::Collection do
 
     describe '#next_page' do
       before do
-        stub_request(:get, 'http://users.example.org/users').
-            to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
-                               headers: {
-                                   'X-Total-Pages' => '2',
-                                   'Link'          => '<http://users.example.org/users?page=2>; rel="next"'
-                               })
+        stub_request(:get, 'http://users.example.org/users')
+          .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
+            headers: {
+              'X-Total-Pages' => '2',
+              'Link'          => '<http://users.example.org/users?page=2>; rel="next"'
+            })
       end
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users?page=2').to_return response([])
@@ -70,12 +70,12 @@ describe Acfs::Collection do
 
     describe '#prev_page' do
       before do
-        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' => '2',
-                                   'Link'          => '<http://users.example.org/users>; rel="prev"'
-                               })
+        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' => '2',
+              'Link'          => '<http://users.example.org/users>; rel="prev"'
+            })
       end
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users').to_return response([])
@@ -94,12 +94,12 @@ describe Acfs::Collection do
 
     describe '#first_page' do
       before do
-        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' => '2',
-                                   'Link'          => '<http://users.example.org/users>; rel="first"'
-                               })
+        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' => '2',
+              'Link'          => '<http://users.example.org/users>; rel="first"'
+            })
       end
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users').to_return response([])
@@ -118,12 +118,12 @@ describe Acfs::Collection do
 
     describe '#last_page' do
       before do
-        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' => '2',
-                                   'Link'          => '<http://users.example.org/users?page=12>; rel="last"'
-                               })
+        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' => '2',
+              'Link'          => '<http://users.example.org/users?page=12>; rel="last"'
+            })
       end
       let!(:req) do
         stub_request(:get, 'http://users.example.org/users?page=12').to_return response([])

data/spec/acfs/configuration_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Acfs::Configuration do
-
   let(:cfg) { Acfs::Configuration.new }
   before { @configuration = Acfs::Configuration.current.dup }
   after { Acfs::Configuration.set @configuration }

data/spec/acfs/global_spec.rb

@@ -14,11 +14,11 @@ describe ::Acfs::Global do
   let(:adapter) { ::NullAdapter.new }
   let(:runner) { double 'runner' }
   let(:collector) { NotificationCollector.new }
-  let(:acfs) { Object.new.tap { |o| o.extend ::Acfs::Global } }
+  let(:acfs) { Object.new.tap {|o| o.extend ::Acfs::Global } }
 
   describe 'instrumentation' do
     before do
-      #allow(runner).to receive(:start)
+      # allow(runner).to receive(:start)
       allow(acfs).to receive(:runner).and_return runner
     end
 
@@ -48,7 +48,7 @@ describe ::Acfs::Global do
       stub_request(:get, %r{http://users.example.org/users/\d+}).to_return(
         status: 200,
         body: '{}',
-        headers: { 'Content-Type' => 'application/json' })
+        headers: {'Content-Type' => 'application/json'})
     end
 
     it 'should invoke when both resources' do

data/spec/acfs/middleware/json_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Acfs::Middleware::JSON do
-  let(:data)     { [{id: 1, name: "Anon"},{id: 2, name:"John", friends: [ 1 ]}] }
+  let(:data)     { [{id: 1, name: 'Anon'}, {id: 2, name: 'John', friends: [1]}] }
   let(:body)     { '' }
   let(:headers)  { {} }
   let(:request)  { Acfs::Request.new 'url', method: 'GET', data: data }
   let(:response) { Acfs::Response.new request, status: 200, headers: headers, body: body }
-  let(:decoder)  { Acfs::Middleware::JSON.new lambda { |req| req } }
+  let(:decoder)  { Acfs::Middleware::JSON.new ->(req) { req } }
 
   before do
     decoder.call request

data/spec/acfs/middleware/msgpack_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Acfs::Middleware::MessagePack do
-  let(:data)     { [{id: 1, name: 'Anon'}, {id: 2, name: 'John', friends: [ 1 ]}] }
+  let(:data)     { [{id: 1, name: 'Anon'}, {id: 2, name: 'John', friends: [1]}] }
   let(:body)     { '' }
   let(:headers)  { {} }
   let(:request)  { Acfs::Request.new 'url', data: data }
   let(:response) { Acfs::Response.new request, status: 200, headers: headers, body: body }
-  let(:decoder)  { Acfs::Middleware::MessagePack.new ->(req){ req } }
+  let(:decoder)  { Acfs::Middleware::MessagePack.new ->(req) { req } }
 
   before do
     decoder.call request
@@ -43,7 +43,7 @@ describe Acfs::Middleware::MessagePack do
   end
 
   context 'with Message Pack response' do
-    let(:headers) { { 'Content-Type' => 'application/x-msgpack' } }
+    let(:headers) { {'Content-Type' => 'application/x-msgpack'} }
     let(:body)    { MessagePack.pack data }
 
     it 'should decode body data' do
@@ -54,7 +54,7 @@ describe Acfs::Middleware::MessagePack do
   end
 
   context 'without Message Pack response' do
-    let(:headers) { { 'Content-Type' => 'application/text' } }
+    let(:headers) { {'Content-Type' => 'application/text'} }
     let(:body)    { data.to_json }
 
     it 'should not decode non-MessagePack encoded responses' do

data/spec/acfs/request/callbacks_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 describe Acfs::Request::Callbacks do
-  let(:callback) { lambda { |res| } }
+  let(:callback) { ->(_res) {} }
   let(:request)  { Acfs::Request.new('fubar') }
 
   describe '#on_complete' do
     it 'should store a given callback' do
-      request.on_complete &callback
+      request.on_complete(&callback)
 
       expect(request.callbacks).to have(1).item
       expect(request.callbacks[0]).to be == callback
     end
 
     it 'should store multiple callback' do
-      request.on_complete { |res| "abc" }
-      request.on_complete &callback
+      request.on_complete {|_res| 'abc' }
+      request.on_complete(&callback)
 
       expect(request.callbacks).to have(2).item
       expect(request.callbacks[0]).to be == callback
@@ -27,16 +27,16 @@ describe Acfs::Request::Callbacks do
     it 'should trigger registered callbacks with given response' do
       expect(callback).to receive(:call).with(response, kind_of(Proc))
 
-      request.on_complete &callback
+      request.on_complete(&callback)
       request.complete! response
     end
 
     it 'should trigger multiple callback in reverted insertion order' do
       check = []
 
-      request.on_complete { |res, nxt| check << 1; nxt.call res }
-      request.on_complete { |res, nxt| check << 2; nxt.call res }
-      request.on_complete { |res, nxt| check << 3; nxt.call res }
+      request.on_complete {|res, nxt| check << 1; nxt.call res }
+      request.on_complete {|res, nxt| check << 2; nxt.call res }
+      request.on_complete {|res, nxt| check << 3; nxt.call res }
 
       request.complete! response
 

data/spec/acfs/request_spec.rb

@@ -15,7 +15,7 @@ describe Acfs::Request do
     end
 
     context 'with parameters' do
-      let(:params) { { id: 10 }}
+      let(:params) { {id: 10} }
 
       it 'should return URL without query' do
         expect(request.url).to be == "#{url}"
@@ -24,7 +24,7 @@ describe Acfs::Request do
   end
 
   describe '#headers' do
-    let(:headers) { { 'Accept' => 'application/json' } }
+    let(:headers) { {'Accept' => 'application/json'} }
 
     it 'should return request headers' do
       expect(request.headers).to be == headers
@@ -46,7 +46,7 @@ describe Acfs::Request do
   end
 
   describe '#params' do
-    let(:params) { { id: 10 }}
+    let(:params) { {id: 10} }
 
     it 'should return request headers' do
       expect(request.params).to be == params
@@ -54,7 +54,7 @@ describe Acfs::Request do
   end
 
   describe '#data' do
-    let(:data) { { id: 10, name: 'Anon' } }
+    let(:data) { {id: 10, name: 'Anon'} }
 
     it 'should return request data' do
       expect(request.data).to be == data
@@ -63,7 +63,7 @@ describe Acfs::Request do
 
   describe '#data' do
     context 'with data' do
-      let(:data) { { id: 10, name: 'Anon' } }
+      let(:data) { {id: 10, name: 'Anon'} }
 
       it { expect(request).to be_data }
     end

data/spec/acfs/{model → resource}/attributes/boolean_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Acfs::Model::Attributes::Boolean do
-  subject { Acfs::Model::Attributes::Boolean.new }
+describe Acfs::Resource::Attributes::Boolean do
+  subject { Acfs::Resource::Attributes::Boolean.new }
 
   describe 'cast' do
     it 'should preserve boolean values' do

data/spec/acfs/{model → resource}/attributes/date_time_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Acfs::Model::Attributes::DateTime do
-  let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
+describe Acfs::Resource::Attributes::DateTime do
+  let(:model) { Class.new Acfs::Resource }
   let(:params) { {} }
-  subject { Acfs::Model::Attributes::DateTime.new params }
+  subject { Acfs::Resource::Attributes::DateTime.new params }
 
   describe 'cast' do
     it 'should return same object, if obj is already of DateTime class' do
@@ -32,16 +32,16 @@ describe Acfs::Model::Attributes::DateTime do
 
     it 'should raise an error if obj is of String class not in valid ISO-8601 format' do
       malformed_string = 'qwe123'
-      expect {
+      expect do
         subject.cast(malformed_string)
-      }.to raise_error ArgumentError
+      end.to raise_error ArgumentError
     end
 
     it 'should raise an error if obj is of wrong class (Fixnum)' do
       fixnum = 12
-      expect {
+      expect do
         subject.cast(fixnum)
-      }.to raise_error TypeError
+      end.to raise_error TypeError
     end
 
     context 'with allow_nil option' do

data/spec/acfs/{model → resource}/attributes/dict_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Acfs::Model::Attributes::Dict do
-  let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
-  subject { Acfs::Model::Attributes::Dict.new }
+describe Acfs::Resource::Attributes::Dict do
+  let(:model) { Class.new(Acfs::Resource) }
+  subject { Acfs::Resource::Attributes::Dict.new }
 
   describe '.cast' do
     context 'with hash' do
-      let(:sample) { {3 => true, "asfd" => 4} }
+      let(:sample) { {3 => true, 'asfd' => 4} }
 
       it 'should return unmodified hash' do
         expect(subject.cast(sample)).to be sample
@@ -17,9 +17,9 @@ describe Acfs::Model::Attributes::Dict do
       let(:sample) { Object.new }
 
       it 'should raise a TypeError' do
-        expect {
+        expect do
           subject.cast(sample)
-        }.to raise_error TypeError
+        end.to raise_error TypeError
       end
     end
 

data/spec/acfs/{model → resource}/attributes/float_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Acfs::Model::Attributes::Float do
-  let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
-  subject { Acfs::Model::Attributes::Float.new }
+describe Acfs::Resource::Attributes::Float do
+  let(:model) { Class.new Acfs::Resource }
+  subject { described_class.new }
 
   describe 'cast' do
     it 'should return same object, if obj is already of float class' do

data/spec/acfs/{model → resource}/attributes/list_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Acfs::Model::Attributes::List do
-  let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
-  subject { Acfs::Model::Attributes::List.new }
+describe Acfs::Resource::Attributes::List do
+  let(:model) { Class.new Acfs::Resource }
+  subject { described_class.new }
 
   describe '.cast' do
     context 'with array' do
@@ -17,9 +17,9 @@ describe Acfs::Model::Attributes::List do
       let(:sample) { Object.new }
 
       it 'should raise a TypeError' do
-        expect {
+        expect do
           subject.cast(sample)
-        }.to raise_error TypeError
+        end.to raise_error TypeError
       end
     end
 

data/spec/acfs/{model → resource}/attributes/uuid_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Acfs::Model::Attributes::UUID do
-  let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
+describe Acfs::Resource::Attributes::UUID do
+  let(:model) { Class.new Acfs::Resource }
   let(:params) { {} }
   let(:instance) { described_class.new params }
   subject { instance }
@@ -26,7 +26,7 @@ describe Acfs::Model::Attributes::UUID do
           it { should raise_error ArgumentError }
         end
 
-        context 'with string in UUID format but containing invalid characters' do
+        context 'with UUID string containing invalid characters' do
           let(:param) { 'xxxxxxxx-yyyy-11e3-baa8-0800200c9a66' }
           it { should raise_error ArgumentError }
         end
@@ -51,9 +51,9 @@ describe Acfs::Model::Attributes::UUID do
     context 'with non-String as param' do
       subject { -> { action } }
 
-      invalid_params = { fixnum: 1, float: 3.2, symbol: :invalid, boolean: true }
-      invalid_params.each do |klass, incorrect_param|
-        context "with #{klass.to_s} as param" do
+      invalid_params = {fixnum: 1, float: 3.2, symbol: :invalid, boolean: true}
+      invalid_params.each do |type, incorrect_param|
+        context "with #{type} as param" do
           let(:param) { incorrect_param }
           it { should raise_error ArgumentError }
         end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Acfs::Model::Attributes do
-  let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
+describe Acfs::Resource::Attributes do
+  let(:model) { Class.new Acfs::Resource }
 
   describe '#initialize' do
     before { model.attribute :name, :string, default: 'John' }
@@ -33,7 +33,7 @@ describe Acfs::Model::Attributes do
     end
 
     it 'should return hash of all attributes' do
-      expect(model.new.attributes).to be == { name: 'John', age: 25 }.stringify_keys
+      expect(model.new.attributes).to eq(name: 'John', age: 25)
     end
   end
 
@@ -46,15 +46,15 @@ describe Acfs::Model::Attributes do
       end
     end
     let(:args) { [params] }
-    let(:params){ {name: 'James'} }
+    let(:params) { {name: 'James'} }
     let(:m) { model.new }
-    let(:action) { lambda{ m.write_attributes *args } }
+    let(:action) { -> { m.write_attributes(*args) } }
     subject { action }
 
     it 'should update attributes'  do
       should change(m, :attributes)
-             .from({'name' => 'The Great John', 'age' => 25})
-             .to({'name' => 'The Great James', 'age' => 25})
+        .from(name: 'The Great John', age: 25)
+        .to(name: 'The Great James', age: 25)
     end
 
     context 'without non-hash params' do
@@ -71,15 +71,24 @@ describe Acfs::Model::Attributes do
 
       it 'should update known attributes and store unknown'  do
         should change(m, :attributes)
-               .from({'name' => 'The Great John', 'age' => 25})
-               .to({'name' => 'The Great James', 'age' => 25, 'born_at' => 'today'})
+          .from(name: 'The Great John', age: 25)
+          .to(name: 'The Great James', age: 25, born_at: 'today')
       end
 
       context 'with unknown: :raise option' do
         let(:args) { [params, {unknown: :raise}] }
 
         it { should raise_error(ArgumentError, /unknown attribute/i) }
-        it { expect{ subject.call rescue true }.to_not change(m, :attributes) }
+
+        it do
+          expect do
+            begin
+              subject.call
+            rescue
+              true
+            end
+          end.to_not change(m, :attributes)
+        end
       end
     end
   end
@@ -132,30 +141,33 @@ describe Acfs::Model::Attributes do
       it 'should add an attribute to model attribute list' do
         model.send :attribute, :name, :string
 
-        expect(model.attributes).to be == { :name => nil }.stringify_keys
+        expect(model.attributes.symbolize_keys).to eq name: nil
       end
 
       it 'should accept a default value' do
         model.send :attribute, :name, :string, default: 'John'
 
-        expect(model.attributes).to be == { :name => 'John' }.stringify_keys
+        expect(model.attributes.symbolize_keys).to eq name: 'John'
       end
 
       it 'should accept an symbolic type' do
         model.send :attribute, :age, :integer, default: '12'
 
-        expect(model.attributes).to be == { :age => 12 }.stringify_keys
+        expect(model.attributes.symbolize_keys).to eq age: 12
       end
 
       it 'should accept an class type' do
-        model.send :attribute, :age, Acfs::Model::Attributes::Integer, default: '12'
+        model.send :attribute, :age, Acfs::Resource::Attributes::Integer,
+          default: '12'
 
-        expect(model.attributes).to be == { :age => 12 }.stringify_keys
+        expect(model.attributes.symbolize_keys).to eq age: 12
       end
 
       context 'allow nil option' do
         it 'should allow nil as value' do
-          model.send :attribute, :updated_at, Acfs::Model::Attributes::DateTime, default: DateTime.new, allow_nil: true
+          model.send :attribute, :updated_at, :date_time,
+            default: DateTime.new, allow_nil: true
+
           resource = model.new
           expect(resource.updated_at).to eq DateTime.new
 
@@ -166,7 +178,9 @@ describe Acfs::Model::Attributes do
 
       context 'allow blank option' do
         it 'should allow blank as value' do
-          model.send :attribute, :updated_at, Acfs::Model::Attributes::DateTime, default: DateTime.new, allow_blank: true
+          model.send :attribute, :updated_at, :date_time,
+            default: DateTime.new, allow_blank: true
+
           resource = model.new
           expect(resource.updated_at).to eq DateTime.new