json_api_client 1.22.0 → 1.24.0

data/lib/json_api_client/errors.rb

@@ -1,125 +1,125 @@
-require 'rack'
-
-module JsonApiClient
-  module Errors
-    class ApiError < StandardError
-      attr_reader :env
-
-      def initialize(env, msg = nil)
-        @env = env
-        # Try to fetch json_api errors from response
-        msg = track_json_api_errors(msg)
-
-        super msg
-      end
-
-      private
-
-      # Try to fetch json_api errors from response
-      def track_json_api_errors(msg)
-        return msg unless env.try(:body).kind_of?(Hash) || env.body.key?('errors')
-
-        errors_msg = env.body['errors'].map { |e| e['title'] }.compact.join('; ').presence
-        return msg unless errors_msg
-
-        msg.nil? ? errors_msg : "#{msg} (#{errors_msg})"
-        # Just to be sure that it is back compatible
-      rescue StandardError
-        msg
-      end
-    end
-
-    class ClientError < ApiError
-    end
-
-    class ResourceImmutableError < StandardError
-      def initialize(msg = 'Resource immutable')
-        super msg
-      end
-    end
-
-    class AccessDenied < ClientError
-    end
-
-    class NotAuthorized < ClientError
-    end
-
-    class NotFound < ClientError
-      attr_reader :uri
-      def initialize(env_or_uri, msg = nil)
-        env = nil
-
-        if env_or_uri.kind_of?(Faraday::Env)
-          env = env_or_uri
-          @uri = env[:url]
-        else
-          @uri = env_or_uri
-        end
-
-        msg ||= "Resource not found: #{uri.to_s}"
-        super env, msg
-      end
-    end
-
-    class RequestTimeout < ClientError
-    end
-
-    class Conflict < ClientError
-      def initialize(env, msg = 'Resource already exists')
-        super env, msg
-      end
-    end
-
-    class TooManyRequests < ClientError
-    end
-
-    class ConnectionError < ApiError
-    end
-
-    class ServerError < ApiError
-      def initialize(env, msg = nil)
-        msg ||= begin
-          status = env.status
-          message = ::Rack::Utils::HTTP_STATUS_CODES[status]
-          "#{status} #{message}"
-        end
-
-        super env, msg
-      end
-    end
-
-    class InternalServerError < ServerError
-    end
-
-    class BadGateway < ServerError
-    end
-
-    class ServiceUnavailable < ServerError
-    end
-
-    class GatewayTimeout < ServerError
-    end
-
-    class UnexpectedStatus < ServerError
-      attr_reader :code, :uri
-      def initialize(code, uri)
-        @code = code
-        @uri = uri
-
-        msg = "Unexpected response status: #{code} from: #{uri.to_s}"
-        super nil, msg
-      end
-    end
-
-    class RecordNotSaved < ServerError
-      attr_reader :record
-
-      def initialize(message = nil, record = nil)
-        @record = record
-      end
-      def message
-        "Record not saved"
-      end
-    end
-  end
-end
+require 'rack'
+
+module JsonApiClient
+  module Errors
+    class ApiError < StandardError
+      attr_reader :env
+
+      def initialize(env, msg = nil)
+        @env = env
+        # Try to fetch json_api errors from response
+        msg = track_json_api_errors(msg)
+
+        super msg
+      end
+
+      private
+
+      # Try to fetch json_api errors from response
+      def track_json_api_errors(msg)
+        return msg unless env.try(:body).kind_of?(Hash) || env.body.key?('errors')
+
+        errors_msg = env.body['errors'].map { |e| e['title'] }.compact.join('; ').presence
+        return msg unless errors_msg
+
+        msg.nil? ? errors_msg : "#{msg} (#{errors_msg})"
+        # Just to be sure that it is back compatible
+      rescue StandardError
+        msg
+      end
+    end
+
+    class ClientError < ApiError
+    end
+
+    class ResourceImmutableError < StandardError
+      def initialize(msg = 'Resource immutable')
+        super msg
+      end
+    end
+
+    class AccessDenied < ClientError
+    end
+
+    class NotAuthorized < ClientError
+    end
+
+    class NotFound < ClientError
+      attr_reader :uri
+      def initialize(env_or_uri, msg = nil)
+        env = nil
+
+        if env_or_uri.kind_of?(Faraday::Env)
+          env = env_or_uri
+          @uri = env[:url]
+        else
+          @uri = env_or_uri
+        end
+
+        msg ||= "Resource not found: #{uri.to_s}"
+        super env, msg
+      end
+    end
+
+    class RequestTimeout < ClientError
+    end
+
+    class Conflict < ClientError
+      def initialize(env, msg = 'Resource already exists')
+        super env, msg
+      end
+    end
+
+    class TooManyRequests < ClientError
+    end
+
+    class ConnectionError < ApiError
+    end
+
+    class ServerError < ApiError
+      def initialize(env, msg = nil)
+        msg ||= begin
+          status = env.status
+          message = ::Rack::Utils::HTTP_STATUS_CODES[status]
+          "#{status} #{message}"
+        end
+
+        super env, msg
+      end
+    end
+
+    class InternalServerError < ServerError
+    end
+
+    class BadGateway < ServerError
+    end
+
+    class ServiceUnavailable < ServerError
+    end
+
+    class GatewayTimeout < ServerError
+    end
+
+    class UnexpectedStatus < ServerError
+      attr_reader :code, :uri
+      def initialize(code, uri)
+        @code = code
+        @uri = uri
+
+        msg = "Unexpected response status: #{code} from: #{uri.to_s}"
+        super nil, msg
+      end
+    end
+
+    class RecordNotSaved < ServerError
+      attr_reader :record
+
+      def initialize(message = nil, record = nil)
+        @record = record
+      end
+      def message
+        "Record not saved"
+      end
+    end
+  end
+end

