acfs 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e1388e9df4207138b2a54f1e9d56c349ac407e52364b849887e9682abfee7e
-  data.tar.gz: ccf1b3550de8f5222988333d14e480ec07742fb0398d3adfb9504be4ca4168b4
+  metadata.gz: 46dc13b234cd5b704b67a731292b06ad8b32ee3fafb0a7a0af2a1003824e6df8
+  data.tar.gz: a35249f8e2a7a6cc49351b62c75b3fe641b26691132f4fb70b0a183ab041a380
 SHA512:
-  metadata.gz: d34c6fd3d4e83e22757633efc72c8d399778b86665f4b5bb6fb46c8d4f93782f996fe307904ac83f9b16701157ecb8418977466cad9d9c5a78c6ea1074e9ddd7
-  data.tar.gz: 3460436cd3a9d61241155658e4c46ef556b69d00fd389aca73c78ca6484b29bac9b3c45a0fd310b41259aba68f8aad55c7ca95a259e18075c2d88b2515bacd52
+  metadata.gz: 07132ad9797084fccd7fdeb31cc9f51572ddda1eb9dc88aaf875cd244000d15823223d3c6c503f0af7ac4cc1f59cb0b748eea75d8592323b807001e82c93d781
+  data.tar.gz: 6d6d15b6841820ae2ee672eec742b417113523ce613f1a7c7d493eeed50232b0915d7edcbf3df1b7060c5ced484bb82f59904e34fe6e17f70babe3b5ddf0a4e7

data/CHANGELOG.md

@@ -14,6 +14,14 @@
 ### Breaks
 
 
+## 1.6.0 - (2021-01-07)
+---
+
+### New
+* Support Ruby 3.0
+* Use keyword arguments in parameters and when calling methods
+
+
 ## 1.5.1 - (2020-12-30)
 ---
 

data/acfs.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w[lib]
 
+  spec.required_ruby_version = '>= 2.5.0'
+
   spec.add_runtime_dependency 'actionpack', '>= 5.2'
   spec.add_runtime_dependency 'activemodel', '>= 5.2'
   spec.add_runtime_dependency 'activesupport', '>= 5.2'

data/lib/acfs/adapter/base.rb

@@ -5,6 +5,8 @@ module Acfs::Adapter
   # and processing.
   #
   class Base
+    def initialize(*); end
+
     # Start processing queued requests.
     #
     def start; end

data/lib/acfs/adapter/typhoeus.rb

@@ -13,8 +13,11 @@ module Acfs
     # Adapter for Typhoeus.
     #
     class Typhoeus < Base
-      def initialize(opts: {}, **kwargs)
-        @opts = DEFAULT_OPTIONS.merge(opts)
+      def initialize(**kwargs)
+        super
+
+        @opts = DEFAULT_OPTIONS
+        @opts = @opts.merge(opts) if (opts = kwargs.delete(:opts))
         @kwargs = kwargs
       end
 
@@ -52,7 +55,7 @@ module Acfs
           body: req.body
         }
 
-        request = ::Typhoeus::Request.new(req.url, **@opts.merge(opts))
+        request = ::Typhoeus::Request.new(req.url, **@opts, **opts)
 
         request.on_complete do |response|
           raise ::Acfs::TimeoutError.new(req) if response.timed_out?

data/lib/acfs/collections/paginatable.rb

@@ -5,7 +5,7 @@ module Acfs::Collections
     extend ActiveSupport::Concern
 
     included do
-      def self.operation(_action, opts = {}, &_block)
+      def self.operation(_action, **opts, &_block)
         opts[:url]
       end
 
@@ -68,8 +68,8 @@ module Acfs::Collections
     def setup_params(params)
       @current_page = begin
         Integer params.fetch(:page, 1)
-                      rescue ArgumentError
-                        params[:page]
+      rescue ArgumentError
+        params[:page]
       end
     end
   end

data/lib/acfs/errors.rb

@@ -39,7 +39,7 @@ module Acfs
       @response = opts[:response]
 
       message = if response
-                  (opts[:message] ? opts[:message] + ':' : 'Received') +
+                  (opts[:message] ? "#{opts[:message]}:" : 'Received') +
                     " #{response.code} for #{response.request.method.upcase}" \
                     " #{response.request.url} #{response.request.format}"
                 else
@@ -87,12 +87,13 @@ module Acfs
       @errors   = opts.delete :errors
       @resource = opts.delete :resource
 
