acfs 1.4.0 → 1.7.0

data/lib/acfs/operation.rb

@@ -8,10 +8,11 @@ module Acfs
   #
   class Operation
     attr_reader :action, :params, :resource, :data, :callback, :location, :url
+
     delegate :service, to: :resource
     delegate :call, to: :callback
 
-    def initialize(resource, action, opts = {}, &block)
+    def initialize(resource, action, **opts, &block)
       @resource = resource
       @action   = action.to_sym
 
@@ -20,9 +21,7 @@ module Acfs
       @params   = (opts[:params] || {}).dup
       @data     = (opts[:data]   || {}).dup
 
-      if opts[:url]
-        @url = opts[:url]
-      else
+      unless (@url = opts[:url])
         @location = resource.location(action: @action).extract_from(@params, @data)
         @url      = location.str
       end
@@ -44,11 +43,11 @@ module Acfs
     end
 
     def full_params
-      (id ? params.merge(id: id) : params).merge location_args
+      (id ? params.merge(id: id) : params).merge(location_vars)
     end
 
-    def location_args
-      location ? location.args : {}
+    def location_vars
+      location ? location.vars : {}
     end
 
     def method
@@ -57,7 +56,7 @@ module Acfs
 
     def request
       request = ::Acfs::Request.new url, method: method, params: params,
-                                         data: data, operation: self
+        data: data, operation: self
       request.on_complete do |response|
         ::ActiveSupport::Notifications.instrument 'acfs.operation.complete',
           operation: self,
@@ -71,10 +70,24 @@ module Acfs
 
     def handle_failure(response)
       case response.code
+        when 400
+          raise ::Acfs::BadRequest.new response: response
+        when 401
+          raise ::Acfs::Unauthorized.new response: response
+        when 403
+          raise ::Acfs::Forbidden.new response: response
         when 404
           raise ::Acfs::ResourceNotFound.new response: response
         when 422
           raise ::Acfs::InvalidResource.new response: response, errors: response.data.try(:[], 'errors')
+        when 500
+          raise ::Acfs::ServerError.new response: response
+        when 502
+          raise ::Acfs::BadGateway.new response: response
+        when 503
+          raise ::Acfs::ServiceUnavailable.new response: response
+        when 504
+          raise ::Acfs::GatewayTimeout.new response: response
         else
           raise ::Acfs::ErroneousResponse.new response: response
       end

data/lib/acfs/request/callbacks.rb

@@ -21,7 +21,7 @@ module Acfs
       # @return [ Acfs::Request ] The request itself.
       #
       def on_complete(&block)
-        callbacks.insert 0, block if block_given?
+        callbacks.insert 0, block if block
         self
       end
 
@@ -45,9 +45,9 @@ module Acfs
       private
 
       def call_callback(res, index)
-        if index < callbacks.size
-          callbacks[index].call res, proc {|bres| call_callback bres, index + 1 }
-        end
+        return if index >= callbacks.size
+
+        callbacks[index].call(res, proc {|bres| call_callback bres, index + 1 })
       end
     end
   end

data/lib/acfs/request.rb

@@ -11,8 +11,7 @@ module Acfs
     attr_reader :url, :headers, :params, :data, :method, :operation
 
     include Request::Callbacks
-
-    def initialize(url, options = {}, &block)
+    def initialize(url, **options, &block)
       @url = URI.parse(url.to_s).tap do |_url|
         @data    = options.delete(:data) || nil
         @format  = options.delete(:format) || :json
@@ -20,20 +19,14 @@ module Acfs
         @params  = options.delete(:params) || {}
         @method  = options.delete(:method) || :get
       end.to_s
+
       @operation = options.delete(:operation) || nil
-      on_complete(&block) if block_given?
+
+      on_complete(&block) if block
     end
 
     def data?
       !data.nil?
     end
-
-    class << self
-      def new(*attrs)
-        return attrs[0] if attrs[0].is_a? self
-
-        super
-      end
-    end
   end
 end

data/lib/acfs/resource/attributes/date_time.rb

