Upgrade json_api_client gem

flex-commerce-api.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "json_matchers", ["~> 0.5", ">= 0.5.1"]
 
   spec.add_dependency "oj", "~> 2.12"
-  spec.add_runtime_dependency "json_api_client", "1.1.1"
+  spec.add_runtime_dependency "json_api_client", "1.6.0"
   spec.add_runtime_dependency "activesupport", ">= 4.0"
   spec.add_runtime_dependency "rack", ">= 1.6"
   spec.add_runtime_dependency "faraday-http-cache", "1.3.0"

lib/flex_commerce_api/base_resource.rb

@@ -17,6 +17,10 @@
 require "flex_commerce_api/json_api_client_extension/remote_builder"
 
 module FlexCommerceApi
+  # Set the pagination param
+  JsonApiClientExtension::Paginator.page_param = "number"
+  JsonApiClientExtension::Paginator.per_page_param = "size"
+
   #
   # Base class for all flex commerce models
   #

lib/flex_commerce_api/json_api_client_extension/flexible_connection.rb

@@ -12,6 +12,7 @@ def initialize(options = {})
         include_previewed = options.fetch :include_previewed, false
         @faraday = Faraday.new(site) do |builder|
           builder.request :json
+          builder.use FaradayMiddleware::Gzip
           builder.use JsonApiClientExtension::SaveRequestBodyMiddleware
           builder.use JsonApiClientExtension::JsonFormatMiddleware if add_json_api_extension
           builder.use JsonApiClientExtension::PreviewedRequestMiddleware if include_previewed

lib/flex_commerce_api/json_api_client_extension/remote_builder.rb

@@ -1,10 +1,10 @@
 module FlexCommerceApi
   module JsonApiClientExtension
     class RemoteBuilder < ::JsonApiClient::Query::Builder
-      def initialize(klass, path: klass.path, connection: klass.connection)
-        super(klass)
-        self.connection = connection
-        self.path = path
+      def initialize(klass, opts = {})
+        super(klass, opts)
+        self.connection = opts.fetch(:connection, klass.connection)
+        self.path = opts.fetch(:path, klass.path)
       end
 
       def find(args = {})
@@ -21,7 +21,7 @@ def find(args = {})
       private
 
       def get_request(params)
-        klass.parser.parse(klass, connection.run(:get, path, params, klass.custom_headers))
+        klass.parser.parse(klass, connection.run(:get, path, params: params, headers: klass.custom_headers))
       end
       attr_accessor :path, :connection
     end

lib/flex_commerce_api/json_api_client_extension/requestor.rb

@@ -4,20 +4,20 @@ class Requestor < ::JsonApiClient::Query::Requestor
       # expects a record
       def create(record)
         request(:post, klass.path(record.attributes, record), {
-                         data: record.as_json_api
+                         body: { data: record.as_json_api }
                      })
       end
 
       def update(record)
         request(:patch, resource_path(record.attributes, record), {
-                          data: record.as_json_api
+                          body: { data: record.as_json_api }
                       })
       end
 
       def get(params = {})
         path = resource_path(params)
         params.delete(klass.primary_key)
-        request(:get, path, params)
+        request(:get, path, params: params)
       end
 
       def destroy(record)
@@ -39,4 +39,4 @@ def encoded(part)
       end
     end
   end
-end
+end

lib/patches/json_api_client/resource.rb

@@ -1,5 +1,6 @@
 require "json_api_client/version"
-if ["1.1.1"].include?(JsonApiClient::VERSION)
+
+if ["1.1.1", "1.5.3"].include?(JsonApiClient::VERSION)
   require "json_api_client/resource"
   module JsonApiClient
     class Resource
@@ -13,20 +14,13 @@ def save
         end
 
         if last_result_set.has_errors?
-          last_result_set.errors.each do |error|
-            if error.source_parameter
-              errors.add(error.source_parameter, error.title || error.detail)
-            else
-              errors.add(:base, error.title || error.detail)
-            end
-          end
+          fill_errors
           false
         else
           self.errors.clear if self.errors
           mark_as_persisted!
           if updated = last_result_set.first
             self.attributes = updated.attributes
-            # This line has been added as part of https://github.com/chingor13/json_api_client/pull/238
             self.links.attributes = updated.links.attributes
             self.relationships.attributes = updated.relationships.attributes
             clear_changes_information
@@ -39,9 +33,8 @@ def save
     end
   end
 else
-  raise %q(
-    Please check these two PRs:
-      * https://github.com/chingor13/json_api_client/pull/238 (This was released in version 1.5.0)
+  puts %q(
+    Please check this PR:
       * https://github.com/JsonApiClient/json_api_client/pull/285 (This hasn't yet been released at the time of writing this)
 
     If both have been merged into the gem version you are using, remove this file (#{__FILE__}).