json_api_client 1.23.0 → 1.24.0

data/lib/json_api_client/included_data.rb

@@ -1,58 +1,58 @@
-module JsonApiClient
-  class IncludedData
-    attr_reader :data
-
-    def initialize(result_set, data)
-      record_class = result_set.record_class
-      grouped_data = data.group_by{|datum| datum["type"]}
-      grouped_included_set = grouped_data.each_with_object({}) do |(type, records), h|
-        klass = Utils.compute_type(record_class, record_class.key_formatter.unformat(type).singularize.classify)
-        h[type] = records.map do |record|
-          params = klass.parser.parameters_from_resource(record)
-          klass.load(params).tap do |resource|
-            resource.last_result_set = result_set
-          end
-        end
-      end
-
-      if record_class.search_included_in_result_set
-        # deep_merge overrides the nested Arrays o_O
-        # {a: [1,2]}.deep_merge(a: [3,4]) # => {a: [3,4]}
-        grouped_included_set.merge!(result_set.group_by(&:type)) do |_, resources1, resources2|
-          resources1 + resources2
-        end
-      end
-
-      grouped_included_set.each do |type, resources|
-        grouped_included_set[type] = resources.index_by { |resource| resource.attributes[:id] }
-      end
-
-      @data = grouped_included_set
-    end
-
-    def data_for(method_name, definition)
-      # If data is defined, pull the record from the included data
-      return nil unless data = definition["data"]
-
-      if data.is_a?(Array)
-        # has_many link
-        data.map(&method(:record_for)).compact
-      else
-        # has_one link
-        record_for(data)
-      end
-    end
-
-    def has_link?(name)
-      data.has_key?(name.to_s)
-    end
-
-    private
-
-    # should return a resource record of some type for this linked document
-    def record_for(link_def)
-      record = data[link_def["type"]]
-      record[link_def["id"]] if record
-    end
-  end
-end
+module JsonApiClient
+  class IncludedData
+    attr_reader :data
+
+    def initialize(result_set, data)
+      record_class = result_set.record_class
+      grouped_data = data.group_by{|datum| datum["type"]}
+      grouped_included_set = grouped_data.each_with_object({}) do |(type, records), h|
+        klass = Utils.compute_type(record_class, record_class.key_formatter.unformat(type).singularize.classify)
+        h[type] = records.map do |record|
+          params = klass.parser.parameters_from_resource(record)
+          klass.load(params).tap do |resource|
+            resource.last_result_set = result_set
+          end
+        end
+      end
+
+      if record_class.search_included_in_result_set
+        # deep_merge overrides the nested Arrays o_O
+        # {a: [1,2]}.deep_merge(a: [3,4]) # => {a: [3,4]}
+        grouped_included_set.merge!(result_set.group_by(&:type)) do |_, resources1, resources2|
+          resources1 + resources2
+        end
+      end
+
+      grouped_included_set.each do |type, resources|
+        grouped_included_set[type] = resources.index_by { |resource| resource.attributes[:id] }
+      end
+
+      @data = grouped_included_set
+    end
+
+    def data_for(method_name, definition)
+      # If data is defined, pull the record from the included data
+      return nil unless data = definition["data"]
+
+      if data.is_a?(Array)
+        # has_many link
+        data.map(&method(:record_for)).compact
+      else
+        # has_one link
+        record_for(data)
+      end
+    end
+
+    def has_link?(name)
+      data.has_key?(name.to_s)
+    end
+
+    private
+
+    # should return a resource record of some type for this linked document
+    def record_for(link_def)
+      record = data[link_def["type"]]
+      record[link_def["id"]] if record
+    end
+  end
+end

data/lib/json_api_client/linking/links.rb

@@ -1,22 +1,22 @@
-module JsonApiClient
-  module Linking
-    class Links
-      include Helpers::DynamicAttributes
-
-      def initialize(links)
-        self.attributes = links
-      end
-
-      def present?
-        attributes.present?
-      end
-
-      protected
-
-      def set_attribute(name, value)
-        attributes[name] = value
-      end
-
-    end
-  end
+module JsonApiClient
+  module Linking
+    class Links
+      include Helpers::DynamicAttributes
+
+      def initialize(links)
+        self.attributes = links
+      end
+
+      def present?
+        attributes.present?
+      end
+
+      protected
+
+      def set_attribute(name, value)
+        attributes[name] = value
+      end
+
+    end
+  end
 end

