jekyll-spree-client 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 390af0f63aee218e9f828303c23352dfaddd6c08c0830476ae04788b7115f6b0
-  data.tar.gz: 81f4e247841705eaea3f73b2e0a941455435c65dd17d87cee68449324d9b8c0f
+  metadata.gz: d84e793a7b13924032e636bc9271c34526b50532a0d195fefec3d4ba396e9929
+  data.tar.gz: 43f88102b50e08f082e22db89899d51198e27d985dfc8b9aa52703ab53abc883
 SHA512:
-  metadata.gz: 99290d03c7daebf7b12cead21c69d0560530ab8bc50ab37312c26f15a6d377c6ae22b4e35b31a77cd1e8550990e7c4b4c11432b896134edb5c52daa5f4b44641
-  data.tar.gz: f846b9e1914977776df45da460794e48855bc5b6fb37dec363d4b6e264e0530a2782e13fee38af25f119457c2bd4d519e5cc3e66ab47b9d24101d94e73a1d771
+  metadata.gz: 9e1e9fd39bd5bf077ef25471c283f23cbe988b59a54bb290a41526db79c0b3a7811a39bb45ec1fc051b956a9a35b2ce1bdd8e368aae110f3959c6d3de1c8fb17
+  data.tar.gz: a9053c799c246b4c70e43d909fc247642288a20dd1ee73b64e62edb3dd380641c6415faac60666da2ea1d378672327e7fc18eba517bd68a74eed9a3716c3e597

data/lib/jekyll/spree_client.rb

@@ -151,21 +151,6 @@ module Jekyll
       @remote_products ||= spree.products(shipping_category_id: shipping_category_id)
     end
 
-    # Obtain the default stock location, the first that's active.
-    #
-    # XXX: API doesn't show which one's the default so we're guessing.
-    #
-    # @return [Hash]
-    def stock_location
-      @stock_location ||=
-        if spree.stock_locations.index
-          spree.stock_locations.response['stock_locations']&.find { |s| s['active'] }
-        else
-          Jekyll.logger.warn "Couldn't get default stock location"
-          nil
-        end
-    end
-
     # Fetch variants by SKU
     #
     # @param [Array]
@@ -188,11 +173,14 @@ module Jekyll
       remote_product = attributes_from(product, product_fields).tap do |a|
         a[:extra_attributes] ||= {}
       end
-      variant_comparison = attributes_from variant, product_fields
+
+      variant_comparison = attributes_from(variant, product_fields).tap do |v|
+        v[:extra_attributes] = v[:extra_attributes]&.transform_keys(&:to_sym)
+      end
 
       # Only when they haven't changed, so we don't waste time sending a
       # request.
-      unless remote_product.slice(*variant_comparison.keys) == variant_comparison
+      unless compare_hashes(remote_product, variant_comparison)
         # XXX: We don't have the product ID with the variant but we have
         # the slug.
         remote_variant = { id: variant['id'] }.merge!(attributes_from product, variant_only_fields)
@@ -244,9 +232,14 @@ module Jekyll
       product.data['variant_id'] = variant_id
       product.data['in_stock'] = product.data['stock'].to_i > 0
 
+      spree.variants.show(id: variant_id)
+      variant = spree.variants.response
+
       # Add the initial stock
-      spree.stock_items(id: variant_id, stock_location_id: stock_location['id'])
-           .stock_movements.create(quantity: product.data['stock'])
+      spree.stock_items(
+        id: variant.dig('stock_items', 0, 'id'),
+        stock_location_id: variant.dig('stock_items', 0, 'stock_location_id')
+      ).stock_movements.create(quantity: product.data['stock'])
 
       true
     end
@@ -268,5 +261,18 @@ module Jekyll
     def attributes_from(document_or_hash, fields)
       (document_or_hash.respond_to?(:data) ? document_or_hash.data : document_or_hash).slice(*fields).transform_keys(&:to_sym)
     end
+
+    # Compare two hashes by the keys they share.  Some fields we send
+    # are not available through the APIv1, like meta_description.
+    #
+    # @link https://stackoverflow.com/a/15503329
+    # @param :h1 [Hash]
+    # @param :h2 [Hash]
+    # @return [Boolean]
+    def compare_hashes(h1, h2)
+      (h1.keys & h2.keys).all? do |k|
+        h1[k] == h2[k]
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spree-client
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.22
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2026-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree-api-client
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Spree Ecommerce API client for Jekyll