-      if @errors.is_a?(Hash)
-        opts[:message] ||= @errors.each_pair.map do |k, v|
-          @errors.is_a?(Array) ? "#{k}: #{v.join(', ')}" : "#{k}: #{v}"
-        end.join ', '
-      elsif @errors.is_a?(Array)
-        opts[:message] ||= @errors.join ', '
+      case @errors
+        when Hash
+          opts[:message] ||= @errors.each_pair.map do |k, v|
+            @errors.is_a?(Array) ? "#{k}: #{v.join(', ')}" : "#{k}: #{v}"
+          end.join ', '
+        when Array
+          opts[:message] ||= @errors.join ', '
       end
 
       super
@@ -131,8 +132,7 @@ module Acfs
   # parent resource. Check if the type is set to the correct
   # Acfs::Resource Name
   class ResourceTypeError < Error
-    attr_reader :base_class
-    attr_reader :type_name
+    attr_reader :base_class, :type_name
 
     def initialize(opts = {})
       @base_class    = opts.delete :base_class

data/lib/acfs/location.rb

@@ -6,36 +6,31 @@ module Acfs
   # Describes a URL with placeholders.
   #
   class Location
-    attr_reader :arguments, :raw, :struct, :args
+    attr_reader :arguments, :raw, :struct, :vars
 
     REGEXP = /^:([A-z][A-z0-9_]*)$/.freeze
 
-    def initialize(uri, args = {})
+    def initialize(uri, vars = {})
       @raw       = URI.parse uri
-      @args      = args
+      @vars      = vars
       @struct    = raw.path.split('/').reject(&:empty?).map {|s| s =~ REGEXP ? Regexp.last_match[1].to_sym : s }
       @arguments = struct.select {|s| s.is_a?(Symbol) }
     end
 
-    def build(args = {})
-      unless args.is_a?(Hash)
-        raise ArgumentError.new "URI path arguments must be a hash, `#{args.inspect}' given."
-      end
-
-      self.class.new raw.to_s, args.merge(self.args)
+    def build(vars)
+      self.class.new raw.to_s, vars.stringify_keys.merge(self.vars)
     end
 
     def extract_from(*args)
-      args = {}.tap do |collect|
-        arguments.each {|key| collect[key] = extract_arg key, args }
-      end
+      vars = {}
+      arguments.each {|key| vars[key.to_s] = extract_arg(key, args) }
 
-      build args
+      build(vars)
     end
 
     def str
       uri = raw.dup
-      uri.path = '/' + struct.map {|s| lookup_arg(s, args) }.join('/')
+      uri.path = "/#{struct.map(&method(:lookup_variable)).join('/')}"
       uri.to_s
     end
 
@@ -56,27 +51,26 @@ module Acfs
       nil
     end
 
-    def lookup_arg(arg, args)
-      arg.is_a?(Symbol) ? lookup_replacement(arg, args) : arg
-    end
+    def lookup_variable(name)
+      return name unless name.is_a?(Symbol)
 
-    def lookup_replacement(sym, args)
-      value = get_replacement(sym, args).to_s
-      return ::URI.encode_www_form_component(value) unless value.empty?
+      value = vars.fetch(name.to_s) do
+        if @raise.nil? || @raise
+          raise ArgumentError.new <<~ERROR.strip
+            URI path argument `#{name}' missing on `#{self}'. Given: `#{vars}.inspect'
+          ERROR
+        end
 
-      raise ArgumentError.new "Cannot replace path argument `#{sym}' with empty string."
-    end
+        ":#{name}"
+      end
 
-    def get_replacement(sym, args)
-      args.fetch(sym.to_s) do
-        args.fetch(sym) do
-          if args[:raise].nil? || args[:raise]
-            raise ArgumentError.new "URI path argument `#{sym}' missing on `#{self}'. Given: `#{args}.inspect'"
-          end
+      value = value.to_s.strip
 
-          ":#{sym}"
-        end
+      if value.empty?
+        raise ArgumentError.new "Cannot replace path argument `#{name}' with empty string."
       end
+
+      ::URI.encode_www_form_component(value)
     end
   end
 end

data/lib/acfs/middleware/base.rb

@@ -8,9 +8,9 @@ module Acfs
     class Base
       attr_reader :app, :options
 
-      def initialize(app, options = {})
+      def initialize(app, **opts)
         @app     = app
-        @options = options
+        @options = opts
       end
 
       def call(request)

data/lib/acfs/middleware/logger.rb

@@ -7,19 +7,17 @@ module Acfs
     # Log requests and responses.
     #
     class Logger < Base
-      def initialize(app, options = {})
+      attr_reader :logger
+
+      def initialize(app, **opts)
         super
-        @logger = options[:logger] if options[:logger]
+        @logger = options[:logger] || ::Logger.new($stdout)
       end
 
       def response(res, nxt)
         logger.info "[ACFS] #{res.request.method.to_s.upcase} #{res.request.url} -> #{res.status}"
         nxt.call res
       end