data/lib/json_api_client/formatter.rb

@@ -1,145 +1,145 @@
-# Taken form jsonapi_resources formatter
-
-require 'active_support/inflector'
-
-module JsonApiClient
-  class Formatter
-    class << self
-      def format(arg)
-        arg.to_s
-      end
-
-      def unformat(arg)
-         # We call to_s() here so that unformat consistently returns a string
-         # (instead of a symbol) regardless which Formatter subclass it is called on
-        arg.to_s
-      end
-
-      def formatter_for(format)
-        formatter_class_name = "JsonApiClient::#{format.to_s.camelize}Formatter"
-        formatter_class_name.safe_constantize
-      end
-    end
-  end
-
-  class KeyFormatter < Formatter
-    class << self
-      def format(key)
-        super
-      end
-
-      def format_keys(hash)
-        Hash[
-          hash.map do |key, value|
-            [format(key).to_sym, value]
-          end
-        ]
-      end
-
-      def unformat(formatted_key)
-        super
-      end
-    end
-  end
-
-  class RouteFormatter < Formatter
-    class << self
-      def format(route)
-        super
-      end
-
-      def unformat(formatted_route)
-        super
-      end
-    end
-  end
-
-  class ValueFormatter < Formatter
-    class << self
-      def format(raw_value)
-        super(raw_value)
-      end
-
-      def unformat(value)
-        super(value)
-      end
-
-      def value_formatter_for(type)
-        formatter_name = "#{type.to_s.camelize}Value"
-        formatter_for(formatter_name)
-      end
-    end
-  end
-
-  class UnderscoredKeyFormatter < KeyFormatter
-  end
-
-  class CamelizedKeyFormatter < KeyFormatter
-    class << self
-      def format(key)
-        super.camelize(:lower)
-      end
-
-      def unformat(formatted_key)
-        formatted_key.to_s.underscore
-      end
-    end
-  end
-
-  class DasherizedKeyFormatter < KeyFormatter
-    class << self
-      def format(key)
-        super.dasherize
-      end
-
-      def unformat(formatted_key)
-        formatted_key.to_s.underscore
-      end
-    end
-  end
-
-  class DefaultValueFormatter < ValueFormatter
-    class << self
-      def format(raw_value)
-        raw_value
-      end
-    end
-  end
-
-  class IdValueFormatter < ValueFormatter
-    class << self
-      def format(raw_value)
-        return if raw_value.nil?
-        raw_value.to_s
-      end
-    end
-  end
-
-  class UnderscoredRouteFormatter < RouteFormatter
-  end
-
-  class CamelizedRouteFormatter < RouteFormatter
-    class << self
-      def format(route)
-        super.camelize(:lower)
-      end
-
-      def unformat(formatted_route)
-        formatted_route.to_s.underscore
-      end
-    end
-  end
-
-  class DasherizedRouteFormatter < RouteFormatter
-    class << self
-      def format(route)
-        super.dasherize
-      end
-
-      def unformat(formatted_route)
-        formatted_route.to_s.underscore
-      end
-    end
-  end
-
-end
+# Taken form jsonapi_resources formatter
+
+require 'active_support/inflector'
+
+module JsonApiClient
+  class Formatter
+    class << self
+      def format(arg)
+        arg.to_s
+      end
+
+      def unformat(arg)
+         # We call to_s() here so that unformat consistently returns a string
+         # (instead of a symbol) regardless which Formatter subclass it is called on
+        arg.to_s
+      end
+
+      def formatter_for(format)
+        formatter_class_name = "JsonApiClient::#{format.to_s.camelize}Formatter"
+        formatter_class_name.safe_constantize
+      end
+    end
+  end
+
+  class KeyFormatter < Formatter
+    class << self
+      def format(key)
+        super
+      end
+
+      def format_keys(hash)
+        Hash[
+          hash.map do |key, value|
+            [format(key).to_sym, value]
+          end
+        ]
+      end
+
+      def unformat(formatted_key)
+        super
+      end
+    end
+  end
+
+  class RouteFormatter < Formatter
+    class << self
+      def format(route)
+        super
+      end
+
+      def unformat(formatted_route)
+        super
+      end
+    end
+  end
+
+  class ValueFormatter < Formatter
+    class << self
+      def format(raw_value)
+        super(raw_value)
+      end
+
+      def unformat(value)
+        super(value)
+      end
+
+      def value_formatter_for(type)
+        formatter_name = "#{type.to_s.camelize}Value"
+        formatter_for(formatter_name)
+      end
+    end
+  end
+
+  class UnderscoredKeyFormatter < KeyFormatter
+  end
+
+  class CamelizedKeyFormatter < KeyFormatter
+    class << self
+      def format(key)
+        super.camelize(:lower)
+      end
+
+      def unformat(formatted_key)
+        formatted_key.to_s.underscore
+      end
+    end
+  end
+
+  class DasherizedKeyFormatter < KeyFormatter
+    class << self
+      def format(key)
+        super.dasherize
+      end
+
+      def unformat(formatted_key)
+        formatted_key.to_s.underscore
+      end
+    end
+  end
+
+  class DefaultValueFormatter < ValueFormatter
+    class << self
+      def format(raw_value)
+        raw_value
+      end
+    end
+  end
+
+  class IdValueFormatter < ValueFormatter
+    class << self
+      def format(raw_value)
+        return if raw_value.nil?
+        raw_value.to_s
+      end
+    end
+  end
+
+  class UnderscoredRouteFormatter < RouteFormatter
+  end
+
+  class CamelizedRouteFormatter < RouteFormatter
+    class << self
+      def format(route)
+        super.camelize(:lower)
+      end
+
+      def unformat(formatted_route)
+        formatted_route.to_s.underscore
+      end
+    end
+  end
+
+  class DasherizedRouteFormatter < RouteFormatter
+    class << self
+      def format(route)
+        super.dasherize
+      end
+
+      def unformat(formatted_route)
+        formatted_route.to_s.underscore
+      end
+    end
+  end
+
+end