acfs 1.3.2 → 1.5.1

data/lib/acfs/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   module Util
     # TODO: Merge wit features in v1.0

data/lib/acfs/version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Acfs
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    PATCH = 2
+    MINOR = 5
+    PATCH = 1
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/lib/acfs/yard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # YARD macros
 
 # @!macro [new] experimental

data/spec/acfs/adapter/typhoeus_spec.rb

@@ -1,14 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Adapter::Typhoeus do
   let(:adapter) { described_class.new }
-  before { WebMock.allow_net_connect! }
+
+  before do
+    stub_request(:any, 'http://example.org').to_return status: 200
+  end
 
   it 'raises an error' do
-    request1 = Acfs::Request.new 'http://altimos.de/404.1' do |_rsp|
+    request1 = Acfs::Request.new 'http://example.org' do |_rsp|
       raise '404-1'
     end
-    request2 = Acfs::Request.new 'http://altimos.de/404.2' do |_rsp|
+    request2 = Acfs::Request.new 'http://example.org' do |_rsp|
       raise '404-2'
     end
     adapter.queue request1
@@ -18,6 +23,28 @@ describe Acfs::Adapter::Typhoeus do
     expect { adapter.start }.to_not raise_error
   end
 
+  it 'raises timeout' do
+    stub_request(:any, 'http://example.org').to_timeout
+
+    request = Acfs::Request.new 'http://example.org'
+    adapter.queue request
+
+    expect { adapter.run(request) }.to raise_error(::Acfs::TimeoutError) do |err|
+      expect(err.message).to eq 'Timeout reached: GET http://example.org'
+    end
+  end
+
+  it 'raises connection errors' do
+    WebMock.allow_net_connect!
+
+    request = Acfs::Request.new 'http://should-never-exists.example.org'
+    adapter.queue request
+
+    expect { adapter.run(request) }.to raise_error(::Acfs::RequestError) do |err|
+      expect(err.message).to eq 'Couldn\'t resolve host name: GET http://should-never-exists.example.org'
+    end
+  end
+
   it 'passes arguments to typhoeus hydra' do
     value = {key: 1, key2: 2}
 

data/spec/acfs/collection_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Collection do
   let(:model) { MyUser }
 
   describe 'Pagination' do
-    let(:params) { Hash.new }
+    let(:params) { {} }
     let!(:collection) { model.all params }
 
     subject { Acfs.run; collection }
@@ -62,7 +64,7 @@ describe Acfs::Collection do
           .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"'
+              'Link' => '<http://users.example.org/users?page=2>; rel="next"'
             })
       end
       let!(:req) do
@@ -86,7 +88,7 @@ describe Acfs::Collection do
           .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"'
+              'Link' => '<http://users.example.org/users>; rel="prev"'
             })
       end
       let!(:req) do
@@ -110,7 +112,7 @@ describe Acfs::Collection do
           .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"'
+              'Link' => '<http://users.example.org/users>; rel="first"'
             })
       end
       let!(:req) do
@@ -134,7 +136,7 @@ describe Acfs::Collection do
           .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"'
+              'Link' => '<http://users.example.org/users?page=12>; rel="last"'
             })
       end
       let!(:req) do

data/spec/acfs/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Configuration do

data/spec/acfs/global_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 class NotificationCollector
@@ -48,7 +50,8 @@ 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
@@ -119,8 +122,8 @@ describe ::Acfs::Global do
 
   describe '#runner' do
     it 'returns per-thread runner' do
-      runner1 = Thread.new { acfs.runner } .value
-      runner2 = Thread.new { acfs.runner } .value
+      runner1 = Thread.new { acfs.runner }.value
+      runner2 = Thread.new { acfs.runner }.value
 
       expect(runner1).to_not equal runner2
     end

data/spec/acfs/location_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ::Acfs::Location do

data/spec/acfs/middleware/json_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Middleware::JSON do
@@ -26,6 +28,20 @@ describe Acfs::Middleware::JSON do
         expect(JSON.parse(request.body)).to eq data.map(&:stringify_keys)
       end
     end
+
+    context 'with #to_json objects' do
+      let(:data) do
+        Class.new do
+          def to_json(*)
+            '{"a": 1, "b": 2}'
+          end
+        end.new
+      end
+
+      it 'should serialize data with #to_json' do
+        expect(JSON.parse(request.body)).to eq 'a' => 1, 'b' => 2
+      end
+    end
   end
 
   describe 'decode' do
@@ -45,7 +61,7 @@ describe Acfs::Middleware::JSON do
       let(:body)    { data.to_json[4..-4] }
 
       it 'should raise an error' do
-        expect { request.complete! response }.to raise_error(MultiJson::LoadError)
+        expect { request.complete! response }.to raise_error(::JSON::ParserError)
       end
     end
 

data/spec/acfs/middleware/msgpack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Middleware::MessagePack do

data/spec/acfs/operation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ::Acfs::Operation do

data/spec/acfs/request/callbacks_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Request::Callbacks do

