wcc-contentful 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b816aba232400e71ec193b4a60220a111afc356d3d6aa3a10d77f96eacea21df
-  data.tar.gz: 95b27d0804915ef3effaf67e36e8e4ebcef39aa8001921d4e94a51c699c43a93
+  metadata.gz: 201a27cf2440f6857717728bedf9be194bda2ee14ae62f2eadbd8dca11d89d91
+  data.tar.gz: ab94d3e9a5bf2f369bc0cec01ede526541b896ac48e8d43bd19ceef5a0bc2994
 SHA512:
-  metadata.gz: ac1bcaeb7ddfe4f1f3fa2c34a542d814665e6d1428da89a4d8ae08a59686b5048d2892dc03cd9b3501a268bcf1867787a34ddeaac0b82d5791dadceef1df69e1
-  data.tar.gz: 7b84baba5cafff0ac07e7f0e557d08389f003918f84d2da7c10a8d7e50f60d45bd6214389b2e545803ed22964c00581920fa9f614b97d6e94a2e6e75abc090bc
+  metadata.gz: 9d0773e70c53a008b56ba96e9a352240db14902657c869449d47aefafc0d9889475947eec0c7e4f4b30d56444ea9763d5ab686045a6dd32bc67800ae62f0142a
+  data.tar.gz: c75c8423dc83f4e1ab695a5a5e0c18809235d0e1d4cbbaa3d960c9f8a3bb8380aab08d0324e87b45842c28a9eb514b9285cc49b418a5230026ccb3ccfe539509

data/lib/wcc/contentful/engine.rb

@@ -32,7 +32,11 @@ module WCC::Contentful
         next unless config&.management_token.present?
         next unless config.app_url.present?
 
-        WebhookEnableJob.set(wait: 10.seconds).perform_later if Rails.env.production?
+        if defined?(WCC::Contentful::WebhookEnableJob)
+          WCC::Contentful::WebhookEnableJob.set(wait: 10.seconds).perform_later if Rails.env.production?
+        else
+          Rails.logger.error 'ActiveJob is not defined, webhook enable job will not run'
+        end
       end
     end
 

data/lib/wcc/contentful/event.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'singleton'
+require 'ostruct'
 
 module WCC::Contentful::Event
   extend ActiveSupport::Concern

data/lib/wcc/contentful/model_builder.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ostruct'
 require_relative './link'
 require_relative './sys'
 require_relative './rich_text'

data/lib/wcc/contentful/simple_client/typhoeus_adapter.rb

@@ -2,6 +2,7 @@
 
 gem 'typhoeus'
 require 'typhoeus'
+require 'ostruct'
 
 class WCC::Contentful::SimpleClient::TyphoeusAdapter
   def get(url, params = {}, headers = {})

data/lib/wcc/contentful/test/double.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ostruct'
+
 require_relative './attributes'
 
 module WCC::Contentful::Test::Double

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '1.6.1'
+    VERSION = '1.6.2'
   end
 end

data/lib/wcc/contentful/webhook_enable_job.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module WCC::Contentful
+  if defined?(ActiveJob)
+    class WebhookEnableJob < ActiveJob::Base
+      self.queue_adapter = :async
+      queue_as :default
+
+      def perform(args = {})
+        args = default_configuration.merge!(args)
+
+        client = WCC::Contentful::SimpleClient::Management.new(
+          **args
+        )
+        enable_webhook(client, **args.slice(:receive_url, :webhook_username, :webhook_password))
+      end
+
+      def enable_webhook(client, receive_url:, webhook_username: nil, webhook_password: nil)
+        webhook = client.webhook_definitions.items.find { |w| w['url'] == receive_url }
+        logger.debug "existing webhook: #{webhook.inspect}" if webhook
+        return if webhook
+
+        body = {
+          'name' => 'WCC::Contentful webhook',
+          'url' => receive_url,
+          'topics' => [
+            '*.publish',
+            '*.unpublish'
+          ],
+          'filters' => webhook_filters
+        }
+        body['httpBasicUsername'] = webhook_username if webhook_username.present?
+        body['httpBasicPassword'] = webhook_password if webhook_password.present?
+
+        begin
+          resp = client.post_webhook_definition(body)
+          logger.info "Created webhook: #{resp.raw.dig('sys', 'id')}"
+        rescue WCC::Contentful::SimpleClient::ApiError => e
+          logger.error "#{e.response.code}: #{e.response.raw}" if e.response
+          raise
+        end
+      end
+
+      private
+
+      def default_configuration
+        return {} unless config = WCC::Contentful&.configuration
+
+        {
+          management_token: config.management_token,
+          space: config.space,
+          environment: config.environment,
+          connection: config.connection,
+          webhook_username: config.webhook_username,
+          webhook_password: config.webhook_password,
+
+          receive_url: URI.join(config.app_url, 'webhook/receive').to_s
+        }
+      end
+
+      def webhook_filters
+        filters = []
+
+        if (environment_id = WCC::Contentful.configuration&.environment).present?
+          filters << {
+            'equals' => [
+              { 'doc' => 'sys.environment.sys.id' },
+              environment_id
+            ]
+          }
+        end
+        filters
+      end
+    end
+  end
+end