@@ -22,7 +22,7 @@ module Acfs::Resource::Attributes
     def cast_value(value)
       if value.blank?
         nil
-      elsif value.acts_like?(:time) || value.acts_like?(:date)
+      elsif !value.is_a?(::String) && value.respond_to?(:to_datetime)
         value.to_datetime
       else
         ::DateTime.iso8601 value

data/lib/acfs/resource/attributes/uuid.rb

@@ -35,7 +35,7 @@ module Acfs::Resource::Attributes
     def cast_value(value)
       if value.blank?
         nil
-      elsif value.to_s =~ UUID_REGEXP
+      elsif UUID_REGEXP.match?(value.to_s)
         value
       else
         raise TypeError.new "Invalid UUID: `#{value}'"

data/lib/acfs/resource/attributes.rb

@@ -48,9 +48,11 @@ class Acfs::Resource
     # @return [HashWithIndifferentAccess{Symbol => Object}]
     #   Attributes and their values.
     #
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     def attributes
       @_attrs ||= HashWithIndifferentAccess.new
     end
+    # rubocop:enable Naming/MemoizedInstanceVariableName
 
     # @api public
     #
@@ -66,7 +68,7 @@ class Acfs::Resource
     # @see #write_attributes Delegates attributes hash to {#write_attributes}.
     #
     def attributes=(attributes)
-      write_attributes attributes
+      write_attributes(attributes)
     end
 
     # @api public
@@ -101,17 +103,16 @@ class Acfs::Resource
     #
     # @see #write_attribute Delegates attribute values to `#write_attribute`.
     #
-    def write_attributes(attributes, opts = {})
+    def write_attributes(attributes, **opts)
       unless attributes.respond_to?(:each) && attributes.respond_to?(:keys)
         return false
       end
 
-      if opts.fetch(:unknown, :ignore) == :raise
-        if (attributes.keys.map(&:to_s) - self.class.attributes.keys).any?
-          missing = attributes.keys - self.class.attributes.keys
-          missing.map!(&:inspect)
-          raise ArgumentError.new "Unknown attributes: #{missing.join(', ')}"
-        end
+      if opts.fetch(:unknown, :ignore) == :raise &&
+         (attributes.keys.map(&:to_s) - self.class.attributes.keys).any?
+        missing = attributes.keys - self.class.attributes.keys
+        missing.map!(&:inspect)
+        raise ArgumentError.new "Unknown attributes: #{missing.join(', ')}"
       end
 
       procs = {}
@@ -120,12 +121,12 @@ class Acfs::Resource
         if attributes[key].is_a? Proc
           procs[key] = attributes[key]
         else
-          write_local_attribute key, attributes[key], opts
+          write_local_attribute(key, attributes[key], **opts)
         end
       end
 
       procs.each do |key, proc|
-        write_local_attribute key, instance_exec(&proc), opts
+        write_local_attribute(key, instance_exec(&proc), **opts)
       end
 
       true
@@ -199,12 +200,12 @@ class Acfs::Resource
       # @param [Symbol, String, Class] type Attribute
       #   type identifier or type class.
       #
-      def attribute(name, type, opts = {})
+      def attribute(name, type, **opts)
         if type.is_a?(Symbol) || type.is_a?(String)
           type = "#{ATTR_CLASS_BASE}::#{type.to_s.classify}".constantize
         end
 
-        define_attribute name.to_sym, type, opts
+        define_attribute(name.to_sym, type, **opts)
       end
 
       # @api public
@@ -242,9 +243,9 @@ class Acfs::Resource
         @local_attributes ||= {}
       end
 
-      def define_attribute(name, type, opts = {})
+      def define_attribute(name, type, **opts)
         name      = name.to_s
-        attribute = type.new opts
+        attribute = type.new(**opts)
 
         local_attributes[name] = attribute
         define_attribute_method name
@@ -263,7 +264,7 @@ end
 
 # Load attribute type classes.
 #
-Dir[File.dirname(__FILE__) + '/attributes/*.rb'].sort.each do |path|
+Dir[File.join(__dir__, 'attributes/*.rb')].sort.each do |path|
   filename = File.basename(path)
   require "acfs/resource/attributes/#{filename}"
 end

