shopify_graphql 1.2.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20f7b85f9a4a22fd1c3ea0509ec496f3447a2764fedf105539cab20274ed221
-  data.tar.gz: 966022527dd821e837c200d6c1df8ca84236b05ed5e311c6ac13dbabe00322f9
+  metadata.gz: fe9ea3cbb7c46d86fe1281d9658cc1de370db1b306b29aa331c1c8ac9ae94f0d
+  data.tar.gz: ab91936f744cd3c40ee1b81952426a839e26fb3fd8b9ca55defa5248c22ed812
 SHA512:
-  metadata.gz: 02c0027937db4125f3a1146275a999e1c6657ebe28682d5e0da81d34fcebac78796877abc4e7d1572de84599a82033d2140cabd8afbdd9b39951e428a9d4644f
-  data.tar.gz: 4eeb9be4a243c5bcba638857a6bfa29f28e20a94ba1d3aa236ac30fdf7a2a6587bd4d74a6b7a53349118a60072458fc87fc255c16560b76b07c0d64c33e2ae13
+  metadata.gz: 2ef56f4a0248e446d3063fd6ef92e13743d65a6ecefd523c8b70444f52353667e9b082efb13177a5912ad598425c6382e0ac36321aab231b46f73871e1109a06
+  data.tar.gz: 3c483532a0d6dc2d853a172a357a07319466bad2313937a1f57f4f359a2978affeacb80f3e3b5c3df287bc2e07565d692e831dff7564a22cc9a02a1522bab59f

data/README.md

@@ -676,12 +676,33 @@ ShopifyGraphql.handle_user_errors(response)
 
 ## Built-in Graphql calls
 
+- `ShopifyGraphql::CurrentShop`:
+
+  Equivalent to `ShopifyAPI::Shop.current`. Usage example:
+
+  ```rb
+  shop = ShopifyGraphql::CurrentShop.call
+  puts shop.name
+  ```
+
+  Or with locales (requires `read_locales` scope):
+
+  ```rb
+  shop = ShopifyGraphql::CurrentShop.call(with_locales: true)
+  puts shop.primary_locale
+  puts shop.shop_locales
+  ```
+
 - `ShopifyGraphql::CancelSubscription`
 - `ShopifyGraphql::CreateRecurringSubscription`
 - `ShopifyGraphql::CreateUsageSubscription`
 - `ShopifyGraphql::GetAppSubscription`
 - `ShopifyGraphql::UpsertPrivateMetafield`
 - `ShopifyGraphql::DeletePrivateMetafield`
+- `ShopifyGraphql::CreateBulkMutation`
+- `ShopifyGraphql::CreateBulkQuery`
+- `ShopifyGraphql::CreateStagedUploads`
+- `ShopifyGraphql::GetBulkOperation`
 
 Built-in wrappers are located in [`app/graphql/shopify_graphql`](/app/graphql/shopify_graphql/) folder. You can use them directly in your apps or as an example to create your own wrappers.
 
