jekyll-spree-client 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fae6ac8495376030f27da4d790f5935e0f20c2ada484eced1a266c98704ec82
-  data.tar.gz: 144cbab5df09cab4c48c1a0d2c16ee2f0a9c593e273750af346d143f9526ad24
+  metadata.gz: cb1e9f91b6b5df295223e22a1a2323ddae55d62df040577a780b58d48ba5138f
+  data.tar.gz: 5d470993e67857cc5dbbba06c55dc29ae685c557b07b524a86899f6de7fe69dc
 SHA512:
-  metadata.gz: ede792ab10edef6455c9a32f7eb42f5ad6dadc4e4c9ab59ebf06c141073177aec0264a6a236da51099108f66e1893ae1c9e5a51b36aeb97efc7357a92ec80176
-  data.tar.gz: 40b3025ef2c89824713d338cc9d9151a7c765803c90e3c16c3bf8430304e62cf63a5d7a71a547f3705786e3ac5a65808c5ba88adc01a0a0c48a40f799f12e9c1
+  metadata.gz: 906fe73618cfaebffd6d61cf49d74dd031ed22df64710bbc6c0e9fb51feeef9fd651457c40543f78170e5a8a8843eaebd22c010fdce7cf804cec0375a473b86b
+  data.tar.gz: 5ffb592af45112839f81145fa60720d0a27583690b65e3b6d7a6cb4bfbdec4fbec1dca23e832e633b31e019b53548439ac8b69814112c9f23f62beb4ff7822e8

data/lib/jekyll/spree_client.rb

@@ -33,21 +33,26 @@ module Jekyll
     #
     # @return [Array]
     def variant_fields
-      @variant_fields ||= %w[price weight height width depth cost_price pay_what_you_can].freeze
+      @variant_fields ||= %w[price weight height width depth cost_price].freeze
     end
 
     # Fields that can change locally and we need to sync to Spree
     #
     # @return [Array]
     def product_fields
-      @product_fields ||= %w[name description meta_description meta_keywords meta_title].freeze
+      @product_fields ||= %w[name description meta_description meta_keywords meta_title pay_what_you_can].freeze
     end
 
     # All fields, using during creation
     #
     # @return [Array]
     def create_fields
-      @create_fields ||= product_fields + variant_fields
+      @create_fields ||= (product_fields + variant_fields).freeze
+    end
+
+    # Fields which are only updated on the Variant.
+    def variant_only_fields
+      @variant_only_fields ||= %w[track_inventory].freeze
     end
 
     # Spree Client
@@ -180,18 +185,23 @@ module Jekyll
     # @return [true,false]
     def update(product, variant)
       # Sync local changes to Spree
-      remote_product = product.data.slice(*product_fields).transform_keys(&:to_sym)
-      variant_comparison = variant.slice(*product_fields).transform_keys(&:to_sym)
+      remote_product = attributes_from product, product_fields
+      variant_comparison = attributes_from variant, product_fields
 
       # Only when they haven't changed, so we don't waste time sending a
       # request.
       unless remote_product.slice(*variant_comparison.keys) == 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)
+
+        remote_product.delete_if do |k, v|
+          remote_variant.key? k
+        end
+
         remote_product[:id] = variant['slug']
-        remote_product[:sku] = product.data[sku_field]
 
-        unless remote_products.update **remote_product
+        unless remote_products.update(**remote_product) && spree.variants.update(**remote_variant)
           Jekyll.logger.error "Couldn't update #{product.data['title']}"
           mark_with_error product, error_messages
         end
@@ -218,21 +228,22 @@ module Jekyll
     # @param [Jekyll::Document]
     # @return [true,false]
     def create(product)
-      new_product = product.data.slice(*create_fields).transform_keys(&:to_sym)
-      new_product[:sku] = product.data[sku_field]
+      new_product = attributes_from(product, create_fields)
 
-      unless remote_products.create **new_product
+      unless remote_products.create(**new_product)
         Jekyll.logger.error "Couldn't create #{product.data['title']}"
         mark_with_error product, error_messages
 
         return false
       end
 
-      product.data['variant_id'] = remote_products.response.dig('master', 'id')
+      variant_id = remote_products.response.dig('master', 'id')
+      spree.variants(id: variant_id).update(attributes_from(product, variant_only_fields))
+      product.data['variant_id'] = variant_id
       product.data['in_stock'] = product.data['stock'].to_i > 0
 
       # Add the initial stock
-      spree.stock_items(id: product.data['variant_id'], stock_location_id: stock_location['id'])
+      spree.stock_items(id: variant_id, stock_location_id: stock_location['id'])
            .stock_movements.create(quantity: product.data['stock'])
 
       true
@@ -246,5 +257,14 @@ module Jekyll
         end
       end&.flatten
     end
+
+    # Converts fields from a Jekyll::Document into an attribute Hash.
+    #
+    # @param [Jekyll::Document,Hash] Document or Hash to extract data from
+    # @param [Array] An Array of field names
+    # @return [Hash] A symbolized Hash of fields and values
+    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
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spree-client
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree-api-client