data/lib/acfs/resource/dirty.rb

@@ -16,8 +16,8 @@ class Acfs::Resource
 
     # @api private
     #
-    def save!(*)
-      super.tap {|_| changes_applied }
+    def save!(**kwargs)
+      super(**kwargs).tap {|_| changes_applied }
     end
 
     # @api private

data/lib/acfs/resource/initialization.rb

@@ -8,7 +8,7 @@ class Acfs::Resource
     #
     # @api public
     #
-    # Initializes a new model with the given `params`. fff
+    # Initializes a new model with the given `params`.
     #
     # @example
     #   class User < Acfs::Resource
@@ -17,15 +17,15 @@ class Acfs::Resource
     #     attribute :age, :integer, default: 18
     #   end
     #
-    #   user = User.new(name: 'bob')
+    #   user = User.new({name: 'bob'})
     #   user.name  # => "bob"
     #   user.email # => "bob@dom.tld"
     #   user.age   # => 18
     #
-    # @param params [Hash{Symbol => Object}] Attributes to set on resource.
+    # @param attributes [Hash{Symbol => Object}] Attributes to set on resource.
     #
-    def initialize(params = {})
-      write_attributes params if params
+    def initialize(attributes = {})
+      write_attributes(attributes) if attributes
     end
   end
 end

data/lib/acfs/resource/locatable.rb

@@ -40,15 +40,18 @@ class Acfs::Resource
       #     usually `:list`, `:create`, `:read`, `:update` or`:delete`.
       #   @return [String] Generated URL.
       #
-      def url(suffix = nil, opts = {})
+      def url(suffix = nil, **opts)
         if suffix.is_a? Hash
           opts = suffix
           suffix = nil
         end
 
-        opts[:action] = :list if suffix
+        kwargs = {}
+        kwargs[:path] = opts[:path] if opts.key?(:path)
+        kwargs[:action] = opts.delete(:action) if opts.key?(:action)
+        kwargs[:action] = :list if suffix
 
-        url  = location(opts).build(opts).str
+        url  = location(**kwargs).build(opts.stringify_keys).str
         url += "/#{suffix}" if suffix.to_s.present?
         url
       end
@@ -81,8 +84,8 @@ class Acfs::Resource
       #
       # @return [Location] Location object.
       #
-      def location(opts = {})
-        service.location(self, opts)
+      def location(**opts)
+        service.location(self, **opts)
       end
 
       # @api private
@@ -109,12 +112,12 @@ class Acfs::Resource
     # @return [ String ] Generated URL.
     # @see ClassMethods#url
     #
-    def url(opts = {})
+    def url(**opts)
       return nil if need_primary_key? && !primary_key?
 
       self.class.service
-          .location(self.class, opts.reverse_merge(action: :read))
-          .build(attributes).str
+        .location(self.class, **opts, action: :read)
+        .build(attributes).str
     end
 
     # @api private

data/lib/acfs/resource/operational.rb

@@ -11,12 +11,15 @@ class Acfs::Resource
   #
   module Operational
     extend ActiveSupport::Concern
-    delegate :operation, to: :'self.class'
+
+    def operation(*args, **kwargs, &block)
+      self.class.operation(*args, **kwargs, &block)
+    end
 
     module ClassMethods
       # Invoke CRUD operation.
-      def operation(action, opts = {}, &block)
-        Acfs.runner.process ::Acfs::Operation.new self, action, opts, &block
+      def operation(action, **opts, &block)
+        Acfs.runner.process ::Acfs::Operation.new(self, action, **opts, &block)
       end
     end
   end

data/lib/acfs/resource/persistence.rb

@@ -57,8 +57,8 @@ class Acfs::Resource
     #   false otherwise.
     # @see #save! See {#save!} for available options.
     #
-    def save(*args)
-      save!(*args)
+    def save(**opts)
+      save!(**opts)
       true
     rescue Acfs::Error
       false
