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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83307bec8f58caaa3b5c7a80325ed2786c9b870
-  data.tar.gz: 74c479c6f4cd6f0df5f2969b995135710cf07e60
+  metadata.gz: cd7879dca084282d83eb0b2b68d51595ee2bb490
+  data.tar.gz: 70b18738b7c0299117476a673db14b5111b0662c
 SHA512:
-  metadata.gz: d661f2c6fb9bc5546acb3d32d278e7a434211f41b1c0824d8667c34002089ac32171944be3d3ebb9e2a3dbd262ea97d3e51f5176f7bf3942513ed69728f7fad9
-  data.tar.gz: 61e4867c01e33ec98f34f6c1e8ebbfcfc8bff8202e66d312ec83891f16452beb94af79adda9e369f80c39d581196088327837c819bd3df876677a4617c10fc1a
+  metadata.gz: de387823a3772352a2eeaa82291699ebba8163a7b96445abfed4f0389af8e84a38ce4b418bc1f06c02aa26984c3988e59c2dc34364b6587c229a358f934fbdfb
+  data.tar.gz: 91bb034e50171ffadc658ed5c21dafc56a3932cfb8285e842402c9b32495de49b280ee01df799fdfbae0f12a146574e5ca6113a905ccf066971ee23e14f47989

data/lib/contentful/scheduler/queue.rb

@@ -63,7 +63,8 @@ module Contentful
 
       def already_published?(webhook)
         return true if publish_date(webhook) < Time.now.utc
-        if !webhook_is_publish_in_future(webhook).nil?
+        puts !webhook_is_publish_in_future(webhook)
+        if !webhook_is_publish_in_future(webhook)
           return false unless webhook.sys.key?('publishedAt')
           if !webhook.sys['publishedAt'].nil?
             return Chronic.parse(webhook.sys['publishedAt']).utc < Time.now.utc
@@ -98,7 +99,11 @@ module Contentful
       end
 
       def webhook_is_publish_in_future(webhook)
-        webhook.fields[spaces[webhook.space_id][:is_publish_in_future]]
+        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

data/lib/contentful/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module Scheduler
-    VERSION = "1.12"
+    VERSION = "1.13"
   end
 end

data/spec/contentful/scheduler/queue_spec.rb

@@ -132,10 +132,10 @@ describe Contentful::Scheduler::Queue do
         )).to be_falsey
       end
 
-      it 'true if sys.publishedAt is in past and is_publish_in_future is true' do
+      it 'false if sys.publishedAt is in past 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_truthy
+        )).to be_falsey
       end
 
       it 'false if sys.publishedAt is not present and is_publish_in_future is false' do
@@ -149,6 +149,18 @@ describe Contentful::Scheduler::Queue do
           WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2011-04-04T22:00:00+00:00', 'is_publish_in_future' => true})
         )).to be_truthy
       end
+
+      it 'false if webhook publish_date is in future  and is_publish_in_future is false' do
+        expect(subject.already_published?(
+          WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2099-04-04T22:00:00+00:00', 'is_publish_in_future' => false})
+        )).to be_falsey
+      end
+
+      it 'true if webhook publish_date is in future  and is_publish_in_future is false' 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' => false})
+        )).to be_truthy
+      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.12'
+  version: '1.13'
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno0