rocketjob 3.4.3 → 3.5.0

data/test/job_test.rb

@@ -2,7 +2,6 @@ require_relative 'test_helper'
 
 # Unit Test for RocketJob::Job
 class JobTest < Minitest::Test
-
   class SimpleJob < RocketJob::Job
     def perform
     end
@@ -68,6 +67,5 @@ class JobTest < Minitest::Test
         assert_equal worker_name2, @job2.worker_name
       end
     end
-
   end
 end

data/test/jobs/housekeeping_job_test.rb

@@ -98,6 +98,5 @@ class HousekeepingJobTest < Minitest::Test
         assert_equal 1, RocketJob::Server.count, -> { RocketJob::Server.all.to_a.ai }
       end
     end
-
   end
 end

data/test/jobs/on_demand_job_test.rb

@@ -0,0 +1,59 @@
+require_relative '../test_helper'
+
+class OnDemandJobTest < Minitest::Test
+  describe RocketJob::Jobs::OnDemandJob do
+    before do
+      RocketJob::Jobs::OnDemandJob.delete_all
+    end
+
+    describe '#perform' do
+      it 'hello world' do
+        code = <<~CODE
+          logger.info 'Hello World'
+        CODE
+
+        job = RocketJob::Jobs::OnDemandJob.new(code: code)
+        job.perform_now
+      end
+
+      it 'retain output' do
+        code = <<~CODE
+          {'value' => 'h' * 24}
+        CODE
+
+        job = RocketJob::Jobs::OnDemandJob.new(
+          code:           code,
+          collect_output: true
+        )
+        job.perform_now
+        assert_equal 'h' * 24, job.result['value']
+      end
+
+      it 'accepts input data' do
+        code = <<~CODE
+          {'value' => data['a'] * data['b']}
+        CODE
+
+        job = RocketJob::Jobs::OnDemandJob.new(
+          code:           code,
+          collect_output: true,
+          data:           {'a' => 10, 'b' => 2}
+        )
+        job.perform_now
+        assert_equal 20, job.result['value']
+      end
+
+      it 'validates code' do
+        code = <<~CODE
+          def bad code
+        CODE
+
+        job = RocketJob::Jobs::OnDemandJob.new(code: code)
+        refute job.valid?
+        assert_raises Mongoid::Errors::Validations do
+          job.perform_now
+        end
+      end
+    end
+  end
+end

data/test/jobs/upload_file_job_test.rb

@@ -0,0 +1,99 @@
+require_relative '../test_helper'
+
+class UploadFileJobTest < Minitest::Test
+  class TestJob < RocketJob::Job
+    field :upload_file_name, type: String
+
+    def upload(file_name)
+      self.upload_file_name = file_name
+    end
+
+    def perform
+    end
+  end
+
+  class BatchTestJob < RocketJob::Job
+    field :upload_file_name, type: String
+    field :saved_streams, type: Array
+
+    def upload(file_name, streams: nil)
+      self.upload_file_name = file_name
+      self.saved_streams    = streams
+    end
+
+    def perform
+    end
+  end
+
+  class BadJob < RocketJob::Job
+    def perform
+    end
+  end
+
+  describe RocketJob::Jobs::UploadFileJob do
+    before do
+      RocketJob::Job.delete_all
+    end
+
+    describe '#valid?' do
+      it 'validates upload_file_name' do
+        job = RocketJob::Jobs::UploadFileJob.new(job_class_name: UploadFileJobTest::TestJob.to_s)
+        refute job.valid?
+        assert_equal ["can't be blank"], job.errors.messages[:upload_file_name]
+      end
+
+      it 'validates file does not exist' do
+        job = RocketJob::Jobs::UploadFileJob.new(
+          job_class_name:   UploadFileJobTest::TestJob.to_s,
+          upload_file_name: '/tmp/blah'
+        )
+        refute job.valid?
+        assert_equal ['Upload file: /tmp/blah does not exist.'], job.errors.messages[:upload_file_name]
+      end
+
+      it 'validates job_class_name' do
+        job = RocketJob::Jobs::UploadFileJob.new(job_class_name: UploadFileJobTest::BadJob.to_s)
+        refute job.valid?
+        assert_equal ['UploadFileJobTest::BadJob must implement any one of: :upload :upload_file_name= :full_file_name= instance methods'], job.errors.messages[:job_class_name]
+      end
+
+      it 'with valid job and upload_file_name' do
+        job = RocketJob::Jobs::UploadFileJob.new(
+          job_class_name:   UploadFileJobTest::TestJob.to_s,
+          upload_file_name: __FILE__
+        )
+        assert job.valid?
+      end
+    end
+
+    describe '#perform' do
+      let :job do
+        RocketJob::Jobs::UploadFileJob.new(
+          job_class_name:   UploadFileJobTest::TestJob.name,
+          upload_file_name: __FILE__
+        )
+      end
+
+      it 'creates the job' do
+        job.perform_now
+        assert_equal 1, UploadFileJobTest::TestJob.count
+        assert job = UploadFileJobTest::TestJob.first
+      end
+
+      it 'calls upload' do
+        job.perform_now
+        assert job = UploadFileJobTest::TestJob.first
+        assert_equal __FILE__, job.upload_file_name
+      end
+
+      it 'calls upload with original_file_name' do
+        job.job_class_name     = BatchTestJob.name
+        job.original_file_name = 'file.zip'
+        job.perform_now
+        assert created_job = UploadFileJobTest::BatchTestJob.first
+        assert_equal __FILE__, created_job.upload_file_name
+        assert_equal %i[file zip], created_job.saved_streams
+      end
+    end
+  end
+end

data/test/plugins/cron_test.rb

@@ -15,7 +15,7 @@ module Plugins
       include RocketJob::Plugins::Cron
 
       def perform
-        raise 'oh no' if failure_count == 0
+        raise 'oh no' if failure_count.zero?
       end
     end
 
@@ -60,7 +60,6 @@ module Plugins
             assert_equal Time.parse('2015-12-10 06:00:00 UTC'), @job.run_at
           end
         end
-
       end
 
       describe '#save' do
@@ -162,7 +161,6 @@ module Plugins
           end
         end
       end
-
     end
   end
 end

data/test/plugins/job/callbacks_test.rb

@@ -23,7 +23,6 @@ module Plugins
         def before_perform_method
           call_list << 'before_perform_method'
         end
-
       end
 
       # This job adds each callback as they run into an array
@@ -45,14 +44,13 @@ module Plugins
         def after_perform_method
           call_list << 'after_perform_method'
         end
-
       end
 
       # This job adds each callback as they run into an array
       class AroundPerformJob < RocketJob::Job
         field :call_list, type: Array, default: []
 
-        around_perform do |job, block|
+        around_perform do |_job, block|
           call_list << 'around_perform_block_before'
           block.call
           call_list << 'around_perform_block_after'
@@ -71,7 +69,6 @@ module Plugins
           yield
           call_list << 'around_perform_method_after'
         end
-
       end
 
       # This job adds each callback as they run into an array
@@ -86,7 +83,7 @@ module Plugins
           call_list << 'after_perform_block'
         end
 
-        around_perform do |job, block|
+        around_perform do |_job, block|
           call_list << 'around_perform_block_before'
           block.call
           call_list << 'around_perform_block_after'
@@ -108,16 +105,15 @@ module Plugins
           call_list << 'before_perform_method'
         end
 
-        def around_perform_method(&block)
+        def around_perform_method
           call_list << 'around_perform_method_before'
-          block.call
+          yield
           call_list << 'around_perform_method_after'
         end
 
         def after_perform_method
           call_list << 'after_perform_method'
         end
-
       end
 
       describe RocketJob::Plugins::Job::Callbacks do
@@ -130,7 +126,7 @@ module Plugins
             @job = BeforePerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(before_perform_block before_perform_method perform)
+            expected = %w[before_perform_block before_perform_method perform]
             assert_equal expected, @job.call_list, 'Sequence of before_perform callbacks is incorrect'
           end
         end
@@ -140,7 +136,7 @@ module Plugins
             @job = AfterPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(perform after_perform_method after_perform_block)
+            expected = %w[perform after_perform_method after_perform_block]
             assert_equal expected, @job.call_list, 'Sequence of after_perform callbacks is incorrect'
           end
         end
@@ -150,7 +146,7 @@ module Plugins
             @job = AroundPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(around_perform_block_before around_perform_method_before perform around_perform_method_after around_perform_block_after)
+            expected = %w[around_perform_block_before around_perform_method_before perform around_perform_method_after around_perform_block_after]
             assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end
@@ -160,11 +156,10 @@ module Plugins
             @job = CombinedPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            expected = %w(before_perform_block around_perform_block_before before_perform_method around_perform_method_before perform after_perform_method around_perform_method_after around_perform_block_after after_perform_block)
+            expected = %w[before_perform_block around_perform_block_before before_perform_method around_perform_method_before perform after_perform_method around_perform_method_after around_perform_block_after after_perform_block]
             assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end
-
       end
     end
   end

data/test/plugins/job/defaults_test.rb

@@ -4,7 +4,6 @@ module Plugins
   module Job
     # Unit Test for RocketJob::Job
     class DefaultsTest < Minitest::Test
-
       class ParentJob < RocketJob::Job
         self.priority    = 53
         self.description = 'Hello'

data/test/plugins/job/logger_test.rb

@@ -4,7 +4,6 @@ require_relative '../../test_helper'
 module Plugins
   module Job
     class LoggerTest < Minitest::Test
-
       class LoggerJob < RocketJob::Job
         def perform
           logger.debug('DONE', value: 123, other_value: 'HI')
@@ -36,7 +35,7 @@ module Plugins
           it 'adds start logging' do
             @job        = LoggerJob.new
             info_called = false
-            @job.logger.stub(:info, -> description { info_called = true if description == 'Start #perform' }) do
+            @job.logger.stub(:info, ->(description) { info_called = true if description == 'Start #perform' }) do
               @job.perform_now
             end
             assert info_called, "In Plugins::Job::Logger.around_perform logger.info('Start #perform') not called"
@@ -45,13 +44,12 @@ module Plugins
           it 'adds completed logging' do
             @job           = LoggerJob.new
             measure_called = false
-            @job.logger.stub(:measure_info, -> description, *args { measure_called = true if description == 'Completed #perform' }) do
+            @job.logger.stub(:measure_info, ->(description, *_args) { measure_called = true if description == 'Completed #perform' }) do
               @job.perform_now
             end
             assert measure_called, "In Plugins::Job::Logger.around_perform logger.measure_info('Completed #perform') not called"
           end
         end
-
       end
     end
   end

data/test/plugins/job/model_test.rb

@@ -81,14 +81,13 @@ module Plugins
           describe '#queued' do
             it 'returns all queued jobs' do
               count = 0
-              RocketJob::Job.queued.each do |job|
+              RocketJob::Job.queued.each do |_job|
                 count += 1
               end
               assert 3, count
             end
           end
         end
-
       end
     end
   end

data/test/plugins/job/persistence_test.rb

@@ -4,7 +4,6 @@ module Plugins
   module Job
     # Unit Test for RocketJob::Job
     class PersistenceTest < Minitest::Test
-
       class PersistJob < RocketJob::Job
         self.priority = 53
         field :data, type: Hash
@@ -89,7 +88,6 @@ module Plugins
             assert_equal 1, counts[:scheduled]
           end
         end
-
       end
     end
   end

data/test/plugins/job/state_machine_test.rb

@@ -3,7 +3,6 @@ module Plugins
   module Job
     # Unit Test for RocketJob::Job
     class StateMachineTest < Minitest::Test
-
       class StateMachineJob < RocketJob::Job
         def perform
         end
@@ -111,7 +110,6 @@ module Plugins
             assert_nil @job.exception
           end
         end
-
       end
     end
   end

data/test/plugins/job/throttle_test.rb

@@ -4,7 +4,6 @@ require_relative '../../test_helper'
 module Plugins
   module Job
     class ThrottleTest < Minitest::Test
-
       class ThrottleJob < RocketJob::Job
         # Only allow one to be processed at a time
         self.throttle_running_jobs = 1
@@ -20,20 +19,20 @@ module Plugins
           RocketJob::Job.delete_all
         end
 
-        describe '.has_throttle?' do
+        describe '.throttle?' do
           it 'defines the running jobs throttle' do
-            assert ThrottleJob.has_throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
-            refute ThrottleJob.has_throttle?(:blah?), ThrottleJob.rocket_job_throttles
+            assert ThrottleJob.throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
+            refute ThrottleJob.throttle?(:blah?), ThrottleJob.rocket_job_throttles
           end
         end
 
         describe '.undefine_throttle' do
           it 'undefines the running jobs throttle' do
-            assert ThrottleJob.has_throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
+            assert ThrottleJob.throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
             ThrottleJob.undefine_throttle(:throttle_running_jobs_exceeded?)
-            refute ThrottleJob.has_throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
+            refute ThrottleJob.throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
             ThrottleJob.define_throttle(:throttle_running_jobs_exceeded?)
-            assert ThrottleJob.has_throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
+            assert ThrottleJob.throttle?(:throttle_running_jobs_exceeded?), ThrottleJob.rocket_job_throttles
           end
         end
 
@@ -106,7 +105,6 @@ module Plugins
             assert_equal 1, filter.size
           end
         end
-
       end
     end
   end

data/test/plugins/job/worker_test.rb

@@ -98,7 +98,7 @@ module Plugins
             @job           = NoisyJob.new
             @job.log_level = :warn
             logged         = false
-            @job.logger.stub(:log_internal, -> level, index, message, payload, exception { logged = true if message.include?('some very noisy logging') }) do
+            @job.logger.stub(:log_internal, ->(_level, _index, message, _payload, _exception) { logged = true if message.include?('some very noisy logging') }) do
               @job.perform_now
             end
             assert_equal false, logged
@@ -193,7 +193,6 @@ module Plugins
             assert active_worker.duration
           end
         end
-
       end
     end
   end