@@ -82,10 +82,10 @@ class Acfs::Resource
     #
     # @see #save
     #
-    def save!(opts = {})
+    def save!(**opts)
       opts[:data] = attributes unless opts[:data]
 
-      operation((new? ? :create : :update), opts) do |data|
+      operation((new? ? :create : :update), **opts) do |data|
         update_with data
       end
     rescue ::Acfs::InvalidResource => e
@@ -109,11 +109,11 @@ class Acfs::Resource
     # @see #attributes=
     # @see #update_attributes!
     #
-    def update_attributes(attrs, opts = {})
-      check_loaded! opts
+    def update_attributes(attrs, **opts)
+      check_loaded!(**opts)
 
       self.attributes = attrs
-      save opts
+      save(**opts)
     end
 
     # @api public
@@ -136,11 +136,11 @@ class Acfs::Resource
     # @see #attributes=
     # @see #update_attributes
     #
-    def update_attributes!(attrs, opts = {})
+    def update_attributes!(attrs, **opts)
       check_loaded! opts
 
       self.attributes = attrs
-      save! opts
+      save!(**opts)
     end
 
     # @api public
@@ -152,8 +152,8 @@ class Acfs::Resource
     # @return [Boolean]
     # @see #delete!
     #
-    def delete(opts = {})
-      delete! opts
+    def delete(**opts)
+      delete!(**opts)
       true
     rescue Acfs::Error
       false
@@ -172,11 +172,11 @@ class Acfs::Resource
     # @return [undefined]
     # @see #delete
     #
-    def delete!(opts = {})
+    def delete!(**opts)
       opts[:params] ||= {}
       opts[:params] = attributes_for_url(:delete).merge opts[:params]
 
-      operation :delete, opts do |data|
+      operation(:delete, **opts) do |data|
         update_with data
         freeze
       end
@@ -244,8 +244,6 @@ class Acfs::Resource
       end
     end
 
-    private
-
     def update_with(data)
       self.attributes = data
       loaded!

data/lib/acfs/resource/query_methods.rb

@@ -56,7 +56,7 @@ class Acfs::Resource
       #
       #   @return [Collection] Collection of requested resources.
       #
-      def find(id_or_ids, opts = {}, &block)
+      def find(id_or_ids, **opts, &block)
         if id_or_ids.respond_to? :each
           find_multiple id_or_ids, opts, &block
         else
@@ -81,7 +81,7 @@ class Acfs::Resource
         collection = ::Acfs::Collection.new self
         collection.__callbacks__ << block if block
 
-        operation :list, opts.merge(params: params) do |data, response|
+        operation(:list, **opts, params: params) do |data, response|
           data.each {|obj| collection << create_resource(obj) }
           collection.process_response response
           collection.loaded!
@@ -109,7 +109,7 @@ class Acfs::Resource
       def find_by(params, &block)
         Acfs::Util::ResourceDelegator.new(new).tap do |m|
           m.__callbacks__ << block unless block.nil?
-          operation :list, params: params do |data|
+          operation(:list, params: params) do |data|
             if data.empty?
               m.__setobj__ nil
             else
@@ -139,7 +139,7 @@ class Acfs::Resource
         find_by params do |m|
           if m.nil?
             raise Acfs::ResourceNotFound.new message: 'Received erroneous ' \
-              "response: no `#{name}` with params #{params} found"
+                                                      "response: no `#{name}` with params #{params} found"
           end
           block&.call m
         end
@@ -210,11 +210,11 @@ class Acfs::Resource
         model = Acfs::Util::ResourceDelegator.new new
 
         opts[:params] ||= {}
-        opts[:params].merge! id: id unless id.nil?
+        opts[:params][:id] = id unless id.nil?
 
         model.__callbacks__ << block unless block.nil?
 
-        operation :read, opts do |data|
+        operation(:read, **opts) do |data|
           model.__setobj__ create_resource data, origin: model.__getobj__
           model.__invoke__
         end
@@ -228,7 +228,7 @@ class Acfs::Resource
 
           counter = 0
           ids.each_with_index do |id, index|
