shopify-client 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f47627632cde83fad96703fba4335e00b5f04a303c40d7c276558ed0d59c04
-  data.tar.gz: 9b0fffc153c69cd1caf0cc67aae87070af2a780dbec6d13c71b63513c0165bf3
+  metadata.gz: 970f20e5e3da6050c6b5d6dd494ca7426079b34c679390e6e0eeee0113eace8a
+  data.tar.gz: '080d4c2dd0f31c41ab6da721a10808d984899318ed591f9c5cf32238bd1d42ee'
 SHA512:
-  metadata.gz: 400820d737e8aa67dea8d4e08e3c3f3d77f5185c91c69ee1e3605707d56d22508cfb64a7cbe9789e1d5f5b9274cbee8ce9f654e7da580800a3c5aa4edd74a294
-  data.tar.gz: 21ecdc9776deb76f0a36b7be42b4a0ab8ad90659f2a47c756f2f9aebfb69377722b6af7710c5915272cec99b1067ecaf9e5cff635de995804fb379a9a3b1ba3a
+  metadata.gz: 29c0d2d0a38ab6f7d335230b6354ac750f318c6094499908e2332b2713c19b1ebd3b6e6566519f3924f549d6b9b3fd7934334731cf72ff9da30b0bf68d379a4d
+  data.tar.gz: 8229de3254fd8bb22401a86278cba84c16718b620cea1f89cb1c4d5c0d57eccfbe6c33d033d5db432647d5cd287d6daee76f032f6ef968df46a715862bb248ed

data/lib/shopify-client/client.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'async/http/faraday'
 require 'faraday'
 require 'faraday_middleware'
 
@@ -18,6 +19,7 @@ module ShopifyClient
         },
         url: "https://#{myshopify_domain}/admin/api/#{ShopifyClient.config.api_version}",
       ) do |conn|
+        conn.adapter :async_http
         # Request throttling to avoid API rate limit.
         conn.use default_throttling_strategy
         # Retry for 429, too many requests.

data/lib/shopify-client/config_error.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module ShopifyClient
+  ConfigError = Class.new(Error)
+end

data/lib/shopify-client/create_all_webhooks.rb

@@ -6,20 +6,52 @@ module ShopifyClient
     #
     # @param client [Client]
     #
-    # @return [Array<Hash>] response data
+    # @return [Array<String>] GraphQL IDs
     def call(client)
-      create_webhook = CreateWebhook.new
+      raise ConfigError, 'webhook_uri is not set' unless ShopifyClient.config.webhook_uri
 
-      ShopifyClient.webhooks.map do |topic, options|
-        Thread.new do
-          webhook = {}.tap do |webhook|
-            webhook[:topic] = topic
-            webhook[:fields] = options[:fields] unless options[:fields].empty?
-          end
+      webhooks_with_index = ShopifyClient.webhooks.each_with_index
 
-          create_webhook.(client, webhook)
+      return [] unless webhooks_with_index.any?
+
+      client.graphql(%(
+        mutation webhookSubscriptionCreate(
+          #{webhooks_with_index.map { |_, i| %(
+            $topic#{i}: WebhookSubscriptionTopic!
+            $webhookSubscription#{i}: WebhookSubscriptionInput!
+          )}.join("\n")}
+        ) {
+          #{webhooks_with_index.map { |_, i| %(
+            webhookSubscriptionCreate#{i}: webhookSubscriptionCreate(
+              topic: $topic#{i}
+              webhookSubscription: $webhookSubscription#{i}
+            ) {
+              userErrors {
+                field
+                message
+              }
+              webhookSubscription {
+                id
+              }
+            }
+          )}.join("\n")}
+        }
+      ), webhooks_with_index.each_with_object({}) do |((topic, options), i), variables|
+        variables["topic#{i}"] = topic_to_graphql(topic)
+        variables["webhookSubscription#{i}"] = {}.tap do |subscription|
+          subscription['callbackUrl'] = ShopifyClient.config.webhook_uri
+          subscription['includeFields'] = options[:fields] unless options[:fields].empty?
         end
-      end.map(&:value)
+      end).data['data'].map do |_, mutation|
+        mutation['webhookSubscription']['id']
+      end
+    end
+
+    # @param topic [String]
+    #
+    # @return [String]
+    private def topic_to_graphql(topic)
+      topic.upcase.sub('/', '_')
     end
   end
 end

data/lib/shopify-client/create_webhook.rb

@@ -7,11 +7,13 @@ module ShopifyClient
     # @option webhook [String] :topic
     # @option webhook [Array<String>] :fields
     #
-    # @return [Hash] response data
+    # @return [Integer] ID
     def call(client, webhook)
+      raise ConfigError, 'webhook_uri is not set' unless ShopifyClient.config.webhook_uri
+
       client.post('webhooks', webhook: webhook.merge(
         address: ShopifyClient.config.webhook_uri,
-      ))
+      )).data['webhook']['id']
     rescue Response::Error => e
       raise e unless e.response.errors.message?([
         /has already been taken/,

data/lib/shopify-client/delete_all_webhooks.rb

@@ -5,18 +5,40 @@ module ShopifyClient
     # Delete any existing webhooks.
     #
     # @param client [Client]
-    #
-    # @return [Array<Hash>] response data
-    def call(client)
-      webhooks = client.get('webhooks').data['webhooks']
+    # @param ids [Array<Integer>, nil] GraphQL IDs
+    def call(client, ids: nil)
+      ids ||= client.graphql(%({
+        webhookSubscriptions(first: 100) {
+          edges {
+            node {
+              id
+            }
+          }
+        }
+      })).data['data']['webhookSubscriptions']['edges'].map do |edge|
+        edge['node']['id']
+      end
 
-      delete_webhook = DeleteWebhook.new
+      return if ids.empty?
 
-      webhooks.map do |webhook|
-        Thread.new do
-          delete_webhook.(client, webhook['id'])
-        end
-      end.map(&:value)
+      client.graphql(%(
+        mutation webhookSubscriptionDelete(
+          #{ids.each_with_index.map { |_, i| %(
+            $id#{i}: ID!
+          )}.join("\n")}
+        ) {
+          #{ids.each_with_index.map { |_, i| %(
+            webhookSubscriptionDelete#{i}: webhookSubscriptionDelete(id: $id#{i}) {
+              userErrors {
+                field
+                message
+              }
+            }
+          )}.join("\n")}
+        }
+      ), ids.each_with_index.each_with_object({}) do |(id, i), variables|
+        variables["id#{i}"] = id
+      end)
     end
   end
 end

data/lib/shopify-client/delete_webhook.rb

@@ -4,8 +4,6 @@ module ShopifyClient
   class DeleteWebhook
     # @param client [Client]
     # @param id [Integer]
-    #
-    # @return [Hash] response data
     def call(client, id)
       client.delete("webhooks/#{id}")
     end

data/lib/shopify-client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ShopifyClient
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Kelsey Judson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.29'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.29'
+- !ruby/object:Gem::Dependency
+  name: async-http-faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +181,7 @@ files:
 - lib/shopify-client/client.rb
 - lib/shopify-client/client/logging.rb
 - lib/shopify-client/client/normalise_path.rb
+- lib/shopify-client/config_error.rb
 - lib/shopify-client/cookieless/check_header.rb
 - lib/shopify-client/cookieless/decode_session_token.rb
 - lib/shopify-client/cookieless/middleware.rb