contentful-scheduler 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6c1e89296a0e023ab7a1965e8d4e61227f50a7e
-  data.tar.gz: 1b88d27deb5cff6083fd1806ab6ee20cf73e3678
+  metadata.gz: 14dd6e0b1a4ab640ac6dc86da32aaf78dd662b24
+  data.tar.gz: b29d84702d42a542f8e19dcb2702e47fc87cf6d1
 SHA512:
-  metadata.gz: 6ff9efe84ab5612b5d4aeabfe8193968cd15cb4745a6f5e55bd4761ce2cd3e27f7ae7473641ca848fffa564c4036ab17689373ba6dec12142feff88390cc27b5
-  data.tar.gz: 5f1e89b67d58bbf5f8772c749846cb98908425e2a5387990670c96f65e69cd1d04745c26eeee3d7fd3c57db00d40d84852760e71eb8beac053f9626aeb9c3e2b
+  metadata.gz: '087d6c529736e060a0a9b5994a0399459907030276ae1bc5d6654f5fb44b178ebbc086f1e472bf3b629c0d51fa247dfeab587b6dfc609201acfd8acb021c61f6'
+  data.tar.gz: 62eb5b0c1828c8e6d323d0b595dc684a20ea80b4f2cde62d716671373d5d1c9dd8375919c80762bff5ccada05dd8a88c67972964ef51ed3954a067254808d541

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
   - 2.2.3
+  - 2.3.1
+  - 2.4.0
 before_install: gem install bundler -v 1.10.6

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.2.1
+
+### Fixed
+* Fix time parsing.
+
 ## 0.2.0
 
 ### Added

data/contentful-scheduler.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "resque", "~> 1.0"
   spec.add_runtime_dependency "resque-scheduler", "~> 4.0"
   spec.add_runtime_dependency "redis", "~> 3.0"
+  spec.add_runtime_dependency "chronic", "~> 0.10"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/contentful/scheduler/queue.rb

@@ -1,4 +1,5 @@
 require_relative "tasks"
+require 'chronic'
 require 'contentful/webhook/listener'
 
 module Contentful
@@ -18,7 +19,7 @@ module Contentful
         return if already_published?(webhook)
 
         success = Resque.enqueue_at(
-          publish_date(webhook).to_time.utc,
+          publish_date(webhook),
           ::Contentful::Scheduler::Tasks::Publish,
           webhook.space_id,
           webhook.id,
@@ -61,11 +62,11 @@ module Contentful
       end
 
       def already_published?(webhook)
-        return true if publish_date(webhook) < DateTime.now
+        return true if publish_date(webhook) < Time.now.utc
         return false unless webhook.sys.key?('publishedAt')
 
         if !webhook.sys['publishedAt'].nil?
-          return DateTime.strptime(webhook.sys['publishedAt']).to_time.utc < DateTime.now.to_time.utc
+          return Chronic.parse(webhook.sys['publishedAt']).utc < Time.now.utc
         end
 
         false
@@ -80,7 +81,7 @@ module Contentful
       def publish_date(webhook)
         date_field = webhook_publish_field(webhook)
         date_field = date_field[date_field.keys[0]] if date_field.is_a? Hash
-        DateTime.strptime(date_field)
+        Chronic.parse(date_field).utc
       end
 
       def spaces

data/lib/contentful/scheduler/version.rb

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

data/spec/contentful/scheduler/queue_spec.rb

@@ -82,10 +82,22 @@ describe Contentful::Scheduler::Queue do
       )).to eq 'something'
     end
 
-    it '#publish_date' do
-      expect(subject.publish_date(
-        WebhookDouble.new('bar', 'foo', {}, {'my_field' => '2011-04-04T22:00:00+00:00'})
-      )).to eq DateTime.new(2011, 4, 4, 22, 0, 0)
+    describe '#publish_date' do
+      it 'works if date field not localized' do
+        expect(subject.publish_date(
+          WebhookDouble.new('bar', 'foo', {}, {'my_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.publish_date(
+          WebhookDouble.new('bar', 'foo', {}, {'my_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.publish_date(
+          WebhookDouble.new('bar', 'foo', {}, {'my_field' => {'en-CA': '2011-04-04T23:00:00Z'}})
+        )).to eq DateTime.new(2011, 4, 4, 23, 0, 0).to_time.utc
+      end
     end
 
     describe '#already_published?' do

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'simplecov'
 SimpleCov.start
 
+require 'rspec'
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'contentful/scheduler'
 require 'contentful/webhook/listener'
@@ -51,3 +53,8 @@ class Contentful::Webhook::Listener::Controllers::Wait
     value
   end
 end
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno0
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful-webhook-listener
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Customizable Scheduler for Contentful Entries.