data/lib/json_api_client/linking/top_level_links.rb

@@ -1,39 +1,39 @@
-module JsonApiClient
-  module Linking
-    class TopLevelLinks
-
-      attr_reader :links, :record_class
-
-      def initialize(record_class, links)
-        @links = links
-        @record_class = record_class
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        links.has_key?(method.to_s) || super
-      end
-
-      def method_missing(method, *args)
-        if respond_to_missing?(method)
-          fetch_link(method)
-        else
-          super
-        end
-      end
-
-      def link_url_for(link_name)
-        link_definition = links.fetch(link_name.to_s)
-        if link_definition.is_a?(Hash)
-          link_definition["href"]
-        else
-          link_definition
-        end
-      end
-
-      def fetch_link(link_name)
-        return unless respond_to_missing?(link_name)
-        record_class.requestor.linked(link_url_for(link_name))
-      end
-    end
-  end
-end
+module JsonApiClient
+  module Linking
+    class TopLevelLinks
+
+      attr_reader :links, :record_class
+
+      def initialize(record_class, links)
+        @links = links
+        @record_class = record_class
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        links.has_key?(method.to_s) || super
+      end
+
+      def method_missing(method, *args)
+        if respond_to_missing?(method)
+          fetch_link(method)
+        else
+          super
+        end
+      end
+
+      def link_url_for(link_name)
+        link_definition = links.fetch(link_name.to_s)
+        if link_definition.is_a?(Hash)
+          link_definition["href"]
+        else
+          link_definition
+        end
+      end
+
+      def fetch_link(link_name)
+        return unless respond_to_missing?(link_name)
+        record_class.requestor.linked(link_url_for(link_name))
+      end
+    end
+  end
+end

data/lib/json_api_client/linking.rb

@@ -1,6 +1,6 @@
-module JsonApiClient
-  module Linking
-    autoload :Links, "json_api_client/linking/links"
-    autoload :TopLevelLinks, "json_api_client/linking/top_level_links"
-  end
+module JsonApiClient
+  module Linking
+    autoload :Links, "json_api_client/linking/links"
+    autoload :TopLevelLinks, "json_api_client/linking/top_level_links"
+  end
 end

data/lib/json_api_client/meta_data.rb

@@ -1,19 +1,19 @@
-module JsonApiClient
-  class MetaData
-    include Helpers::DynamicAttributes
-
-    attr_accessor :record_class
-
-    def initialize(data, record_class = nil)
-      self.record_class = record_class
-      self.attributes = data
-    end
-
-    protected
-
-    def key_formatter
-      record_class && record_class.key_formatter
-    end
-
-  end
-end
+module JsonApiClient
+  class MetaData
+    include Helpers::DynamicAttributes
+
+    attr_accessor :record_class
+
+    def initialize(data, record_class = nil)
+      self.record_class = record_class
+      self.attributes = data
+    end
+
+    protected
+
+    def key_formatter
+      record_class && record_class.key_formatter
+    end
+
+  end
+end

data/lib/json_api_client/middleware/json_request.rb

@@ -1,26 +1,26 @@
-module JsonApiClient
-  module Middleware
-    class JsonRequest < Faraday::Middleware
-      def call(environment)
-        accept_header = update_accept_header(environment[:request_headers])
-
-        environment[:request_headers]["Content-Type"] = 'application/vnd.api+json'
-        environment[:request_headers]["Accept"] = accept_header
-        @app.call(environment)
-      end
-
-      private
-
-      def update_accept_header(headers)
-        return 'application/vnd.api+json' if headers["Accept"].nil?
-        accept_params = headers["Accept"].split(",")
-
-        unless accept_params.include?('application/vnd.api+json')
-          accept_params.unshift('application/vnd.api+json')
-        end
-
-        accept_params.join(",")
-      end
-    end
-  end
-end
+module JsonApiClient
+  module Middleware
+    class JsonRequest < Faraday::Middleware
+      def call(environment)
+        accept_header = update_accept_header(environment[:request_headers])
+
+        environment[:request_headers]["Content-Type"] = 'application/vnd.api+json'
+        environment[:request_headers]["Accept"] = accept_header
+        @app.call(environment)
+      end
+
+      private
+
+      def update_accept_header(headers)
+        return 'application/vnd.api+json' if headers["Accept"].nil?
+        accept_params = headers["Accept"].split(",")
+
+        unless accept_params.include?('application/vnd.api+json')
+          accept_params.unshift('application/vnd.api+json')
+        end
+
+        accept_params.join(",")
+      end
+    end
+  end
+end