-
-      def logger
-        @logger ||= ::Logger.new STDOUT
-      end
     end
   end
 end

data/lib/acfs/middleware/serializer.rb

@@ -29,7 +29,7 @@ module Acfs
         request.headers['Accept'] = accept.join(',')
 
         request.on_complete do |response, nxt|
-          response.data = decode response.body if mime == response.content_type
+          response.data = decode(response.body) if mime == response.content_type
 
           nxt.call response
         end

data/lib/acfs/operation.rb

@@ -12,7 +12,7 @@ module Acfs
     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
 
@@ -21,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
@@ -45,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

data/lib/acfs/request.rb

@@ -11,7 +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
@@ -28,13 +28,5 @@ module Acfs
     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.rb

@@ -68,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
@@ -103,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 = {}
@@ -122,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
@@ -201,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
@@ -265,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,11 +112,11 @@ 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))
+          .location(self.class, **opts, action: :read)
           .build(attributes).str
     end
 

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

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
@@ -214,7 +214,7 @@ class Acfs::Resource
 
         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

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

@@ -22,7 +22,7 @@ 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

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/service.rb

@@ -28,34 +28,26 @@ module Acfs
 
     # @api private
     #
-    def initialize(options = {})
+    def initialize(**options)
       @options = options
     end
 
     # @api private
     # @return [Location]
     #
-    def location(resource_class, opts = {})
-      opts.reverse_merge! options
+    def location(resource_class, path: nil, action: :list, **)
+      path ||= options[:path]
 
-      action = opts[:action] || :list
+      if path.is_a?(Hash) && path.key?(action)
+        path = path.fetch(action)
+      else
+        path = path.is_a?(Hash) ? path[:all].to_s : path.to_s
 
-      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
-
-          if path.blank?
-            path = (resource_class.name || 'class').pluralize.underscore
-          end
-
-          resource_class.location_default_path(action, path.strip)
+        if path.blank?
+          path = (resource_class.name || 'class').pluralize.underscore
         end
+
+        path = resource_class.location_default_path(action, path.strip)
       end
 
       if path.nil?

data/lib/acfs/singleton_resource.rb

@@ -27,10 +27,10 @@ module Acfs
     # @return [undefined]
     # @see #delete
     #
-    def delete!(opts = {})
+    def delete!(**opts)
       opts[:params] ||= {}
 
-      operation :delete, opts do |data|
+      operation(:delete, **opts) do |data|
         update_with data
         freeze
       end

data/lib/acfs/stub.rb

@@ -22,7 +22,7 @@ module Acfs
     end
 
     def accept?(op)
-      return opts[:with].call op if opts[:with].respond_to? :call
+      return opts[:with].call(op) if opts[:with].respond_to?(:call)
 
       params = op.full_params.stringify_keys
       data   = op.data.stringify_keys
@@ -84,9 +84,13 @@ module Acfs
     def raise_error(op, name, data)
       raise name if name.is_a? Class
 
-      data.stringify_keys! if data.respond_to? :stringify_keys!
+      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
+      op.handle_failure ::Acfs::Response.new(
+        op.request,
+        status: Rack::Utils.status_code(name),
+        data: data
+      )
     end
 
     class << self
@@ -154,12 +158,14 @@ module Acfs
         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}'.
