sidekiq-cron 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/sidekiq/cron/job.rb

@@ -176,7 +176,7 @@ module Sidekiq
         @last_run_time = Time.parse(args['last_run_time'].to_s) rescue Time.now
 
         #get right arguments for job
-        @args = args["args"].nil? ? [] : (args["args"].is_a?(Array) ? args["args"] : [ args["args"] ])
+        @args = args["args"].nil? ? [] : parse_args( args["args"] )
 
         if args["message"]
           @message = args["message"]
@@ -266,7 +266,12 @@ module Sidekiq
             cron = CronParser.new(@cron)
             cron.next(Time.now)
           rescue Exception => e
-            errors << "'cron' -> #{@cron}: #{e.message}"
+            #fix for different versions of cron-parser
+            if e.message == "Bad Vixie-style specification bad"
+              errors << "'cron' -> #{@cron}: not a valid cronline"
+            else
+              errors << "'cron' -> #{@cron}: #{e.message}"
+            end
           end
         end
 
@@ -359,6 +364,25 @@ module Sidekiq
       
       private
 
+      # Try parsing inbound args into an array.
+      # args from Redis will be encoded JSON;
+      # try to load JSON, then failover
+      # to string array.
+      def parse_args(args)
+        case args
+        when String
+          begin
+            Sidekiq.load_json(args)
+          rescue JSON::ParserError
+            [*args]   # cast to string array
+          end
+        when Array
+          args        # do nothing, already array
+        else
+          [*args]     # cast to string array
+        end
+      end
+
       # Redis key for set of all cron jobs
       def self.jobs_key
         "cron_jobs"

data/sidekiq-cron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2013-08-30"
+  s.date = "2013-09-07"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [

data/test/unit/job_test.rb

@@ -292,6 +292,45 @@ class CronJobTest < Test::Unit::TestCase
       end
     end
 
+    context "initialize args" do
+      should "from JSON" do
+        args = {
+          name: "Test",
+          cron: "* * * * *",
+          klass: "CronTestClass",
+          args: JSON.dump(["123"])
+        }
+        Sidekiq::Cron::Job.new(args).tap do |job|
+          assert_equal job.args, ["123"]
+          assert_equal job.name, "Test"
+        end
+      end
+      should "from String" do
+        args = {
+          name: "Test",
+          cron: "* * * * *",
+          klass: "CronTestClass",
+          args: "(my funny string)"
+        }
+        Sidekiq::Cron::Job.new(args).tap do |job|
+          assert_equal job.args, ["(my funny string)"]
+          assert_equal job.name, "Test"
+        end
+      end
+      should "from Array" do
+        args = {
+          name: "Test",
+          cron: "* * * * *",
+          klass: "CronTestClass",
+          args: ["This is array"]
+        }
+        Sidekiq::Cron::Job.new(args).tap do |job|
+          assert_equal job.args, ["This is array"]
+          assert_equal job.name, "Test"
+        end
+      end
+    end
+
     context "create & find methods" do
       setup do 
         @args = {
@@ -485,7 +524,7 @@ class CronJobTest < Test::Unit::TestCase
           @jobs_hash['name_of_job']['cron'] = "bad cron"
           out = Sidekiq::Cron::Job.load_from_hash @jobs_hash
           assert_equal out.size, 1, "should have 1 error"
-          assert_equal out, {"name_of_job"=>["'cron' -> bad cron: Bad Vixie-style specification bad"]}
+          assert_equal out, {"name_of_job"=>["'cron' -> bad cron: not a valid cronline"]}
           assert_equal Sidekiq::Cron::Job.all.size, 1, "Should have only 1 job after load"          
         end
 
@@ -526,4 +565,4 @@ class CronJobTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -298,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4034147313320020795
+      hash: 2947287720654605412
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: