rocketjob 2.1.3 → 3.0.0.alpha

data/test/plugins/job/defaults_test.rb

@@ -6,25 +6,21 @@ module Plugins
     class DefaultsTest < Minitest::Test
 
       class ParentJob < RocketJob::Job
-        rocket_job do |job|
-          job.priority    = 53
-          job.description = 'Hello'
-        end
+        self.priority    = 53
+        self.description = 'Hello'
 
         def perform
         end
       end
 
       class ChildJob < ParentJob
-        rocket_job do |job|
-          job.priority = 72
-        end
+        self.priority = 72
 
         def perform
         end
       end
 
-      describe RocketJob::Plugins::Job::Defaults do
+      describe RocketJob::Plugins::Job do
         after do
           @job.destroy if @job && !@job.new_record?
         end
@@ -36,6 +32,12 @@ module Plugins
             assert_equal 'Hello', @job.description
           end
 
+          it 'can override defaults on initialize' do
+            @job = ParentJob.new(priority: 72, description: 'More')
+            assert_equal 72, @job.priority
+            assert_equal 'More', @job.description
+          end
+
           it 'allows a child to override parent defaults' do
             @job = ChildJob.new
             assert_equal 72, @job.priority

data/test/plugins/job/model_test.rb

@@ -11,9 +11,7 @@ module Plugins
       end
 
       class TwoArgumentJob < RocketJob::Job
-        rocket_job do |job|
-          job.priority = 53
-        end
+        self.priority = 53
 
         def perform(a, b)
           a + b

data/test/plugins/job/persistence_test.rb

@@ -6,9 +6,8 @@ module Plugins
     class PersistenceTest < Minitest::Test
 
       class PersistJob < RocketJob::Job
-        rocket_job do |job|
-          job.priority = 53
-        end
+        self.priority = 53
+        field :data, type: Hash
 
         def perform(hash)
           hash
@@ -19,10 +18,10 @@ module Plugins
         before do
           RocketJob::Job.destroy_all
           @description = 'Hello World'
-          @arguments   = [{key: 'value'}]
+          @data        = {'key' => 'value'}
           @job         = PersistJob.new(
             description:         @description,
-            arguments:           [{key: 'value'}],
+            data:                @data,
             destroy_on_complete: false
           )
         end
@@ -35,7 +34,7 @@ module Plugins
 
         describe '.config' do
           it 'support multiple databases' do
-            assert_equal 'test_rocketjob', RocketJob::Job.collection.db.name
+            assert_equal 'rocketjob_test', RocketJob::Job.collection.database.name
           end
         end
 
@@ -47,14 +46,13 @@ module Plugins
 
         describe '#reload' do
           it 'handle hash' do
-            assert_equal 'value', @job.arguments.first[:key]
+            assert_equal 'value', @job.data['key']
             @job.worker_name = nil
             @job.save!
             @job.worker_name = '123'
             @job.reload
-            assert @job.arguments.first.is_a?(ActiveSupport::HashWithIndifferentAccess), @job.arguments.first.class.ai
-            assert_equal 'value', @job.arguments.first['key']
-            assert_equal 'value', @job.arguments.first[:key]
+            assert @job.data.is_a?(Hash), @job.data.class.ai
+            assert_equal 'value', @job.data['key']
             assert_equal nil, @job.worker_name
           end
         end
@@ -68,7 +66,7 @@ module Plugins
             assert_equal @description, @job.description
             assert_equal false, @job.destroy_on_complete
             assert_nil @job.expires_at
-            assert_equal @arguments, @job.arguments
+            assert_equal @data, @job.data
             assert_equal 0, @job.percent_complete
             assert_equal 53, @job.priority
             assert_equal 0, @job.failure_count
@@ -81,8 +79,8 @@ module Plugins
         describe '.counts_by_state' do
           it 'returns states as symbols' do
             @job.start!
