webflow_sync 6.1.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acaae64b1e573657f4983a9dc387f22da9be1f4c03a3d3475179cf9dcb288ab9
-  data.tar.gz: f169ae62d45a2136607438bd7c329939f3459126a7e27fd62ff26bbfd713ee74
+  metadata.gz: f639ebd2128267a119b8dd6a93e2d06858e8713a2faeb6b6f17bc123e60438bb
+  data.tar.gz: 43294f31bc2fa6e5b0772ecbd28480b8c071c6472c1748b05a3109bd2818dc47
 SHA512:
-  metadata.gz: 752e7ad6219a4f5062bf7ef970cf48117aa33a1ab8beb25df0630154f3e3cfc8bd997430753f4ea2731545072254e8c1e20ac73539246e00e4038709a23faae8
-  data.tar.gz: ac6ac22d798f4dca3ac516be03a2877d9da52f0c3e4256fafa09b544a74ba7327ef183b17cf18a7e607f4ad8ff95c754ed659ea0d90f37504e6cc689da4e4473
+  metadata.gz: 2fac06bf9bc32b9618636acd2ab18437385f01071435757db1d311225c4f032800cb210c51168c9fb659bc095dcec5d716ce718d1c2e89449bbbf842e59bf4a8
+  data.tar.gz: 8109face21e162c8826b25fec73409009a4bc94ffd519c1648c9c7916f9a4ae6b7bdbe5c328d95031ae0fadfbc0ade771c196a83b3cf4232be80e1cefe19a8de

data/app/jobs/webflow_sync/create_item_job.rb

@@ -11,11 +11,14 @@ module WebflowSync
     # collection_slug => slug of the WebFlow collection
     # model_name = 'articles'; id = article.id, collection_slug = 'stories'
     def perform(model_name, id, collection_slug = model_name.underscore.dasherize.pluralize)
+      return if WebflowSync.configuration.skip_webflow_sync
+
       model_class = model_name.underscore.classify.constantize
       record = model_class.find_by(id:)
       return if record.blank?
+      return if record.skip_webflow_sync
       return if record.webflow_site_id.blank?
-      return WebflowSync::UpdateItemJob.perform_now(model_name, id, collection_slug) if record.webflow_item_id.present?
+      return WebflowSync::UpdateItemJob.perform_later(model_name, id, collection_slug) if record.webflow_item_id.present?
 
       WebflowSync::Api.new(record.webflow_site_id).create_item(record, collection_slug)
     end

data/app/jobs/webflow_sync/destroy_item_job.rb

@@ -3,6 +3,7 @@
 module WebflowSync
   class DestroyItemJob < ApplicationJob
     def perform(collection_slug:, webflow_site_id:, webflow_item_id:)
+      return if WebflowSync.configuration.skip_webflow_sync
       return if webflow_site_id.blank?
       return if webflow_item_id.blank?
 

data/app/jobs/webflow_sync/update_item_job.rb

@@ -7,11 +7,14 @@ module WebflowSync
     # 'JobListing'.underscore.dasherize.pluralize => 'job-listings'
     # 'job_listing'.underscore.dasherize.pluralize => 'job-listings'
     def perform(model_name, id, collection_slug = model_name.underscore.dasherize.pluralize)
+      return if WebflowSync.configuration.skip_webflow_sync
+
       model_class = model_name.underscore.classify.constantize
       record = model_class.find_by(id:)
       return if record.blank?
+      return if record.skip_webflow_sync
       return if record.webflow_site_id.blank?
-      return WebflowSync::CreateItemJob.perform_now(model_name, id, collection_slug) if record.webflow_item_id.blank?
+      return WebflowSync::CreateItemJob.perform_later(model_name, id, collection_slug) if record.webflow_item_id.blank?
 
       WebflowSync::Api.new(record.webflow_site_id).update_item(record, collection_slug)
     end

data/app/services/webflow_sync/api.rb

@@ -8,20 +8,20 @@ module WebflowSync
       @site_id = site_id
     end
 
-    def get_all_items(collection_slug:, page_limit: 100) # rubocop:disable Metrics/MethodLength
-      collection_id = find_webflow_collection(collection_slug)['_id']
-      max_items_per_page = page_limit # Webflow::Error: 'limit' must be less than or equal to 100
+    def get_all_items(collection_slug:, page_limit: 100) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      collection_id = find_webflow_collection(collection_slug).fetch('id')
+      max_items_per_page = [page_limit, 100].min
       first_page_number = 1
 
       result = make_request(:paginate_items, collection_id, page: first_page_number, per_page: max_items_per_page)
       puts "Get all items from WebFlow for #{collection_slug} page: #{first_page_number}"
 
-      total_items = result['total']
+      total_items = result.dig('pagination', 'total')
       total_pages = (total_items.to_f / max_items_per_page).ceil
-      items = result['items']
+      items = result.fetch('items')
 
       (2..total_pages).each do |page_number|
