webflow_sync 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b6c5dc80e752a95692afe908be134cdefd6193e0ed712c7a6d41440bb679e0
-  data.tar.gz: 5bd56794f4d0f09634a776b18ca613844b149afaf99cbbb841fe6294ae5cc67a
+  metadata.gz: 462ca934ced66c135d9737e6d3a488d93e26c90b4a3e48e1e0b5b8a87c710fb4
+  data.tar.gz: 9473b40c6a4bc830a864902c013de92936edfd3b81985a77353c90dae481b905
 SHA512:
-  metadata.gz: 83fe81d28e2aec28ef31bee07956f8a105b368053f60dbcff1e668ae853671e708e543db1444aad37571117562ac7c6412913600c1da0d35d80851d5438a827c
-  data.tar.gz: 9e40ae99fa67b4d6ae787900e288009f2d7bc3c6633908e36f13efec62df3b676ec23ddcf0710cbd82a80beb5a573bf13da69c2d13c8f49c9db57686f8d60428
+  metadata.gz: 74d85eea27d5d66ddc36ae45c336422f64dc447a83d82a0764abcdcb470f6148732d60b76ac2209b6d9d37bab07e5fc28281c961f2e6d9bdf380dd5c8c6bc15e
+  data.tar.gz: ebec0cbb65c0f521724366c3fe85be6b0f4c4e17939d62c5f3a0ffc3639a0003161e1d3c05676bf72af9a7e55816e03aa9e9f4c3afe81c1c4bc1149a03144a4b

data/README.md

@@ -1,4 +1,5 @@
-![build](https://github.com/vfonic/webflow_sync/workflows/build/badge.svg)
+[![Build Status](https://github.com/vfonic/webflow_sync/workflows/build/badge.svg)](https://github.com/vfonic/webflow_sync/actions)
+
 
 # WebflowSync
 
@@ -158,6 +159,11 @@ This gem silently "fails" (does nothing) when `webflow_site_id` or `webflow_item
 
 PRs welcome!
 
+## Thanks and Credits
+
+This gem wouldn't be possible without the amazing work of [webflow-ruby](https://github.com/penseo/webflow-ruby) gem. Thank you, @phoet!
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/jobs/webflow_sync/initial_sync_job.rb

@@ -7,8 +7,18 @@ module WebflowSync
       model_class.where(webflow_item_id: nil).find_each do |record|
         next if record.webflow_site_id.blank?
 
-        WebflowSync::Api.new(record.webflow_site_id).create_item(record, collection_slug)
+        client(record.webflow_site_id).create_item(record, collection_slug)
       end
     end
+
+    private
+
+      def client(site_id)
+        if @client&.site_id == site_id
+          @client
+        else
+          @client = WebflowSync::Api.new(site_id)
+        end
+      end
   end
 end

data/app/jobs/webflow_sync/update_item_job.rb

@@ -7,7 +7,7 @@ module WebflowSync
       record = model_class.find_by(id: id)
       return if record.blank?
       return if record.webflow_site_id.blank?
-      return if record.webflow_item_id.blank?
+      return WebflowSync::CreateItemJob.perform_now(collection_slug, id) if record.webflow_item_id.blank?
 
       WebflowSync::Api.new(record.webflow_site_id).update_item(record, collection_slug)
     end

data/app/models/concerns/webflow_sync/callbacks.rb

@@ -8,9 +8,9 @@ module WebflowSync
     included do
       attr_accessor :skip_webflow_sync
 
-      after_create :create_webflow_item
-      after_update :update_webflow_item
-      after_destroy :destroy_webflow_item
+      after_commit :create_webflow_item, on: :create
+      after_commit :update_webflow_item, on: :update
+      after_commit :destroy_webflow_item, on: :destroy
 
       def create_webflow_item
         return if self.skip_webflow_sync || WebflowSync.configuration.skip_webflow_sync

data/app/services/webflow_sync/api.rb

@@ -8,16 +8,21 @@ module WebflowSync
       @site_id = site_id
     end
 
-    def create_item(record, collection_slug)
+    def create_item(record, collection_slug) # rubocop:disable Metrics/MethodLength
       collection = find_webflow_collection(collection_slug)
       response = client.create_item(
         collection['_id'],
         record.as_webflow_json.reverse_merge(_archived: false, _draft: false), live: true
       )
 
-      record.update!(webflow_item_id: response['_id'])
-      puts "Created #{record.inspect} in #{collection_slug}"
-      response
+      # use update_column to skip callbacks to prevent WebflowSync::ItemSync to kick off
+      if record.update_column(:webflow_item_id, response['_id']) # rubocop:disable Rails/SkipsModelValidations
+        puts "Created #{record.inspect} in #{collection_slug}"
+        response
+      else
+        raise "Failed to store webflow_item_id: '#{response['_id']}' " \
+              "after creating item in WebFlow collection #{record.inspect}"
+      end
     end
 
     def update_item(record, collection_slug)

data/lib/webflow_sync/configuration.rb

@@ -9,7 +9,7 @@ module WebflowSync
       yield(self.configuration)
 
       self.configuration.api_token ||= ENV.fetch('WEBFLOW_API_TOKEN')
-      self.configuration.skip_webflow_sync ||= Rails.env.test?
+      defined?(self.configuration.skip_webflow_sync) or self.configuration.skip_webflow_sync = !Rails.env.production?
     end
 
     private
@@ -18,7 +18,8 @@ module WebflowSync
   end
 
   class Configuration
-    attr_accessor :api_token, :skip_webflow_sync, :webflow_site_id
+    attr_accessor :skip_webflow_sync, :webflow_site_id
+    attr_reader :api_token
 
     def api_token=(value)
       @api_token = Webflow.config.api_token = value

data/lib/webflow_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebflowSync
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webflow_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Viktor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails