contentful-scheduler-custom-build-john 1.19 → 1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 881f639b9bd9c5778e7b7ce829e7ee9f6e31515d
-  data.tar.gz: a56adb18cecb018021eaa89ef0e115c4a4cfe919
+  metadata.gz: c4cea8eacabcba29ef219c4d136191622a650d7f
+  data.tar.gz: 9216bce248b65bfcfcf573ae29155cb6af4844ec
 SHA512:
-  metadata.gz: 98e2b7d348fca952091a15e4fcea38538d0ea1e0d8a69f1a76dfb9359ce09b6d710d688fbfd95f700ee2c38c5f4268cd6c90defb6ebd783fb1b452a961244f8a
-  data.tar.gz: 718584ab1949837810153ea7e903026f63c78bf9529ba04a8ca6787e2f370d4c4d940844a2d7b0b2c41854fca1aab19c2f9d235f5ca5dbc763ebcd10c0c2f5f0
+  metadata.gz: dca4de0888852f6626bf4cb84fb493686c6e09402f1b106e6763a82f13c6152a062207ac75a989b7a21d1de1d737539d9a5a19b58cfc3f6471820cb8a0b5cb5c
+  data.tar.gz: 11ff2fc5b6a6f5398e74cd841628809d6432b4387756d0b8a3ca46eeb61a28c0d7e3a2877dfd2c4bde6953c61d4615dbee36bba3100372aaf1dd88ce1c3ca077

data/lib/contentful/scheduler/queue.rb

@@ -26,6 +26,8 @@ module Contentful
           ::Contentful::Scheduler.config[:spaces][webhook.space_id][:management_token]
         )
 
+        updateContentBlocks(webhook)
+
         if success
           logger.info "Webhook {id: #{webhook.id}, space_id: #{webhook.space_id}} successfully added to queue"
         else
@@ -44,6 +46,8 @@ module Contentful
           ::Contentful::Scheduler.config[:management_token]
         )
 
+        removeContentBlocks(webhook)
+
         if success
           logger.info "Webhook {id: #{webhook.id}, space_id: #{webhook.space_id}} successfully removed from queue"
         else
@@ -51,6 +55,43 @@ module Contentful
         end
       end
 
+      def updateContentBlocks(webhook)
+        if isContentBlockAvailable(webhook)
+          webhook.fields['contentBlocks']['fi-FI'].each do |sys|
+            success = Resque.enqueue_at(
+              publish_date(webhook),
+              ::Contentful::Scheduler::Tasks::Publish,
+              webhook.space_id,
+              sys.id,
+              ::Contentful::Scheduler.config[:spaces][webhook.space_id][:management_token]
+            )
+            if success
+              logger.info "Webhook Content block {id: #{sys.id}, space_id: #{webhook.space_id}} successfully added to queue"
+            else
+              logger.warn "Webhook Content block {id: #{sys.id}, space_id: #{webhook.space_id}} couldn't be added to queue"
+            end
+          end
+        end
+      end
+
+      def removeContentBlocks(webhook)
+        if isContentBlockAvailable(webhook)
+          webhook.fields['contentBlocks']['fi-FI'].each do |sys|
+            success = Resque.remove_delayed(
+              ::Contentful::Scheduler::Tasks::Publish,
+              webhook.space_id,
+              sys.id,
+              ::Contentful::Scheduler.config[:management_token]
+            )
+            if success
+              logger.info "Webhook Content Block {id: #{sys.id}, space_id: #{webhook.space_id}} successfully removed from queue"
+            else
+              logger.warn "Webhook Content Block {id: #{sys.id}, space_id: #{webhook.space_id}} couldn't be removed from queue"
+            end
+          end
+        end
+      end
+
       def publishable?(webhook)
         return false unless spaces.key?(webhook.space_id)
 
@@ -91,14 +132,6 @@ module Contentful
         webhook.fields[spaces[webhook.space_id][:publish_field]]
       end
 
-      def webhook_is_publish_in_future(webhook)
-        if webhook.fields.key?(spaces.fetch(webhook.space_id, {})[:is_publish_in_future])
-          return webhook.fields[spaces[webhook.space_id][:is_publish_in_future]]
-        else
-          return true
-        end
-      end
-
       private
 
       def initialize(logger)

data/lib/contentful/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module Scheduler
-    VERSION = "1.19"
+    VERSION = "1.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-scheduler-custom-build-john
 version: !ruby/object:Gem::Version
-  version: '1.19'
+  version: '1.20'
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno0
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful-webhook-listener