flex_commerce_api 0.6.57 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df21fbb808a597a47e3ce03e124cde9285e26bbfdafe37af9783eed3fc43571
-  data.tar.gz: 1b628de8125b13534465116d350a5b9c6b79ff3227012857a874b8d8ea6a043e
+  metadata.gz: 30004ed9299f30f35981aab7dfebe49fb3665449c02f827c86d1e678e66d8776
+  data.tar.gz: ea5dcde40fca7ded2737675da0f0208ab2846b7fe4266769cf56b49275104a3a
 SHA512:
-  metadata.gz: fa63b986f6e5deae7834142534a7eb2051c2a5c4eeadf6059fefd578fbf83b4211fb890d27516a2bbbbfbaeec6f6fbae068c03d4e8c8598a79e3237023ea6d3f
-  data.tar.gz: d4d71f00eceda350a4824bf3d383409e3bbbf473042f7c6bbffe8078cf6ae3988dc77c0c2d07b4fd7e0e67fe56d9c4258ec7a88765f69c33a91c9c3ef2adbafb
+  metadata.gz: 5fb1d9ddc76030328010fa15f3985d9594650e603b399ecde71832d25fc2dcf7365305f30e09a38ee68baca6a4986ee779bd9d3965e40ae1316af9a150cc169f
+  data.tar.gz: ffcd68fc795a6221fd17b391f1859ebf4a142d0842c71f134d40077ac6c77154a2ad1be8e771e1336310298f6008bfb7952830fd34b911c773d11258dd543a51

data/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.5.3"
   spec.add_runtime_dependency "activesupport", ">= 4.0"
   spec.add_runtime_dependency "rack", ">= 1.6"
   spec.add_runtime_dependency "faraday-http-cache", "1.3.0"

data/lib/flex_commerce_api/base_resource.rb

@@ -17,6 +17,9 @@ require "flex_commerce_api/json_api_client_extension/parsers/parser"
 require "flex_commerce_api/json_api_client_extension/remote_builder"
 
 module FlexCommerceApi
+  JsonApiClientExtension::Paginator.page_param = "number"
+  JsonApiClientExtension::Paginator.per_page_param = "size"
+
   #
   # Base class for all flex commerce models
   #

data/lib/flex_commerce_api/version.rb

@@ -1,3 +1,3 @@
 module FlexCommerceApi
-  VERSION = '0.6.57'
+  VERSION = '0.7'
 end

data/lib/patches/json_api_client/builder.rb

@@ -0,0 +1,17 @@
+module JsonApiClient
+    module Query
+      class Builder
+        # This is a workaround because in the json_api_client gem they now parse
+        # the "last" link instead of the original behaviour:
+        # https://github.com/JsonApiClient/json_api_client/blob/v1.5.3/lib/json_api_client/query/builder.rb#L69
+        # This causes an error when Faraday parses our params due to the filter
+        # param appearing to be malformed.
+        #
+        # TODO: Look at fixing our links so that we can remove this workaround
+        # (platform ticket #7293)
+        def last
+          self.to_a.last
+        end
+      end
+    end
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flex_commerce_api
 version: !ruby/object:Gem::Version
-  version: 0.6.57
+  version: '0.7'
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -403,7 +403,7 @@ files:
 - lib/json_erb.rb
 - lib/json_struct.rb
 - lib/patches.rb
-- lib/patches/json_api_client/resource.rb
+- lib/patches/json_api_client/builder.rb
 - lib/paypal_express.rb
 - lib/paypal_express/additional_info.rb
 - lib/paypal_express/api.rb

data/lib/patches/json_api_client/resource.rb

@@ -1,50 +0,0 @@
-require "json_api_client/version"
-if ["1.1.1"].include?(JsonApiClient::VERSION)
-  require "json_api_client/resource"
-  module JsonApiClient
-    class Resource
-      def save
-        return false unless valid?
-
-        self.last_result_set = if persisted?
-          self.class.requestor.update(self)
-        else
-          self.class.requestor.create(self)
-        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
-          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
-            # This line has been added as part of https://github.com/JsonApiClient/json_api_client/pull/285
-            self.relationships.clear_changes_information
-          end
-          true
-        end
-      end
-    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)
-      * 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__}).
-    If not, add the current version to the allowed array at the top of this file.
-  )
-end