jekyll-spree-client 0.1.13 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3313a5acca299870b21648a253999a7bda4fae1c50a8ada64ba08bf710ee677
-  data.tar.gz: 15ce97b96ab22eb484960cea96a98549bc6ba972ba82599442f67d5ed6c32925
+  metadata.gz: cb1e9f91b6b5df295223e22a1a2323ddae55d62df040577a780b58d48ba5138f
+  data.tar.gz: 5d470993e67857cc5dbbba06c55dc29ae685c557b07b524a86899f6de7fe69dc
 SHA512:
-  metadata.gz: 061be8dc0a119fd8b106e08dd5edc7506aa2d297fd213012f1442744349bcb8d0e955c1887597154510368e9c866e59e597d484f33ede18cf74e76caeb28c27e
-  data.tar.gz: 2a6e0c0e080ba05a8d94d7b383d445fe7e7aa96b113f053ece6b9528d9e80ad1bfc886f41cad37e97c5bfbb533ab44d4e4099600ef7e6501cc3d4a6ea05d4db3
+  metadata.gz: 906fe73618cfaebffd6d61cf49d74dd031ed22df64710bbc6c0e9fb51feeef9fd651457c40543f78170e5a8a8843eaebd22c010fdce7cf804cec0375a473b86b
+  data.tar.gz: 5ffb592af45112839f81145fa60720d0a27583690b65e3b6d7a6cb4bfbdec4fbec1dca23e832e633b31e019b53548439ac8b69814112c9f23f62beb4ff7822e8

data/README.md

@@ -43,6 +43,7 @@ spree:
   sku_field: sku
   api_url: http://localhost:3000
   shipping_category_id: 1
+  store: https://your.store
 ```
 
 You can get the API key on your user profile.  Pass it as the
@@ -52,7 +53,7 @@ You can get the API key on your user profile.  Pass it as the
 SPREE_API_KEY="some random value generated by spree" bundle exec jekyll build
 ```
 
-Since v0.1.4 you can pass the store URL too, and it'll take precedence
+Since v0.1.4 you can pass the API URL too, and it'll take precedence
 over `_config.yml`:
 
 ```bash

data/lib/jekyll-spree-client.rb

@@ -22,7 +22,7 @@ Jekyll::Hooks.register :site, :post_read do |site|
   end
 
   config = site.config['spree']&.transform_keys(&:to_sym) || {}
-  config.merge!(site: site, api_key: ENV['SPREE_API_KEY'], spree_url: ENV['SPREE_URL'])
+  config.merge!(site: site, api_key: ENV['SPREE_API_KEY'], spree_url: ENV['SPREE_URL'], store: site.config['url'])
 
   client = Jekyll::SpreeClient.new **config
 

data/lib/jekyll/spree_client.rb

@@ -5,7 +5,7 @@ require 'spree_client'
 
 # 
 module Jekyll
-  SpreeClient = Struct.new :site, :sku_field, :api_key, :spree_url, :shipping_category_id, keyword_init: true do
+  SpreeClient = Struct.new :site, :sku_field, :api_key, :spree_url, :shipping_category_id, :store, keyword_init: true do
     # Products are posts with the SKU field
     #
     # @return [Array] Jekyll::Document
@@ -33,28 +33,33 @@ 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
     #
     # @return [SpreeClient::API::V1]
     def spree
-      @spree ||= ::SpreeClient::API::V1.new **to_h.slice(:api_key, :spree_url)
+      @spree ||= ::SpreeClient::API::V1.new **to_h.slice(:api_key, :spree_url, :store)
     end
 
     # Localization with jekyll-locales
@@ -180,16 +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)
+      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 == variant.slice(*product_fields).transform_keys(&:to_sym)
+      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
@@ -216,20 +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
@@ -243,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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spree-client
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.17
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: fast_blank
   requirement: !ruby/object:Gem::Requirement