acfs 1.3.1 → 1.5.0

data/lib/acfs/global.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   #
   # Global Acfs module methods.
@@ -73,7 +75,7 @@ module Acfs
       end
       return false if block.nil?
 
-      if resource.loaded?
+      if resource.nil? || resource.loaded?
         block.call resource
       else
         resource.__callbacks__ << block
@@ -81,9 +83,17 @@ module Acfs
     end
 
     def on(*resources)
+      # If all resources have already been loaded, we run the callback immediately.
+      if resources.all? {|res| res.nil? || res.loaded? }
+        yield(*resources)
+        return
+      end
+
+      # Otherwise, we add a callback to *each* resource with a guard that ensures
+      # that only the very last resource being loaded executes the callback.
       resources.each do |resource|
         add_callback resource do |_|
-          yield(*resources) unless resources.any? {|res| !res.loaded? }
+          yield(*resources) if resources.all? {|res| res.nil? || res.loaded? }
         end
       end
     end

data/lib/acfs/location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   # @api private
   #
@@ -6,7 +8,7 @@ module Acfs
   class Location
     attr_reader :arguments, :raw, :struct, :args
 
-    REGEXP = /^:([A-z][A-z0-9_]*)$/
+    REGEXP = /^:([A-z][A-z0-9_]*)$/.freeze
 
     def initialize(uri, args = {})
       @raw       = URI.parse uri
@@ -40,13 +42,15 @@ module Acfs
     def raw_uri
       raw.to_s
     end
-    alias_method :to_s, :raw_uri
+    alias to_s raw_uri
 
     private
 
     def extract_arg(key, hashes)
       hashes.each_with_index do |hash, index|
-        return (index == 0 ? hash.delete(key) : hash.fetch(key)) if hash.key?(key)
+        if hash.key?(key)
+          return (index.zero? ? hash.delete(key) : hash.fetch(key))
+        end
       end
 
       nil
@@ -68,9 +72,9 @@ module Acfs
         args.fetch(sym) do
           if args[:raise].nil? || args[:raise]
             raise ArgumentError.new "URI path argument `#{sym}' missing on `#{self}'. Given: `#{args}.inspect'"
-          else
-            ":#{sym}"
           end
+
+          ":#{sym}"
         end
       end
     end

data/lib/acfs/middleware/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   module Middleware
     # A base middleware that does not modify request or response.
@@ -12,7 +14,9 @@ module Acfs
       end
 
       def call(request)
-        request.on_complete {|res, nxt| response(res, nxt) } if respond_to? :response
+        if respond_to? :response
+          request.on_complete {|res, nxt| response(res, nxt) }
+        end
         app.call(request)
       end
     end

data/lib/acfs/middleware/json.rb

@@ -1,4 +1,6 @@
-require 'multi_json'
+# frozen_string_literal: true
+
+require 'json'
 
 module Acfs
   module Middleware
@@ -10,11 +12,11 @@ module Acfs
       end
 
       def encode(data)
-        ::MultiJson.dump data
+        ::JSON.dump data
       end
 
       def decode(body)
-        ::MultiJson.load body
+        ::JSON.load body
       end
     end
 

data/lib/acfs/middleware/logger.rb

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

data/lib/acfs/middleware/msgpack.rb

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

data/lib/acfs/middleware/print.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   module Middleware
     # Print resquests and response on terminal

data/lib/acfs/middleware/serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   module Middleware
     # A base middleware that does not modify request or response.

data/lib/acfs/operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   # @api private
   #
@@ -6,6 +8,7 @@ module Acfs
   #
   class Operation
     attr_reader :action, :params, :resource, :data, :callback, :location, :url
+
     delegate :service, to: :resource
     delegate :call, to: :callback
 
@@ -19,7 +22,7 @@ module Acfs
       @data     = (opts[:data]   || {}).dup
 
       if opts[:url]
-        @url      = opts[:url]
+        @url = opts[:url]
       else
         @location = resource.location(action: @action).extract_from(@params, @data)
         @url      = location.str
@@ -29,11 +32,11 @@ module Acfs
     end
 
     def single?
-      [:read, :update, :delete].include? action
+      %i[read update delete].include? action
     end
 
     def synchronous?
-      [:update, :delete, :create].include? action
+      %i[update delete create].include? action
     end
 
     def id
