contentful-scheduler-custom 1.6.116 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f8a7d88bc6392835f76f171fabfde5aed9d64f59c5606a89aaefb07e43d7230
-  data.tar.gz: 3a9d7ccbfe3d5ad7e3a80bccf7a8f69cd776e89b4323dc55f3a26129103144cc
+  metadata.gz: 3da54c37d419eee61f8c110cb58fb927d2b75ac49ab5f0f714950658299e6b7e
+  data.tar.gz: 82fdd3836f5597dfad53cac1ddb6e73612b7df656ca7cbd6acd5dae602a3193a
 SHA512:
-  metadata.gz: d0cbdcf5cffb8fd674b7cfba28fccaea2166625cb1e250a511e649d39862e477644085f6a5e5a660e3baef6683cd08d4fd357fb2cccf1c807bbbb0479c7273d4
-  data.tar.gz: 227a4780d34a1c5becc8029bd538e810a8a49a1ee183b6a3b5e1d8e86bd936e1ea59bec7aefa4f5d44c7031d466be73a245a7c10521595d1f695f1747eb1a795
+  metadata.gz: 33c4f182623da852a81486e6fe1b6e9b5c9f8e1586866d5bbf65b28d52b6a31b440ce2c5e917dc22ff118217ceb97f8b1e18ef42616c2d587439c39b8e723545
+  data.tar.gz: 1be3647f52670146eb513671d3f9c66ee1bfdc70f1e03548ef918385b792f85c46c169e308207acab2433333cf6ae44b3e39eb1eaa10ccc8b2a382e9d9e242d5

data/contentful-scheduler.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "contentful", "~> 2.11.1"
   spec.add_runtime_dependency "contentful-webhook-listener", "~> 0.2"
   spec.add_runtime_dependency "contentful-management", "~> 1.8"
   spec.add_runtime_dependency "resque", "~> 1.27.4"

data/lib/contentful/scheduler/queue.rb

@@ -1,5 +1,4 @@
-require_relative "tasks"
-require_relative "tasks"
+require_relative 'tasks'
 require 'chronic'
 require 'contentful/webhook/listener'
 

data/lib/contentful/scheduler/tasks/publish.rb

@@ -1,4 +1,7 @@
 require 'contentful/management'
+require 'contentful'
+require 'logger'
+require_relative '../taskshelper'
 
 module Contentful
   module Scheduler
@@ -7,13 +10,33 @@ module Contentful
         @queue = :publish
 
         def self.perform(space_id, entry_id, token)
-          client = ::Contentful::Management::Client.new(
-            token,
-            raise_errors: true,
-            application_name: 'contentful.scheduler',
-            application_version: Contentful::Scheduler::VERSION
+
+          logger = Logger.new(STDOUT)
+
+          client = Contentful::Client.new(
+              space: space_id,
+              access_token: ::Contentful::Scheduler.config[:spaces][space_id][:delivery_token]
+          )
+
+          clientManagement = ::Contentful::Management::Client.new(
+              token,
+              raise_errors: true,
+              application_name: 'contentful.scheduler',
+              application_version: Contentful::Scheduler::VERSION
           )
-          client.entries(include: 3).find(space_id, entry_id).publish
+
+          linked_entries = client.entries(links_to_entry: entry_id)
+
+          if !linked_entries.raw["includes"].nil? && !linked_entries.raw["includes"]["Entry"].nil?
+            linked_entries_ids = Taskshelper.extract_element_ids(linked_entries.raw["includes"]["Entry"])
+            logger.info("Linked enteries for entry_id ==>> #{entry_id} are ==>> #{linked_entries_ids}")
+            linked_entries_ids.each do |id|
+              logger.info"Publishing linked entry with id #{id}"
+              clientManagement.entries.find(space_id, id).publish
+            end
+          end
+
+          clientManagement.entries.find(space_id, entry_id).publish
         end
       end
     end

data/lib/contentful/scheduler/tasks/unpublish.rb

@@ -1,4 +1,7 @@
 require 'contentful/management'
+require 'contentful'
+require 'logger'
+require_relative '../taskshelper'
 
 module Contentful
   module Scheduler
@@ -7,13 +10,33 @@ module Contentful
         @queue = :unpublish
 
         def self.perform(space_id, entry_id, token)
-          client = ::Contentful::Management::Client.new(
-            token,
-            raise_errors: true,
-            application_name: 'contentful.scheduler',
-            application_version: Contentful::Scheduler::VERSION
+
+          logger = Logger.new(STDOUT)
+
+          client = Contentful::Client.new(
+              space: space_id,
+              access_token: ::Contentful::Scheduler.config[:spaces][space_id][:delivery_token]
+          )
+
+          clientManagement = ::Contentful::Management::Client.new(
+              token,
+              raise_errors: true,
+              application_name: 'contentful.scheduler',
+              application_version: Contentful::Scheduler::VERSION
           )
-          client.entries(include: 3).find(space_id, entry_id).unpublish
+
+          linked_entries = client.entries(links_to_entry: entry_id)
+
+          if !linked_entries.raw["includes"].nil? && !linked_entries.raw["includes"]["Entry"].nil?
+            linked_entries_ids = Taskshelper.extract_element_ids(linked_entries.raw["includes"]["Entry"])
+            logger.info("Linked enteries for entry_id ==>> #{entry_id} are ==>> #{linked_entries_ids}")
+            linked_entries_ids.each do |id|
+              logger.info"Unpublishing linked entry with id #{id}"
+              clientManagement.entries.find(space_id, id).unpublish
+            end
+          end
+
+          clientManagement.entries.find(space_id, entry_id).unpublish
         end
       end
     end

data/lib/contentful/scheduler/taskshelper.rb

@@ -0,0 +1,31 @@
+module Contentful
+  module Scheduler
+    module Taskshelper
+      def Taskshelper.extract_element_ids input_array
+        ids = []
+        input_array.each {|item| (ids << (Taskshelper.get_each_field item)).flatten!}
+        return ids.uniq
+      end
+
+      def Taskshelper.get_each_field item
+        ids = []
+        keys = item["fields"].keys
+        keys.each {|key| (ids << (Taskshelper.get_each_element key, item["fields"])).flatten!}
+        return ids
+      end
+
+      def Taskshelper.get_each_element key, item
+        ids = []
+        if item[key].is_a?(::Array)
+          item[key].each do |i|
+            (!(i["sys"]["linkType"].nil?) && i["sys"]["linkType"] == "Entry") ? ids.push(i["sys"]["id"]) : nil
+          end
+        elsif item[key].is_a?(::Hash)
+          (!(item[key]["sys"]["linkType"].nil?) && item[key]["sys"]["linkType"] == "Entry") ? ids.push(item[key]["sys"]["id"]) : nil
+        end
+        return ids
+      end
+    end
+  end
+end
+

data/lib/contentful/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module Scheduler
-    VERSION = "1.6.116"
+    VERSION = "1.7"
   end
-end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: contentful-scheduler-custom
 version: !ruby/object:Gem::Version
-  version: 1.6.116
+  version: '1.7'
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno0
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: contentful
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: contentful-webhook-listener
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +222,7 @@ files:
 - lib/contentful/scheduler/tasks.rb
 - lib/contentful/scheduler/tasks/publish.rb
 - lib/contentful/scheduler/tasks/unpublish.rb
+- lib/contentful/scheduler/taskshelper.rb
 - lib/contentful/scheduler/version.rb
 - spec/contentful/scheduler/auth_spec.rb
 - spec/contentful/scheduler/controller_spec.rb