-            @job2 = PersistJob.create!(arguments: [{key: 'value'}])
-            @job3 = PersistJob.create!(arguments: [{key: 'value'}], run_at: 1.day.from_now)
+            @job2  = PersistJob.create!(data: {key: 'value'})
+            @job3  = PersistJob.create!(data: {key: 'value'}, run_at: 1.day.from_now)
             counts = RocketJob::Job.counts_by_state
             assert_equal 4, counts.size, counts.ai
             assert_equal 1, counts[:running]

data/test/plugins/job/worker_test.rb

@@ -19,20 +19,22 @@ module Plugins
       end
 
       class SumJob < RocketJob::Job
-        rocket_job do |job|
-          job.destroy_on_complete = false
-          job.collect_output      = true
-          job.priority            = 51
-        end
+        self.destroy_on_complete = false
+        self.collect_output      = true
+        self.priority            = 51
+
+        field :first, type: Integer
+        field :second, type: Integer
 
-        def perform(first, second)
+        def perform
           first + second
         end
       end
 
       describe RocketJob::Plugins::Job::Worker do
         before do
-          RocketJob::Job.destroy_all
+          RocketJob::Job.delete_all
+          RocketJob::Server.delete_all
         end
 
         after do
@@ -42,7 +44,7 @@ module Plugins
         describe '.rocket_job_next_job' do
           before do
             @job    = QuietJob.new
-            @worker = RocketJob::Worker.new(name: 'worker:123')
+            @worker = RocketJob::Server.new(name: 'worker:123')
           end
 
           it 'return nil when no jobs available' do
@@ -79,25 +81,17 @@ module Plugins
 
         describe '#perform_now' do
           it 'calls perform method' do
-            @job = SumJob.new(arguments: [10, 5])
+            @job = SumJob.new(first: 10, second: 5)
             assert_equal 15, @job.perform_now['result']
             assert @job.completed?, @job.attributes.ai
             assert_equal 15, @job.result['result']
           end
 
-          it 'saves exception' do
-            @job = SumJob.new(arguments: ['10', 5])
-            assert_raises TypeError do
-              @job.perform_now
-            end
-            assert @job.exception.backtrace
-            assert_equal 'TypeError', @job.exception.class_name
-            if RUBY_VERSION.to_f < 2.0
-              assert_equal "can't convert Fixnum into String", @job.exception.message
-            else
-              assert_equal 'no implicit conversion of Fixnum into String', @job.exception.message
-            end
-            assert_equal 'inline', @job.exception.worker_name
+          it 'converts type' do
+            @job = SumJob.new(first: '10', second: 5)
+            assert_equal 15, @job.perform_now['result']
+            assert @job.completed?, @job.attributes.ai
+            assert_equal 15, @job.result['result']
           end
 
           it 'silence logging when log_level is set' do
@@ -127,14 +121,14 @@ module Plugins
         describe '.perform_later' do
           it 'queues the job for processing' do
             RocketJob::Config.stub(:inline_mode, false) do
-              @job = SumJob.perform_later(1, 23)
+              @job = SumJob.perform_later(first: 1, second: 23)
             end
             assert @job.queued?
 
             # Manually run the job
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
-            assert_equal 24, @job.result['result']
+            assert_equal 24, @job.result['result'], -> { @job.result.ai }
 
             assert_nil @job.worker_name
             assert @job.completed_at
@@ -150,7 +144,7 @@ module Plugins
 
           it 'runs the job immediately when inline_mode = true' do
             RocketJob::Config.stub(:inline_mode, true) do
-              @job = SumJob.perform_later(1, 23)
+              @job = SumJob.perform_later(first: 1, second: 23)
             end
 
             assert @job.completed?, @job.attributes.ai
@@ -171,12 +165,37 @@ module Plugins
 
         describe '.perform_now' do
           it 'run the job immediately' do
-            @job = SumJob.perform_now(1, 5)
+            @job = SumJob.perform_now(first: 1, second: 5)
             assert_equal true, @job.completed?
             assert_equal 6, @job.result['result']
           end
         end
 
+        describe '#rocket_job_active_servers' do
+          before do
+            @job    = QuietJob.create!
+            @worker = RocketJob::Server.create!(name: 'worker:123')
+          end
+
+          it 'should return empty hash for no active jobs' do
+            assert_equal({}, @job.rocket_job_active_servers)
+          end
+
+          it 'should return active servers' do
+            assert job = RocketJob::Job.rocket_job_next_job(@worker.name)
+            assert active = job.rocket_job_active_servers
+            assert_equal 1, active.size
+            assert active_servers = active[@worker.name]
+            assert_equal 1, active_servers.size
+            assert active_server = active_servers.first
+            assert_equal @job.id, active_server.job.id
+            assert_equal @worker.name, active_server.name
+            assert_equal job.started_at, active_server.started_at
+            assert active_server.duration_s
+            assert active_server.duration
+          end
+        end
+
       end
     end
   end

data/test/plugins/processing_window_test.rb

@@ -55,8 +55,8 @@ module Plugins
 
       describe '#rocket_job_processing_window_active?' do
         it 'returns true when in the processing window' do
-          time = Time.parse('2015-12-09 17:50:05 +0000')
-          @job = ProcessingWindowJob.new(processing_schedule: '* 17 * * * UTC', processing_duration: 1.hour)
+          time   = Time.parse('2015-12-09 17:50:05 +0000')
+          @job   = ProcessingWindowJob.new(processing_schedule: '* 17 * * * UTC', processing_duration: 1.hour)
           result = Time.stub(:now, time) do
             @job.rocket_job_processing_window_active?
           end
@@ -64,8 +64,8 @@ module Plugins
         end
 
         it 'returns false when not in the processing window' do
-          time = Time.parse('2015-12-09 16:50:05 +0000')
-          @job = ProcessingWindowJob.new(processing_schedule: '* 17 * * * UTC', processing_duration: 1.hour)
+          time   = Time.parse('2015-12-09 16:50:05 +0000')
+          @job   = ProcessingWindowJob.new(processing_schedule: '* 17 * * * UTC', processing_duration: 1.hour)
           result = Time.stub(:now, time) do
             @job.rocket_job_processing_window_active?
           end

data/test/plugins/restart_test.rb

@@ -7,10 +7,10 @@ module Plugins
       include RocketJob::Plugins::Restart
 
       # Ensure a new start_at and end_at is generated every time this job is restarted
-      self.rocket_job_restart_excludes = self.rocket_job_restart_excludes + %w(start_at end_at)
+      self.rocket_job_restart_excludes += %w(start_at end_at)
 
-      key :start_at, Date
-      key :end_at, Date
+      field :start_at, type: Date
+      field :end_at, type: Date
 
       def perform
         self.start_at = Date.today
@@ -28,7 +28,6 @@ module Plugins
 
       after do
         @job.delete if @job && !@job.new_record?
-        RestartableJob.delete_all
       end
 
       describe '#create!' do
@@ -53,7 +52,7 @@ module Plugins
           @job = RestartableJob.create!
           @job.abort!
           assert_equal 2, RestartableJob.count
-          assert other = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert other = RestartableJob.where(:id.ne => @job.id).first
           refute_equal @job.id, other.id
           assert other.queued?
         end
@@ -63,7 +62,7 @@ module Plugins
           assert @job.expired?
           @job.abort!
           assert_equal 1, RestartableJob.count
-          assert_equal nil, RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert_equal nil, RestartableJob.where(:id.ne => @job.id).first
         end
       end
 
@@ -133,7 +132,7 @@ module Plugins
           assert @job.running?
           assert @job.expired?
           assert_equal 1, RestartableJob.count
-          assert_equal nil, RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert_equal nil, RestartableJob.where(:id.ne => @job.id).first
         end
       end
 
@@ -142,7 +141,7 @@ module Plugins
           @job = RestartableJob.create!(destroy_on_complete: true)
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert job2.queued?, job2.attributes.ai
         end
 
@@ -151,7 +150,7 @@ module Plugins
           refute @job.expired?
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert job2.queued?, job2.attributes.ai
 
           # Copy across all attributes, except
@@ -171,14 +170,14 @@ module Plugins
           assert_equal nil, job2.worker_name
           assert_equal 0, job2.percent_complete
           assert_equal nil, job2.exception
-          assert_equal({}, job2.result)
+          refute job2.result
         end
 
         it 'copies run_at when it is in the future' do
           @job = RestartableJob.create!(run_at: Time.now + 1.day, destroy_on_complete: true)
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert job2.run_at, job2.attributes.ai
         end
 
@@ -186,7 +185,7 @@ module Plugins
           @job = RestartableJob.create!(run_at: Time.now - 1.day, destroy_on_complete: true)
           @job.perform_now
           assert_equal 1, RestartableJob.count
-          assert job2 = RestartableJob.where(id: {'$ne' => @job.id}).first
+          assert job2 = RestartableJob.where(:id.ne => @job.id).first
           assert_equal nil, job2.run_at
         end
       end

data/test/plugins/state_machine_event_callbacks_test.rb

@@ -6,78 +6,80 @@ module Plugins
     # This job adds each event callback as they run into an array
     # [:start, :complete, :fail, :retry, :pause, :resume, :abort, :requeue]
     class PositivePathJob < RocketJob::Job
+      field :call_list, type: Array, default: []
+
       before_complete do
-        arguments.first << 'before_complete_block'
+        call_list << 'before_complete_block'
       end
 
       after_complete do
-        arguments.first << 'after_complete_block'
+        call_list << 'after_complete_block'
       end
 
       before_complete :before_complete_method
 
       before_start do
-        arguments.first << 'before_start_block'
+        call_list << 'before_start_block'
       end
 
       before_start :before_start_method
 
       before_start do
-        arguments.first << 'before_start2_block'
+        call_list << 'before_start2_block'
       end
 
       after_start :after_start_method
       after_complete :after_complete_method
 
       before_complete do
-        arguments.first << 'before_complete2_block'
+        call_list << 'before_complete2_block'
       end
 
       after_start do
-        arguments.first << 'after_start_block'
+        call_list << 'after_start_block'
       end
 
       after_complete do
-        arguments.first << 'after_complete2_block'
+        call_list << 'after_complete2_block'
       end
 
       after_start :after_start_method
 
       after_start do
-        arguments.first << 'after_start2_block'
+        call_list << 'after_start2_block'
       end
 
       before_start :before_start_method2
       before_complete :before_complete_method2
 
-      def perform(list)
-        list << 'perform'
+      def perform
+        call_list << 'perform'
       end
 
       private
 
       def before_start_method
-        arguments.first << 'before_start_method'
+        call_list << 'before_start_method'
       end
 
       def before_start_method2
-        arguments.first << 'before_start_method2'
+        call_list << 'before_start_method2'
       end
 
       def after_start_method
-        arguments.first << 'after_start_method'
+        call_list << 'after_start_method'
       end
 
       def before_complete_method
-        arguments.first << 'before_complete_method'
+        call_list << 'before_complete_method'
       end
 
       def before_complete_method2
-        arguments.first << 'before_complete_method2'
+        call_list << 'before_complete_method2'
       end
 
       def after_complete_method
-        arguments.first << 'after_complete_method'
+        call_list << 'after_complete_method'
       end
     end
 
@@ -88,11 +90,11 @@ module Plugins
 
       describe 'before_start after_start & before_complete after_complete' do
         it 'runs blocks and functions' do
-          @job = PositivePathJob.new(arguments: [[]])
+          @job = PositivePathJob.new
           @job.perform_now
           assert @job.completed?, @job.attributes.ai
           expected = %w(before_start_block before_start_method before_start2_block before_start_method2 after_start2_block after_start_method after_start_block perform before_complete_block before_complete_method before_complete2_block before_complete_method2 after_complete2_block after_complete_method after_complete_block)
-          assert_equal expected, @job.arguments.first, 'Sequence of before_perform callbacks is incorrect'
+          assert_equal expected, @job.call_list, 'Sequence of before_perform callbacks is incorrect'
         end
       end