data/lib/json_api_client/middleware/status.rb

@@ -1,67 +1,67 @@
-module JsonApiClient
-  module Middleware
-    class Status < Faraday::Middleware
-      def initialize(app, options)
-        super(app)
-        @options = options
-      end
-
-      def call(environment)
-        @app.call(environment).on_complete do |env|
-          handle_status(env[:status], env)
-
-          # look for meta[:status]
-          if env[:body].is_a?(Hash)
-            code = env[:body].fetch("meta", {}).fetch("status", 200).to_i
-            handle_status(code, env)
-          end
-        end
-      rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
-        raise Errors::ConnectionError.new environment, e.to_s
-      end
-
-      private
-
-      def custom_handler_for(code)
-        @options.fetch(:custom_handlers, {})[code]
-      end
-
-      def handle_status(code, env)
-        custom_handler = custom_handler_for(code)
-        return custom_handler.call(env) if custom_handler.present?
-
-        case code
-        when 200..399
-        when 401
-          raise Errors::NotAuthorized, env
-        when 403
-          raise Errors::AccessDenied, env
-        when 404
-          raise Errors::NotFound, env
-        when 408
-          raise Errors::RequestTimeout, env
-        when 409
-          raise Errors::Conflict, env
-        when 422
-          # Allow to proceed as resource errors will be populated
-        when 429
-          raise Errors::TooManyRequests, env
-        when 400..499
-          raise Errors::ClientError, env
-        when 500
-          raise Errors::InternalServerError, env
-        when 502
-          raise Errors::BadGateway, env
-        when 503
-          raise Errors::ServiceUnavailable, env
-        when 504
-          raise Errors::GatewayTimeout, env
-        when 501..599
-          raise Errors::ServerError, env
-        else
-          raise Errors::UnexpectedStatus.new(code, env[:url])
-        end
-      end
-    end
-  end
-end
+module JsonApiClient
+  module Middleware
+    class Status < Faraday::Middleware
+      def initialize(app, options)
+        super(app)
+        @options = options
+      end
+
+      def call(environment)
+        @app.call(environment).on_complete do |env|
+          handle_status(env[:status], env)
+
+          # look for meta[:status]
+          if env[:body].is_a?(Hash)
+            code = env[:body].fetch("meta", {}).fetch("status", 200).to_i
+            handle_status(code, env)
+          end
+        end
+      rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+        raise Errors::ConnectionError.new environment, e.to_s
+      end
+
+      private
+
+      def custom_handler_for(code)
+        @options.fetch(:custom_handlers, {})[code]
+      end
+
+      def handle_status(code, env)
+        custom_handler = custom_handler_for(code)
+        return custom_handler.call(env) if custom_handler.present?
+
+        case code
+        when 200..399
+        when 401
+          raise Errors::NotAuthorized, env
+        when 403
+          raise Errors::AccessDenied, env
+        when 404
+          raise Errors::NotFound, env
+        when 408
+          raise Errors::RequestTimeout, env
+        when 409
+          raise Errors::Conflict, env
+        when 422
+          # Allow to proceed as resource errors will be populated
+        when 429
+          raise Errors::TooManyRequests, env
+        when 400..499
+          raise Errors::ClientError, env
+        when 500
+          raise Errors::InternalServerError, env
+        when 502
+          raise Errors::BadGateway, env
+        when 503
+          raise Errors::ServiceUnavailable, env
+        when 504
+          raise Errors::GatewayTimeout, env
+        when 501..599
+          raise Errors::ServerError, env
+        else
+          raise Errors::UnexpectedStatus.new(code, env[:url])
+        end
+      end
+    end
+  end
+end

data/lib/json_api_client/middleware.rb

@@ -1,6 +1,6 @@
-module JsonApiClient
-  module Middleware
-    autoload :JsonRequest, 'json_api_client/middleware/json_request'
-    autoload :Status, 'json_api_client/middleware/status'
-  end
-end
+module JsonApiClient
+  module Middleware
+    autoload :JsonRequest, 'json_api_client/middleware/json_request'
+    autoload :Status, 'json_api_client/middleware/status'
+  end
+end