acfs 1.3.0 → 1.4.0

data/lib/acfs/response/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   class Response
     # Method to fetch information about response status.
@@ -11,7 +13,7 @@ module Acfs
         # return response.response_code unless response.nil?
         # 0
       end
-      alias_method :code, :status_code
+      alias code status_code
 
       # Return true if response was successful indicated by
       # response status code.

data/lib/acfs/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acfs'
 
 RSpec.configure do |config|

data/lib/acfs/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acfs/service/middleware'
 
 module Acfs
@@ -59,7 +61,7 @@ module Acfs
 
       enqueue_operations
       start_all
-    rescue
+    rescue StandardError
       queue.clear
       raise
     end
@@ -87,10 +89,13 @@ module Acfs
 
     def op_request(op)
       return if Acfs::Stub.enabled? && Acfs::Stub.stubbed(op)
+
       req = op.service.prepare op.request
       return unless req.is_a? Acfs::Request
+
       req = prepare req
       return unless req.is_a? Acfs::Request
+
       yield req
     end
   end

data/lib/acfs/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acfs/service/middleware'
 
 module Acfs
@@ -47,12 +49,16 @@ module Acfs
                         opts[:path].to_s
                       end
 
-               path = (resource_class.name || 'class').pluralize.underscore if path.blank?
+               if path.blank?
+                 path = (resource_class.name || 'class').pluralize.underscore
+               end
 
                resource_class.location_default_path(action, path.strip)
              end
 
-      raise ArgumentError.new "Location for `#{action}' explicit disabled by set to nil." if path.nil?
+      if path.nil?
+        raise ArgumentError.new "Location for `#{action}' explicit disabled by set to nil."
+      end
 
       Location.new [self.class.base_url.to_s, path.to_s].join('/')
     end

data/lib/acfs/service/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acfs/service/middleware/stack'
 
 module Acfs

data/lib/acfs/service/middleware/stack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   class Service
     module Middleware
@@ -5,7 +7,7 @@ module Acfs
         include Enumerable
 
         MUTEX = Mutex.new
-        IDENTITY = -> (i) { i }
+        IDENTITY = ->(i) { i }
 
         attr_reader :middlewares
 
@@ -41,7 +43,7 @@ module Acfs
                 next_middleware.call(klass.call(env, *args))
               end
             else
-              fail "Invalid middleware, doesn't respond to `call`: #{klass.inspect}"
+              raise "Invalid middleware, doesn't respond to `call`: #{klass.inspect}"
             end
           end
         end
@@ -51,7 +53,7 @@ module Acfs
         end
 
         def each
-          middlewares.each { |x| yield x.first }
+          middlewares.each {|x| yield x.first }
         end
 
         def clear

data/lib/acfs/singleton_resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   # Acfs SingletonResources
   #
@@ -71,8 +73,8 @@ module Acfs
       def all
         raise ::Acfs::UnsupportedOperation.new
       end
-      alias_method :find_by, :all
-      alias_method :find_by!, :all
+      alias find_by all
+      alias find_by! all
 
       # @api private
       def location_default_path(_, path)

data/lib/acfs/stub.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rack/utils'
 
 module Acfs
   # Global handler for stubbing resources.
   #
   class Stub
-    ACTIONS = [:read, :create, :update, :delete, :list]
+    ACTIONS = %i[read create update delete list].freeze
 
     attr_reader :opts
 
@@ -13,7 +15,10 @@ module Acfs
 
       @opts[:with].stringify_keys! if @opts[:with].is_a? Hash
       @opts[:return].stringify_keys! if @opts[:return].is_a? Hash
-      @opts[:return].map! {|h| h.stringify_keys! if h.is_a? Hash } if @opts[:return].is_a? Array
+
+      if @opts[:return].is_a? Array
+        @opts[:return].map! {|h| h.stringify_keys! if h.is_a? Hash }
+      end
     end
 
     def accept?(op)
@@ -28,8 +33,13 @@ module Acfs
       case opts.fetch(:match, :inclusion)
         when :legacy
           return true if with.empty? && params.empty? && data.empty?
-          return true if with.reject {|_, v| v.nil? } == params.reject {|_, v| v.nil? }
-          return true if with.reject {|_, v| v.nil? } == data.reject {|_, v| v.nil? }
+          if with.reject {|_, v| v.nil? } == params.reject {|_, v| v.nil? }
+            return true
+          end
+          if with.reject {|_, v| v.nil? } == data.reject {|_, v| v.nil? }
+            return true
+          end
+
           false
         when :inclusion
           with.each_pair.all? do |k, v|
@@ -43,7 +53,9 @@ module Acfs
     end
 
     def called?(count = nil)
-      count = count.count if count.respond_to? :count # For `5.times` Enumerators
+      if count.respond_to? :count
+        count = count.count
+      end # For `5.times` Enumerators
       count.nil? ? calls.any? : calls.size == count
     end
 