-            find_single id, opts do |resource|
+            find_single(id, opts) do |resource|
               collection[index] = resource
               if (counter += 1) == ids.size
                 collection.loaded!
@@ -239,11 +239,11 @@ class Acfs::Resource
         end
       end
 
-      def create_resource(data, opts = {})
+      def create_resource(data, **opts)
         type = data.delete 'type'
         klass = resource_class_lookup(type)
         (opts[:origin].is_a?(klass) ? opts[:origin] : klass.new).tap do |m|
-          m.write_attributes data, opts
+          m.write_attributes(data, **opts)
           m.loaded!
         end
       end
@@ -258,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

@@ -34,8 +34,8 @@ class Acfs::Resource
       #   @param options [Object] Option delegated to
       #     service class initializer.
       #
-      def service(klass = nil, options = {})
-        return (@service = klass.new options) if klass
+      def service(klass = nil, **options)
+        return (@service = klass.new(**options)) if klass
 
         @service || superclass.service
       end

data/lib/acfs/resource/validation.rb

@@ -2,12 +2,6 @@
 
 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
@@ -28,12 +22,28 @@ class Acfs::Resource
       end
     end
 
-    def save!(*_)
+    def save!(**kwargs)
       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

@@ -19,12 +19,12 @@ module Acfs
     #         :response_body, :response_headers, :response_code, :headers,
     #         to: :response
 
-    def initialize(request, data = {})
+    def initialize(request, **opts)
       @request  = request
-      @status   = data[:status]  || 0
-      @headers  = data[:headers] || {}
-      @body     = data[:body]    || ''
-      @data     = data[:data]    || nil
+      @status   = opts[:status]  || 0
+      @headers  = opts[:headers] || {}
+      @body     = opts[:body]    || ''
+      @data     = opts[:data]    || nil
     end
   end
 end

data/lib/acfs/runner.rb

@@ -17,16 +17,16 @@ module Acfs
     # Process an operation. Synchronous operations will be run
     # and parallel operations will be queued.
     #
-    def process(op)
-      ::ActiveSupport::Notifications.instrument 'acfs.operation.before_process', operation: op
-      op.synchronous? ? run(op) : enqueue(op)
+    def process(operation)
+      ::ActiveSupport::Notifications.instrument('acfs.operation.before_process', operation: operation)
+      operation.synchronous? ? run(operation) : enqueue(operation)
     end
 
     # Run operation right now skipping queue.
     #
-    def run(op)
-      ::ActiveSupport::Notifications.instrument 'acfs.runner.sync_run', operation: op do
-        op_request(op) {|req| adapter.run req }
+    def run(operation)
+      ::ActiveSupport::Notifications.instrument('acfs.runner.sync_run', operation: operation) do
+        operation_request(operation) {|req| adapter.run req }
       end
     end
 
@@ -38,12 +38,12 @@ module Acfs
 
     # Enqueue operation to be run later.
     #
-    def enqueue(op)
-      ::ActiveSupport::Notifications.instrument 'acfs.runner.enqueue', operation: op do
+    def enqueue(operation)
+      ::ActiveSupport::Notifications.instrument('acfs.runner.enqueue', operation: operation) do
         if running?
-          op_request(op) {|req| adapter.queue req }
+          operation_request(operation) {|req| adapter.queue req }
         else
-          queue << op
+          queue << operation
         end
       end
     end
@@ -82,15 +82,15 @@ module Acfs
     end
 
     def enqueue_operations
-      while (op = queue.shift)
-        op_request(op) {|req| adapter.queue req }
+      while (operation = queue.shift)
+        operation_request(operation) {|req| adapter.queue req }
       end
     end
 
-    def op_request(op)
-      return if Acfs::Stub.enabled? && Acfs::Stub.stubbed(op)
+    def operation_request(operation)
+      return if Acfs::Stub.enabled? && Acfs::Stub.stubbed(operation)
 
-      req = op.service.prepare op.request
+      req = operation.service.prepare(operation.request)
       return unless req.is_a? Acfs::Request
 
       req = prepare req