contentful-scheduler-custom 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49b54660734e1d99de423774a5704df42900639
-  data.tar.gz: dbefa3a1295ef8255342ae9de0a3b06f74c1f8d2
+  metadata.gz: e0b82b5e275d4c0dae01a44780318417ab6f87e3
+  data.tar.gz: 42719ffbdc3ccf8d5575b48142a715f4bb8c13d7
 SHA512:
-  metadata.gz: 6ef18cffb5aa64b4e11884bba9f95f9bfc32e67c09038941fc0d624ba4f6e7acf166552ece511a1cb208ea41913e47b3686e6ee80bda233cf4f8331d5e63883f
-  data.tar.gz: 4c56e55d8e087c7c8fb1f0615f07d3cc90fcbf089a0e5a23161d36c9f0d4e63ded599f69e49884202e0e029b12214cee6d906be569df7afe8726eec2c2203261
+  metadata.gz: 9a05d4921b687ca48b7e4cb52201756c227d736fa27bcc152b5f01b7eb7ed15a6da47df2b0ffe51eeccf52d9515bd1ae14fa4fc066f751cf7067829f67f00398
+  data.tar.gz: ad89cfde974e0ade192c67809a281cb59f03feee3b024db99155ad07dde51e178d54211f204cfcd3ae40952f4dac3abf5682a0a76722355f2211b9023ddd5182

data/lib/contentful/scheduler/queue.rb

@@ -20,7 +20,7 @@ module Contentful
         end
 
         if unpublishable?(webhook)
-          success = update_or_create_for_unpublish(webhook) && success
+          success = update_or_create_for_unpublish(webhook)
           log_event_success(webhook, success, 'unpublish', 'added to')
         end
 

data/lib/contentful/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module Scheduler
-    VERSION = "1.5.2"
+    VERSION = "1.5.3"
   end
 end

data/spec/contentful/scheduler/queue_spec.rb

@@ -1,67 +1,27 @@
 require 'spec_helper'
 
-class WebhookDouble
-  attr_reader :id, :space_id, :sys, :fields
-  def initialize(id, space_id, sys = {}, fields = {})
-    @id = id
-    @space_id = space_id
-    @sys = sys
-    @fields = fields
-  end
-end
-
 describe Contentful::Scheduler::Queue do
-  let(:config) {
-    {
-      logger: ::Contentful::Scheduler::DEFAULT_LOGGER,
-      endpoint: ::Contentful::Scheduler::DEFAULT_ENDPOINT,
-      port: ::Contentful::Scheduler::DEFAULT_PORT,
-      redis: {
-        host: 'localhost',
-        port: 12341,
-        password: 'foobar'
-      },
-      spaces: {
-        'foo' => {
-          publish_field: 'my_field',
-          management_token: 'foo'
-        }
-      }
-    }
-  }
-
+  let(:config) { base_config }
   subject { described_class.instance }
 
   before :each do
     allow(Resque).to receive(:redis=)
     described_class.class_variable_set(:@@instance, nil)
-    ::Contentful::Scheduler.config = config
+
+    ::Contentful::Scheduler.class_variable_set(:@@config, base_config)
   end
 
   describe 'singleton' do
     it 'creates an instance if not initialized' do
-      queue = described_class.instance
-      expect(queue).to be_a described_class
+      expect(subject).to be_a described_class
     end
 
     it 'reuses same instance' do
-      queue = described_class.instance
-
-      expect(queue).to eq described_class.instance
-    end
-  end
-
-  describe 'attributes' do
-    it '.config' do
-      expect(subject.config).to eq config
+      expect(subject).to eq described_class.instance
     end
   end
 
   describe 'instance methods' do
-    it '#spaces' do
-      expect(subject.spaces).to eq config[:spaces]
-    end
-
     it '#webhook_publish_field?' do
       expect(subject.webhook_publish_field?(
         WebhookDouble.new('bar', 'foo', {}, {'my_field' => 'something'})
@@ -76,12 +36,32 @@ describe Contentful::Scheduler::Queue do
       )).to be_falsey
     end
 
+    it '#webhook_unpublish_field?' do
+      expect(subject.webhook_unpublish_field?(
+        WebhookDouble.new('bar', 'unpublish_space', {}, {'unpublish_field' => 'something'})
+      )).to be_truthy
+
+      expect(subject.webhook_publish_field?(
+        WebhookDouble.new('bar', 'unpublish_space', {}, {'not_unpublish_field' => 'something'})
+      )).to be_falsey
+
+      expect(subject.webhook_publish_field?(
+        WebhookDouble.new('bar', 'other_space', {}, {'not_my_field' => 'something'})
+      )).to be_falsey
+    end
+
     it '#webhook_publish_field' do
       expect(subject.webhook_publish_field(
         WebhookDouble.new('bar', 'foo', {}, {'my_field' => 'something'})
       )).to eq 'something'
     end
 