@@ -60,8 +72,8 @@ module Acfs
 
         response = Acfs::Response.new op.request,
           headers: opts[:headers] || {},
-          status:  opts[:status] || 200,
-          data:    data || {}
+          status: opts[:status] || 200,
+          data: data || {}
         op.call data, response
       else
         raise ArgumentError.new 'Unsupported stub.'
@@ -72,6 +84,7 @@ module Acfs
 
     def raise_error(op, name, data)
       raise name if name.is_a? Class
+
       data.stringify_keys! if data.respond_to? :stringify_keys!
 
       op.handle_failure ::Acfs::Response.new op.request, status: Rack::Utils.status_code(name), data: data
@@ -83,7 +96,9 @@ module Acfs
       #
       def resource(klass, action, opts = {}, &_block)
         action = action.to_sym
-        raise ArgumentError.new "Unknown action `#{action}`." unless ACTIONS.include? action
+        unless ACTIONS.include? action
+          raise ArgumentError.new "Unknown action `#{action}`."
+        end
 
         Stub.new(opts).tap do |stub|
           stubs[klass]         ||= {}
@@ -128,7 +143,9 @@ module Acfs
 
         accepted_stubs = stubs.select {|stub| stub.accept? op }
 
-        raise AmbiguousStubError.new stubs: accepted_stubs, operation: op if accepted_stubs.size > 1
+        if accepted_stubs.size > 1
+          raise AmbiguousStubError.new stubs: accepted_stubs, operation: op
+        end
 
         accepted_stubs.first
       end
@@ -137,6 +154,7 @@ module Acfs
         stub = stub_for op
         unless stub
           return false if allow_requests?
+
           raise RealRequestsNotAllowedError.new <<-MSG.strip.gsub(/^[ ]{12}/, '')
             No stub found for `#{op.action}' on `#{op.resource.name}' with params `#{op.full_params.inspect}', data `#{op.data.inspect}' and id `#{op.id}'.
 
@@ -159,8 +177,12 @@ module Acfs
             stubs.each do |stub|
               out << "    #{action}"
               out << " with #{stub.opts[:with].inspect}" if stub.opts[:with]
-              out << " and return #{stub.opts[:return].inspect}" if stub.opts[:return]
-              out << " and raise #{stub.opts[:raise].inspect}" if stub.opts[:raise]
+              if stub.opts[:return]
+                out << " and return #{stub.opts[:return].inspect}"
+              end
+              if stub.opts[:raise]
+                out << " and raise #{stub.opts[:raise].inspect}"
+              end
               out << "\n"
             end
           end

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,7 +1,9 @@
+# frozen_string_literal: true
+
 module Acfs
   module VERSION
     MAJOR = 1
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     STAGE = nil
 

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
@@ -71,6 +74,50 @@ describe ::Acfs::Global do
       end
       Acfs.run
     end
+
+    context 'with an empty result for a find_by call' do
+      before do
+        stub_request(:get, %r{http://users.example.org/users})
+          .with(query: {id: '2'})
+          .to_return(
+            status: 200,
+            body: '{}',
+            headers: {'Content-Type' => 'application/json'}
+          )
+      end
+
+      it 'invokes once both requests are finished' do
+        user1 = MyUser.find 1
+        user2 = MyUser.find_by id: 2
+
+        expect do |cb|
+          Acfs.on(user1, user2, &cb)
+          Acfs.run
+        end.to yield_with_args(user1, be_nil)
+      end
+
+      it 'invokes once remaining requests are finished' do
+        user1 = MyUser.find 1
+        Acfs.run # Finish the first request
+
+        user2 = MyUser.find_by id: 2
+
+        expect do |cb|
+          Acfs.on(user1, user2, &cb)
+          Acfs.run
+        end.to yield_with_args(user1, be_nil)
+      end
+
+      it 'invokes immediately when all requests have already been finished' do
+        user1 = MyUser.find 1
+        user2 = MyUser.find_by id: 2
+        Acfs.run
+
+        expect do |cb|
+          Acfs.on(user1, user2, &cb)
+        end.to yield_with_args(user1, be_nil)
+      end
+    end
   end
 
   describe '#runner' do

data/spec/acfs/location_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ::Acfs::Location do
+  let(:location) { described_class.new(uri, args) }
+  let(:uri)      { 'http://localhost/users/:id' }
+  let(:args)     { {id: 4} }
+
+  describe '#str' do
+    subject(:str) { location.str }
+
+    it 'replaces variables with values' do
+      expect(str).to eq 'http://localhost/users/4'
+    end
+
+    context 'with special characters' do
+      let(:args) { {id: '4 [@(\/!^$'} }
+
+      it 'escapes special characters' do
+        expect(str).to eq 'http://localhost/users/4+%5B%40%28%5C%2F%21%5E%24'
+      end
+    end
+  end
+end