data/spec/acfs/request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Request do
@@ -18,7 +20,7 @@ describe Acfs::Request do
       let(:params) { {id: 10} }
 
       it 'should return URL without query' do
-        expect(request.url).to be == "#{url}"
+        expect(request.url).to be == url.to_s
       end
     end
   end

data/spec/acfs/resource/attributes/boolean_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::Boolean do

data/spec/acfs/resource/attributes/date_time_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::DateTime do

data/spec/acfs/resource/attributes/dict_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::Dict do
@@ -13,12 +15,12 @@ describe Acfs::Resource::Attributes::Dict do
 
     context 'with blank string (I)' do
       let(:value) { '' }
-      it { expect(subject.call).to eq Hash.new }
+      it { expect(subject.call).to eq({}) }
     end
 
     context 'with blank string (II)' do
       let(:value) { "  \t" }
-      it { expect(subject.call).to eq Hash.new }
+      it { expect(subject.call).to eq({}) }
     end
 
     context 'with hash' do

data/spec/acfs/resource/attributes/float_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::Float do
@@ -33,7 +35,7 @@ describe Acfs::Resource::Attributes::Float do
 
     context 'with -Infinity' do
       let(:value) { '-Infinity' }
-      it { expect(subject.call).to eq -::Float::INFINITY }
+      it { expect(subject.call).to eq(-::Float::INFINITY) }
     end
 
     context 'with NaN' do

data/spec/acfs/resource/attributes/integer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::Integer do

data/spec/acfs/resource/attributes/list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::List do
@@ -13,16 +15,16 @@ describe Acfs::Resource::Attributes::List do
 
     context 'with blank string (I)' do
       let(:value) { '' }
-      it { expect(subject.call).to eq Array.new }
+      it { expect(subject.call).to eq [] }
     end
 
     context 'with blank string (II)' do
       let(:value) { "  \t" }
-      it { expect(subject.call).to eq Array.new }
+      it { expect(subject.call).to eq [] }
     end
 
     context 'with array' do
-      let(:value) { %w(abc cde efg) }
+      let(:value) { %w[abc cde efg] }
       it { expect(subject.call).to eq value }
     end
 

data/spec/acfs/resource/attributes/uuid_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::UUID do

data/spec/acfs/resource/attributes_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes do
@@ -52,7 +54,7 @@ describe Acfs::Resource::Attributes do
     let(:action) { -> { m.write_attributes(*args) } }
     subject { action }
 
-    it 'should update attributes'  do
+    it 'should update attributes' do
       should change(m, :attributes)
         .from(name: 'The Great John', age: 25)
         .to(name: 'The Great James', age: 25)
@@ -70,7 +72,7 @@ describe Acfs::Resource::Attributes do
 
       it { should_not raise_error }
 
-      it 'should update known attributes and store unknown'  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')
@@ -83,11 +85,9 @@ describe Acfs::Resource::Attributes do
 
         it do
           expect do
-            begin
-              subject.call
-            rescue
-              true
-            end
+            subject.call
+          rescue StandardError
+            true
           end.to_not change(m, :attributes)
         end
       end
@@ -171,7 +171,7 @@ describe Acfs::Resource::Attributes do
         end
 
         it 'includes superclass attributes' do
-          expect(submodel.attributes.keys).to match_array %w(age born_at)
+          expect(submodel.attributes.keys).to match_array %w[age born_at]
         end
       end
     end

data/spec/acfs/resource/dirty_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Dirty do

data/spec/acfs/resource/initialization_spec.rb

@@ -1,11 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Acfs::Resource::Initialization' do
   let(:model) do
     Class.new(Acfs::Resource).tap do |c|
       c.class_eval do
-        attr_accessor :name, :age
-        private :age=
+        attr_accessor :name
+        attr_reader :age
+
+        private
+
+        attr_writer :age
       end
     end
   end

data/spec/acfs/resource/loadable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Loadable do

data/spec/acfs/resource/locatable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Locatable do

data/spec/acfs/resource/persistance_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Acfs::Resource::Persistence do
@@ -226,8 +228,12 @@ describe Acfs::Resource::Persistence do
 
       it 'should set local errors hash' do
         model.name = ''
-        model.save! rescue nil
-        expect(model.errors.to_hash).to be == {name: %w(required)}
+        begin
+          model.save!
+        rescue StandardError
+          nil
+        end
+        expect(model.errors.to_hash).to be == {name: %w[required]}
       end
     end
 
@@ -265,7 +271,7 @@ describe Acfs::Resource::Persistence do
       it 'should raise an error' do
         expect { model_class.create! data }.to \
           raise_error(::Acfs::InvalidResource) do |error|
-            expect(error.errors).to be == {'name' => %w(required)}
+            expect(error.errors).to be == {'name' => %w[required]}
           end
       end
     end
@@ -295,7 +301,7 @@ describe Acfs::Resource::Persistence do
       end
 
       it 'should contain error hash' do
-        expect(subject.errors.to_hash).to eq name: %w(required)
+        expect(subject.errors.to_hash).to eq name: %w[required]
       end
     end