-        next_page_items = make_request(:paginate_items, collection_id, page: page_number, per_page: max_items_per_page)['items']
+        next_page_items = make_request(:paginate_items, collection_id, page: page_number, per_page: max_items_per_page).fetch('items')
         puts "Get all items from WebFlow for #{collection_slug} page: #{page_number}"
 
         items.concat next_page_items
@@ -33,47 +33,38 @@ module WebflowSync
     def get_item(collection_slug, webflow_item_id)
       collection = find_webflow_collection(collection_slug)
 
-      make_request(:item, collection['_id'], webflow_item_id)
+      make_request(:item, collection.fetch('id'), webflow_item_id)
     end
 
     def create_item(record, collection_slug)
       collection = find_webflow_collection(collection_slug)
-      response = make_request(:create_item, collection['_id'],
-                              record.as_webflow_json.reverse_merge(_archived: false, _draft: false), live: true)
+      response = make_request(:create_item, collection.fetch('id'), record.as_webflow_json, publish: true)
 
       if update_record_columns(record, response)
         puts "Created #{record.inspect} in #{collection_slug}"
         response
       else
-        raise "Failed to store webflow_item_id: '#{response['_id']}' " \
+        raise "Failed to store webflow_item_id: '#{response.fetch('id')}' " \
               "after creating item in WebFlow collection #{record.inspect}"
       end
     end
 
     def update_item(record, collection_slug)
       collection = find_webflow_collection(collection_slug)
-      response = make_request(:update_item, { '_cid' => collection['_id'], '_id' => record.webflow_item_id },
-                              record.as_webflow_json.reverse_merge(_archived: false, _draft: false), live: true)
-
+      response = make_request(:update_item, collection.fetch('id'), record.webflow_item_id, record.as_webflow_json, publish: true)
       puts "Updated #{record.inspect} in #{collection_slug}"
       response
     end
 
     def delete_item(collection_slug, webflow_item_id)
       collection = find_webflow_collection(collection_slug)
-      # deleting items from Webflow doesn't work as expected.
-      # if we delete without `live: true`, the item will stay visible on the site until the site is published again
-      # if we delete with `live: true`, the item will be set as draft and not visible on the site, but it will be visible in the Webflow CMS
-      # we then call delete again to remove the item from Webflow CMS
-      make_request(:delete_item, { '_cid' => collection['_id'], '_id' => webflow_item_id }, live: true)
-      response = make_request(:delete_item, { '_cid' => collection['_id'], '_id' => webflow_item_id })
-
+      response = make_request(:delete_item, collection.fetch('id'), webflow_item_id)
       puts "Deleted #{webflow_item_id} from #{collection_slug}"
       response
     end
 
     def publish
-      response = make_request(:publish, site_id, domain_names:)
+      response = make_request(:publish, site_id)
 
       puts "Publish all domains for Webflow site with id: #{site_id}"
       response
@@ -89,23 +80,7 @@ module WebflowSync
       end
 
       def collections
-        @collections ||= make_request(:collections, site_id)
-      end
-
-      def domain_names
-        @domain_names ||= find_domain_names
-      end
-
-      def find_domain_names
-        # client.domains request does not return the default domain
-        # We need to get default domain name if there are no custom domains set to avoid error:
-        # Webflow::Error: Domain not found for site
-        site = make_request(:site, site_id)
-        default_domain_name = "#{site.fetch('shortName')}.webflow.io"
-        names = [default_domain_name]
-        make_request(:domains, site_id).each { |domain| names << domain.fetch('name') }
-
-        names
+        @collections ||= make_request(:collections, site_id).fetch('collections')
       end
 
       def find_webflow_collection(collection_slug)
@@ -118,9 +93,9 @@ module WebflowSync
       def update_record_columns(record, response)
         # use update_column to skip callbacks to prevent WebflowSync::ItemSync to kick off
         if WebflowSync.configuration.sync_webflow_slug
-          record.update_columns(webflow_item_id: response['_id'], webflow_slug: response['slug']) # rubocop:disable Rails/SkipsModelValidations
+          record.update_columns(webflow_item_id: response.fetch('id'), webflow_slug: response.dig('fieldData', 'slug')) # rubocop:disable Rails/SkipsModelValidations
         else
-          record.update_column(:webflow_item_id, response['_id']) # rubocop:disable Rails/SkipsModelValidations
+          record.update_column(:webflow_item_id, response.fetch('id')) # rubocop:disable Rails/SkipsModelValidations
         end
       end
 
@@ -131,7 +106,7 @@ module WebflowSync
           client.public_send(method_name, *args)
         end
       rescue Webflow::Error => e
-        raise unless e.message.strip == 'Rate limit hit'
+        raise unless e.message.strip == 'Too Many Requests'
 
         puts 'Sleeping 10 seconds'
         sleep 10

data/lib/webflow_sync/engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rails'
+
 module WebflowSync
   class Engine < ::Rails::Engine
   end

data/lib/webflow_sync/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webflow_sync
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 7.0.0
 platform: ruby
 authors:
 - Viktor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Keep Rails models in sync with WebFlow.