@@ -709,9 +730,73 @@ response.query_cost # => 1
 response.points_maxed?(threshold: 100) # => false
 ```
 
-## Graphql webhooks
+## Custom apps
+
+In custom apps, if you're using `shopify_app` gem, then the setup is similar public apps. Except `Shop` model which must include class method to make queries to your store:
+
+```rb
+# app/models/shop.rb
+class Shop < ActiveRecord::Base
+  include ShopifyApp::ShopSessionStorageWithScopes
+
+  def self.system
+    new(
+      shopify_domain: "MYSHOPIFY_DOMAIN",
+      shopify_token: "API_ACCESS_TOKEN_FOR_CUSTOM_APP"
+    )
+  end
+end
+```
+
+Using this method, you should be able to make API calls like this:
+
+```rb
+Shop.system.with_shopify_session do
+  GetOrder.call(id: order.shopify_gid)
+end
+```
+
+If you're not using `shopify_app` gem, then you need to setup `ShopifyAPI::Context` manually:
+
+```rb
+# config/initializers/shopify_api.rb
+ShopifyAPI::Context.setup(
+  api_key: "XXX",
+  api_secret_key: "XXXX",
+  scope: "read_orders,read_products",
+  is_embedded: false,
+  api_version: "2024-07",
+  is_private: true,
+)
+```
+
+And create another method in Shop model to make queries to your store:
+
+```rb
+# app/models/shop.rb
+def Shop
+  def self.with_shopify_session(&block)
+    ShopifyAPI::Auth::Session.temp(
+      shop: "MYSHOPIFY_DOMAIN",
+      access_token: "API_ACCESS_TOKEN_FOR_CUSTOM_APP",
+      &block
+    )
+  end
+end
+```
+
+Using this method, you should be able to make API calls like this:
+
+```rb
+Shop.with_shopify_session do
+  GetOrder.call(id: order.shopify_gid)
+end
+```
+
+## Graphql webhooks (deprecated)
 
-> Since version 10 `shopify_api` gem includes built-in support for Graphql webhooks. If you are using `shopify_api` version 10 or higher you don't need to use this gem to handle Graphql webhooks. See [`shopify_app` documentation](https://github.com/Shopify/shopify_app/blob/main/docs/shopify_app/webhooks.md) for more details.
+> [!WARNING]
+> ShopifyGraphql webhooks are deprecated and will be removed in v3.0. Please use `shopify_app` gem for handling webhooks. See [`shopify_app` documentation](https://github.com/Shopify/shopify_app/blob/main/docs/shopify_app/webhooks.md) for more details.
 
 The gem has built-in support for Graphql webhooks (similar to `shopify_app`). To enable it add the following config to `config/initializers/shopify_app.rb`:
 

data/app/graphql/shopify_graphql/create_bulk_mutation.rb

@@ -0,0 +1,27 @@
+module ShopifyGraphql
+  class CreateBulkMutation
+    include Mutation
+
+    MUTATION = <<~GRAPHQL
+      mutation($mutation: String!, $stagedUploadPath: String!) {
+        bulkOperationRunMutation(mutation: $mutation, stagedUploadPath: $stagedUploadPath) {
+          bulkOperation {
+            id
+            status
+          }
+          userErrors {
+            field
+            message
+          }
+        }
+      }
+    GRAPHQL
+
+    def call(mutation:, staged_upload_path:)
+      response = execute(MUTATION, mutation: mutation, stagedUploadPath: staged_upload_path)
+      response.data = response.data.bulkOperationRunMutation
+      handle_user_errors(response.data)
+      response
+    end
+  end
+end

data/app/graphql/shopify_graphql/create_bulk_query.rb

@@ -0,0 +1,27 @@
+module ShopifyGraphql
+  class CreateBulkQuery
+    include Mutation
+
+    MUTATION = <<~GRAPHQL
+      mutation($query: String!) {
+        bulkOperationRunQuery(query: $query) {
+          bulkOperation {
+            id
+            status
+          }
+          userErrors {
+            field
+            message
+          }
+        }
+      }
+    GRAPHQL
+
+    def call(query:)
+      response = execute(MUTATION, query: query)
+      response.data = response.data.bulkOperationRunQuery
+      handle_user_errors(response.data)
+      response
+    end
+  end
+end

data/app/graphql/shopify_graphql/create_staged_uploads.rb

@@ -0,0 +1,31 @@
+module ShopifyGraphql
+  class CreateStagedUploads
+    include Mutation
+
+    MUTATION = <<~GRAPHQL
+      mutation stagedUploadsCreate($input: [StagedUploadInput!]!) {
+        stagedUploadsCreate(input: $input) {
+          stagedTargets {
+            url
+            resourceUrl
+            parameters {
+              name
+              value
+            }
+          }
+          userErrors{
+            field,
+            message
+          }
+        }
+      }
+    GRAPHQL
+
+    def call(input:)
+      response = execute(MUTATION, input: input)
+      response.data = response.data.stagedUploadsCreate
+      handle_user_errors(response.data)
+      response
+    end
+  end
+end

data/app/graphql/shopify_graphql/current_shop.rb

@@ -0,0 +1,139 @@
+module ShopifyGraphql
+  class CurrentShop
+    include ShopifyGraphql::Query
+
+    QUERY = <<~GRAPHQL
+      query {
+        shop {
+          id
+          name
+          email
+          contactEmail
+          myshopifyDomain
+          primaryDomain {
+            host
+          }
+          #CREATED_AT#
+          #UPDATED_AT#
+          #SHOP_OWNER_NAME#
+          currencyCode
+          billingAddress {
+            country
+            countryCodeV2
+            province
+            city
+            address1
+            address2
+            zip
+            latitude
+            longitude
+            phone
+          }
+          timezoneAbbreviation
+          ianaTimezone
+          plan {
+            displayName
+          }
+          currencyFormats {
+            moneyFormat
+            moneyInEmailsFormat
+            moneyWithCurrencyFormat
+            moneyWithCurrencyInEmailsFormat
+          }
+          weightUnit
+          taxShipping
+          taxesIncluded
+          setupRequired
+          checkoutApiSupported
+          transactionalSmsDisabled
+          enabledPresentmentCurrencies
+          #SMS_CONSENT#
+        }
+        #LOCALES_SUBQUERY#
+      }
+    GRAPHQL
+    LOCALES_SUBQUERY = <<~GRAPHQL
+      shopLocales {
+        locale
+        primary
+      }
+    GRAPHQL
+
+    def call(with_locales: false)
+      query = prepare_query(QUERY, with_locales: with_locales)
+      response = execute(query)
+      parse_data(response.data, with_locales: with_locales)
+    end
+
+    private
+
+    def prepare_query(query, with_locales:)
+      query = query.gsub("#LOCALES_SUBQUERY#", with_locales ? LOCALES_SUBQUERY : "")
+      if ShopifyAPI::Context.api_version.in?(%w[2024-01 2024-04 2024-07])
+        query.gsub!("#SHOP_OWNER_NAME#", "")
+      else
+        query.gsub!("#SHOP_OWNER_NAME#", "shopOwnerName")
+      end
+      if ShopifyAPI::Context.api_version.in?(%w[2024-01])
+        query.gsub!("#CREATED_AT#", "")
+        query.gsub!("#UPDATED_AT#", "")
+        query.gsub!("#SMS_CONSENT#", "")
+      else
+        query.gsub!("#CREATED_AT#", "createdAt")
+        query.gsub!("#UPDATED_AT#", "updatedAt")
+        query.gsub!("#SMS_CONSENT#", "marketingSmsConsentEnabledAtCheckout")
+      end
+      query
+    end
+
+    def parse_data(data, with_locales: false)
+      plan_display_name = ShopifyGraphql.normalize_plan_display_name(data.shop.plan.displayName)
+      plan_name = ShopifyGraphql::DISPLAY_NAME_TO_PLAN[plan_display_name]
+      response = OpenStruct.new(
+        id: data.shop.id.split("/").last.to_i,
+        name: data.shop.name,
+        email: data.shop.email,
+        customer_email: data.shop.contactEmail,
+        myshopify_domain: data.shop.myshopifyDomain,
+        domain: data.shop.primaryDomain.host,
+        created_at: data.shop.createdAt,
+        updated_at: data.shop.updatedAt,
+        shop_owner: data.shop.shopOwnerName,
+        currency: data.shop.currencyCode,
+        country_name: data.shop.billingAddress.country,
+        country: data.shop.billingAddress.countryCodeV2,
+        country_code: data.shop.billingAddress.countryCodeV2,
+        province: data.shop.billingAddress.province,
+        province_code: data.shop.billingAddress.provinceCode,
+        city: data.shop.billingAddress.city,
+        address1: data.shop.billingAddress.address1,
+        address2: data.shop.billingAddress.address2,
+        zip: data.shop.billingAddress.zip,
+        latitude: data.shop.billingAddress.latitude,
+        longitude: data.shop.billingAddress.longitude,
+        phone: data.shop.billingAddress.phone,
+        timezone: data.shop.timezoneAbbreviation,
+        iana_timezone: data.shop.ianaTimezone,
+        plan_name: plan_name,
+        plan_display_name: plan_display_name,
+        money_format: data.shop.currencyFormats.moneyFormat,
+        money_in_emails_format: data.shop.currencyFormats.moneyInEmailsFormat,
+        money_with_currency_format: data.shop.currencyFormats.moneyWithCurrencyFormat,
+        money_with_currency_in_emails_format: data.shop.currencyFormats.moneyWithCurrencyInEmailsFormat,
+        weight_unit: data.shop.weightUnit,
+        tax_shipping: data.shop.taxShipping,
+        taxes_included: data.shop.taxesIncluded,
+        setup_required: data.shop.setupRequired,
+        checkout_api_supported: data.shop.checkoutApiSupported,
+        transactional_sms_disabled: data.shop.transactionalSmsDisabled,
+        enabled_presentment_currencies: data.shop.enabledPresentmentCurrencies,
+        marketing_sms_consent_enabled_at_checkout: data.shop.marketingSmsConsentEnabledAtCheckout
+      )
+      if with_locales
+        response.primary_locale = data.shopLocales.find(&:primary).locale
+        response.shop_locales = data.shopLocales.map(&:locale)
+      end
+      response
+    end
+  end
+end

data/app/graphql/shopify_graphql/get_app_subscription.rb

@@ -22,7 +22,7 @@ module ShopifyGraphql
 
     def parse_data(data)
       unless data.node
-        raise ResourceNotFound.new(200, "Subscription not found")
+        raise ResourceNotFound.new, "Subscription not found"
       end
 
       OpenStruct.new(

data/app/graphql/shopify_graphql/get_bulk_operation.rb

@@ -0,0 +1,44 @@
+module ShopifyGraphql
+  class GetBulkOperation
+    include Query
+
+    QUERY = <<~GRAPHQL
+      query($id: ID!){
+        node(id: $id) {
+          ... on BulkOperation {
+            id
+            status
+            errorCode
+            createdAt
+            completedAt
+            fileSize
+            url
+          }
+        }
+      }
+    GRAPHQL
+
+    def call(id:)
+      response = execute(QUERY, id: id)
+      response.data = parse_data(response.data.node)
+      response
+    end
+
+    private
+
+    def parse_data(data)
+      unless data
+        raise ResourceNotFound.new, "BulkOperation not found"
+      end
+
+      OpenStruct.new(
+        id: data.id,
+        status: data.status,
+        error_code: data.errorCode,
+        created_at: Time.find_zone("UTC").parse(data.createdAt),
+        completed_at: data.completedAt ? Time.find_zone("UTC").parse(data.completedAt) : nil,
+        url: data.url
+      )
+    end
+  end
+end

data/lib/shopify_graphql/client.rb

@@ -1,4 +1,29 @@
 module ShopifyGraphql
+  # Mapping from deprecated plan_name to plan_display_name
+  PLAN_TO_DISPLAY_NAME = {
+    "trial" => "trial",
+    "frozen" => "frozen",
+    "fraudulent" => "cancelled",
+    "shopify_alumni" =>	"shopify_alumni",
+    "affiliate" => "development",
+    "basic" => "basic",
+    "professional" => "shopify",
+    "npo_full" => "npo_full",
+    "shopify_plus" => "shopify_plus",
+    "staff" => "staff",
+    "unlimited" => "advanced",
+    "retail" => "retail",
+    "cancelled" => "cancelled",
+    "dormant" => "pause_and_build",
+    "starter_2022" => "shopify_starter",
+    "plus_partner_sandbox" => "shopify_plus_partner_sandbox",
+    "paid_trial" => "extended_trial",
+    "partner_test" => "developer_preview",
+    "open_learning" => "open_learning",
+    "staff_business" => "staff_business"
+  }
+  DISPLAY_NAME_TO_PLAN = PLAN_TO_DISPLAY_NAME.invert
+
   class Client
     def client
       @client ||= ShopifyAPI::Clients::Graphql::Admin.new(session: ShopifyAPI::Context.active_session)
@@ -8,11 +33,17 @@ module ShopifyGraphql
       response = client.query(query: query, variables: variables)
       Response.new(handle_response(response))
     rescue ShopifyAPI::Errors::HttpResponseError => e
-      Response.new(handle_response(e.response))
+      Response.new(handle_response(e.response, e))
     rescue JSON::ParserError => e
-      raise ServerError.new(e, "Invalid JSON response")
-    rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENETUNREACH, Net::ReadTimeout, Net::OpenTimeout, OpenSSL::SSL::SSLError, EOFError, Socket::ResolutionError => e
-      raise ServerError.new(e, "Network error")
+      raise ServerError.new(response: response), "Invalid JSON response: #{e.message}"
+    rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENETUNREACH, Net::ReadTimeout, Net::OpenTimeout, OpenSSL::SSL::SSLError, EOFError => e
+      raise ServerError.new(response: response), "Network error: #{e.message}"
+    rescue => e
+      if (defined?(Socket::ResolutionError) and e.is_a?(Socket::ResolutionError))
+        raise ServerError.new(response: response), "Network error: #{e.message}"
+      else
+        raise e
+      end
     end
 
     def parsed_body(response)
@@ -23,78 +54,107 @@ module ShopifyGraphql
       end
     end
 
-    def handle_response(response)
+    def handle_response(response, error = nil)
       case response.code
       when 200..400
-        handle_graphql_errors(parsed_body(response))
+        handle_graphql_errors(response)
       when 400
-        raise BadRequest.new(parsed_body(response), code: response.code)
+        raise BadRequest.new(response: response), error.message
       when 401
-        raise UnauthorizedAccess.new(parsed_body(response), code: response.code)
+        raise UnauthorizedAccess.new(response: response), error.message
       when 402
-        raise PaymentRequired.new(parsed_body(response), code: response.code)
+        raise PaymentRequired.new(response: response), error.message
       when 403
-        raise ForbiddenAccess.new(parsed_body(response), code: response.code)
+        raise ForbiddenAccess.new(response: response), error.message
       when 404
-        raise ResourceNotFound.new(parsed_body(response), code: response.code)
+        raise ResourceNotFound.new(response: response), error.message
       when 405
-        raise MethodNotAllowed.new(parsed_body(response), code: response.code)
+        raise MethodNotAllowed.new(response: response), error.message
       when 409
-        raise ResourceConflict.new(parsed_body(response), code: response.code)
+        raise ResourceConflict.new(response: response), error.message
       when 410
-        raise ResourceGone.new(parsed_body(response), code: response.code)
+        raise ResourceGone.new(response: response), error.message
       when 412
-        raise PreconditionFailed.new(parsed_body(response), code: response.code)
+        raise PreconditionFailed.new(response: response), error.message
       when 422
-        raise ResourceInvalid.new(parsed_body(response), code: response.code)
+        raise ResourceInvalid.new(response: response), error.message
       when 423
-        raise ShopLocked.new(parsed_body(response), code: response.code)
+        raise ShopLocked.new(response: response), error.message
       when 429, 430
-        raise TooManyRequests.new(parsed_body(response), code: response.code)
+        raise TooManyRequests.new(response: response), error.message
       when 401...500
-        raise ClientError.new(parsed_body(response), code: response.code)
+        raise ClientError.new(response: response), error.message
       when 500...600
-        raise ServerError.new(parsed_body(response), code: response.code)
+        raise ServerError.new(response: response), error.message
       else
-        raise ConnectionError.new(parsed_body(response), "Unknown response code: #{response.code}")
+        raise ConnectionError.new(response: response), error.message
       end
     end
 
     def handle_graphql_errors(response)
-      return response if response.errors.blank?
+      parsed_body = parsed_body(response)
+      if parsed_body.errors.nil? || parsed_body.errors.empty?
+        return parsed_body(response)
+      end
 
-      error = response.errors.first
-      error_message = error.message
+      error = parsed_body.errors.first
       error_code = error.extensions&.code
-      error_doc = error.extensions&.documentation
+      error_message = generate_error_message(
+        message: error.message,
+        code: error_code,
+        doc: error.extensions&.documentation
+      )
 
-      case error_code
-      when "THROTTLED"
-        raise TooManyRequests.new(response, error_message, code: error_code, doc: error_doc)
-      when "INTERNAL_SERVER_ERROR"
-        raise ServerError.new(response, error_message, code: error_code, doc: error_doc)
-      else
-        raise ConnectionError.new(response, error_message, code: error_code, doc: error_doc)
-      end
+      exception = case error_code
+        when "THROTTLED"
+          TooManyRequests.new(response: response)
+        when "INTERNAL_SERVER_ERROR"
+          ServerError.new(response: response)
+        else
+          ConnectionError.new(response: response)
+        end
+      exception.error_code = error_code
+      raise exception, error_message
     end
 
     def handle_user_errors(response)
       return response if response.userErrors.blank?
 
       error = response.userErrors.first
-      error_message = error.message
-      error_fields = error.field
       error_code = error.code
+      error_message = generate_error_message(
+        message: error.message,
+        code: error_code,
+        fields: error.field,
+      )
+
+      exception = UserError.new(response: response)
+      exception.error_code = error_code
+      exception.fields = error.field
+      raise exception, error_message
+    end
 
-      raise UserError.new(response, error_message, fields: error_fields, code: error_code)
+    def generate_error_message(message: nil, code: nil, doc: nil, fields: nil)
+      string = "Failed.".dup
+      string << " Response code = #{code}." if code
+      string << " Response message = #{message}.".gsub("..", ".") if message
+      string << " Documentation = #{doc}." if doc
+      string << " Fields = #{fields}." if fields
+      string
     end
   end
 
   class << self
-    delegate :execute, :handle_user_errors, to: :client
+    extend Forwardable
+    def_delegators :client, :execute, :handle_user_errors
 
     def client
       Client.new
     end
+
+    def normalize_plan_display_name(plan_display_name)
+      return if plan_display_name.blank?
+      plan_display_name.parameterize(separator: "_")
+    end
   end
 end

data/lib/shopify_graphql/controller_concerns/webhook_verification.rb

@@ -4,12 +4,17 @@ module ShopifyGraphql
     include ShopifyGraphql::PayloadVerification
 
     included do
+      before_action :deprecate_webhooks
       skip_before_action :verify_authenticity_token, raise: false
       before_action :verify_request
     end
 
     private
 
+    def deprecate_webhooks
+      ShopifyGraphql.deprecator.warn("ShopifyGraphql webhooks are deprecated and will be removed in v3.0. Please use shopify_app gem for handling webhooks.")
+    end
+
     def verify_request
       data = request.raw_post
       return head(:unauthorized) unless hmac_valid?(data)

data/lib/shopify_graphql/engine.rb

@@ -1,4 +1,8 @@
 module ShopifyGraphql
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new("3.0", "ShopifyGraphql")
+  end
+
   module RedactJobParams
     private
 

data/lib/shopify_graphql/exceptions.rb

@@ -1,22 +1,23 @@
 module ShopifyGraphql
-  class ConnectionError < StandardError
-    attr_reader :response, :code, :doc, :fields
-
-    def initialize(response, message = nil, code: nil, doc: nil, fields: nil)
-      @response = response
-      @message = message
-      @code = code
-      @doc = doc
-      @fields = fields
-    end
-
-    def to_s
-      message = "Failed.".dup
-      message << " Response code = #{@code}." if @code
-      message << " Response message = #{@message}." if @message
-      message << " Documentation = #{@doc}." if @doc
-      message << " Fields = #{@fields}." if @fields
-      message
+  class ConnectionError < ShopifyAPI::Errors::HttpResponseError
+    attr_accessor :error_code, :fields
+
+    def initialize(response: nil)
+      unless response
+        empty_response = ShopifyAPI::Clients::HttpResponse.new(code: 200, headers: {}, body: "")
+        super(response: empty_response) and return
+      end
+
+      if response.is_a?(ShopifyAPI::Clients::HttpResponse)
+        super(response: response)
+      else
+        response = ShopifyAPI::Clients::HttpResponse.new(
+          code: 200,
+          headers: {},
+          body: response
+        )
+        super(response: response)
+      end
     end
   end
 
@@ -68,11 +69,11 @@ module ShopifyGraphql
   class TooManyRequests < ClientError # :nodoc:
   end
 
-  # Graphql userErrors
-  class UserError < ClientError # :nodoc:
-  end
-
   # 5xx Server Error
   class ServerError < ConnectionError
   end
+
+  # Custom error for Graphql userErrors handling
+  class UserError < ConnectionError
+  end
 end

data/lib/shopify_graphql/mutation.rb

@@ -7,7 +7,8 @@ module ShopifyGraphql::Mutation
     end
   end
 
-  delegate :execute, :handle_user_errors, to: :client
+  extend Forwardable
+  def_delegators :client, :execute, :handle_user_errors
 
   def client
     @client ||= ShopifyGraphql::Client.new

data/lib/shopify_graphql/query.rb

@@ -7,7 +7,8 @@ module ShopifyGraphql::Query
     end
   end
 
-  delegate :execute, :handle_user_errors, to: :client
+  extend Forwardable
+  def_delegators :client, :execute, :handle_user_errors
 
   def client
     @client ||= ShopifyGraphql::Client.new

data/lib/shopify_graphql/resource.rb

@@ -3,7 +3,8 @@ module ShopifyGraphql
     extend ActiveSupport::Concern
 
     class_methods do
-      delegate :execute, :handle_user_errors, to: :client
+      extend Forwardable
+      def_delegators :client, :execute, :handle_user_errors
 
       def client
         ShopifyGraphql::Client.new

data/lib/shopify_graphql/version.rb

@@ -1,3 +1,3 @@
 module ShopifyGraphql
-  VERSION = "1.2.6"
+  VERSION = "2.0.0"
 end

data/lib/shopify_graphql.rb

@@ -1,8 +1,11 @@
 require 'shopify_api'
+require 'active_support'
 
 require 'shopify_graphql/client'
 require 'shopify_graphql/configuration'
-require 'shopify_graphql/engine'
+if defined?(Rails)
+  require 'shopify_graphql/engine'
+end
 require 'shopify_graphql/exceptions'
 require 'shopify_graphql/mutation'
 require 'shopify_graphql/query'
@@ -15,9 +18,11 @@ require 'shopify_graphql/controller_concerns/payload_verification'
 require 'shopify_graphql/controller_concerns/webhook_verification'
 
 # jobs
-require 'shopify_graphql/jobs/create_webhooks_job'
-require 'shopify_graphql/jobs/destroy_webhooks_job'
-require 'shopify_graphql/jobs/update_webhooks_job'
+if defined?(Rails)
+  require 'shopify_graphql/jobs/create_webhooks_job'
+  require 'shopify_graphql/jobs/destroy_webhooks_job'
+  require 'shopify_graphql/jobs/update_webhooks_job'
+end
 
 # managers
 require 'shopify_graphql/managers/webhooks_manager'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_graphql
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Kirill Platonov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: shopify_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.4'
 - !ruby/object:Gem::Dependency
   name: shopify_app
   requirement: !ruby/object:Gem::Requirement
@@ -64,10 +78,15 @@ files:
 - app/controllers/shopify_graphql/graphql_webhooks_controller.rb
 - app/graphql/shopify_graphql/app_subscription_fields.rb
 - app/graphql/shopify_graphql/cancel_subscription.rb
+- app/graphql/shopify_graphql/create_bulk_mutation.rb
+- app/graphql/shopify_graphql/create_bulk_query.rb
 - app/graphql/shopify_graphql/create_recurring_subscription.rb
+- app/graphql/shopify_graphql/create_staged_uploads.rb
 - app/graphql/shopify_graphql/create_usage_subscription.rb
+- app/graphql/shopify_graphql/current_shop.rb
 - app/graphql/shopify_graphql/delete_private_metafield.rb
 - app/graphql/shopify_graphql/get_app_subscription.rb
+- app/graphql/shopify_graphql/get_bulk_operation.rb
 - app/graphql/shopify_graphql/upsert_private_metafield.rb
 - config/routes.rb
 - lib/shopify_graphql.rb
@@ -102,14 +121,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Less painful way to work with Shopify Graphql API in Ruby.