json_api_client 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1eaf54d769a3c0308319a18629440a2fea1fcdc
-  data.tar.gz: da232e4dfd3b4e13a45c69c22b993fa9c08f209b
+  metadata.gz: ed66b4d235079e662896ac7076427c21c716706c
+  data.tar.gz: c70ff83b6e97b0671d584e68fc6958b41bd75246
 SHA512:
-  metadata.gz: 9737c509ddc0c91b6bf759e2b891acee5de9fe7c99e83f88bf4b1f8deef40b648dc166a03bad952ebcac0aada03a39aafcc538f05adea2473ec28a25bf54f2a2
-  data.tar.gz: b5e197b2d9164b5496cb0df20d248660d6191d5186403ea0da9f6df234bd2d9275974214000c5a730d07dac0ecfd0a40323d0727e95d8ae77f37d4347919f69d
+  metadata.gz: 57f163489d42ceff20dc4ab15de433c5d30af28daa0332d9bef2a990dc398de3b92d9f8b2d1e6b947943d88f8b031b533bb55fcfb406f79fde020d1b1517e42d
+  data.tar.gz: 5b431c9c1e10f1197bff2558d776f92ff9ecec69cb484a6c603e07d47ef1ae03bc00a2511b9f7849a17d7ba5e9fb85617ed72fe82ace564a78ec9fdbb9a641f5

data/lib/json_api_client/errors.rb

@@ -2,7 +2,8 @@ module JsonApiClient
   module Errors
     class ApiError < StandardError
       attr_reader :env
-      def initialize(env)
+      def initialize(env, msg = nil)
+        super msg
         @env = env
       end
     end
@@ -20,14 +21,14 @@ module JsonApiClient
     end
 
     class ServerError < ApiError
-      def message
-        "Internal server error"
+      def initialize(env, msg = 'Internal server error')
+        super env, msg
       end
     end
 
     class Conflict < ServerError
-      def message
-        "Resource already exists"
+      def initialize(env, msg = 'Resource already exists')
+        super env, msg
       end
     end
 
@@ -51,6 +52,5 @@ module JsonApiClient
         "Unexpected response status: #{code} from: #{uri.to_s}"
       end
     end
-
   end
 end

data/lib/json_api_client/included_data.rb

@@ -4,15 +4,18 @@ module JsonApiClient
 
     def initialize(result_set, data)
       record_class = result_set.record_class
-      grouped_data = data.group_by{|datum| datum["type"]}
-      @data = grouped_data.inject({}) do |h, (type, records)|
+      included_set = data.map do |datum|
+        type = datum["type"]
         klass = Utils.compute_type(record_class, record_class.key_formatter.unformat(type).singularize.classify)
-        h[type] = records.map do |datum|
-          params = klass.parser.parameters_from_resource(datum)
-          resource = klass.load(params)
-          resource.last_result_set = result_set
-          resource
-        end.index_by(&:id)
+        params = klass.parser.parameters_from_resource(datum)
+        resource = klass.load(params)
+        resource.last_result_set = result_set
+        resource
+      end
+
+      included_set.concat(result_set) if record_class.search_included_in_result_set
+      @data = included_set.group_by(&:type).inject({}) do |h, (type, resources)|
+        h[type] = resources.index_by(&:id)
         h
       end
     end

data/lib/json_api_client/middleware/status.rb

@@ -11,8 +11,8 @@ module JsonApiClient
             handle_status(code, env)
           end
         end
-      rescue Faraday::ConnectionFailed, Faraday::TimeoutError
-        raise Errors::ConnectionError, environment
+      rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+        raise Errors::ConnectionError.new environment, e.to_s
       end
 
       protected

data/lib/json_api_client/resource.rb

@@ -34,6 +34,7 @@ module JsonApiClient
                     :route_format,
                     :request_params_class,
                     :keep_request_params,
+                    :search_included_in_result_set,
                     instance_accessor: false
     class_attribute :add_defaults_to_changes,
                     instance_writer: false
@@ -50,6 +51,7 @@ module JsonApiClient
     self.request_params_class = RequestParams
     self.keep_request_params = false
     self.add_defaults_to_changes = false
+    self.search_included_in_result_set = false
 
     #:underscored_key, :camelized_key, :dasherized_key, or custom
     self.json_key_format = :underscored_key
@@ -584,10 +586,14 @@ module JsonApiClient
       relationships.as_json_api
     end
 
+    def error_message_for(error)
+      error.error_msg
+    end
+
     def fill_errors
       last_result_set.errors.each do |error|
         key = self.class.key_formatter.unformat(error.error_key)
-        errors.add(key, error.error_msg)
+        errors.add(key, error_message_for(error))
       end
     end
   end

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-24 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport