rocketjob 2.1.3 → 3.0.0.alpha

data/test/config/mongoid.yml

@@ -0,0 +1,88 @@
+# See: https://docs.mongodb.com/ruby-driver/master/tutorials/5.1.0/mongoid-installation/
+client_options: &client_options
+  read:
+    mode:             :primary
+  write:
+    w:                0
+  max_pool_size:      50
+  min_pool_size:      10
+  connect_timeout:    5
+  socket_timeout:     300
+  wait_queue_timeout: 5
+
+mongoid_options: &mongoid_options
+  # Includes the root model name in json serialization. (default: false)
+  # include_root_in_json: false
+
+  # Include the _type field in serialization. (default: false)
+  # include_type_for_serialization: false
+
+  # Preload all models in development, needed when models use
+  # inheritance. (default: false)
+  preload_models: true
+
+  # Raise an error when performing a #find and the document is not found.
+  # (default: true)
+  # raise_not_found_error: true
+
+  # Raise an error when defining a scope with the same name as an
+  # existing method. (default: false)
+  scope_overwrite_exception: true
+
+  # Use Active Support's time zone in conversions. (default: true)
+  # use_activesupport_time_zone: true
+
+  # Ensure all times are UTC in the app side. (default: false)
+  use_utc: true
+
+development:
+  clients:
+    default: &default_development
+      uri: mongodb://localhost:27017/rocketjob_development
+      options:
+        <<: *client_options
+        write:
+          w:   0
+        max_pool_size: 5
+        min_pool_size: 1
+    rocketjob:
+      <<: *default_development
+    rocketjob_slices:
+      <<: *default_development
+  options:
+    <<: *mongoid_options
+
+test:
+  clients:
+    default: &default_test
+      uri: mongodb://localhost:27017/rocketjob_test
+      options:
+        <<: *client_options
+        write:
+          w:           1
+        max_pool_size: 5
+        min_pool_size: 1
+    rocketjob:
+      <<: *default_test
+    rocketjob_slices:
+      <<: *default_test
+  options:
+    <<: *mongoid_options
+
+production:
+  clients:
+    default: &default_production
+      uri: mongodb://user:secret@server.example.org:27017,server2.example.org:27017/rocketjob_production
+      options:
+        <<: *client_options
+        write:
+          w:   0
+    rocketjob:
+      <<: *default_production
+    rocketjob_slices:
+      <<: *default_production
+      # Optionally Specify a different database or even server to store slices on
+      # uri: mongodb://user:secret@server3.example.org:27017/slices_production
+  options:
+    <<: *mongoid_options
+

data/test/config_test.rb

@@ -4,7 +4,7 @@ class ConfigTest < Minitest::Test
 
     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
 

data/test/dirmon_entry_test.rb

@@ -3,14 +3,9 @@ require_relative 'test_helper'
 # Unit Test for RocketJob::Job
 class DirmonEntryTest < Minitest::Test
 
-  class OneArgumentJob < RocketJob::Job
-    def perform(arg)
-    end
-  end
-
   class WithFullFileNameJob < RocketJob::Job
     # Dirmon will store the filename in this property when starting the job
-    key :upload_file_name, String
+    field :upload_file_name, type: String
 
     def perform
       # Do something with the file name stored in :upload_file_name
@@ -33,7 +28,7 @@ class DirmonEntryTest < Minitest::Test
   describe RocketJob::DirmonEntry do
     describe '.config' do
       it 'support multiple databases' do
-        assert_equal 'test_rocketjob', RocketJob::DirmonEntry.collection.db.name
+        assert_equal 'rocketjob_test', RocketJob::DirmonEntry.collection.database.name
       end
     end
 
@@ -56,7 +51,6 @@ class DirmonEntryTest < Minitest::Test
         it 'return job class' do
           entry = RocketJob::DirmonEntry.new(job_class_name: 'RocketJob::Job')
           assert_equal(RocketJob::Job, entry.job_class)
-          assert_equal 0, entry.arguments.size
           assert_equal 0, entry.properties.size
         end
       end
@@ -90,7 +84,7 @@ class DirmonEntryTest < Minitest::Test
 
     describe '#fail!' do
       before do
-        @dirmon_entry = RocketJob::DirmonEntry.new(job_class_name: 'DirmonEntryTest::OneArgumentJob', pattern: 'test/files/**', arguments: [1])
+        @dirmon_entry = RocketJob::DirmonEntry.new(job_class_name: 'DirmonEntryTest::WithFullFileNameJob', pattern: 'test/files/**')
         @dirmon_entry.enable!
         assert @dirmon_entry.valid?, @dirmon_entry.errors.messages.ai
       end
@@ -123,7 +117,7 @@ class DirmonEntryTest < Minitest::Test
 
     describe '#validate' do
       it 'existance' do
-        assert entry = RocketJob::DirmonEntry.new(job_class_name: 'DirmonEntryTest::OneArgumentJob')
+        assert entry = RocketJob::DirmonEntry.new(job_class_name: 'DirmonEntryTest::WithFullFileNameJob')
         assert_equal false, entry.valid?
         assert_equal ["can't be blank"], entry.errors[:pattern], entry.errors.messages.ai
       end
@@ -135,52 +129,6 @@ class DirmonEntryTest < Minitest::Test
           assert_equal ["can't be blank", 'job_class_name must be defined and must be derived from RocketJob::Job'], entry.errors[:job_class_name], entry.errors.messages.ai
         end
       end
-
-      describe 'arguments' do
-        it 'allow no arguments' do
-          assert entry = RocketJob::DirmonEntry.new(
-            job_class_name: 'DirmonEntryTest::WithFullFileNameJob',
-            pattern:        'test/files/**'
-          )
-          assert entry.valid?, entry.errors.messages.ai
-        end
-
-        it 'ensure correct number of arguments' do
-          assert entry = RocketJob::DirmonEntry.new(
-            job_class_name: 'DirmonEntryTest::OneArgumentJob',
-            pattern:        'test/files/**'
-          )
-          refute entry.valid?
-          assert_equal ['There must be 1 argument(s)'], entry.errors[:arguments], entry.errors.messages.ai
-        end
-
-        it 'fail if the job name is bad' do
-          assert entry = RocketJob::DirmonEntry.new(
-            job_class_name: 'Jobs::Tests::Names::Things',
-            pattern:        'test/files/**'
-          )
-          refute entry.valid?
-          assert_equal [], entry.errors[:arguments], entry.errors.messages.ai
-        end
-      end
-
-      it 'invalid without 2 arguments' do
-        assert entry = RocketJob::DirmonEntry.new(
-          job_class_name: 'DirmonEntryTest::SumJob',
-          pattern:        'test/files/**'
-        )
-        refute entry.valid?
-        assert_equal ['There must be 2 argument(s)'], entry.errors[:arguments], entry.errors.messages.ai
-      end
-
-      it 'valid with 2 arguments' do
-        assert entry = RocketJob::DirmonEntry.new(
-          job_class_name: 'DirmonEntryTest::SumJob',
-          pattern:        'test/files/**',
-          arguments:      [1, 2]
-        )
-        assert entry.valid?, entry.errors.messages.ai
-      end
     end
 
     describe 'with valid entry' do
@@ -193,15 +141,11 @@ class DirmonEntryTest < Minitest::Test
         @entry        = RocketJob::DirmonEntry.new(
           pattern:           'test/files/**/*',
           job_class_name:    'RocketJob::Jobs::DirmonJob',
-          arguments:         [{}],
           properties:        {priority: 23},
           archive_directory: @archive_directory
         )
-        @job          = DirmonEntryTest::OneArgumentJob.new(
-          @entry.properties.merge(
-            arguments:  @entry.arguments,
-            properties: @entry.properties
-          )
+        @job          = DirmonEntryTest::WithFullFileNameJob.new(
+          @entry.properties
         )
         @file         = Tempfile.new('archive')
         @file_name    = @file.path
@@ -235,11 +179,6 @@ class DirmonEntryTest < Minitest::Test
       end
 
       describe '#upload_default' do
-        it 'sets full_file_name in Hash argument' do
-          @entry.send(:upload_default, @job, @pathname)
-          assert_equal @archive_real_name, @job.arguments.first[:full_file_name], @job.arguments
-        end
-
         it 'sets upload_file_name property' do
           @entry = RocketJob::DirmonEntry.new(
             pattern:           'test/files/**/*',
@@ -250,14 +189,7 @@ class DirmonEntryTest < Minitest::Test
           job = @entry.job_class.new
           @entry.send(:upload_default, job, @pathname)
           archive_real_name = @archive_path.join("#{job.id}_#{File.basename(@file_name)}").to_s
-          assert_equal archive_real_name, job.upload_file_name, job.arguments
-        end
-
-        it 'handles non hash argument and missing property' do
-          @job.arguments = [1]
-          assert_raises ArgumentError do
-            @entry.send(:upload_default, @job, @pathname)
-          end
+          assert_equal archive_real_name, job.upload_file_name
         end
       end
 
@@ -273,14 +205,18 @@ class DirmonEntryTest < Minitest::Test
 
       describe '#later' do
         it 'enqueues job' do
-          @entry.arguments = [{}]
-          job              = @entry.later(@pathname)
-          assert_equal Pathname.new(@archive_directory).join("#{job.id}_#{File.basename(@file_name)}").realdirpath.to_s, job.arguments.first[:full_file_name]
+          @entry = RocketJob::DirmonEntry.new(
+            pattern:           'test/files/**/*',
+            job_class_name:    'DirmonEntryTest::WithFullFileNameJob',
+            archive_directory: @archive_directory
+          )
+          job    = @entry.later(@pathname)
+          assert_equal Pathname.new(@archive_directory).join("#{job.id}_#{File.basename(@file_name)}").realdirpath.to_s, job.upload_file_name
           assert job.queued?
+          assert_equal 50, job.priority
         end
 
         it 'fails with bad job class name' do
-          @entry.arguments      = [{}]
           @entry.job_class_name = 'Blah'
           assert_raises ArgumentError do
             @entry.later(@pathname)

data/test/dirmon_job_test.rb

@@ -17,7 +17,6 @@ class DirmonJobTest < Minitest::Test
       @entry             = RocketJob::DirmonEntry.new(
         pattern:           "#{@directory}/abc/*",
         job_class_name:    'DirmonJobTest::DirmonTestJob',
-        arguments:         [{input: 'yes'}],
         properties:        {priority: 23},
         archive_directory: @archive_directory
       )
@@ -164,7 +163,7 @@ class DirmonJobTest < Minitest::Test
         end
         assert @dirmon_job.completed?, @dirmon_job.status.inspect
         # Job must destroy on complete
-        refute RocketJob::Jobs::DirmonJob.find(@dirmon_job.id)
+        assert_equal 0, RocketJob::Jobs::DirmonJob.where(id: @dirmon_job.id).count, -> { RocketJob::Jobs::DirmonJob.all.to_a.ai }
 
         # Must have enqueued another instance to run in the future
         assert_equal 1, RocketJob::Jobs::DirmonJob.count
@@ -191,17 +190,18 @@ class DirmonJobTest < Minitest::Test
             dirmon_job.perform_now
           end
         end
+        dirmon_job.save!
         assert dirmon_job.aborted?, dirmon_job.status.ai
         assert_equal 'RuntimeError', dirmon_job.exception.class_name, dirmon_job.exception.attributes
         assert_equal 'Oh no', dirmon_job.exception.message, dirmon_job.exception.attributes
 
         # Must have enqueued another instance to run in the future
-        assert_equal 2, RocketJob::Jobs::DirmonJob.count, RocketJob::Jobs::DirmonJob.to_a
-        assert new_dirmon_job = RocketJob::Jobs::DirmonJob.last
+        assert_equal 2, RocketJob::Jobs::DirmonJob.count, -> { RocketJob::Jobs::DirmonJob.all.ai }
+        assert new_dirmon_job = RocketJob::Jobs::DirmonJob.queued.first
         assert new_dirmon_job.run_at
-        assert_equal 11, new_dirmon_job.priority
+        assert_equal 11, new_dirmon_job.priority, -> { new_dirmon_job.attributes.ai }
         assert_equal 30, new_dirmon_job.check_seconds
-        assert new_dirmon_job.queued?
+        assert new_dirmon_job.queued?, new_dirmon_job.state
 
         new_dirmon_job.destroy
       end

data/test/job_test.rb

@@ -40,7 +40,7 @@ class JobTest < Minitest::Test
       end
     end
 
-    describe '.requeue_dead_worker' do
+    describe '.requeue_dead_server' do
       it 'requeue jobs from dead workers' do
         assert_equal 52, @job2.priority
         worker_name      = 'server:12345'
@@ -55,7 +55,7 @@ class JobTest < Minitest::Test
         assert @job2.running?, @job2.state
         @job2.save!
 
-        RocketJob::Job.requeue_dead_worker(worker_name)
+        RocketJob::Job.requeue_dead_server(worker_name)
         @job.reload
 
         assert @job.queued?

data/test/plugins/job/callbacks_test.rb

@@ -6,82 +6,90 @@ module Plugins
     class CallbacksTest < Minitest::Test
       # This job adds each callback as they run into an array
       class BeforePerformJob < RocketJob::Job
+        field :call_list, type: Array, default: []
+
         before_perform do
-          arguments.first << 'before_perform_block'
+          call_list << 'before_perform_block'
         end
 
         before_perform :before_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def before_perform_method
-          arguments.first << 'before_perform_method'
+          call_list << 'before_perform_method'
         end
 
       end
 
       # This job adds each callback as they run into an array
       class AfterPerformJob < RocketJob::Job
+        field :call_list, type: Array, default: []
+
         after_perform do
-          arguments.first << 'after_perform_block'
+          call_list << 'after_perform_block'
         end
 
         after_perform :after_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def after_perform_method
-          arguments.first << '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|
-          arguments.first << 'around_perform_block_before'
+          call_list << 'around_perform_block_before'
           block.call
-          arguments.first << 'around_perform_block_after'
+          call_list << 'around_perform_block_after'
         end
 
         around_perform :around_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def around_perform_method
-          arguments.first << 'around_perform_method_before'
+          call_list << 'around_perform_method_before'
           yield
-          arguments.first << 'around_perform_method_after'
+          call_list << 'around_perform_method_after'
         end
 
       end
 
       # This job adds each callback as they run into an array
       class CombinedPerformJob < RocketJob::Job
+        field :call_list, type: Array, default: []
+
         before_perform do
-          arguments.first << 'before_perform_block'
+          call_list << 'before_perform_block'
         end
 
         after_perform do
-          arguments.first << 'after_perform_block'
+          call_list << 'after_perform_block'
         end
 
         around_perform do |job, block|
-          arguments.first << 'around_perform_block_before'
+          call_list << 'around_perform_block_before'
           block.call
-          arguments.first << 'around_perform_block_after'
+          call_list << 'around_perform_block_after'
         end
 
         before_perform :before_perform_method
@@ -90,24 +98,24 @@ module Plugins
 
         after_perform :after_perform_method
 
-        def perform(list)
-          list << 'perform'
+        def perform
+          call_list << 'perform'
         end
 
         private
 
         def before_perform_method
-          arguments.first << 'before_perform_method'
+          call_list << 'before_perform_method'
         end
 
         def around_perform_method(&block)
-          arguments.first << 'around_perform_method_before'
+          call_list << 'around_perform_method_before'
           block.call
-          arguments.first << 'around_perform_method_after'
+          call_list << 'around_perform_method_after'
         end
 
         def after_perform_method
-          arguments.first << 'after_perform_method'
+          call_list << 'after_perform_method'
         end
 
       end
@@ -119,41 +127,41 @@ module Plugins
 
         describe '#before_perform' do
           it 'runs blocks and functions' do
-            @job = BeforePerformJob.new(arguments: [[]])
+            @job = BeforePerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
             expected = %w(before_perform_block before_perform_method perform)
-            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
 
         describe '#after_perform' do
           it 'runs blocks and functions' do
-            @job = AfterPerformJob.new(arguments: [[]])
+            @job = AfterPerformJob.new
             @job.perform_now
             assert @job.completed?, @job.attributes.ai
             expected = %w(perform after_perform_method after_perform_block)
-            assert_equal expected, @job.arguments.first, 'Sequence of after_perform callbacks is incorrect'
+            assert_equal expected, @job.call_list, 'Sequence of after_perform callbacks is incorrect'
           end
         end
 
         describe '#around_perform' do
           it 'runs blocks and functions' do
-            @job = AroundPerformJob.new(arguments: [[]])
+            @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)
-            assert_equal expected, @job.arguments.first, 'Sequence of around_perform callbacks is incorrect'
+            assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end
 
         describe 'all callbacks' do
           it 'runs them in the right order' do
-            @job = CombinedPerformJob.new(arguments: [[]])
+            @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)
-            assert_equal expected, @job.arguments.first, 'Sequence of around_perform callbacks is incorrect'
+            assert_equal expected, @job.call_list, 'Sequence of around_perform callbacks is incorrect'
           end
         end