delayed_cron 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794d097692d2a62b9afda86ab4ef063222346956
-  data.tar.gz: 9ec982d8f66359e2c385cde299f4c152cd0ab934
+  metadata.gz: 5ff17f816e19f148c452438b48c45bbc1f9c30fc
+  data.tar.gz: 7fcc1e2435d54c239893f281a10fd0561ad5f11f
 SHA512:
-  metadata.gz: 3bb6954c254ec218b44ac7266135ada9d2213c63f82bf346057bae07dd336ddb8737fe3777762757c720c616669d581992d6123823971e08c09bb2f58186facb
-  data.tar.gz: f6982f58ca882e82d32ead011b243c9f3ea85dc67372b9c8ca166debe0d32aa3e79d7ceaa721ce525c750b7d890042dc524ce7ebdef298dbde5e4f3ce05b4b85
+  metadata.gz: 4356a31a22fb9713486ccc55d77998d0487c27424c6bfe68b8bfee2124e31d52c112fa883216546e4dd0b4db16c1a20159c06349e56471f6f851202cb4b36a47
+  data.tar.gz: d40f0c45bec851dc5e0985a50eee5b114ff409b137818377c80f822c7019a07f8da408fb54736fee6ce1763ce956191463c07b85734b51f6ba191234d1485bca

data/.gitignore

@@ -1,3 +1,4 @@
 *.DS_Store
 pkg
 Gemfile.lock
+coverage

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.2.5
 
 matrix:
   allow_failures:
@@ -12,6 +12,9 @@ services:
 script:
 - bundle exec rake
 
+before_script:
+- export TZ=US/Eastern
+
 addons:
    code_climate:
      repo_token: f0884115cadbe82b33756e38a9cd32d5129304746a17126d6c7da02e7a69910a

data/CHANGES.md

@@ -0,0 +1,3 @@
+# 0.2.9
+
+- fix scheduling

data/README.md

@@ -10,7 +10,7 @@ run cron jobs with sidekiq, delayed_job, resque, or sucker_punch
 ### INSTALL
 
 ```ruby
-gem "delayed_cron", "~> 0.2.7"
+gem "delayed_cron", "~> 0.2.9"
 ```
 
 ### USE IN MODEL

data/delayed_cron.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails"
   s.add_development_dependency "timecop"
   s.add_development_dependency "rspec-sidekiq"
-  s.add_development_dependency "codeclimate-test-reporter"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
   s.add_development_dependency "hashie"
 
   s.files         = `git ls-files`.split("\n")

data/lib/delayed_cron.rb

@@ -40,7 +40,8 @@ module DelayedCron
     def process_job(klass, method_name, options)
       # TODO: add ability to send args to klass method
       klass.constantize.send(method_name)
-      schedule(klass, method_name, options)
+      symbolized_options = options.collect{|k,v| [k.to_sym, v]}.to_h
+      schedule(klass, method_name, symbolized_options)
     end
 
   end

data/lib/delayed_cron/scheduling.rb

@@ -27,46 +27,23 @@ module DelayedCron
     end
 
     def add_interval(options)
-      date = beginning_of_day(options[:interval].to_i)
-      options[:interval] = adjust_interval(date, options[:at])
+      options[:interval] = convert_time_string_to_seconds_interval(options[:at])
       options
     end
 
+    def convert_time_string_to_seconds_interval(scheduled_time_string)
+      day_in_seconds = 60 * 60 * 24
+      scheduled_time = Time.now.strftime("%Y-%m-%d #{scheduled_time_string}")
+      scheduled_time = DateTime.parse(scheduled_time, false).to_time
+      scheduled_time += day_in_seconds if Time.now >= scheduled_time
+      scheduled_time.to_i - Time.now.to_i
+    end
+
     def timing_opts(interval, options_at)
       timing_opts = { interval: interval }
       timing_opts.merge!(at: options_at) if options_at.present?
       timing_opts
     end
 
-    def beginning_of_day(seconds)
-      (Time.now + seconds).beginning_of_day
-    end
-
-    def adjust_interval(date, time_string)
-      adjusted_date(date, time_string).to_i - Time.now.to_i
-    end
-
-    def adjusted_date(date, time_string)
-      time = parse_time(time_string.split(/:|\ /).map(&:to_i))
-      DateTime.civil(
-        date.year,
-        date.month,
-        date.day,
-        time[:hours],
-        time[:mins],
-        time[:secs],
-        Rational(time[:tz], 2400)
-      )
-    end
-
-    def parse_time(time_array)
-      {
-        hours: time_array[0],
-        mins:  time_array[1],
-        secs:  time_array[2] || 0,
-        tz:    time_array[3] || Time.now.strftime("%z").to_i
-      }
-    end
-
   end
 end

data/lib/delayed_cron/version.rb

@@ -1,3 +1,3 @@
 module DelayedCron
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/scheduling_spec.rb

@@ -35,6 +35,37 @@ describe DelayedCron::Scheduling do
     end
   end
 
+  describe ".add_interval" do
+    it 'adds an interval key and value to the options hash' do
+      options = DelayedCron.add_interval(at: '12:00:00 -0500')
+      expect(options).to include(:interval)
+    end
+  end
+
+  describe ".convert_time_string_to_seconds_interval" do
+    let(:next_occurrence) do
+      DelayedCron.convert_time_string_to_seconds_interval(scheduled_time)
+    end
+    # Set Time.now to January 1, 2014 12:00:00 PM
+    before { Timecop.freeze(Time.local(2014, 1, 1, 12, 0, 0)) }
+    context "next occurrence is today" do
+      let(:known_interval) { 3600 }
+      let(:scheduled_time) { "13:00:00 -0500" }
+      it "converts a time string to seconds" do
+        expect(next_occurrence).to be(known_interval)
+      end
+    end
+
+    context "next occurrence is tomorrow" do
+      let(:known_interval) { 82800 }
+      let(:scheduled_time) { "11:00:00 -0500" }
+      it "converts a time string to seconds" do
+        expect(next_occurrence).to be(known_interval)
+      end
+    end
+
+  end
+
   describe ".timing_opts" do
 
     let(:options) do
@@ -49,25 +80,4 @@ describe DelayedCron::Scheduling do
     end
   end
 
-  describe ".beginning_of_day" do
-    it "returns the beginning of the day for the interval" do
-      seconds = 2.days.to_i
-      beginning_of_day_2_days_from_now = DelayedCron.beginning_of_day(seconds)
-      expect(beginning_of_day_2_days_from_now).to be <  2.days.from_now
-      expect(beginning_of_day_2_days_from_now).to be >  1.day.from_now
-    end
-  end
-
-  describe ".adjust_interval" do
-    it "adjusts the interval based on the :at option" do
-      # Set Time.now to January 1, 2014 12:00:00 PM
-      Timecop.freeze(Time.local(2014, 1, 1, 12, 0, 0))
-      interval = 9.days
-      adjusted_interval = interval - 12.hours
-      expect(DelayedCron.processor).to receive(:enqueue_delayed_cron)
-                 .with("SomeClass", "long_method", { interval: adjusted_interval.to_i, at: "00:00" })
-      DelayedCron.schedule("SomeClass", "long_method", { interval: interval, at: "00:00" })
-    end
-  end
-
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require "simplecov"
+SimpleCov.start
 
 require 'bundler/setup'
 Bundler.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Justin Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +174,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - README.md
 - Rakefile