+    it '#webhook_unpublish_field' do
+      expect(subject.webhook_unpublish_field(
+        WebhookDouble.new('bar', 'unpublish_space', {}, {'unpublish_field' => 'something'})
+      )).to eq 'something'
+    end
+
     describe '#publish_date' do
       it 'works if date field not localized' do
         expect(subject.publish_date(
@@ -100,6 +80,24 @@ describe Contentful::Scheduler::Queue do
       end
     end
 
+    describe '#unpublish_date' do
+      it 'works if date field not localized' do
+        expect(subject.unpublish_date(
+          WebhookDouble.new('bar', 'unpublish_space', {}, {'unpublish_field' => '2011-04-04T22:00:00+00:00'})
+        )).to eq DateTime.new(2011, 4, 4, 22, 0, 0).to_time.utc
+      end
+
+      it 'works if date field localized by grabbing first available locale' do
+        expect(subject.unpublish_date(
+          WebhookDouble.new('bar', 'unpublish_space', {}, {'unpublish_field' => {'en-US': '2011-04-04T22:00:00+00:00'}})
+        )).to eq DateTime.new(2011, 4, 4, 22, 0, 0).to_time.utc
+
+        expect(subject.unpublish_date(
+          WebhookDouble.new('bar', 'unpublish_space', {}, {'unpublish_field' => {'en-CA': '2011-04-04T23:00:00Z'}})
+        )).to eq DateTime.new(2011, 4, 4, 23, 0, 0).to_time.utc
+      end
+    end
+
     describe '#publishable?' do
       it 'false if webhook space not present in config' do
         expect(subject.publishable?(
@@ -126,18 +124,60 @@ describe Contentful::Scheduler::Queue do
       end
     end
 
-    describe '#in_queue?' do
+    describe '#unpublishable?' do
+      it 'false if webhook space not present in config' do
+        expect(subject.unpublishable?(
+          WebhookDouble.new('bar', 'not_foo')
+        )).to be_falsey
+      end
+
+      it 'false if unpublish_field is not found' do
+        expect(subject.unpublishable?(
+          WebhookDouble.new('bar', 'unpublish_space')
+        )).to be_falsey
+      end
+
+      it 'false if unpublish_field is nil' do
+        expect(subject.unpublishable?(
+          WebhookDouble.new('bar', 'unpublish_space', {}, {'unpublish_field' => nil})
+        )).to be_falsey
+      end
+
+      it 'true if unpublish_field is populated' do
+        expect(subject.unpublishable?(
+          WebhookDouble.new('bar', 'unpublish_space', {}, {'unpublish_field' => '2111-04-04T22:00:00+00:00'})
+        )).to be_truthy
+      end
+    end
+
+    describe '#in_publish_queue?' do
       it 'false if not in queue' do
         allow(Resque).to receive(:peek) { [] }
-        expect(subject.in_queue?(
+        expect(subject.in_publish_queue?(
           WebhookDouble.new('bar', 'foo')
         )).to be_falsey
       end
 
       it 'true if in queue' do
         allow(Resque).to receive(:peek) { [{'args' => ['foo', 'bar']}] }
-        expect(subject.in_queue?(
+        expect(subject.in_publish_queue?(
+          WebhookDouble.new('bar', 'foo')
+        )).to be_truthy
+      end
+    end
+
+    describe '#in_unpublish_queue?' do
+      it 'false if not in queue' do
+        allow(Resque).to receive(:peek) { [] }
+        expect(subject.in_unpublish_queue?(
           WebhookDouble.new('bar', 'foo')
+        )).to be_falsey
+      end
+
+      it 'true if in queue' do
+        allow(Resque).to receive(:peek) { [{'args' => ['unpublish_space', 'bar']}] }
+        expect(subject.in_unpublish_queue?(
+          WebhookDouble.new('bar', 'unpublish_space')
         )).to be_truthy
       end
     end
@@ -191,7 +231,7 @@ describe Contentful::Scheduler::Queue do
             'bar',
             'foo'
           ) { true }
-          expect(subject).to receive(:remove)
+          expect(subject).to receive(:remove_publish)
 
           subject.update_or_create(WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2099-04-04T22:00:00+00:00'}))
         end
@@ -220,4 +260,4 @@ describe Contentful::Scheduler::Queue do
       end
     end
   end
-end
+end

data/spec/contentful/scheduler/tasks/publish_spec.rb

@@ -21,13 +21,13 @@ describe Contentful::Scheduler::Tasks::Publish do
   let(:mock_entry) { MockEntry.new }
 
   before :each do
-    ::Contentful::Scheduler.class_variable_set(:@@config, {management_token: 'foobar'})
+    ::Contentful::Scheduler.config = base_config
   end
 
   describe 'class methods' do
     it '::perform' do
       expect(::Contentful::Management::Client).to receive(:new).with(
-        'foobar',
+        'foo',
         raise_errors: true,
         application_name: 'contentful-scheduler',
         application_version: Contentful::Scheduler::VERSION
@@ -36,7 +36,7 @@ describe Contentful::Scheduler::Tasks::Publish do
       expect(mock_entries).to receive(:find).with('foo', 'bar') { mock_entry }
       expect(mock_entry).to receive(:publish)
 
-      described_class.perform('foo', 'bar', ::Contentful::Scheduler.config[:management_token])
+      described_class.perform('foo', 'bar', ::Contentful::Scheduler.config[:spaces]['foo'][:management_token])
     end
   end
-end
+end

data/spec/contentful/scheduler/tasks/unpublish_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+class MockEntry
+  def publish
+  end
+end
+
+class MockClient
+  def entries
+  end
+end
+
+class MockEntries
+  def find
+  end
+end
+
+describe Contentful::Scheduler::Tasks::Unpublish do
+  let(:mock_client) { MockClient.new }
+  let(:mock_entries) { MockEntries.new }
+  let(:mock_entry) { MockEntry.new }
+
+  before :each do
+    ::Contentful::Scheduler.class_variable_set(:@@config, {management_token: 'foobar'})
+  end
+
+  describe 'class methods' do
+    it '::perform' do
+      expect(::Contentful::Management::Client).to receive(:new).with(
+        'foobar',
+        raise_errors: true,
+        application_name: 'contentful-scheduler',
+        application_version: Contentful::Scheduler::VERSION
+      ) { mock_client }
+      expect(mock_client).to receive(:entries) { mock_entries }
+      expect(mock_entries).to receive(:find).with('foo', 'bar') { mock_entry }
+      expect(mock_entry).to receive(:unpublish)
+
+      described_class.perform('foo', 'bar', ::Contentful::Scheduler.config[:management_token])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -40,6 +40,17 @@ class RequestDummy
   end
 end
 
+class WebhookDouble
+  attr_reader :id, :space_id, :sys, :fields, :raw_headers
+  def initialize(id, space_id, sys = {}, fields = {}, headers = {})
+    @id = id
+    @space_id = space_id
+    @sys = sys
+    @fields = fields
+    @raw_headers = headers
+  end
+end
+
 class Contentful::Webhook::Listener::Controllers::Wait
   @@sleeping = false
 
@@ -54,7 +65,59 @@ class Contentful::Webhook::Listener::Controllers::Wait
   end
 end
 
+def base_config
+  {
+    logger: ::Contentful::Scheduler::DEFAULT_LOGGER,
+    endpoint: ::Contentful::Scheduler::DEFAULT_ENDPOINT,
+    port: ::Contentful::Scheduler::DEFAULT_PORT,
+    redis: {
+      host: 'localhost',
+      port: 12341,
+      password: 'foobar'
+    },
+    spaces: {
+      'foo' => {
+        publish_field: 'my_field',
+        management_token: 'foo'
+      },
+      'unpublish_space' => {
+        publish_field: 'my_field',
+        unpublish_field: 'unpublish_field',
+        management_token: 'foo'
+      },
+      'no_auth' => {
+        publish_field: 'my_field',
+        management_token: 'foo'
+      },
+      'valid_token_array' => {
+        publish_field: 'my_field',
+        management_token: 'foo',
+        auth: {
+          key: 'auth',
+          valid_tokens: ['test_1']
+        }
+      },
+      'valid_token_string' => {
+        publish_field: 'my_field',
+        management_token: 'foo',
+        auth: {
+          key: 'auth',
+          valid_tokens: 'test_2'
+        }
+      },
+      'lambda_auth' => {
+        publish_field: 'my_field',
+        management_token: 'foo',
+        auth: {
+          key: 'auth',
+          validation: -> (value) { value.size == 4 }
+        }
+      }
+    }
+  }
+end
+
 RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-scheduler-custom
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno0
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful-webhook-listener
@@ -211,6 +211,7 @@ files:
 - spec/contentful/scheduler/controller_spec.rb
 - spec/contentful/scheduler/queue_spec.rb
 - spec/contentful/scheduler/tasks/publish_spec.rb
+- spec/contentful/scheduler/tasks/unpublish_spec.rb
 - spec/contentful/scheduler_spec.rb
 - spec/spec_helper.rb
 homepage: https://www.contentful.com
@@ -241,5 +242,6 @@ test_files:
 - spec/contentful/scheduler/controller_spec.rb
 - spec/contentful/scheduler/queue_spec.rb
 - spec/contentful/scheduler/tasks/publish_spec.rb
+- spec/contentful/scheduler/tasks/unpublish_spec.rb
 - spec/contentful/scheduler_spec.rb
 - spec/spec_helper.rb