contentful-scheduler 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14dd6e0b1a4ab640ac6dc86da32aaf78dd662b24
-  data.tar.gz: b29d84702d42a542f8e19dcb2702e47fc87cf6d1
+  metadata.gz: bd007e6c6d4a25ead5ebc991d556bcf0c54999ff
+  data.tar.gz: d1c46c66389f3e0e3156a74452c481677471df8e
 SHA512:
-  metadata.gz: '087d6c529736e060a0a9b5994a0399459907030276ae1bc5d6654f5fb44b178ebbc086f1e472bf3b629c0d51fa247dfeab587b6dfc609201acfd8acb021c61f6'
-  data.tar.gz: 62eb5b0c1828c8e6d323d0b595dc684a20ea80b4f2cde62d716671373d5d1c9dd8375919c80762bff5ccada05dd8a88c67972964ef51ed3954a067254808d541
+  metadata.gz: a93a782354a79b12c9c939ff29574a6fd647544865fad71447c5bac64af3f08e30ef666bb3a34581a835a4e95fb96918b1530e96558d11169e7cc6765b854ee2
+  data.tar.gz: f7a8ed7913141c24f9fc040d17232d451842a6ce4d4f4f80781b7158ea3990ce651466bcdef68eb299d85c9d2a32846ff593e12a6755ce276f9b62ee61f24f6a

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.3.0
+### Added
+* Added possibility to republish already published content. [#5](https://github.com/contentful/contentful-scheduler.rb/issues/5)
+
 ## 0.2.1
 
 ### Fixed

data/README.md

@@ -3,19 +3,19 @@
 Scheduling Server for Contentful entries.
 
 ## Contentful
-[Contentful](http://www.contentful.com) is a content management platform for web applications,
-mobile apps and connected devices. It allows you to create, edit & manage content in the cloud
-and publish it anywhere via powerful API. Contentful offers tools for managing editorial
-teams and enabling cooperation between organizations.
+[Contentful](https://www.contentful.com) provides a content infrastructure for digital teams to power content in websites, apps, and devices. Unlike a CMS, Contentful was built to integrate with the modern software stack. It offers a central hub for structured content, powerful management and delivery APIs, and a customizable web app that enable developers and content creators to ship digital products faster.
 
 ## What does `contentful-scheduler` do?
 The aim of `contentful-scheduler` is to have developers setting up their Contentful
 entries for scheduled publishing.
 
 ## How does it work
-`contentful-scheduler` provides a web endpoint to receive webhook calls from Contentful,
-every time the endpoint recieves a call it looks for the value of the field defined in the configuration,
-if the value is a time in the future it will schedule the entry for publishing at the specified time.
+`contentful-scheduler` provides a web endpoint to receive webhook calls from Contentful.
+
+Every time the endpoint recieves a call it looks for the value of the field defined in the configuration.
+If the value is a time in the future -- and if the entry has not already been published -- it will schedule
+the entry for publishing at the specified time.
+
 A background worker based on the popular `resque` gem will then proceed to actually make the publish call
 against the Content Management API at the due time. For this the Entries you wish to publish require a
 customizable Date field, which we advice to call `publishDate`, this field can be configured inside your

data/lib/contentful/scheduler/queue.rb

@@ -16,7 +16,7 @@ module Contentful
       def update_or_create(webhook)
         return unless publishable?(webhook)
         remove(webhook) if in_queue?(webhook)
-        return if already_published?(webhook)
+        return unless publish_is_future?(webhook)
 
         success = Resque.enqueue_at(
           publish_date(webhook),
@@ -55,21 +55,14 @@ module Contentful
         return false unless spaces.key?(webhook.space_id)
 
         if webhook_publish_field?(webhook)
-          return !webhook_publish_field(webhook).nil?
+          return !webhook_publish_field(webhook).nil? && publish_is_future?(webhook)
         end
 
         false
       end
 
-      def already_published?(webhook)
-        return true if publish_date(webhook) < Time.now.utc
-        return false unless webhook.sys.key?('publishedAt')
-
-        if !webhook.sys['publishedAt'].nil?
-          return Chronic.parse(webhook.sys['publishedAt']).utc < Time.now.utc
-        end
-
-        false
+      def publish_is_future?(webhook)
+        publish_date(webhook) > Time.now.utc
       end
 
       def in_queue?(webhook)

data/lib/contentful/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module Scheduler
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/spec/contentful/scheduler/queue_spec.rb

@@ -100,32 +100,6 @@ describe Contentful::Scheduler::Queue do
       end
     end
 
-    describe '#already_published?' do
-      it 'true if webhook publish_date is in past' do
-        expect(subject.already_published?(
-          WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2011-04-04T22:00:00+00:00'})
-        )).to be_truthy
-      end
-
-      it 'true if sys.publishedAt is in past' 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'})
-        )).to be_truthy
-      end
-
-      it 'false if sys.publishedAt is not present' do
-        expect(subject.already_published?(
-          WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2099-04-04T22:00:00+00:00'})
-        )).to be_falsey
-      end
-
-      it 'false if sys.publishedAt is present but nil' do
-        expect(subject.already_published?(
-          WebhookDouble.new('bar', 'foo', {'publishedAt' => nil}, {'my_field' => '2099-04-04T22:00:00+00:00'})
-        )).to be_falsey
-      end
-    end
-
     describe '#publishable?' do
       it 'false if webhook space not present in config' do
         expect(subject.publishable?(
@@ -147,7 +121,7 @@ describe Contentful::Scheduler::Queue do
 
       it 'true if publish_field is populated' do
         expect(subject.publishable?(
-          WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2011-04-04T22:00:00+00:00'})
+          WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2111-04-04T22:00:00+00:00'})
         )).to be_truthy
       end
     end
@@ -221,14 +195,6 @@ describe Contentful::Scheduler::Queue do
 
           subject.update_or_create(WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2099-04-04T22:00:00+00:00'}))
         end
-
-        it 'removes old call if already published' do
-          allow(Resque).to receive(:peek) { [{'args' => ['foo', 'bar']}] }
-          expect(Resque).not_to receive(:enqueue_at)
-          expect(subject).to receive(:remove)
-
-          subject.update_or_create(WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2011-04-04T22:00:00+00:00'}))
-        end
       end
     end
 
@@ -250,7 +216,7 @@ describe Contentful::Scheduler::Queue do
         allow(Resque).to receive(:peek) { [{'args' => ['foo', 'bar']}] }
         expect(Resque).to receive(:remove_delayed)
 
-        subject.remove(WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2011-04-04T22:00:00+00:00'}))
+        subject.remove(WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2111-04-04T22:00:00+00:00'}))
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno0
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful-webhook-listener