contentful-scheduler-custom-build-john 1.13 → 1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd7879dca084282d83eb0b2b68d51595ee2bb490
-  data.tar.gz: 70b18738b7c0299117476a673db14b5111b0662c
+  metadata.gz: 7a3ad6b71a82b2e86208b3742260bfa99c417c8d
+  data.tar.gz: 2fc217e5c6864866986107dbba00ec406ceae2de
 SHA512:
-  metadata.gz: de387823a3772352a2eeaa82291699ebba8163a7b96445abfed4f0389af8e84a38ce4b418bc1f06c02aa26984c3988e59c2dc34364b6587c229a358f934fbdfb
-  data.tar.gz: 91bb034e50171ffadc658ed5c21dafc56a3932cfb8285e842402c9b32495de49b280ee01df799fdfbae0f12a146574e5ca6113a905ccf066971ee23e14f47989
+  metadata.gz: 76c3630273048ffbe92baac8622127c448d363bdf6b6039f9d0ac4cf6311e39f3bbddcd7c3cd93a0dbf9ad1fd34447f3b986b1f69f65caf58ead4dbf01a871b6
+  data.tar.gz: 0b227b979bc3c0522bad48b07778db4b1c1a3673e623bb84beb71fcfe5f9495c9ddcc3697c0d3826ce87a9c689ee21a4e47e98c46278b0f46b575056dfda3405

data/lib/contentful/scheduler/queue.rb

@@ -16,6 +16,7 @@ module Contentful
       def update_or_create(webhook)
         return unless publishable?(webhook)
         remove(webhook) if in_queue?(webhook)
+        puts already_published?(webhook)
         return if already_published?(webhook)
 
         success = Resque.enqueue_at(
@@ -63,8 +64,7 @@ module Contentful
 
       def already_published?(webhook)
         return true if publish_date(webhook) < Time.now.utc
-        puts !webhook_is_publish_in_future(webhook)
-        if !webhook_is_publish_in_future(webhook)
+        if !webhook.fields[spaces[webhook.space_id][:is_publish_in_future]]
           return false unless webhook.sys.key?('publishedAt')
           if !webhook.sys['publishedAt'].nil?
             return Chronic.parse(webhook.sys['publishedAt']).utc < Time.now.utc
@@ -98,14 +98,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.13"
+    VERSION = "1.14"
   end
 end

data/spec/contentful/scheduler/queue_spec.rb

@@ -161,6 +161,12 @@ describe Contentful::Scheduler::Queue do
           WebhookDouble.new('bar', 'foo', {'publishedAt' =>  '2011-04-04T22:00:00+00:00'}, {'my_field' => '2099-04-04T22:00:00+00:00', 'is_publish_in_future' => false})
         )).to be_truthy
       end
+
+      it 'false if webhook publish_date is in future  and is_publish_in_future is true' do
+        expect(subject.already_published?(
+          WebhookDouble.new('bar', 'foo', {'publishedAt' =>  '2011-04-04T22:00:00+00:00'}, {'my_field' => '2099-04-04T22:00:00+00:00', 'is_publish_in_future' => true})
+        )).to be_falsey
+      end
     end
 
     describe '#publishable?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful-scheduler-custom-build-john
 version: !ruby/object:Gem::Version
-  version: '1.13'
+  version: '1.14'
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno0