lucid-shopify 0.61.1 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d59c069d078e6fa47fe962a4d5ad0f14a3c78f7b6a727c66d6dfae0097fad9ec
-  data.tar.gz: 851bace61bdcaedaeb9b48270336caa77ebd13754118080b67d7c6bcad84ef05
+  metadata.gz: e66a0c2dcd13c2a44f4200675e90d3f90199fee2a199d6be48fb52ceaffab607
+  data.tar.gz: f9d500101e5a5cae6a1f6d5de0eac6a737d5e4b7f83127e353db267f68d0d01a
 SHA512:
-  metadata.gz: 4d3a9ea60b994ca6e5ae84122955ddfcc47b189d8bad46378bea6133595d1ce24ae54f7add5240a183e24f0f8d3269623718f8b7b83f6b624bd4f0591f3b8d7d
-  data.tar.gz: e5e04c7dd54caf988cfdeec9257f97ec0a9aa28e647d85c7882440233e182a837590b31d209c7fd59e58beb132bf9d3ce62de4862efb09d5aa8f1fd813d551c7
+  metadata.gz: b9ef5945b9bf554b1826b028ddca3492c106d0c661f1a4ab7c4286a0daddd6d583043c239fd71c6803b14a17c18e3449dd07f9493faed5bc0098d13da73139a1
+  data.tar.gz: 25b6dc870fff5fbc006f1654793e1ab4a35159956c7f5361584e16ecca8ce7664c8f1254c108a40178e8682a2e81b067132e59e7f688b5365956508aea87f05f

data/lib/lucid/shopify/bulk_request.rb

@@ -2,6 +2,7 @@
 
 require 'json'
 require 'lucid/shopify'
+require 'timeout'
 
 module Lucid
   module Shopify
@@ -71,21 +72,48 @@ module Lucid
 
         # Cancel the bulk operation.
         def cancel
-          client.post_graphql(credentials, <<~QUERY)
-            mutation {
-              bulkOperationCancel(id: "#{id}") {
-                userErrors {
-                  field
-                  message
+          begin
+            client.post_graphql(credentials, <<~QUERY)
+              mutation {
+                bulkOperationCancel(id: "#{id}") {
+                  userErrors {
+                    field
+                    message
+                  }
                 }
               }
-            }
-          QUERY
+            QUERY
+          rescue Response::GraphQLClientError => e
+            return if e.response.error_message?([
+              /cannot be canceled when it is completed/,
+            ])
+
+            raise e
+          end
 
-          loop do
-            status, _ = poll
+          poll_until(['CANCELED', 'COMPLETED'])
+        end
 
-            break unless status == 'CANCELING'
+        # Poll until operation status is met.
+        #
+        # @param statuses [Array<Regexp, String>] to terminate polling on
+        # @param timeout [Integer] in seconds
+        #
+        # @raise Timeout::Error
+        def poll_until(statuses, timeout: 60)
+          Timeout.timeout(timeout) do
+            loop do
+              status, _ = poll
+
+              break if statuses.any? do |expected_status|
+                case expected_status
+                when Regexp
+                  status.match?(expected_status)
+                when String
+                  status == expected_status
+                end
+              end
+            end
           end
         end
 
@@ -155,7 +183,12 @@ module Lucid
           }
         QUERY
 
-        Operation.new(client, credentials, op['id']).cancel if op && op['status'] == 'RUNNING'
+        case op&.fetch('status')
+        when 'CANCELING'
+          Operation.new(client, credentials, op['id']).poll_until(['CANCELED'])
+        when 'CREATED', 'RUNNING'
+          Operation.new(client, credentials, op['id']).cancel
+        end
 
         id = client.post_graphql(credentials, <<~QUERY)['data']['bulkOperationRunQuery']['bulkOperation']['id']
           mutation {

data/lib/lucid/shopify/response.rb

@@ -118,7 +118,7 @@ module Lucid
           raise ShopError.new(request, self), 'Shop is frozen, awaiting payment'
         when 403
           # NOTE: Not sure what this one means (undocumented).
-          if data_hash['errors'] =~ /unavailable shop/i
+          if error_message?(/unavailable shop/i)
             raise ShopError.new(request, self), 'Shop is unavailable'
           else
             raise ClientError.new(request, self)
@@ -229,12 +229,14 @@ module Lucid
       #
       # @return [Boolean]
       def error_message?(messages)
+        all_messages = error_messages + user_error_messages
+
         messages.any? do |message|
           case message
           when Regexp
-            error_messages.any? { |other_message| other_message.match?(message) }
+            all_messages.any? { |other_message| other_message.match?(message) }
           when String
-            error_messages.include?(message)
+            all_messages.include?(message)
           end
         end
       end

data/lib/lucid/shopify/version.rb

@@ -2,6 +2,6 @@
 
 module Lucid
   module Shopify
-    VERSION = '0.61.1'
+    VERSION = '0.62.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucid-shopify
 version: !ruby/object:Gem::Version
-  version: 0.61.1
+  version: 0.62.0
 platform: ruby
 authors:
 - Kelsey Judson