+          raise RealRequestsNotAllowedError.new <<~ERROR
+            No stub found for `#{op.action}' on `#{op.resource.name}' \
+            with params `#{op.full_params.inspect}', data `#{op.data.inspect}' \
+            and id `#{op.id}'.
 
             Available stubs:
             #{pretty_print}
-          MSG
+          ERROR
         end
 
         stub.call op

data/lib/acfs/version.rb

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

data/spec/acfs/adapter/typhoeus_spec.rb

@@ -19,7 +19,7 @@ describe Acfs::Adapter::Typhoeus do
     adapter.queue request1
     adapter.queue request2
 
-    expect { adapter.start }.to raise_error(/404\-[12]/)
+    expect { adapter.start }.to raise_error(/404-[12]/)
     expect { adapter.start }.to_not raise_error
   end
 

data/spec/acfs/location_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe ::Acfs::Location do
   let(:location) { described_class.new(uri, args) }
   let(:uri)      { 'http://localhost/users/:id' }
-  let(:args)     { {id: 4} }
+  let(:args)     { {'id' => 4} }
 
   describe '#str' do
     subject(:str) { location.str }
@@ -15,7 +15,7 @@ describe ::Acfs::Location do
     end
 
     context 'with special characters' do
-      let(:args) { {id: '4 [@(\/!^$'} }
+      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'

data/spec/acfs/request_spec.rb

@@ -9,7 +9,7 @@ describe Acfs::Request do
   let(:data)    { nil }
   let(:method)  { :get }
   let(:options) { {method: method, headers: headers, params: params, data: data} }
-  let(:request) { Acfs::Request.new(url, options) }
+  let(:request) { Acfs::Request.new(url, **options) }
 
   describe '#url' do
     it 'should return request URL' do

data/spec/acfs/resource/attributes_spec.rb

@@ -48,10 +48,10 @@ describe Acfs::Resource::Attributes do
         write_attribute :name, "The Great #{name}"
       end
     end
-    let(:args) { [params] }
     let(:params) { {name: 'James'} }
+    let(:opts) { {} }
     let(:m) { model.new }
-    let(:action) { -> { m.write_attributes(*args) } }
+    let(:action) { -> { m.write_attributes(params, **opts) } }
     subject { action }
 
     it 'should update attributes' do
@@ -79,7 +79,7 @@ describe Acfs::Resource::Attributes do
       end
 
       context 'with unknown: :raise option' do
-        let(:args) { [params, {unknown: :raise}] }
+        let(:opts) { {unknown: :raise} }
 
         it { should raise_error(ArgumentError, /unknown attribute/i) }
 

data/spec/acfs/resource/persistance_spec.rb

@@ -101,12 +101,12 @@ describe Acfs::Resource::Persistence do
     let!(:model) { model_class.find 1 }
 
     describe '#update_attributes' do
-      subject { -> { model.update_attributes name: 'John' } }
+      subject { -> { model.update_attributes({name: 'John'}) } }
       it { expect { subject.call }.to raise_error Acfs::ResourceNotLoaded }
     end
 
     describe '#update_attributes!' do
-      subject { -> { model.update_attributes! name: 'John' } }
+      subject { -> { model.update_attributes!({name: 'John'}) } }
       it { expect { subject.call }.to raise_error Acfs::ResourceNotLoaded }
     end
   end
@@ -179,18 +179,18 @@ describe Acfs::Resource::Persistence do
       before { model; Acfs.run }
 
       it 'should set attributes' do
-        model.update_attributes name: 'Idefix'
+        model.update_attributes({name: 'Idefix'})
         expect(model.attributes.symbolize_keys).to eq id: 1, name: 'Idefix', age: 12
       end
 
       it 'should save resource' do
-        expect(model.__getobj__).to receive(:save).with({})
-        model.update_attributes name: 'Idefix'
+        expect(model.__getobj__).to receive(:save)
+        model.update_attributes({name: 'Idefix'})
       end
 
-      it 'should pass second hash to save' do
+      it 'should kwargs to save' do
         expect(model.__getobj__).to receive(:save).with(bla: 'blub')
-        model.update_attributes({name: 'Idefix'}, {bla: 'blub'})
+        model.update_attributes({name: 'Idefix'}, bla: 'blub')
       end
     end
 
@@ -199,18 +199,18 @@ describe Acfs::Resource::Persistence do
       before { model; Acfs.run }
 
       it 'should set attributes' do
-        model.update_attributes! name: 'Idefix'
+        model.update_attributes!({name: 'Idefix'})
         expect(model.attributes.symbolize_keys).to eq id: 1, name: 'Idefix', age: 12
       end
 
       it 'should save resource' do
-        expect(model.__getobj__).to receive(:save!).with({})
-        model.update_attributes! name: 'Idefix'
+        expect(model.__getobj__).to receive(:save!)
+        model.update_attributes!({name: 'Idefix'})
       end
 
       it 'should pass second hash to save' do
         expect(model.__getobj__).to receive(:save!).with(bla: 'blub')
-        model.update_attributes!({name: 'Idefix'}, {bla: 'blub'})
+        model.update_attributes!({name: 'Idefix'}, bla: 'blub')
       end
     end
   end

data/spec/acfs/service_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Acfs::Service do
   let(:srv_class) { Class.new(Acfs::Service) { identity :test } }
   let(:options) { {} }
-  let(:service) { srv_class.new options }
+  let(:service) { srv_class.new(**options) }
 
   before do
     Acfs::Configuration.current.locate :test, ''

data/spec/acfs_spec.rb

@@ -191,7 +191,7 @@ describe 'Acfs' do
   it 'should load associated resources from different service' do
     @user = MyUser.find 2 do |user|
       expect(user.id).to be == 2
-      @comments = Comment.where user: user.id
+      @comments = Comment.where({user: user.id})
     end
 
     Acfs.run

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ require 'bundler'
 Bundler.require(:default, :test)
 
 require 'acfs'
-require 'webmock/rspec'
 
 Dir[File.expand_path('spec/support/**/*.rb')].sort.each {|f| require f }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -221,14 +221,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.