data/lib/wcc/contentful.rb

@@ -24,6 +24,7 @@ require 'wcc/contentful/rich_text'
 require 'wcc/contentful/rich_text_renderer'
 require 'wcc/contentful/rich_text_renderer_factory'
 require 'wcc/contentful/sync_engine'
+require 'wcc/contentful/webhook_enable_job'
 require 'wcc/contentful/events'
 require 'wcc/contentful/middleware'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -419,7 +419,6 @@ files:
 - Rakefile
 - app/controllers/wcc/contentful/application_controller.rb
 - app/controllers/wcc/contentful/webhook_controller.rb
-- app/jobs/wcc/contentful/webhook_enable_job.rb
 - config/initializers/mime_types.rb
 - config/routes.rb
 - lib/tasks/download_schema.rake
@@ -494,6 +493,7 @@ files:
 - lib/wcc/contentful/test/double.rb
 - lib/wcc/contentful/test/factory.rb
 - lib/wcc/contentful/version.rb
+- lib/wcc/contentful/webhook_enable_job.rb
 - wcc-contentful.gemspec
 homepage: https://github.com/watermarkchurch/wcc-contentful/wcc-contentful
 licenses:
@@ -516,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://rubygems.org/gems/wcc-contentful)

data/app/jobs/wcc/contentful/webhook_enable_job.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_job'
-
-module WCC::Contentful
-  class WebhookEnableJob < ActiveJob::Base
-    self.queue_adapter = :async
-    queue_as :default
-
-    def perform(args = {})
-      args = default_configuration.merge!(args)
-
-      client = WCC::Contentful::SimpleClient::Management.new(
-        **args
-      )
-      enable_webhook(client, **args.slice(:receive_url, :webhook_username, :webhook_password))
-    end
-
-    def enable_webhook(client, receive_url:, webhook_username: nil, webhook_password: nil)
-      webhook = client.webhook_definitions.items.find { |w| w['url'] == receive_url }
-      logger.debug "existing webhook: #{webhook.inspect}" if webhook
-      return if webhook
-
-      body = {
-        'name' => 'WCC::Contentful webhook',
-        'url' => receive_url,
-        'topics' => [
-          '*.publish',
-          '*.unpublish'
-        ],
-        'filters' => webhook_filters
-      }
-      body['httpBasicUsername'] = webhook_username if webhook_username.present?
-      body['httpBasicPassword'] = webhook_password if webhook_password.present?
-
-      begin
-        resp = client.post_webhook_definition(body)
-        logger.info "Created webhook: #{resp.raw.dig('sys', 'id')}"
-      rescue WCC::Contentful::SimpleClient::ApiError => e
-        logger.error "#{e.response.code}: #{e.response.raw}" if e.response
-        raise
-      end
-    end
-
-    private
-
-    def default_configuration
-      return {} unless config = WCC::Contentful&.configuration
-
-      {
-        management_token: config.management_token,
-        space: config.space,
-        environment: config.environment,
-        connection: config.connection,
-        webhook_username: config.webhook_username,
-        webhook_password: config.webhook_password,
-
-        receive_url: URI.join(config.app_url, 'webhook/receive').to_s
-      }
-    end
-
-    def webhook_filters
-      filters = []
-
-      if (environment_id = WCC::Contentful.configuration&.environment).present?
-        filters << {
-          'equals' => [
-            { 'doc' => 'sys.environment.sys.id' },
-            environment_id
-          ]
-        }
-      end
-      filters
-    end
-  end
-end