delayed_cron 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6fe770d7d97f8a9d7fdb92905e00b26d4e9c0d6
-  data.tar.gz: 11bac5d4b29ae8bea2196fce52573ada1cf67d8e
+  metadata.gz: af92ec64204d2a7f01c4dbb31c511603e87b43f0
+  data.tar.gz: ec7ea779e56c8f82e2112eb19799beac0f1327e7
 SHA512:
-  metadata.gz: 689013117dd11c13c5cb50178155f99d112824e2747a613125194e0cc46f53c7d8d78f5f3ed7937117ebc8a1e8def1d3a7a1775e7dc0c34cee187c100fe222ff
-  data.tar.gz: ccb01e5dce56a3c3b454d088e204ef831bf4128b5d03090033b34a527e2599f15a99a98c22bc45b8d2c37b2901ecbc902f033079fd5e8465ea0c18d5392f9063
+  metadata.gz: 827a3222ad6c991c8a6ffb542ce3376efce3f43a922bf2fc8560b6de8f65db923d354b50c456716860bb1029aab773adb48c68ee2fd73979241c56aaca867631
+  data.tar.gz: 6f5a6750da95164b5531e4f5e4d9570888099a4482a8e3a1b7f1b2e2d25a87f68ea80d000fa56e80ef400a90c8302a7b6b264769024dfc79ac75a20873f6c6e9

data/.gitignore

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

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.5"
+gem "delayed_cron", "0.2.6"
 ```
 
 ### USE IN MODEL

data/lib/delayed_cron/jobs/sidekiq.rb

@@ -8,21 +8,40 @@ module DelayedCron
       sidekiq_options :queue => :cron_job
 
       def self.enqueue_delayed_cron(klass, method_name, options)
-        unless scheduled?(klass, method_name)
+        unless do_not_enqueue?(klass, method_name)
           options.symbolize_keys!
           perform_in(options[:interval], klass, method_name, options)
         end
       end
 
+      def self.do_not_enqueue?(klass, method_name)
+        scheduled?(klass, method_name) ||
+        enqueued?(klass, method_name)  ||
+        retrying?(klass, method_name)
+      end
+
+      def self.retrying?(klass, method_name)
+        ::Sidekiq::RetrySet.new.collect(&:item).select do |item|
+          matches_kass_and_method?(item, klass, method_name)
+        end.present?
+      end
+
       def self.scheduled?(klass, method_name)
-        items = []
-        ::Sidekiq::ScheduledSet.new.each { |job| items << job.item }
-        items.select do |item|
-          item["args"][0] == klass &&
-          item["args"][1] == method_name.to_s
+        ::Sidekiq::ScheduledSet.new.collect(&:item).select do |item|
+          matches_kass_and_method?(item, klass, method_name)
         end.present?
       end
 
+      def self.enqueued?(klass, method_name)
+        ::Sidekiq::Queue.new("cron_job").collect(&:item).select do |item|
+          matches_kass_and_method?(item, klass, method_name)
+        end.present?
+      end
+
+      def self.matches_kass_and_method?(item, klass, method_name)
+        item["args"][0] == klass && item["args"][1] == method_name.to_s
+      end
+
       def perform(klass, method_name, options)
         DelayedCron.process_job(klass, method_name, options)
       end

data/lib/delayed_cron/version.rb

@@ -1,3 +1,3 @@
 module DelayedCron
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_cron
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Justin Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -147,7 +147,6 @@ files:
 - .ruby-version
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - delayed_cron.gemspec

data/Gemfile.lock

@@ -1,151 +0,0 @@
-PATH
-  remote: .
-  specs:
-    delayed_cron (0.2.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.2)
-      actionpack (= 4.1.2)
-      actionview (= 4.1.2)
-      mail (~> 2.5.4)
-    actionpack (4.1.2)
-      actionview (= 4.1.2)
-      activesupport (= 4.1.2)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.2)
-      activesupport (= 4.1.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.2)
-      activesupport (= 4.1.2)
-      builder (~> 3.1)
-    activerecord (4.1.2)
-      activemodel (= 4.1.2)
-      activesupport (= 4.1.2)
-      arel (~> 5.0.0)
-    activesupport (4.1.2)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    codeclimate-test-reporter (0.3.0)
-      simplecov (>= 0.7.1, < 1.0.0)
-    connection_pool (2.0.0)
-    delayed_job (4.0.2)
-      activesupport (>= 3.0, < 4.2)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.9)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (5.3.5)
-    mono_logger (1.1.0)
-    multi_json (1.10.1)
-    polyglot (0.3.5)
-    rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.1.2)
-      actionmailer (= 4.1.2)
-      actionpack (= 4.1.2)
-      actionview (= 4.1.2)
-      activemodel (= 4.1.2)
-      activerecord (= 4.1.2)
-      activesupport (= 4.1.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.2)
-      sprockets-rails (~> 2.0)
-    railties (4.1.2)
-      actionpack (= 4.1.2)
-      activesupport (= 4.1.2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    redis (3.1.0)
-    redis-namespace (1.5.0)
-      redis (~> 3.0, >= 3.0.4)
-    resque (1.25.2)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
-    rspec-sidekiq (1.1.0)
-      rspec (~> 2.0)
-      sidekiq (>= 2.4.0)
-    sidekiq (3.1.4)
-      celluloid (>= 0.15.2)
-      connection_pool (>= 2.0.0)
-      json
-      redis (>= 3.0.6)
-      redis-namespace (>= 1.3.1)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.12.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sucker_punch (1.1)
-      celluloid (~> 0.15.2)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    timecop (0.7.1)
-    timers (1.1.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  codeclimate-test-reporter
-  delayed_cron!
-  delayed_job
-  rails
-  resque
-  rspec
-  rspec-sidekiq
-  sidekiq
-  sucker_punch
-  timecop