acfs 1.3.2 → 1.5.1

data/lib/acfs/resource/operational.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   # @api private
   #
@@ -11,7 +13,6 @@ class Acfs::Resource
     extend ActiveSupport::Concern
     delegate :operation, to: :'self.class'
 
-    #
     module ClassMethods
       # Invoke CRUD operation.
       def operation(action, opts = {}, &block)

data/lib/acfs/resource/persistence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   #
   # Allow to track the persistence state of a model.
@@ -40,7 +42,7 @@ class Acfs::Resource
     def new?
       !loaded?
     end
-    alias_method :new_record?, :new?
+    alias new_record? new?
 
     # @api public
     #
@@ -86,9 +88,9 @@ class Acfs::Resource
       operation((new? ? :create : :update), opts) do |data|
         update_with data
       end
-    rescue ::Acfs::InvalidResource => err
-      self.remote_errors = err.errors
-      raise err
+    rescue ::Acfs::InvalidResource => e
+      self.remote_errors = e.errors
+      raise e
     end
 
     # @api public
@@ -242,8 +244,6 @@ class Acfs::Resource
       end
     end
 
-    private
-
     def update_with(data)
       self.attributes = data
       loaded!
@@ -251,6 +251,7 @@ class Acfs::Resource
 
     def check_loaded!(opts = {})
       return if loaded? || opts[:force]
+
       raise ::Acfs::ResourceNotLoaded.new resource: self
     end
   end

data/lib/acfs/resource/query_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   # Methods providing the query interface for finding resouces.
   #
@@ -14,7 +16,6 @@ class Acfs::Resource
   module QueryMethods
     extend ActiveSupport::Concern
 
-    #
     module ClassMethods
       # @api public
       #
@@ -89,7 +90,7 @@ class Acfs::Resource
 
         collection
       end
-      alias_method :where, :all
+      alias where all
 
       # @api public
       #
@@ -140,7 +141,7 @@ class Acfs::Resource
             raise Acfs::ResourceNotFound.new message: 'Received erroneous ' \
               "response: no `#{name}` with params #{params} found"
           end
-          block.call m unless block.nil?
+          block&.call m
         end
       end
 
@@ -249,6 +250,7 @@ class Acfs::Resource
 
       def resource_class_lookup(type)
         return self if type.nil?
+
         klass = type.camelize.constantize
 
         unless klass <= self
@@ -256,7 +258,7 @@ class Acfs::Resource
         end
 
         klass
-      rescue NameError, NoMethodError
+      rescue NameError
         raise Acfs::ResourceTypeError.new type_name: type, base_class: self
       end
     end

data/lib/acfs/resource/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   # Included by Acfs::Model. Allows to configure the service
   # a resource belongs to.
@@ -5,7 +7,6 @@ class Acfs::Resource
   module Service
     extend ActiveSupport::Concern
 
-    #
     module ClassMethods
       # @api public
       #
@@ -35,6 +36,7 @@ class Acfs::Resource
       #
       def service(klass = nil, options = {})
         return (@service = klass.new options) if klass
+
         @service || superclass.service
       end
     end

data/lib/acfs/resource/validation.rb

@@ -1,12 +1,7 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
-  #
   module Validation
-    def valid?(*args)
-      super
-      remote_errors.each {|f, e| errors.add f, e }
-      errors.empty?
-    end
-
     def remote_errors
       @remote_errors ||= ActiveModel::Errors.new self
     end
@@ -31,7 +26,24 @@ class Acfs::Resource
       unless valid?(new? ? :create : :save)
         raise ::Acfs::InvalidResource.new resource: self, errors: errors.to_a
       end
+
       super
     end
+
+    if ::ActiveModel.version >= Gem::Version.new('6.1')
+      def valid?(*args)
+        super
+
+        remote_errors.each {|e| errors.add(e.attribute, e.message) }
+        errors.empty?
+      end
+    else
+      def valid?(*args)
+        super
+
+        remote_errors.each {|f, e| errors.add(f, e) }
+        errors.empty?
+      end
+    end
   end
 end

data/lib/acfs/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acfs/response/formats'
 require 'acfs/response/status'
 require 'active_support/core_ext/module/delegation'

data/lib/acfs/response/formats.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_dispatch'
 
 module Acfs

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
@@ -38,21 +40,27 @@ module Acfs
 
       action = opts[:action] || :list
 
-      path = if opts[:path].is_a?(Hash) && opts[:path].key?(action)
-               opts[:path].fetch(action)
-             else
-               path = if opts[:path].is_a?(Hash)
-                        opts[:path][:all].to_s
-                      else
-                        opts[:path].to_s
-                      end
+      path = begin
+        if opts[:path].is_a?(Hash) && opts[:path].key?(action)
+          opts[:path].fetch(action)
+        else
+          path = if opts[:path].is_a?(Hash)
+                   opts[:path][:all].to_s
+                 else
+                   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
+          resource_class.location_default_path(action, path.strip)
+        end
+      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
@@ -81,7 +89,10 @@ module Acfs
       #
       def base_url
         unless (base = Acfs::Configuration.current.locate identity)
-          raise ArgumentError.new "#{identity} not configured. Add `locate '#{identity.to_s.underscore}', 'http://service.url/'` to your configuration."
+          raise ArgumentError.new \
+            "#{identity} not configured. Add `locate '" \
+            "#{identity.to_s.underscore}', 'http://service.url/'` " \
+            'to your configuration.'
         end
 
         base.to_s

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) # rubocop:disable Style/GuardClause
+        @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,8 @@ module Acfs
     end
 
     def called?(count = nil)
-      count = count.count if count.respond_to? :count # For `5.times` Enumerators
+      count = count.count if count.respond_to?(:count)
+
       count.nil? ? calls.any? : calls.size == count
     end
 
@@ -60,8 +71,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 +83,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 +95,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 +142,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 +153,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 +176,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