rocketjob 5.1.1 → 5.2.0.beta1

data/lib/rocket_job/worker_pool.rb

@@ -1,5 +1,5 @@
-require 'concurrent-ruby'
-require 'rocket_job/supervisor/shutdown'
+require "concurrent-ruby"
+require "rocket_job/supervisor/shutdown"
 
 module RocketJob
   class WorkerPool
@@ -27,7 +27,7 @@ module RocketJob
     #       The worker also responds faster than max_poll_seconds when a new job is created.
     def rebalance(max_workers, stagger_start = false)
       count = max_workers.to_i - living_count
-      return 0 unless count > 0
+      return 0 unless count.positive?
 
       logger.info("#{'Stagger ' if stagger_start}Starting #{count} workers")
 
@@ -38,6 +38,7 @@ module RocketJob
       count.times.each do
         sleep(delay) if stagger_start
         return -1 if Supervisor.shutdown?
+
         add_one
       end
     end
@@ -90,13 +91,12 @@ module RocketJob
 
     def add_one
       workers << Worker.new(id: next_worker_id, server_name: server_name)
-    rescue StandardError => exc
-      logger.fatal('Cannot start worker', exc)
+    rescue StandardError => e
+      logger.fatal("Cannot start worker", e)
     end
 
     def next_worker_id
       @worker_id += 1
     end
-
   end
 end

data/lib/rocketjob.rb

@@ -1,105 +1,101 @@
-require 'iostreams'
-require 'semantic_logger'
-require 'symmetric-encryption'
-require 'mongoid'
-require 'rocket_job/extensions/mongo/logging'
-require 'rocket_job/version'
-require 'rocket_job/rocket_job'
-require 'rocket_job/config'
-require 'rocket_job/railtie' if defined?(Rails)
+require "iostreams"
+require "semantic_logger"
+require "symmetric-encryption"
+require "mongoid"
+require "rocket_job/extensions/mongo/logging"
+require "rocket_job/version"
+require "rocket_job/rocket_job"
+require "rocket_job/config"
+require "rocket_job/railtie" if defined?(Rails)
 
 # Apply patches to implement `with_collection`
-if Mongoid::VERSION.to_i >= 6
-  require 'rocket_job/extensions/mongoid/clients/options'
-  require 'rocket_job/extensions/mongoid/contextual/mongo'
-  require 'rocket_job/extensions/mongoid/factory'
-else
-  require 'rocket_job/extensions/mongoid_5/clients/options'
-  require 'rocket_job/extensions/mongoid_5/contextual/mongo'
-  require 'rocket_job/extensions/mongoid_5/factory'
-end
+require "rocket_job/extensions/mongoid/clients/options"
+require "rocket_job/extensions/mongoid/contextual/mongo"
+require "rocket_job/extensions/mongoid/factory"
 
 # @formatter:off
 module RocketJob
-  autoload :ActiveWorker,       'rocket_job/active_worker'
-  autoload :Batch,              'rocket_job/batch'
-  autoload :CLI,                'rocket_job/cli'
-  autoload :DirmonEntry,        'rocket_job/dirmon_entry'
-  autoload :Event,              'rocket_job/event'
-  autoload :Heartbeat,          'rocket_job/heartbeat'
-  autoload :Job,                'rocket_job/job'
-  autoload :JobException,       'rocket_job/job_exception'
-  autoload :Worker,             'rocket_job/worker'
-  autoload :Performance,        'rocket_job/performance'
-  autoload :Server,             'rocket_job/server'
-  autoload :Subscriber,         'rocket_job/subscriber'
-  autoload :Supervisor,         'rocket_job/supervisor'
-  autoload :WorkerPool,         'rocket_job/worker_pool'
+  autoload :ActiveWorker,       "rocket_job/active_worker"
+  autoload :Batch,              "rocket_job/batch"
+  autoload :CLI,                "rocket_job/cli"
+  autoload :DirmonEntry,        "rocket_job/dirmon_entry"
+  autoload :Event,              "rocket_job/event"
+  autoload :Heartbeat,          "rocket_job/heartbeat"
+  autoload :Job,                "rocket_job/job"
+  autoload :JobException,       "rocket_job/job_exception"
+  autoload :Worker,             "rocket_job/worker"
+  autoload :Performance,        "rocket_job/performance"
+  autoload :Server,             "rocket_job/server"
+  autoload :Subscriber,         "rocket_job/subscriber"
+  autoload :Supervisor,         "rocket_job/supervisor"
+  autoload :ThrottleDefinition, "rocket_job/throttle_definition"
+  autoload :ThrottleDefinitions, "rocket_job/throttle_definitions"
+  autoload :WorkerPool, "rocket_job/worker_pool"
 
   module Plugins
     module Job
-      autoload :Callbacks,           'rocket_job/plugins/job/callbacks'
-      autoload :Defaults,            'rocket_job/plugins/job/defaults'
-      autoload :StateMachine,        'rocket_job/plugins/job/state_machine'
-      autoload :Logger,              'rocket_job/plugins/job/logger'
-      autoload :Model,               'rocket_job/plugins/job/model'
-      autoload :Persistence,         'rocket_job/plugins/job/persistence'
-      autoload :Throttle,            'rocket_job/plugins/job/throttle'
-      autoload :ThrottleRunningJobs, 'rocket_job/plugins/job/throttle_running_jobs'
-      autoload :Transaction,         'rocket_job/plugins/job/transaction'
-      autoload :Worker,              'rocket_job/plugins/job/worker'
+      autoload :Callbacks,           "rocket_job/plugins/job/callbacks"
+      autoload :Defaults,            "rocket_job/plugins/job/defaults"
+      autoload :StateMachine,        "rocket_job/plugins/job/state_machine"
+      autoload :Logger,              "rocket_job/plugins/job/logger"
+      autoload :Model,               "rocket_job/plugins/job/model"
+      autoload :Persistence,         "rocket_job/plugins/job/persistence"
+      autoload :Throttle,            "rocket_job/plugins/job/throttle"
+      autoload :ThrottleRunningJobs, "rocket_job/plugins/job/throttle_running_jobs"
+      autoload :Transaction,         "rocket_job/plugins/job/transaction"
+      autoload :Worker,              "rocket_job/plugins/job/worker"
     end
     module Rufus
-      autoload :CronLine,       'rocket_job/plugins/rufus/cron_line'
-      autoload :ZoTime,         'rocket_job/plugins/rufus/zo_time'
+      autoload :CronLine,       "rocket_job/plugins/rufus/cron_line"
+      autoload :ZoTime,         "rocket_job/plugins/rufus/zo_time"
     end
-    autoload :Cron,             'rocket_job/plugins/cron'
-    autoload :Document,         'rocket_job/plugins/document'
-    autoload :ProcessingWindow, 'rocket_job/plugins/processing_window'
-    autoload :Restart,          'rocket_job/plugins/restart'
-    autoload :Retry,            'rocket_job/plugins/retry'
-    autoload :Singleton,        'rocket_job/plugins/singleton'
-    autoload :StateMachine,     'rocket_job/plugins/state_machine'
-    autoload :Transaction,      'rocket_job/plugins/transaction'
+    autoload :Cron,             "rocket_job/plugins/cron"
+    autoload :Document,         "rocket_job/plugins/document"
+    autoload :ProcessingWindow, "rocket_job/plugins/processing_window"
+    autoload :Restart,          "rocket_job/plugins/restart"
+    autoload :Retry,            "rocket_job/plugins/retry"
+    autoload :Singleton,        "rocket_job/plugins/singleton"
+    autoload :StateMachine,     "rocket_job/plugins/state_machine"
+    autoload :Transaction,      "rocket_job/plugins/transaction"
   end
 
   module Jobs
-    autoload :ActiveJob,               'rocket_job/jobs/active_job'
-    autoload :CopyFileJob,             'rocket_job/jobs/copy_file_job'
-    autoload :DirmonJob,               'rocket_job/jobs/dirmon_job'
-    autoload :OnDemandBatchJob,        'rocket_job/jobs/on_demand_batch_job'
-    autoload :OnDemandBatchTabularJob, 'rocket_job/jobs/on_demand_batch_tabular_job'
-    autoload :OnDemandJob,             'rocket_job/jobs/on_demand_job'
-    autoload :HousekeepingJob,         'rocket_job/jobs/housekeeping_job'
-    autoload :PerformanceJob,          'rocket_job/jobs/performance_job'
-    autoload :SimpleJob,               'rocket_job/jobs/simple_job'
-    autoload :UploadFileJob,           'rocket_job/jobs/upload_file_job'
+    autoload :ActiveJob,               "rocket_job/jobs/active_job"
+    autoload :CopyFileJob,             "rocket_job/jobs/copy_file_job"
+    autoload :DirmonJob,               "rocket_job/jobs/dirmon_job"
+    autoload :OnDemandBatchJob,        "rocket_job/jobs/on_demand_batch_job"
+    autoload :OnDemandBatchTabularJob, "rocket_job/jobs/on_demand_batch_tabular_job"
+    autoload :OnDemandJob,             "rocket_job/jobs/on_demand_job"
+    autoload :HousekeepingJob,         "rocket_job/jobs/housekeeping_job"
+    autoload :PerformanceJob,          "rocket_job/jobs/performance_job"
+    autoload :SimpleJob,               "rocket_job/jobs/simple_job"
+    autoload :UploadFileJob,           "rocket_job/jobs/upload_file_job"
     module ReEncrypt
-      autoload :RelationalJob,         'rocket_job/jobs/re_encrypt/relational_job'
+      autoload :RelationalJob, "rocket_job/jobs/re_encrypt/relational_job"
     end
   end
 
   module Sliced
-    autoload :CompressedSlice,  'rocket_job/sliced/compressed_slice'
-    autoload :EncryptedSlice,   'rocket_job/sliced/encrypted_slice'
-    autoload :Input,            'rocket_job/sliced/input'
-    autoload :Output,           'rocket_job/sliced/output'
-    autoload :Slice,            'rocket_job/sliced/slice'
-    autoload :Slices,           'rocket_job/sliced/slices'
-    autoload :Store,            'rocket_job/sliced/store'
+    autoload :CompressedSlice,  "rocket_job/sliced/compressed_slice"
+    autoload :EncryptedSlice,   "rocket_job/sliced/encrypted_slice"
+    autoload :Input,            "rocket_job/sliced/input"
+    autoload :Output,           "rocket_job/sliced/output"
+    autoload :Slice,            "rocket_job/sliced/slice"
+    autoload :Slices,           "rocket_job/sliced/slices"
+    autoload :Store,            "rocket_job/sliced/store"
 
     module Writer
-      autoload :Input,          'rocket_job/sliced/writer/input'
-      autoload :Output,         'rocket_job/sliced/writer/output'
+      autoload :Input,          "rocket_job/sliced/writer/input"
+      autoload :Output,         "rocket_job/sliced/writer/output"
     end
   end
 
   module Subscribers
-    autoload :Logger,           'rocket_job/subscribers/logger'
-    autoload :Server,           'rocket_job/subscribers/server'
-    autoload :Worker,           'rocket_job/subscribers/worker'
+    autoload :Logger,           "rocket_job/subscribers/logger"
+    autoload :Server,           "rocket_job/subscribers/server"
+    autoload :Worker,           "rocket_job/subscribers/worker"
   end
 end
 
 # Add Active Job adapter for Rails
-require 'rocket_job/extensions/rocket_job_adapter' if defined?(ActiveJob)
+require "rocket_job/extensions/rocket_job_adapter" if defined?(ActiveJob)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0.beta1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.12'
 - !ruby/object:Gem::Dependency
@@ -56,16 +56,16 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
@@ -95,8 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 description: 
-email:
-- support@rocketjob.io
+email: 
 executables:
 - rocketjob
 - rocketjob_perf
@@ -124,7 +123,7 @@ files:
 - lib/rocket_job/batch/tabular/input.rb
 - lib/rocket_job/batch/tabular/output.rb
 - lib/rocket_job/batch/throttle.rb
-- lib/rocket_job/batch/throttle_running_slices.rb
+- lib/rocket_job/batch/throttle_running_workers.rb
 - lib/rocket_job/batch/worker.rb
 - lib/rocket_job/cli.rb
 - lib/rocket_job/config.rb
@@ -134,9 +133,6 @@ files:
 - lib/rocket_job/extensions/mongoid/clients/options.rb
 - lib/rocket_job/extensions/mongoid/contextual/mongo.rb
 - lib/rocket_job/extensions/mongoid/factory.rb
-- lib/rocket_job/extensions/mongoid_5/clients/options.rb
-- lib/rocket_job/extensions/mongoid_5/contextual/mongo.rb
-- lib/rocket_job/extensions/mongoid_5/factory.rb
 - lib/rocket_job/extensions/rocket_job_adapter.rb
 - lib/rocket_job/heartbeat.rb
 - lib/rocket_job/job.rb
@@ -190,6 +186,8 @@ files:
 - lib/rocket_job/subscribers/worker.rb
 - lib/rocket_job/supervisor.rb
 - lib/rocket_job/supervisor/shutdown.rb
+- lib/rocket_job/throttle_definition.rb
+- lib/rocket_job/throttle_definitions.rb
 - lib/rocket_job/version.rb
 - lib/rocket_job/worker.rb
 - lib/rocket_job/worker_pool.rb
@@ -209,12 +207,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: Ruby's missing batch system.
+summary: Ruby's missing batch processing system.
 test_files: []

data/lib/rocket_job/extensions/mongoid_5/clients/options.rb

@@ -1,38 +0,0 @@
-require 'mongoid/criteria'
-require 'mongoid/document'
-module RocketJob
-  module Mongoid5Clients
-    module Options
-      extend ActiveSupport::Concern
-
-      def with_collection(collection_name)
-        self.collection_name = collection_name
-        self
-      end
-
-      def collection
-        return (@klass || self.class).with(persistence_options || {}).collection unless @collection_name
-        (@klass || self.class).mongo_client[@collection_name]
-      end
-
-      def collection_name
-        @collection_name || super
-      end
-
-      def collection_name=(collection_name)
-        @collection_name = collection_name&.to_sym
-      end
-
-      private
-
-      module ClassMethods
-        def with_collection(collection_name)
-          all.with_collection(collection_name)
-        end
-      end
-    end
-  end
-end
-
-::Mongoid::Criteria.include(RocketJob::Mongoid5Clients::Options)
-::Mongoid::Document.include(RocketJob::Mongoid5Clients::Options)

data/lib/rocket_job/extensions/mongoid_5/contextual/mongo.rb

@@ -1,64 +0,0 @@
-::Mongoid::Contextual::Mongo
-module Mongoid
-  module Contextual
-    class Mongo
-      def initialize(criteria)
-        @criteria, @klass, @cache = criteria, criteria.klass, criteria.options[:cache]
-
-        # Only line changed is here, get collection name from criteria, not @klass
-        #@collection = @klass.with(criteria.persistence_options || {}).collection
-        @collection = criteria.collection
-
-        criteria.send(:merge_type_selection)
-        @view = collection.find(criteria.selector)
-        apply_options
-      end
-
-      #
-      # Patches below add `criteria` as the last argument to `Factory.from_db`
-      #
-      def first
-        return documents.first if cached? && cache_loaded?
-        try_cache(:first) do
-          if raw_doc = view.limit(-1).first
-            doc = Factory.from_db(klass, raw_doc, criteria.options[:fields], criteria)
-            eager_load([doc]).first
-          end
-        end
-      end
-
-      def find_first
-        return documents.first if cached? && cache_loaded?
-        if raw_doc = view.first
-          doc = Factory.from_db(klass, raw_doc, criteria.options[:fields], criteria)
-          eager_load([doc]).first
-        end
-      end
-
-      def last
-        try_cache(:last) do
-          with_inverse_sorting do
-            if raw_doc = view.limit(-1).first
-              doc = Factory.from_db(klass, raw_doc, criteria.options[:fields], criteria)
-              eager_load([doc]).first
-            end
-          end
-        end
-      end
-
-      def documents_for_iteration
-        return documents if cached? && !documents.empty?
-        return view unless eager_loadable?
-        docs = view.map{ |doc| Factory.from_db(klass, doc, criteria.options[:fields], criteria) }
-        eager_load(docs)
-      end
-
-      def yield_document(document, &block)
-        doc = document.respond_to?(:_id) ?
-                document : Factory.from_db(klass, document, criteria.options[:fields], criteria)
-        yield(doc)
-        documents.push(doc) if cacheable?
-      end
-    end
-  end
-end

data/lib/rocket_job/extensions/mongoid_5/factory.rb

@@ -1,13 +0,0 @@
-require 'mongoid/factory'
-
-module RocketJob
-  module Mongoid5Factory
-    def from_db(klass, attributes = nil, selected_fields = nil, criteria = nil)
-      obj                 = super(klass, attributes, selected_fields)
-      obj.collection_name = criteria.collection_name if criteria
-      obj
-    end
-  end
-end
-
-::Mongoid::Factory.extend(RocketJob::Mongoid5Factory)