shopify_api 10.0.0 → 10.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify_api (10.0.0)
+    shopify_api (10.0.3)
       concurrent-ruby
       hash_diff
       httparty
@@ -79,11 +79,11 @@ GEM
       rubocop (>= 0.90.0)
     ruby-progressbar (1.11.0)
     securerandom (0.2.0)
-    sorbet (0.5.9623)
-      sorbet-static (= 0.5.9623)
-    sorbet-runtime (0.5.9619)
-    sorbet-static (0.5.9623-universal-darwin-21)
-    sorbet-static (0.5.9623-x86_64-linux)
+    sorbet (0.5.9924)
+      sorbet-static (= 0.5.9924)
+    sorbet-runtime (0.5.9924)
+    sorbet-static (0.5.9924-universal-darwin-21)
+    sorbet-static (0.5.9924-x86_64-linux)
     spoom (1.1.8)
       sorbet (>= 0.5.9204)
       sorbet-runtime (>= 0.5.9204)

data/README.md

@@ -4,12 +4,6 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
 ![Build Status](https://github.com/Shopify/shopify_api/workflows/CI/badge.svg?branch=main)
 
-## A Note About Versions
-
-The latest release of `shopify_api` is v9. The main branch of this repo reflects the upcoming v10 release, which has some major changes. If you’re looking for the documentation / instructions for v9, you can find them [in this branch](https://github.com/Shopify/shopify_api/tree/v9).
-
-## v10
-
 This library provides support for Ruby [Shopify apps](https://apps.shopify.com/) to access the [Shopify Admin API](https://shopify.dev/api/admin), by making it easier to perform the following actions:
 
 - Creating [online](https://shopify.dev/concepts/about-apis/authentication#online-access) or [offline](https://shopify.dev/concepts/about-apis/authentication#offline-access) access tokens for the Admin API via OAuth
@@ -21,6 +15,8 @@ In addition to the Admin API, this library also allows querying the [Storefront
 
 You can use this library in any application that has a Ruby backend, since it doesn't rely on any specific framework — you can include it alongside your preferred stack and use the features that you need to build your app.
 
+**Note**: These instructions apply to v10 or later of this package. If you're running v9 in your app, you can find the documentation [in this branch](https://github.com/Shopify/shopify_api/tree/v9).
+
 ## Requirements
 
 To follow these usage guides, you will need to:

data/RELEASING.md

@@ -0,0 +1,18 @@
+# Releasing ShopifyAPI
+
+1. Before releasing, make sure `sorbet` and `sorbet-runtime` are up to date
+1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
+1. Update the version of ShopifyAPI in lib/shopify_api/version.rb
+1. Run `bundle`
+1. Add a CHANGELOG entry for the new release
+1. Commit the changes with a commit message like "Packaging for release X.Y.Z"
+1. Tag the release with the version (Leave REV blank for HEAD or provide a SHA)
+   $ git tag vX.Y.Z REV
+1. Push out the changes
+   $ git push
+1. Push out the tags
+   $ git push --tags
+1. Publish the gem using Shipit
+1. Consider if the dependency in Shopify/shopify needs updated. It's used only by the tests so is a low risk change.
+   Also consider Shopify/shopify_app whose gemspec depends on this.
+   We don't need to do this for every release, but we should try to keep them relatively up to date.

data/Rakefile

@@ -11,7 +11,7 @@ namespace :test do
 
   Rake::TestTask.new(:rest_wrappers) do |t|
     pattern = if ENV.key?("API_VERSION")
-      "test/rest/**/#{ENV["API_VERSION"]}/*.rb"
+      "test/rest/**/#{ENV.fetch("API_VERSION")}/*.rb"
     else
       "test/rest/**/*.rb"
     end

data/docs/usage/rest.md

@@ -22,7 +22,7 @@ The Rest Admin client offers the 4 core request methods: `get`, `delete`, `post`
 
 ```ruby
 # Load the current session to get the `accessToken`.
-session = ShopifyAPI::Auth::SessionLoader.load_current_session(headers, cookies, is_online)
+session = ShopifyAPI::Utils::SessionUtils.load_current_session(headers, cookies, is_online)
 
 # Create a new client.
 client = ShopifyAPI::Clients::Rest::Admin.new(session: session)
@@ -38,7 +38,7 @@ some_function(response.body)
 
 ```ruby
 # Load the current session to get the `accessToken`.
-session = ShopifyAPI::Auth::SessionLoader.load_current_session(headers, cookies, is_online)
+session = ShopifyAPI::Utils::SessionUtils.load_current_session(headers, cookies, is_online)
 
 # Create a new client.
 client = ShopifyAPI::Clients::Rest::Admin.new(session: session)
@@ -71,7 +71,7 @@ After making a request, the `next_page_info` and `prev_page_info` can be found o
 An example of this is shown below:
 
 ```ruby
-session = ShopifyAPI::Auth::SessionLoader.load_current_session(headers, cookies, is_online)
+session = ShopifyAPI::Utils::SessionUtils.load_current_session(headers, cookies, is_online)
 client = ShopifyAPI::Clients::Rest::Admin.new(session: session)
 
 response = client.get(path: "products", query: { limit: 10 })
@@ -88,7 +88,7 @@ Similarly, when using REST resources the `next_page_info` and `prev_page_info` c
 An example of this is shown below:
 
 ```ruby
-session = ShopifyAPI::Auth::SessionLoader.load_current_session(headers, cookies, is_online)
+session = ShopifyAPI::Utils::SessionUtils.load_current_session(headers, cookies, is_online)
 
 products = ShopifyAPI::Product.all(session: session, limit: 10)
 
@@ -104,7 +104,7 @@ The next/previous page_info strings can also be retrieved from the response obje
 An example of this is shown below:
 
 ```ruby
-session = ShopifyAPI::Auth::SessionLoader.load_current_session(headers, cookies, is_online)
+session = ShopifyAPI::Utils::SessionUtils.load_current_session(headers, cookies, is_online)
 client = ShopifyAPI::Clients::Rest::Admin.new(session: session)
 
 response = client.get(path: "products", query: { limit: 10 })

data/lib/shopify_api/admin_versions.rb

@@ -2,14 +2,19 @@
 # frozen_string_literal: true
 
 module ShopifyAPI
-  SUPPORTED_ADMIN_VERSIONS = T.let([
-    "unstable",
-    "2022-04",
-    "2022-01",
-    "2021-10",
-    "2021-07",
-    "2021-04",
-  ], T::Array[String])
+  module AdminVersions
+    SUPPORTED_ADMIN_VERSIONS = T.let([
+      "unstable",
+      "2022-04",
+      "2022-01",
+      "2021-10",
+      "2021-07",
+      "2021-04",
+    ], T::Array[String])
 
-  LATEST_SUPPORTED_ADMIN_VERSION = T.let("2022-01", String)
+    LATEST_SUPPORTED_ADMIN_VERSION = T.let("2022-01", String)
+  end
+
+  SUPPORTED_ADMIN_VERSIONS = ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS
+  LATEST_SUPPORTED_ADMIN_VERSION = ShopifyAPI::AdminVersions::LATEST_SUPPORTED_ADMIN_VERSION
 end

data/lib/shopify_api/auth/jwt_payload.rb

@@ -35,8 +35,6 @@ module ShopifyAPI
 
         raise ShopifyAPI::Errors::InvalidJwtTokenError,
           "Session token had invalid API key" unless @aud == Context.api_key
-        raise ShopifyAPI::Errors::InvalidJwtTokenError,
-          "Session token had invalid shop" unless validate_shop(shop)
       end
 
       sig { returns(String) }
@@ -44,9 +42,14 @@ module ShopifyAPI
         @dest.gsub("https://", "")
       end
 
+      # TODO: Remove before releasing v11
       sig { params(shop: String).returns(T::Boolean) }
       def validate_shop(shop)
-        /\A[a-z0-9]+[a-z0-9\-]*[a-z0-9]+\.myshopify\.(io|com)\z/.match?(shop)
+        Context.logger.warn(
+          "Deprecation notice: ShopifyAPI::Auth::JwtPayload.validate_shop no longer checks the given shop and always " \
+            "returns true. It will be removed in v11."
+        )
+        true
       end
 
       alias_method :eql?, :==

data/lib/shopify_api/context.rb

@@ -52,9 +52,9 @@ module ShopifyAPI
         private_shop: nil,
         user_agent_prefix: nil
       )
-        unless SUPPORTED_ADMIN_VERSIONS.include?(api_version)
+        unless ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS.include?(api_version)
           raise Errors::UnsupportedVersionError,
-            "Invalid vession #{api_version}, supported versions: #{SUPPORTED_ADMIN_VERSIONS}"
+            "Invalid vession #{api_version}, supported versions: #{ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS}"
         end
 
         @api_key = api_key

data/lib/shopify_api/rest/base.rb

@@ -15,6 +15,8 @@ module ShopifyAPI
       @has_many = T.let({}, T::Hash[Symbol, Class])
       @paths = T.let([], T::Array[T::Hash[Symbol, T.any(T::Array[Symbol], String, Symbol)]])
       @custom_prefix = T.let(nil, T.nilable(String))
+      @read_only_attributes = T.let([], T.nilable(T::Array[Symbol]))
+      @aliased_properties = T.let({}, T::Hash[String, String])
 
       sig { returns(T::Hash[Symbol, T.untyped]) }
       attr_accessor :original_state
@@ -32,6 +34,7 @@ module ShopifyAPI
         @original_state = T.let({}, T::Hash[Symbol, T.untyped])
         @custom_prefix = T.let(nil, T.nilable(String))
         @forced_nils = T.let({}, T::Hash[String, T::Boolean])
+        @aliased_properties = T.let({}, T::Hash[String, String])
 
         session ||= ShopifyAPI::Context.active_session
 
@@ -42,7 +45,7 @@ module ShopifyAPI
         @errors = T.let(Rest::BaseErrors.new, Rest::BaseErrors)
 
         from_hash&.each do |key, value|
-          instance_variable_set("@#{key}", value)
+          set_property(key, value)
         end
       end
 
@@ -118,6 +121,11 @@ module ShopifyAPI
           @has_one.include?(attribute)
         end
 
+        sig { returns(T.nilable(T::Array[Symbol])) }
+        def read_only_attributes
+          @read_only_attributes&.map { |a| :"@#{a}" }
+        end
+
         sig do
           params(
             http_method: Symbol,
@@ -209,24 +217,21 @@ module ShopifyAPI
           instance ||= new(session: session)
           instance.original_state = {}
 
-          unless data.empty?
-            # This retrieves all the setters on the resource and calls them with the data
-            instance_methods(false).select { |method| !method.to_s.include?("=") }.each do |attribute|
-              next unless data.key?(attribute.to_s)
-
-              if has_many?(attribute) && data[attribute.to_s]
-                attr_list = []
-                data[attribute.to_s].each do |element|
-                  attr_list << T.unsafe(@has_many[attribute]).create_instance(data: element, session: session)
-                end
-                instance.public_send("#{attribute}=", attr_list)
-              elsif has_one?(attribute) && data[attribute.to_s]
-                instance.public_send("#{attribute}=",
-                  T.unsafe(@has_one[attribute]).create_instance(data: data[attribute.to_s], session: session))
-              else
-                instance.public_send("#{attribute}=", data[attribute.to_s])
-                instance.original_state[attribute] = data[attribute.to_s]
+          data.each do |attribute, value|
+            attr_sym = attribute.to_sym
+
+            if has_many?(attr_sym) && value
+              attr_list = []
+              value.each do |element|
+                attr_list << T.unsafe(@has_many[attr_sym]).create_instance(data: element, session: session)
               end
+              instance.public_send("#{attribute}=", attr_list)
+            elsif has_one?(attr_sym) && value
+              instance.public_send("#{attribute}=",
+                T.unsafe(@has_one[attr_sym]).create_instance(data: value, session: session))
+            else
+              instance.public_send("#{attribute}=", value)
+              instance.original_state[attr_sym] = value
             end
           end
 
@@ -234,16 +239,18 @@ module ShopifyAPI
         end
       end
 
-      sig { params(meth_id: Symbol, val: T.untyped).void }
+      sig { params(meth_id: Symbol, val: T.untyped).returns(T.untyped) }
       def method_missing(meth_id, val = nil)
-        match = meth_id.id2name.match(/([^=]+)=/)
-
-        return super unless match
+        match = meth_id.id2name.match(/([^=]+)(=)?/)
 
-        var = match[1]
+        var = T.must(T.must(match)[1])
 
-        instance_variable_set("@#{var}", val)
-        @forced_nils[T.must(var)] = val.nil?
+        if T.must(match)[2]
+          set_property(var, val)
+          @forced_nils[var] = val.nil?
+        else
+          get_property(var)
+        end
       end
 
       sig { params(meth_id: Symbol, args: T.untyped).void }
@@ -258,17 +265,31 @@ module ShopifyAPI
       def to_hash
         hash = {}
         instance_variables.each do |var|
-          next if [:"@original_state", :"@session", :"@client", :"@forced_nils", :"@errors"].include?(var)
+          next if [
+            :"@original_state",
+            :"@session",
+            :"@client",
+            :"@forced_nils",
+            :"@errors",
+            :"@aliased_properties",
+          ].include?(var)
+          next if self.class.read_only_attributes&.include?(var)
+
+          var = var.to_s.delete("@")
+          attribute = if @aliased_properties.value?(var)
+            T.must(@aliased_properties.key(var))
+          else
+            var
+          end.to_sym
 
-          attribute = var.to_s.delete("@").to_sym
           if self.class.has_many?(attribute)
-            hash[attribute.to_s] = instance_variable_get(var).map(&:to_hash).to_a if instance_variable_get(var)
+            hash[attribute.to_s] = get_property(attribute).map(&:to_hash).to_a if get_property(attribute)
           elsif self.class.has_one?(attribute)
-            element_hash = instance_variable_get(var)&.to_hash
+            element_hash = get_property(attribute)&.to_hash
             hash[attribute.to_s] = element_hash if element_hash || @forced_nils[attribute.to_s]
-          elsif !instance_variable_get(var).nil? || @forced_nils[attribute.to_s]
+          elsif !get_property(attribute).nil? || @forced_nils[attribute.to_s]
             hash[attribute.to_s] =
-              instance_variable_get(var)
+              get_property(attribute)
           end
         end
         hash
@@ -313,6 +334,27 @@ module ShopifyAPI
         @errors.errors << e
         raise
       end
+
+      private
+
+      sig { params(key: T.any(String, Symbol), val: T.untyped).void }
+      def set_property(key, val)
+        # Some API fields contain invalid characters, like `?`, which causes issues when setting them as instance
+        # variables. To work around that, we're cleaning them up here but keeping track of the properties that were
+        # aliased this way. When loading up the property, we can map back from the "invalid" field so that it is
+        # transparent to outside callers
+        clean_key = key.to_s.gsub(/[\?\s]/, "")
+        @aliased_properties[key.to_s] = clean_key if clean_key != key
+
+        instance_variable_set("@#{clean_key}", val)
+      end
+
+      sig { params(key: T.any(String, Symbol)).returns(T.untyped) }
+      def get_property(key)
+        clean_key = @aliased_properties.key?(key.to_s) ? @aliased_properties[key.to_s] : key
+
+        instance_variable_get("@#{clean_key}")
+      end
     end
   end
 end

data/lib/shopify_api/rest/resources/2021_07/abandoned_checkout.rb

@@ -61,7 +61,6 @@ module ShopifyAPI
       discount_codes: DiscountCode
     }, T::Hash[Symbol, Class])
     @paths = T.let([
-      {http_method: :get, operation: :checkouts, ids: [], path: "checkouts.json"},
       {http_method: :get, operation: :checkouts, ids: [], path: "checkouts.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
 
@@ -147,25 +146,25 @@ module ShopifyAPI
     class << self
       sig do
         params(
+          limit: T.untyped,
           since_id: T.untyped,
           created_at_min: T.untyped,
           created_at_max: T.untyped,
           updated_at_min: T.untyped,
           updated_at_max: T.untyped,
           status: T.untyped,
-          limit: T.untyped,
           session: Auth::Session,
           kwargs: T.untyped
         ).returns(T.untyped)
       end
       def checkouts(
+        limit: nil,
         since_id: nil,
         created_at_min: nil,
         created_at_max: nil,
         updated_at_min: nil,
         updated_at_max: nil,
         status: nil,
-        limit: nil,
         session: ShopifyAPI::Context.active_session,
         **kwargs
       )
@@ -174,7 +173,7 @@ module ShopifyAPI
           operation: :checkouts,
           session: session,
           ids: {},
-          params: {since_id: since_id, created_at_min: created_at_min, created_at_max: created_at_max, updated_at_min: updated_at_min, updated_at_max: updated_at_max, status: status, limit: limit}.merge(kwargs).compact,
+          params: {limit: limit, since_id: since_id, created_at_min: created_at_min, created_at_max: created_at_max, updated_at_min: updated_at_min, updated_at_max: updated_at_max, status: status}.merge(kwargs).compact,
           body: {},
           entity: nil,
         )

data/lib/shopify_api/rest/resources/2021_07/article.rb

@@ -41,6 +41,7 @@ module ShopifyAPI
       {http_method: :get, operation: :get, ids: [:blog_id], path: "blogs/<blog_id>/articles.json"},
       {http_method: :get, operation: :get, ids: [:blog_id, :id], path: "blogs/<blog_id>/articles/<id>.json"},
       {http_method: :get, operation: :tags, ids: [], path: "articles/tags.json"},
+      {http_method: :get, operation: :tags, ids: [:blog_id], path: "blogs/<blog_id>/articles/tags.json"},
       {http_method: :post, operation: :post, ids: [:blog_id], path: "blogs/<blog_id>/articles.json"},
       {http_method: :put, operation: :put, ids: [:blog_id, :id], path: "blogs/<blog_id>/articles/<id>.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
@@ -229,11 +230,17 @@ module ShopifyAPI
 
       sig do
         params(
+          blog_id: T.nilable(T.any(Integer, String)),
+          limit: T.untyped,
+          popular: T.untyped,
           session: Auth::Session,
           kwargs: T.untyped
         ).returns(T.untyped)
       end
       def tags(
+        blog_id: nil,
+        limit: nil,
+        popular: nil,
         session: ShopifyAPI::Context.active_session,
         **kwargs
       )
@@ -241,8 +248,8 @@ module ShopifyAPI
           http_method: :get,
           operation: :tags,
           session: session,
-          ids: {},
-          params: {}.merge(kwargs).compact,
+          ids: {blog_id: blog_id},
+          params: {limit: limit, popular: popular}.merge(kwargs).compact,
           body: {},
           entity: nil,
         )

data/lib/shopify_api/rest/resources/2021_07/gift_card_adjustment.rb

@@ -30,7 +30,7 @@ module ShopifyAPI
     @has_many = T.let({}, T::Hash[Symbol, Class])
     @paths = T.let([
       {http_method: :get, operation: :get, ids: [:gift_card_id], path: "gift_cards/<gift_card_id>/adjustments.json"},
-      {http_method: :get, operation: :get, ids: [:gift_card_id, :id], path: "gift_cards/<gift_card_id>/adjustments/2.json"},
+      {http_method: :get, operation: :get, ids: [:gift_card_id, :id], path: "gift_cards/<gift_card_id>/adjustments/<id>.json"},
       {http_method: :post, operation: :post, ids: [:gift_card_id], path: "gift_cards/<gift_card_id>/adjustments.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
 

data/lib/shopify_api/rest/resources/2021_07/variant.rb

@@ -36,7 +36,7 @@ module ShopifyAPI
       @taxable = T.let(nil, T.nilable(T::Boolean))
       @title = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
-      @weight = T.let(nil, T.nilable(Integer))
+      @weight = T.let(nil, T.nilable(Float))
       @weight_unit = T.let(nil, T.nilable(String))
     end
 
@@ -50,6 +50,10 @@ module ShopifyAPI
       {http_method: :post, operation: :post, ids: [:product_id], path: "products/<product_id>/variants.json"},
       {http_method: :put, operation: :put, ids: [:id], path: "variants/<id>.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
+    @read_only_attributes = T.let([
+      :inventory_quantity,
+      :inventory_quantity_adjustment
+    ], T::Array[Symbol])
 
     sig { returns(T.nilable(String)) }
     attr_reader :barcode
@@ -99,7 +103,7 @@ module ShopifyAPI
     attr_reader :title
     sig { returns(T.nilable(String)) }
     attr_reader :updated_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(Float)) }
     attr_reader :weight
     sig { returns(T.nilable(String)) }
     attr_reader :weight_unit

data/lib/shopify_api/rest/resources/2021_10/abandoned_checkout.rb

@@ -61,7 +61,6 @@ module ShopifyAPI
       discount_codes: DiscountCode
     }, T::Hash[Symbol, Class])
     @paths = T.let([
-      {http_method: :get, operation: :checkouts, ids: [], path: "checkouts.json"},
       {http_method: :get, operation: :checkouts, ids: [], path: "checkouts.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
 
@@ -147,25 +146,25 @@ module ShopifyAPI
     class << self
       sig do
         params(
+          limit: T.untyped,
           since_id: T.untyped,
           created_at_min: T.untyped,
           created_at_max: T.untyped,
           updated_at_min: T.untyped,
           updated_at_max: T.untyped,
           status: T.untyped,
-          limit: T.untyped,
           session: Auth::Session,
           kwargs: T.untyped
         ).returns(T.untyped)
       end
       def checkouts(
+        limit: nil,
         since_id: nil,
         created_at_min: nil,
         created_at_max: nil,
         updated_at_min: nil,
         updated_at_max: nil,
         status: nil,
-        limit: nil,
         session: ShopifyAPI::Context.active_session,
         **kwargs
       )
@@ -174,7 +173,7 @@ module ShopifyAPI
           operation: :checkouts,
           session: session,
           ids: {},
-          params: {since_id: since_id, created_at_min: created_at_min, created_at_max: created_at_max, updated_at_min: updated_at_min, updated_at_max: updated_at_max, status: status, limit: limit}.merge(kwargs).compact,
+          params: {limit: limit, since_id: since_id, created_at_min: created_at_min, created_at_max: created_at_max, updated_at_min: updated_at_min, updated_at_max: updated_at_max, status: status}.merge(kwargs).compact,
           body: {},
           entity: nil,
         )

data/lib/shopify_api/rest/resources/2021_10/article.rb

@@ -41,6 +41,7 @@ module ShopifyAPI
       {http_method: :get, operation: :get, ids: [:blog_id], path: "blogs/<blog_id>/articles.json"},
       {http_method: :get, operation: :get, ids: [:blog_id, :id], path: "blogs/<blog_id>/articles/<id>.json"},
       {http_method: :get, operation: :tags, ids: [], path: "articles/tags.json"},
+      {http_method: :get, operation: :tags, ids: [:blog_id], path: "blogs/<blog_id>/articles/tags.json"},
       {http_method: :post, operation: :post, ids: [:blog_id], path: "blogs/<blog_id>/articles.json"},
       {http_method: :put, operation: :put, ids: [:blog_id, :id], path: "blogs/<blog_id>/articles/<id>.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
@@ -229,11 +230,17 @@ module ShopifyAPI
 
       sig do
         params(
+          blog_id: T.nilable(T.any(Integer, String)),
+          limit: T.untyped,
+          popular: T.untyped,
           session: Auth::Session,
           kwargs: T.untyped
         ).returns(T.untyped)
       end
       def tags(
+        blog_id: nil,
+        limit: nil,
+        popular: nil,
         session: ShopifyAPI::Context.active_session,
         **kwargs
       )
@@ -241,8 +248,8 @@ module ShopifyAPI
           http_method: :get,
           operation: :tags,
           session: session,
-          ids: {},
-          params: {}.merge(kwargs).compact,
+          ids: {blog_id: blog_id},
+          params: {limit: limit, popular: popular}.merge(kwargs).compact,
           body: {},
           entity: nil,
         )

data/lib/shopify_api/rest/resources/2021_10/gift_card_adjustment.rb

@@ -30,7 +30,7 @@ module ShopifyAPI
     @has_many = T.let({}, T::Hash[Symbol, Class])
     @paths = T.let([
       {http_method: :get, operation: :get, ids: [:gift_card_id], path: "gift_cards/<gift_card_id>/adjustments.json"},
-      {http_method: :get, operation: :get, ids: [:gift_card_id, :id], path: "gift_cards/<gift_card_id>/adjustments/2.json"},
+      {http_method: :get, operation: :get, ids: [:gift_card_id, :id], path: "gift_cards/<gift_card_id>/adjustments/<id>.json"},
       {http_method: :post, operation: :post, ids: [:gift_card_id], path: "gift_cards/<gift_card_id>/adjustments.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
 

data/lib/shopify_api/rest/resources/2021_10/variant.rb

@@ -36,7 +36,7 @@ module ShopifyAPI
       @taxable = T.let(nil, T.nilable(T::Boolean))
       @title = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
-      @weight = T.let(nil, T.nilable(Integer))
+      @weight = T.let(nil, T.nilable(Float))
       @weight_unit = T.let(nil, T.nilable(String))
     end
 
@@ -50,6 +50,10 @@ module ShopifyAPI
       {http_method: :post, operation: :post, ids: [:product_id], path: "products/<product_id>/variants.json"},
       {http_method: :put, operation: :put, ids: [:id], path: "variants/<id>.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
+    @read_only_attributes = T.let([
+      :inventory_quantity,
+      :inventory_quantity_adjustment
+    ], T::Array[Symbol])
 
     sig { returns(T.nilable(String)) }
     attr_reader :barcode
@@ -99,7 +103,7 @@ module ShopifyAPI
     attr_reader :title
     sig { returns(T.nilable(String)) }
     attr_reader :updated_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(Float)) }
     attr_reader :weight
     sig { returns(T.nilable(String)) }
     attr_reader :weight_unit

data/lib/shopify_api/rest/resources/2022_01/abandoned_checkout.rb

@@ -61,7 +61,6 @@ module ShopifyAPI
       discount_codes: DiscountCode
     }, T::Hash[Symbol, Class])
     @paths = T.let([
-      {http_method: :get, operation: :checkouts, ids: [], path: "checkouts.json"},
       {http_method: :get, operation: :checkouts, ids: [], path: "checkouts.json"}
     ], T::Array[T::Hash[String, T.any(T::Array[Symbol], String, Symbol)]])
 
@@ -147,25 +146,25 @@ module ShopifyAPI
     class << self
       sig do
         params(
+          limit: T.untyped,
           since_id: T.untyped,
           created_at_min: T.untyped,
           created_at_max: T.untyped,
           updated_at_min: T.untyped,
           updated_at_max: T.untyped,
           status: T.untyped,
-          limit: T.untyped,
           session: Auth::Session,
           kwargs: T.untyped
         ).returns(T.untyped)
       end
       def checkouts(
+        limit: nil,
         since_id: nil,
         created_at_min: nil,
         created_at_max: nil,
         updated_at_min: nil,
         updated_at_max: nil,
         status: nil,
-        limit: nil,
         session: ShopifyAPI::Context.active_session,
         **kwargs
       )
@@ -174,7 +173,7 @@ module ShopifyAPI
           operation: :checkouts,
           session: session,
           ids: {},
-          params: {since_id: since_id, created_at_min: created_at_min, created_at_max: created_at_max, updated_at_min: updated_at_min, updated_at_max: updated_at_max, status: status, limit: limit}.merge(kwargs).compact,
+          params: {limit: limit, since_id: since_id, created_at_min: created_at_min, created_at_max: created_at_max, updated_at_min: updated_at_min, updated_at_max: updated_at_max, status: status}.merge(kwargs).compact,
           body: {},
           entity: nil,
         )