sidekiq-cron 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fee94038858506eefe77c7b4a8881a0923e2428
-  data.tar.gz: eb5ba565bd6869c554c137cefe703f689cbc0c4b
+  metadata.gz: 1c9490a07af91904810a5289c0899691f70bb56b
+  data.tar.gz: 4d79c982c22844a7f7fa887dde61925aaa26e48e
 SHA512:
-  metadata.gz: 8c378f2be21943897c6b275cb7bdd4bc973f586d2a3da59a7815c78e918edb5ddcfee6aed233ffdc901b686baaf7a3c66f28376836093fcb8eb1956646aea0b2
-  data.tar.gz: 20fa4ed75821bb30805303d2b6ac1354fc7669d70c125d2f4f9af81c98d151feae36d2806921dd5debdf0721cfb6d0171e8000abc6c5008c5f9cece50d5bb321
+  metadata.gz: c9717f01b61187ffb9cc2024ac3de6a01a1641159ef5f0013f742858a932b01c5a89dcb37abb254484cc1ca9edb6da10cf96fa7d0b2b068199945db18e855c3b
+  data.tar.gz: a06735e8a699441b6b9a0218e99949710b44dc2a1fdf92725fe865594687e428cd7509efd04023a9a09d5f4580466ab117ad6ccc471ab2797fae804fef9a3ea8

data/Gemfile

@@ -27,6 +27,6 @@ group :development do
 
   gem 'shotgun'
 
-  # gem 'guard'
-  # gem 'guard-minitest'
+  gem 'guard'
+  gem 'guard-minitest'
 end

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/sidekiq/cron/job.rb

@@ -1,6 +1,7 @@
 require 'sidekiq'
 require 'sidekiq/util'
 require 'rufus-scheduler'
+require 'sidekiq/cron/support'
 
 module Sidekiq
   module Cron
@@ -49,7 +50,7 @@ module Sidekiq
 
         klass_const =
             begin
-              @klass.to_s.constantize
+              Sidekiq::Cron::Support.constantize(@klass.to_s)
             rescue NameError
               nil
             end
@@ -73,7 +74,7 @@ module Sidekiq
       end
 
       def is_active_job?
-        @active_job || defined?(ActiveJob::Base) && @klass.to_s.constantize < ActiveJob::Base
+        @active_job || defined?(ActiveJob::Base) && Sidekiq::Cron::Support.constantize(@klass.to_s) < ActiveJob::Base
       rescue NameError
         false
       end
@@ -296,18 +297,19 @@ module Sidekiq
 
           #get right data for message
           #only if message wasn't specified before
-          message_data = case @klass
+          klass_data = case @klass
             when Class
-              @klass.get_sidekiq_options.merge(message_data)
+              @klass.get_sidekiq_options
             when String
               begin
-                @klass.constantize.get_sidekiq_options.merge(message_data)
-              rescue
+                Sidekiq::Cron::Support.constantize(@klass).get_sidekiq_options
+              rescue Exception => e
                 #Unknown class
-                message_data.merge("queue"=>"default")
+                {"queue"=>"default"}
               end
           end
 
+          message_data = klass_data.merge(message_data)
           #override queue if setted in config
           #only if message is hash - can be string (dumped JSON)
           if args['queue']

data/lib/sidekiq/cron/support.rb

@@ -0,0 +1,38 @@
+# https://github.com/rails/rails/blob/352865d0f835c24daa9a2e9863dcc9dde9e5371a/activesupport/lib/active_support/inflector/methods.rb#L270
+
+module Sidekiq
+  module Cron
+    module Support
+      def self.constantize(camel_cased_word)
+        names = camel_cased_word.split("::".freeze)
+
+        # Trigger a built-in NameError exception including the ill-formed constant in the message.
+        Object.const_get(camel_cased_word) if names.empty?
+
+        # Remove the first blank element in case of '::ClassName' notation.
+        names.shift if names.size > 1 && names.first.empty?
+
+        names.inject(Object) do |constant, name|
+          if constant == Object
+            constant.const_get(name)
+          else
+            candidate = constant.const_get(name)
+            next candidate if constant.const_defined?(name, false)
+            next candidate unless Object.const_defined?(name)
+
+            # Go down the ancestors to check if it is owned directly. The check
+            # stops when we reach Object or the end of ancestors tree.
+            constant = constant.ancestors.inject(constant) do |const, ancestor|
+              break const    if ancestor == Object
+              break ancestor if ancestor.const_defined?(name, false)
+              const
+            end
+
+            # owner is in Object, so raise
+            constant.const_get(name, false)
+          end
+        end
+      end
+    end
+  end
+end

data/sidekiq-cron.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 0.6.2 ruby lib
+# stub: sidekiq-cron 0.6.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/sidekiq/cron/locales/en.yml",
     "lib/sidekiq/cron/locales/ru.yml",
     "lib/sidekiq/cron/poller.rb",
+    "lib/sidekiq/cron/support.rb",
     "lib/sidekiq/cron/views/cron.erb",
     "lib/sidekiq/cron/views/cron.slim",
     "lib/sidekiq/cron/web.rb",
@@ -52,7 +53,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ondrejbartas/sidekiq-cron"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.5.1"
   s.summary = "Sidekiq Cron helps to add repeated scheduled jobs"
 
   if s.respond_to? :specification_version then
@@ -76,6 +77,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<coveralls>, [">= 0"])
       s.add_development_dependency(%q<shotgun>, [">= 0"])
+      s.add_development_dependency(%q<guard>, [">= 0"])
+      s.add_development_dependency(%q<guard-minitest>, [">= 0"])
     else
       s.add_dependency(%q<sidekiq>, [">= 4.2.1"])
       s.add_dependency(%q<rufus-scheduler>, [">= 3.3.0"])
@@ -94,6 +97,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<coveralls>, [">= 0"])
       s.add_dependency(%q<shotgun>, [">= 0"])
+      s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<guard-minitest>, [">= 0"])
     end
   else
     s.add_dependency(%q<sidekiq>, [">= 4.2.1"])
@@ -113,6 +118,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<coveralls>, [">= 0"])
     s.add_dependency(%q<shotgun>, [">= 0"])
+    s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<guard-minitest>, [">= 0"])
   end
 end
 

data/test/test_helper.rb

@@ -44,9 +44,11 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sidekiq-cron'
 require 'sidekiq/cron/web'
+require 'pp'
 
 class CronTestClass
   include Sidekiq::Worker
+  sidekiq_options retry: true
 
   def perform args = {}
     puts "super croned job #{args}"
@@ -55,7 +57,7 @@ end
 
 class CronTestClassWithQueue
   include Sidekiq::Worker
-  sidekiq_options :queue => :super, :retry => false, :backtrace => true
+  sidekiq_options queue: :super, retry: false, backtrace: true
 
   def perform args = {}
     puts "super croned job #{args}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Ondrej Bartas
@@ -248,6 +248,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  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: Enables to set jobs to be run in specified time (using CRON notation)
 email: ondrej@bartas.cz
 executables: []
@@ -276,6 +304,7 @@ files:
 - lib/sidekiq/cron/locales/en.yml
 - lib/sidekiq/cron/locales/ru.yml
 - lib/sidekiq/cron/poller.rb
+- lib/sidekiq/cron/support.rb
 - lib/sidekiq/cron/views/cron.erb
 - lib/sidekiq/cron/views/cron.slim
 - lib/sidekiq/cron/web.rb
@@ -306,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sidekiq Cron helps to add repeated scheduled jobs