@@ -69,10 +72,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.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acfs/request/callbacks'
 
 module Acfs
@@ -9,7 +11,6 @@ module Acfs
     attr_reader :url, :headers, :params, :data, :method, :operation
 
     include Request::Callbacks
-
     def initialize(url, options = {}, &block)
       @url = URI.parse(url.to_s).tap do |_url|
         @data    = options.delete(:data) || nil
@@ -18,7 +19,9 @@ 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?
     end
 
@@ -29,6 +32,7 @@ module Acfs
     class << self
       def new(*attrs)
         return attrs[0] if attrs[0].is_a? self
+
         super
       end
     end

data/lib/acfs/request/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs
   class Request
     # Module containing callback handling for Requests.
@@ -43,7 +45,9 @@ module Acfs
       private
 
       def call_callback(res, index)
-        callbacks[index].call res, proc {|bres| call_callback bres, index + 1 } if index < callbacks.size
+        return if index >= callbacks.size
+
+        callbacks[index].call(res, proc {|bres| call_callback bres, index + 1 })
       end
     end
   end

data/lib/acfs/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_model'
 
 # @api public

data/lib/acfs/resource/attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   #
   # = Acfs Attributes
@@ -46,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
     #
@@ -176,9 +180,8 @@ class Acfs::Resource
       attributes[name.to_s] = value
     end
 
-    #
     module ClassMethods
-      ATTR_CLASS_BASE = '::Acfs::Resource::Attributes'.freeze
+      ATTR_CLASS_BASE = '::Acfs::Resource::Attributes'
 
       #
       # @api public

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

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
-  #
   class Base
     attr_reader :default
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #
@@ -10,7 +12,6 @@ module Acfs::Resource::Attributes
   #   end
   #
   class DateTime < Base
-
     # @api public
     #
     # Cast given object to DateTime.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #
@@ -21,9 +23,9 @@ module Acfs::Resource::Attributes
 
       case value
         when ::Float then value
-        when "Infinity" then ::Float::INFINITY
-        when "-Infinity" then -::Float::INFINITY
-        when "NaN" then ::Float::NAN
+        when 'Infinity' then ::Float::INFINITY
+        when '-Infinity' then -::Float::INFINITY
+        when 'NaN' then ::Float::NAN
         else Float(value)
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Acfs::Resource::Attributes
   # @api public
   #
@@ -9,8 +11,7 @@ module Acfs::Resource::Attributes
   #   end
   #
   class UUID < Base
-    #
-    UUID_REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i
+    UUID_REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i.freeze
 
     # @api public
     #
@@ -37,7 +38,7 @@ module Acfs::Resource::Attributes
       elsif value.to_s =~ UUID_REGEXP
         value
       else
-        raise TypeError.new "Invalid UUID: `#{value.to_s}'"
+        raise TypeError.new "Invalid UUID: `#{value}'"
       end
     end
   end

data/lib/acfs/resource/dirty.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   #
   # Thin wrapper around ActiveModel::Dirty

data/lib/acfs/resource/initialization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   #
   # Initialization drop-in for pre-4.0 ActiveModel.

data/lib/acfs/resource/loadable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   # Provides method to check for loading state of resources.
   # A resource that is created but not yet fetched will be loaded

data/lib/acfs/resource/locatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Acfs::Resource
   # Provide methods for generation URLs for resources.
   #
@@ -11,7 +13,6 @@ class Acfs::Resource
   module Locatable
     extend ActiveSupport::Concern
 
-    #
     module ClassMethods
       # @overload url(suffix)
       #   @deprecated
@@ -40,7 +41,10 @@ class Acfs::Resource
       #   @return [String] Generated URL.
       #
       def url(suffix = nil, opts = {})
-        opts, suffix = suffix, nil if suffix.is_a? Hash
+        if suffix.is_a? Hash
+          opts = suffix
+          suffix = nil
+        end
 
         opts[:action] = :list if suffix
 
@@ -85,9 +89,9 @@ class Acfs::Resource
       def location_default_path(action, path)
         case action
           when :list, :create
-            return path
+            path
           when :read, :update, :delete
-            return "#{path}/:id"
+            "#{path}/:id"
         end
       end
     end
@@ -109,8 +113,8 @@ class Acfs::Resource
       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.reverse_merge(action: :read))
+          .build(attributes).str
     end
 
     # @api private