delayed_cron 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7a2942e092055795c248a6eb82433c760c26733
-  data.tar.gz: 195e7f6a46052e687611a825afede8ab3d4ef4f5
+  metadata.gz: 98459d8cfb19c18cd7d11fdfa6fd11743dc248cd
+  data.tar.gz: dbd9446e7fcd0f71c98404a4437540b3fdcd225f
 SHA512:
-  metadata.gz: 596b466d8708c44a8023995a0df0ff7c6fa87b2c74b1d2e42521f5671e6d1b41147525fde9e1bdaecfc981978efcadcbf503a01e49d3fc4f1243765586d60f6a
-  data.tar.gz: f2c640b98de5f67f384a54b7c493715b4b14a1a7024ad52c903bb103fc004810a1de8c33c1f259df4efb4ca571774de81d89a3ba15832022a68539c30d5e8fd2
+  metadata.gz: 0b6f2a9a47a0a671a42e2aae7e48929e0a5796949ccbeae7f49ef1d3326dabefe31870ab6e0c263bf355039b1ac4e3763f720ea3591520074807868c920659fb
+  data.tar.gz: 4bbbf3aa5d91f639edd427a66ccf8620c8c3620a8c13a03f902f6a660d8338de6648b222ed4ee42c2f7a7f1276493d2d81b73cb38571a908ff7edcfc0d4ebd0b

data/CHANGES.md

@@ -1,3 +1,17 @@
+# 0.2.11
+
+- Use ActiveSupport::Duration to apply time offsets
+
+  Using seconds to apply the time offsets when the parsed time is in the
+  past is not time zone aware. This causes issues when DST begins/ends
+  between the two times. For example, daily jobs are scheduled an hour
+  earlier than the are supposed to when DST ends since it doesn't take the
+  extra hour into account. This causes further issues when calculating the
+  next offset time, the offset to prevent scheduling past times doesn't
+  apply as expected and the job is scheduled over and over. As a related
+  issue, we sometimes need a two hour jump to bring the parsed time to the
+  future, add a while loop to handle this case.
+
 # 0.2.10
 
 - Add ability to set a job time zone and also allow running a job at a specific minute of each hour.

data/delayed_cron.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
   s.add_development_dependency "hashie"
+  s.add_development_dependency "pry-byebug"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/delayed_cron.rb

@@ -1,3 +1,4 @@
+require 'active_support/all'
 require 'delayed_cron/jobs'
 require 'delayed_cron/scheduling'
 require 'delayed_cron/railtie'

data/lib/delayed_cron/cron_job.rb

@@ -38,15 +38,15 @@ module DelayedCron
       zone = Time.find_zone!(zone_name)
 
       if hourly?
-        period_in_seconds = 60 * 60
+        period_duration = 1.hour
         scheduled_time_string = "%H:#{scheduled_time_string}"
       else
-        period_in_seconds = 60 * 60 * 24
+        period_duration = 1.day
       end
 
       scheduled_time = zone.now.strftime("%Y-%m-%d #{scheduled_time_string}")
       scheduled_time = zone.parse(scheduled_time)
-      scheduled_time += period_in_seconds if zone.now >= scheduled_time
+      scheduled_time += period_duration while zone.now >= scheduled_time
       scheduled_time.to_i - zone.now.to_i
     end
 

data/lib/delayed_cron/version.rb

@@ -1,3 +1,3 @@
 module DelayedCron
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

data/spec/cron_job_spec.rb

@@ -76,8 +76,11 @@ module DelayedCron
       let(:next_occurrence) do
         job.send(:convert_time_string_to_seconds_interval, scheduled_time, "Eastern Time (US & Canada)")
       end
+      let(:zone) { Time.find_zone!("Eastern Time (US & Canada)") }
+
       # Set Time.now to January 1, 2014 12:00:00 PM
       before { Timecop.freeze(Time.utc(2014, 1, 1, 12, 0, 0)) }
+
       context "next occurrence is today" do
         let(:known_interval) { 21600 }
         let(:scheduled_time) { "13:00:00 -0500" }
@@ -132,6 +135,35 @@ module DelayedCron
 
           expect(next_occurrence).to be(known_interval)
         end
+
+        it 'handles DST end' do
+          time = zone.local(2017, 11, 5, 1, 0) + 1.hour # ST start
+          Timecop.freeze(time)
+
+          expect(next_occurrence).to eq(1.hour.to_i)
+        end
+      end
+
+      context 'DST ends before next time' do
+        let(:scheduled_time) { "00:05:00" }
+
+        it 'adds an extra hour to the offset' do
+          time = zone.local(2017, 11, 5, 0, 5)
+          Timecop.freeze(time)
+
+          expect(next_occurrence).to eq(25.hours.to_i)
+        end
+      end
+
+      context 'calculation is on day of DST end' do
+        let(:scheduled_time) { "00:05:00" }
+
+        it 'still calculates correct offset' do
+          time = zone.local(2017, 11, 5, 23, 5)
+          Timecop.freeze(time)
+
+          expect(next_occurrence).to eq(1.hour.to_i)
+        end
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Justin Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run your cron jobs with sidekiq, delayed_job, resque, or sucker_punch.
 email: justin@sellect.com
 executables: []