sidekiq-cron 0.1.8 → 0.1.9

data/.travis.yml

@@ -4,6 +4,9 @@ rvm:
   - jruby-19mode
   - rbx-19mode
   - 2.0.0
+  - 2.1.0
+services:
+  - redis-server
 branches:
   only:
     - master
@@ -16,5 +19,4 @@ env:
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: rbx-19mode
-    - rvm: 2.0.0
+    - rvm: rbx-19mode

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "sidekiq", ">= 2.16.0"
+gem "sidekiq", ">= 2.17.3"
 gem 'rufus-scheduler', '>= 2.0.24'
 
 group :development do

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/sidekiq/cron/job.rb

@@ -15,18 +15,14 @@ module Sidekiq
 
       #crucial part of whole enquing job
       def should_enque? time
-        out = false
-        Sidekiq.redis do |conn|
-          out = (
-            status == "enabled" && 
-            @last_run_time < last_time(time) && 
-            conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time) )
-          )
+        enqueue = false
+        enqueue = Sidekiq.redis do |conn|
+          status == "enabled" && not_enqueued_after?(time) && conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time))
         end
-        out
+        enqueue
       end
 
-      # remove previous informations about run times 
+      # remove previous informations about run times
       # this will clear redis and make sure that redis will
       # not overflow with memory
       def remove_previous_enques time
@@ -47,7 +43,6 @@ module Sidekiq
 
       #enque cron job to queue
       def enque! time = Time.now
-        @last_run_time = time
         @last_enqueue_time = time
 
         Sidekiq::Client.push(@message.is_a?(String) ? Sidekiq.load_json(@message) : @message)
@@ -159,7 +154,7 @@ module Sidekiq
       end
 
       attr_accessor :name, :cron, :klass, :args, :message
-      attr_reader   :last_run_time, :last_enqueue_time
+      attr_reader   :last_enqueue_time
 
       def initialize input_args = {}
         args = input_args.stringify_keys
@@ -173,9 +168,9 @@ module Sidekiq
         #set status of job
         @status = args['status'] || status_from_redis
 
-        #set last run time
-        @last_run_time = Time.parse(args['last_run_time'].to_s) rescue Time.now
-        @last_enqueue_time = Time.parse(args['last_enqueue_time'].to_s) rescue nil
+        if args['last_enqueue_time'] && !args['last_enqueue_time'].empty?
+          @last_enqueue_time = Time.parse(args['last_enqueue_time'])
+        end
 
         #get right arguments for job
         @args = args["args"].nil? ? [] : parse_args( args["args"] )
@@ -248,7 +243,6 @@ module Sidekiq
           args: @args.is_a?(String) ? @args : Sidekiq.dump_json(@args || []),
           message: @message.is_a?(String) ? @message : Sidekiq.dump_json(@message || {}),
           status: @status,
-          last_run_time: @last_run_time,
           last_enqueue_time: @last_enqueue_time,
         }
       end
@@ -361,9 +355,13 @@ module Sidekiq
       def sort_name
         "#{status == "enabled" ? 0 : 1}_#{name}".downcase
       end
-      
+
       private
 
+      def not_enqueued_after?(time)
+        @last_enqueue_time.nil? || @last_enqueue_time < last_time(time)
+      end
+      
       # Try parsing inbound args into an array.
       # args from Redis will be encoded JSON;
       # try to load JSON, then failover

data/sidekiq-cron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2013-11-29"
+  s.date = "2014-01-27"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sidekiq>, [">= 2.16.0"])
+      s.add_runtime_dependency(%q<sidekiq>, [">= 2.17.3"])
       s.add_runtime_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<coveralls>, [">= 0"])
       s.add_development_dependency(%q<shotgun>, [">= 0"])
     else
-      s.add_dependency(%q<sidekiq>, [">= 2.16.0"])
+      s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
       s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
@@ -86,7 +86,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shotgun>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sidekiq>, [">= 2.16.0"])
+    s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
     s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])

data/test/unit/job_test.rb

@@ -20,6 +20,7 @@ class CronJobTest < Test::Unit::TestCase
 
     should "be initialized" do
       job = Sidekiq::Cron::Job.new()
+      assert_nil job.last_enqueue_time
       assert job.is_a?(Sidekiq::Cron::Job)
     end
 
@@ -109,8 +110,8 @@ class CronJobTest < Test::Unit::TestCase
       end
 
       should "have to_hash method" do
-        [:name,:klass,:cron,:args,:message,:status, :last_run_time].each do |key|
-          assert @job.to_hash.has_key?(key), "to_hash must have key: #{key}" 
+        [:name,:klass,:cron,:args,:message,:status].each do |key|
+          assert @job.to_hash.has_key?(key), "to_hash must have key: #{key}"
         end
       end
     end
@@ -467,7 +468,11 @@ class CronJobTest < Test::Unit::TestCase
       end
 
       should "remove old enque times + should be enqeued" do
-        assert Sidekiq::Cron::Job.new(@args).test_and_enque_for_time!(@time), "should enqueue"
+        job = Sidekiq::Cron::Job.new(@args)
+        assert_nil job.last_enqueue_time
+        assert job.test_and_enque_for_time!(@time), "should enqueue"
+        assert job.last_enqueue_time
+
         refute Sidekiq::Cron::Job.new(@args).test_and_enque_for_time!(@time), "should not enqueue"
         Sidekiq.redis do |conn|
           assert_equal conn.zcard(Sidekiq::Cron::Job.new(@args).send(:job_enqueued_key)), 2, "Should have two enqueued job (first was in save, second in enque)"

data/test/unit/web_extesion_test.rb

@@ -1,13 +1,14 @@
 require './test/test_helper'
 
 class CronWebExtensionTest < Test::Unit::TestCase
+
+  def app
+    Sidekiq::Web
+  end
+
   context 'Cron web' do
     include Rack::Test::Methods
 
-    def app
-      Sidekiq::Web
-    end
-
     setup do
       Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.17.3
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1914216490910981092
+      hash: -890325318725409661
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: