rocketjob 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bf52fdcaa423858a798fdd0da28cf9df7448170
-  data.tar.gz: a8cd888f37215dbe633dad2f13941e629c6463dc
+  metadata.gz: eca6d0b99611683528bcec8d6db9756b1bb765a4
+  data.tar.gz: 2351fdabe936b770404e0c82d9a052579fac8ae4
 SHA512:
-  metadata.gz: 99b6ff7af94d554ff2107deaaade0b639703cf29cd714fcdbe0763f1e4217ae8b22e87a790fd87101a849d1172684a670fb2c6b80c6ec5689ca3991795a0bb53
-  data.tar.gz: 1d477d2acc562df2a16ebccf500e71d77c570feb486c38a01f8bdcabacc99ebcdf56394b05049b893b5237754633920643c8e8387058666bc0f710984f9058f1
+  metadata.gz: 0fa9812d3413bd0dfb18dfe66d61e1f22e538d743030ed3e02d060d74e141e7128bada92fd8c4b24fea1305fcb99b5acfc70172cd5ffb3a309b20c9a6c39802d
+  data.tar.gz: 14a209e63e6abc3e491fb51da5760cd3df85bb37e5a12bed758630ecbac5ffe156f78ae22a00028591033a5ac29e5cc22f88c4d117844558f34f9d179442538c

data/README.md

@@ -1,13 +1,7 @@
 # Rocket Job
-[![Gem Version](https://img.shields.io/gem/v/rocketjob.svg)](https://rubygems.org/gems/rocketjob) [![Build Status](https://travis-ci.org/rocketjob/rocketjob.svg?branch=master)](https://travis-ci.org/rocketjob/rocketjob) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Production%20Ready-blue.svg) [![Gitter chat](https://img.shields.io/badge/IRC%20(gitter)-Support-brightgreen.svg)](https://gitter.im/rocketjob/support)
+[![Gem Version](https://img.shields.io/gem/v/rocketjob.svg)](https://rubygems.org/gems/rocketjob) [![Build Status](https://travis-ci.org/rocketjob/rocketjob.svg?branch=master)](https://travis-ci.org/rocketjob/rocketjob) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Production%20Ready-blue.svg) [![Support](https://img.shields.io/badge/IRC%20(gitter)-Support-brightgreen.svg)](https://gitter.im/rocketjob/support)
 
-Rocket Job is a distributed, priority-based, background job, computation system for Ruby.
-Rocket Job makes it easy to reliably process data using jobs written in Ruby.
-
-Outgrown existing Ruby background job processing solutions?
-
-Upgrade to Rocket Job.
-Or, start small with Rocket Job and seamlessly scale up to meet future business demands.
+Ruby's missing batch system
 
 Checkout http://rocketjob.io/
 
@@ -23,6 +17,12 @@ Checkout http://rocketjob.io/
 * Questions? Join the chat room on Gitter for [rocketjob support](https://gitter.im/rocketjob/support)
 * [Report bugs](https://github.com/rocketjob/rocketjob/issues)
 
+## Ruby Support
+
+Rocket Job is tested and supported on the following Ruby platforms:
+- Ruby 2.1, 2.2, 2.3, and above
+- JRuby 1.7.23, 9.0.5 and above
+
 ## Versioning
 
 This project uses [Semantic Versioning](http://semver.org/).

data/Rakefile

@@ -1,6 +1,4 @@
-require 'rake/clean'
 require 'rake/testtask'
-
 require_relative 'lib/rocket_job/version'
 
 task :gem do
@@ -14,14 +12,10 @@ task publish: :gem do
   system "rm rocketjob-#{RocketJob::VERSION}.gem"
 end
 
-desc 'Run Test Suite'
-task :test do
-  Rake::TestTask.new(:functional) do |t|
-    t.test_files = FileList['test/**/*_test.rb']
-    t.verbose    = true
-  end
-
-  Rake::Task['functional'].invoke
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+  t.warning = false
 end
 
 task default: :test

data/lib/rocket_job/cli.rb

@@ -1,5 +1,4 @@
 require 'optparse'
-require 'yaml'
 require 'semantic_logger'
 module RocketJob
   # Command Line Interface parser for RocketJob
@@ -25,7 +24,6 @@ module RocketJob
       setup_environment
       setup_logger
       rails? ? boot_rails : boot_standalone
-#      setup_metrics
       write_pidfile
 
       opts               = {}
@@ -34,15 +32,6 @@ module RocketJob
       Worker.run(opts)
     end
 
-    def setup_metrics
-      SemanticLogger.on_metric do |log|
-        if log.metric.start_with?('rocketjob/')
-          ap log
-          RocketJob::Stats::ShortTerm.increment_metric(log.time, log.name, log.duration, log.metric_amount)
-        end
-      end
-    end
-
     def rails?
       @rails ||= begin
         boot_file = Pathname.new(directory).join('config/environment.rb').expand_path

data/lib/rocket_job/config.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 # encoding: UTF-8
 module RocketJob
   # Centralized Configuration for Rocket Jobs
@@ -15,9 +16,9 @@ module RocketJob
       end
     end
 
-    # Useful for Testing, not recommended elsewhere
-    # By enabling inline_mode jobs will be called in-line using perform_now
-    # No worker processes will be created, nor threads created
+    # Useful for Testing, not recommended elsewhere.
+    # When enabled all calls to `perform_later` will be redirected to `perform_now`.
+    # Also, exceptions will be raised instead of failing the job.
     cattr_accessor(:inline_mode) { false }
 
     # @formatter:off

data/lib/rocket_job/dirmon_entry.rb

@@ -222,7 +222,7 @@ module RocketJob
         }
       ]
       ).each do |result|
-        counts[result['_id']] = result['count']
+        counts[result['_id'].to_sym] = result['count']
       end
       counts
     end

data/lib/rocket_job/extensions/aasm.rb

@@ -50,6 +50,7 @@ module AASM
       @states = orig.states.collect { |state| state.clone }
       @events = {}
       orig.events.each_pair { |name, event| @events[name] = event.clone }
+      @global_callbacks = @global_callbacks.dup
     end
   end
 end

data/lib/rocket_job/extensions/mongo_mapper.rb

@@ -0,0 +1,30 @@
+# TODO Delete this file once PR has been accepted
+#   https://github.com/mongomapper/mongomapper/pull/641
+MongoMapper::Plugins::Keys::Static
+module MongoMapper
+  module Plugins
+    module Keys
+      module Static
+        module ClassMethods
+          def embedded_keys
+            @embedded_keys ||= embedded_associations.collect(&:as)
+          end
+
+          def embedded_key?(key)
+            embedded_keys.include?(key.to_sym)
+          end
+        end
+
+        private
+
+        def load_from_database(attrs, with_cast = false)
+          return super if !self.class.static_keys || !attrs.respond_to?(:each)
+
+          attrs = attrs.select { |key, _| self.class.key?(key) || self.class.embedded_key?(key) }
+
+          super(attrs, with_cast)
+        end
+      end
+    end
+  end
+end

data/lib/rocket_job/extensions/rocket_job_adapter.rb

@@ -0,0 +1,51 @@
+#require 'rocketjob'
+
+module ActiveJob
+  module QueueAdapters
+    # == Rocket Job adapter for Active Job
+    #
+    # Ruby's missing batch system.
+    #
+    # Read more about Rocket Job {here}[http://rocketjob.io].
+    #
+    # To use Rocket Job set the queue_adapter config to +:rocket_job+.
+    #
+    #   Rails.application.config.active_job.queue_adapter = :rocket_job
+    class RocketJobAdapter
+      def enqueue(active_job) #:nodoc:
+        rocket_job                 = JobWrapper.perform_later(active_job.serialize) do |job|
+          job.active_job_id    = active_job.job_id
+          job.active_job_class = active_job.class.name
+          job.active_job_queue = active_job.queue_name
+          job.description      = active_job.class.name
+          job.priority         = active_job.priority if active_job.priority
+        end
+        active_job.provider_job_id = rocket_job.id.to_s
+        rocket_job
+      end
+
+      def enqueue_at(active_job, timestamp) #:nodoc:
+        rocket_job                 = JobWrapper.perform_later(active_job.serialize) do |job|
+          job.active_job_id    = active_job.job_id
+          job.active_job_class = active_job.class.name
+          job.active_job_queue = active_job.queue_name
+          job.description      = active_job.class.name
+          job.priority         = active_job.priority if active_job.priority
+          job.run_at           = Time.at(timestamp).utc
+        end
+        active_job.provider_job_id = rocket_job.id.to_s
+        rocket_job
+      end
+
+      class JobWrapper < RocketJob::Job #:nodoc:
+        key :active_job_id, String
+        key :active_job_class, String
+        key :active_job_queue, String
+
+        def perform(job_data)
+          Base.execute job_data
+        end
+      end
+    end
+  end
+end

data/lib/rocket_job/jobs/housekeeping_job.rb

@@ -0,0 +1,57 @@
+module RocketJob
+  module Jobs
+    # Applies Retention policies to how long jobs are kept.
+    #
+    # Retentions are specific to each state so that for example completed
+    # jobs can be cleaned up before jobs that are running.
+    #
+    # Only one active instance of this housekeeping job is permitted at a time.
+    #
+    # Example:
+    #   RocketJob::Jobs::HousekeepingJob.create!
+    #
+    # Example, with the default values that can be modified:
+    #   RocketJob::Jobs::HousekeepingJob.create!(
+    #     aborted_retention:   7.days,
+    #     completed_retention: 7.days,
+    #     failed_retention:    14.days,
+    #     paused_retention:    90.days,
+    #     queued_retention:    nil
+    #   )
+    #
+    # Example, overriding defaults and disabling removal of paused jobs:
+    #   RocketJob::Jobs::HousekeepingJob.create!(
+    #     aborted_retention:   1.day,
+    #     completed_retention: 12.hours,
+    #     failed_retention:    7.days,
+    #     paused_retention:    nil
+    #   )
+    class HousekeepingJob < RocketJob::Job
+      include RocketJob::Plugins::Cron
+      include RocketJob::Plugins::Singleton
+
+      rocket_job do |job|
+        job.priority      = 50
+        job.description   = 'Cleans out historical jobs'
+        job.cron_schedule = '0 0 * * * America/New_York'
+      end
+
+      # Retention intervals in seconds
+      # Set to nil to not
+      key :aborted_retention, Integer, default: 7.days
+      key :completed_retention, Integer, default: 7.days
+      key :failed_retention, Integer, default: 14.days
+      key :paused_retention, Integer, default: 90.days
+      key :queued_retention, Integer
+
+      def perform
+        RocketJob::Job.where(state: :aborted, created_at: {'$lte' => aborted_retention.ago}).destroy_all if aborted_retention
+        RocketJob::Job.where(state: :completed, created_at: {'$lte' => completed_retention.ago}).destroy_all if completed_retention
+        RocketJob::Job.where(state: :failed, created_at: {'$lte' => failed_retention.ago}).destroy_all if failed_retention
+        RocketJob::Job.where(state: :paused, created_at: {'$lte' => paused_retention.ago}).destroy_all if paused_retention
+        RocketJob::Job.where(state: :queued, created_at: {'$lte' => queued_retention.ago}).destroy_all if queued_retention
+      end
+
+    end
+  end
+end

data/lib/rocket_job/plugins/cron.rb

@@ -107,6 +107,9 @@ module RocketJob
 
         key :cron_schedule, String
 
+        # Make cron_schedule editable for scheduled jobs
+        public_rocket_job_properties :cron_schedule
+
         before_create :rocket_job_set_run_at
 
         validates_presence_of :cron_schedule

data/lib/rocket_job/plugins/document.rb

@@ -8,20 +8,18 @@ module RocketJob
   module Plugins
     # Base class for storing models in MongoDB
     module Document
-      autoload :Static, 'rocket_job/plugins/document/static'
-
       extend ActiveSupport::Concern
       include MongoMapper::Document
-      include RocketJob::Plugins::Document::Static
 
       included do
-        # Add after_initialize & after_find callbacks
-        define_model_callbacks :initialize, :find, :only => [:after]
-
-        # Prevent data in MongoDB from re-defining the model behavior
+        # Prevent data in MongoDB from re-defining the model behavior.
         self.static_keys     = true
 
-        # Turn off embedded callbacks. Slow and not used for Jobs
+        # Only save changes to this instance to prevent losing
+        # changes made by other processes or threads.
+        self.partial_updates = true
+
+        # Turn off embedded callbacks. Slow and not used by Jobs.
         embedded_callbacks_off
       end
 
@@ -38,21 +36,6 @@ module RocketJob
         end
       end
 
-      # Add after_initialize callbacks
-      # TODO: Remove after new MongoMapper gem is released
-      #       Also remove define_model_callbacks above
-      def initialize(*)
-        run_callbacks(:initialize) { super }
-      end
-
-      def initialize_from_database(*)
-        run_callbacks(:initialize) do
-          run_callbacks(:find) do
-            super
-          end
-        end
-      end
-
       private
 
       def update_attributes_and_reload(attrs)

data/lib/rocket_job/plugins/job/persistence.rb

@@ -109,7 +109,7 @@ module RocketJob
               }
             ]
             ).each do |result|
-              counts[result['_id']] = result['count']
+              counts[result['_id'].to_sym] = result['count']
             end
 
             # Calculate :queued_now and :scheduled if there are queued jobs

data/lib/rocket_job/plugins/job/worker.rb

@@ -69,7 +69,10 @@ module RocketJob
 
           # Requeues all jobs that were running on worker that died
           def self.requeue_dead_worker(worker_name)
-            running.each { |job| job.requeue!(worker_name) if job.may_requeue?(worker_name) }
+            # TODO Need to requeue paused, failed since user may have transitioned job before it finished
+            running.each do |job|
+              job.requeue!(worker_name) if job.may_requeue?(worker_name)
+            end
           end
 
           # Turn off embedded callbacks. Slow and not used for Jobs
@@ -97,7 +100,7 @@ module RocketJob
           worker = RocketJob::Worker.new(name: 'inline')
           worker.started
           start if may_start?
-          # Raise exceptions
+          # Re-Raise exceptions
           rocket_job_work(worker, true) if running?
           result
         end
@@ -113,10 +116,10 @@ module RocketJob
         # worker_name: [String]
         #   Name of the worker on which the exception has occurred
         #
-        # raise_exceptions: [true|false]
+        # re_raise_exceptions: [true|false]
         #   Re-raise the exception after updating the job
-        #   Default: !RocketJob::Config.inline_mode
-        def rocket_job_fail_on_exception!(worker_name, raise_exceptions = !RocketJob::Config.inline_mode)
+        #   Default: false
+        def rocket_job_fail_on_exception!(worker_name, re_raise_exceptions = false)
           yield
         rescue Exception => exc
           if failed? || !may_fail?
@@ -130,7 +133,7 @@ module RocketJob
               fail!(worker_name, exc)
             end
           end
-          raise exc if raise_exceptions
+          raise exc if re_raise_exceptions
         end
 
         # Works on this job
@@ -141,9 +144,9 @@ module RocketJob
         # is set in the job itself.
         #
         # Thread-safe, can be called by multiple threads at the same time
-        def rocket_job_work(worker, raise_exceptions = !RocketJob::Config.inline_mode)
+        def rocket_job_work(worker, re_raise_exceptions = false)
           raise(ArgumentError, 'Job must be started before calling #rocket_job_work') unless running?
-          rocket_job_fail_on_exception!(worker.name, raise_exceptions) do
+          rocket_job_fail_on_exception!(worker.name, re_raise_exceptions) do
             run_callbacks :perform do
               # Allow callbacks to fail, complete or abort the job
               if running?

data/lib/rocket_job/plugins/restart.rb

@@ -18,7 +18,7 @@ module RocketJob
       extend ActiveSupport::Concern
 
       # Attributes to exclude when copying across the attributes to the new instance
-      RESTART_EXCLUDES = %w(_id state created_at started_at completed_at failure_count worker_name percent_complete exception result run_at)
+      RESTART_EXCLUDES = %w(_id state created_at started_at completed_at failure_count worker_name percent_complete exception result run_at record_count sub_state)
 
       included do
         after_abort :rocket_job_restart_new_instance

data/lib/rocket_job/plugins/retry.rb

@@ -0,0 +1,101 @@
+# encoding: UTF-8
+require 'active_support/concern'
+
+module RocketJob
+  module Plugins
+    # Automatically retry the job on failure.
+    #
+    # The following retry algorithm is used to automatically retry a job when it fails:
+    # Failed jobs are aborted so that they cannot be restarted since a new instance has there are workers
+    # available to run. For example if workers are busy working on higher priority jobs, then the job
+    # will only run once those jobs have completed, or their priority lowered. Additionally, while the
+    # job is queued no additional instances will be enqueued, even if the next cron interval has been reached.
+    #
+    # Note:
+    # - After failure the job is scheduled to run again in the future.
+    # - The job will not be retried if:
+    #   - The job has expired.
+    #   - The job fails validations.
+    #   - The number of retry counts has been exceeded.
+    # - To see the number of times a job has failed so far:
+    #     job.failure_count
+    #
+    # Example:
+    #
+    # class MyJob < RocketJob::Job
+    #   include RocketJob::Plugins::Retry
+    #
+    #   # Set the default retry_count
+    #   rocket_job do |job|
+    #     job.max_retries = 3
+    #   end
+    #
+    #   def perform
+    #     puts "DONE"
+    #   end
+    # end
+    #
+    # # Queue the job for processing using the default cron_schedule specified above
+    # MyJob.create!
+    #
+    # # Replace the default retry_count
+    # MyCronJob.create!(max_retries: 10)
+    #
+    # # Disable retries for this job instance
+    # MyCronJob.create!(max_retries: 0)
+    #
+    module Retry
+      extend ActiveSupport::Concern
+
+      included do
+        after_fail :rocket_job_retry
+
+        # Maximum number of times to retry this job
+        # 25 is approximately 3 weeks of retries
+        key :max_retries, Integer, default: 25
+
+        # List of times when this job failed
+        key :failed_times, Array
+
+        # Make max_retries editable in Rocket Job Mission Control
+        public_rocket_job_properties :max_retries
+
+        validates_presence_of :max_retries
+      end
+
+      # Returns [true|false] whether this job will be automatically retried on failure
+      def rocket_job_retry_on_fail?
+        failure_count > max_retries
+      end
+
+      private
+
+      def rocket_job_retry
+        # Failure count is incremented during before_fail
+        return if expired? || !rocket_job_retry_on_fail?
+
+        delay_seconds = rocket_job_retry_seconds_to_delay
+        logger.info "Job failed, automatically retrying in #{delay_seconds} seconds. Retry count: #{failure_count}"
+
+        now         = Time.now
+        self.run_at = now + delay_seconds
+        self.failed_times << now
+        new_record? ? retry : retry!
+      end
+
+      # Prevent exception from being cleared on retry
+      def rocket_job_clear_exception
+        self.completed_at = nil
+        self.exception    = nil unless rocket_job_retry_on_fail?
+        self.worker_name  = nil
+      end
+
+      # Returns [Time] when to retry this job at
+      # Same basic formula as Sidekiq and Delayed Job
+      def rocket_job_retry_seconds_to_delay
+        (failure_count ** 4) + 15 + (rand(30)*(failure_count+1))
+      end
+
+    end
+  end
+end

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '2.0.0'
+  VERSION = '2.1.1'
 end

data/lib/rocket_job/worker.rb

@@ -178,7 +178,7 @@ module RocketJob
         }
       ]
       ).each do |result|
-        counts[result['_id']] = result['count']
+        counts[result['_id'].to_sym] = result['count']
       end
       counts
     end
@@ -195,7 +195,7 @@ module RocketJob
     # - The worker process is "hanging"
     # - The worker is no longer able to communicate with the MongoDB Server
     def zombie?(missed = 4)
-      return false unless running?
+      return false unless running? || stopping?
       return true if heartbeat.nil? || heartbeat.updated_at.nil?
       dead_seconds = Config.instance.heartbeat_seconds * missed
       (Time.now - heartbeat.updated_at) >= dead_seconds
@@ -260,13 +260,25 @@ module RocketJob
         # Stop worker if shutdown indicator was set
         stop! if self.class.shutdown? && may_stop?
       end
+
       logger.info 'Waiting for worker threads to stop'
-      # TODO Put a timeout on join.
-      # Log Thread dump for active threads
-      # Compare thread dumps for any changes, force down if no change?
-      # reload, if model missing: Send Shutdown exception to each thread
-      #           5 more seconds then exit
-      worker_threads.each { |t| t.join }
+      while thread = worker_threads.first
+        if thread.join(5)
+          # Worker thread is dead
+          worker_threads.shift
+        else
+          # Timeout waiting for thread to stop
+          begin
+            update_attributes_and_reload(
+              'heartbeat.updated_at'      => Time.now,
+              'heartbeat.current_threads' => worker_count
+            )
+          rescue MongoMapper::DocumentNotFound
+            logger.error('Worker has been destroyed. Going down hard!')
+            break
+          end
+        end
+      end
       logger.info 'Shutdown'
     rescue Exception => exc
       logger.error('RocketJob::Worker is stopping due to an exception', exc)
@@ -336,6 +348,8 @@ module RocketJob
       logger.info "Stopping. Worker state: #{state.inspect}"
     rescue Exception => exc
       logger.fatal('Unhandled exception in job processing thread', exc)
+    ensure
+      ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
     end
 
     # Process the next available job

data/lib/rocketjob.rb

@@ -3,6 +3,7 @@ require 'semantic_logger'
 require 'rocket_job/extensions/mongo'
 require 'mongo_ha'
 require 'mongo_mapper'
+require 'rocket_job/extensions/mongo_mapper'
 require 'rocket_job/version'
 
 # @formatter:off
@@ -65,3 +66,6 @@ module RocketJob
   end
 
 end
+
+# Add Active Job adapter for Rails
+require 'rocket_job/extensions/rocket_job_adapter' if defined?(ActiveJob)

data/test/dirmon_entry_test.rb

@@ -207,7 +207,7 @@ class DirmonEntryTest < Minitest::Test
         @file_name    = @file.path
         @pathname     = Pathname.new(@file_name)
         File.open(@file_name, 'w') { |file| file.write('Hello World') }
-        assert File.exists?(@file_name)
+        assert File.exist?(@file_name)
         @archive_real_name = @archive_path.join("#{@job.id}_#{File.basename(@file_name)}").to_s
       end
 
@@ -230,7 +230,7 @@ class DirmonEntryTest < Minitest::Test
       describe '#archive_file' do
         it 'archive file' do
           assert_equal @archive_real_name, @entry.send(:archive_file, @job, Pathname.new(@file_name))
-          assert File.exists?(@archive_real_name)
+          assert File.exist?(@archive_real_name)
         end
       end
 

data/test/plugins/job/persistence_test.rb

@@ -17,6 +17,7 @@ module Plugins
 
       describe RocketJob::Plugins::Job::Persistence do
         before do
+          RocketJob::Job.destroy_all
           @description = 'Hello World'
           @arguments   = [{key: 'value'}]
           @job         = PersistJob.new(
@@ -28,6 +29,8 @@ module Plugins
 
         after do
           @job.destroy if @job && !@job.new_record?
+          @job2.destroy if @job2 && !@job2.new_record?
+          @job3.destroy if @job3 && !@job3.new_record?
         end
 
         describe '.config' do
@@ -75,6 +78,20 @@ module Plugins
           end
         end
 
+        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)
+            counts = RocketJob::Job.counts_by_state
+            assert_equal 4, counts.size, counts.ai
+            assert_equal 1, counts[:running]
+            assert_equal 2, counts[:queued]
+            assert_equal 1, counts[:queued_now]
+            assert_equal 1, counts[:scheduled]
+          end
+        end
+
       end
     end
   end

data/test/plugins/processing_window_test.rb

@@ -78,7 +78,7 @@ module Plugins
           @job = ProcessingWindowJob.new
           refute @job.valid?
           assert_equal "can't be blank", @job.errors.messages[:processing_schedule].first
-          assert_equal "not a string: nil", @job.errors.messages[:processing_schedule].second
+          assert_equal 'not a string: nil', @job.errors.messages[:processing_schedule].second
           assert_equal "can't be blank", @job.errors.messages[:processing_duration].first
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -42,16 +42,16 @@ dependencies:
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.14.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.14.0.rc1
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
@@ -66,38 +66,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: symmetric-encryption
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-description: Batch Processing System focused on performance, scalability, reliability,
-  and visibility of every job in the system.
+description: 
 email:
-- reidmo@gmail.com
+- support@rocketjob.io
 executables:
 - rocketjob
 - rocketjob_perf
@@ -114,15 +99,17 @@ files:
 - lib/rocket_job/dirmon_entry.rb
 - lib/rocket_job/extensions/aasm.rb
 - lib/rocket_job/extensions/mongo.rb
+- lib/rocket_job/extensions/mongo_mapper.rb
+- lib/rocket_job/extensions/rocket_job_adapter.rb
 - lib/rocket_job/heartbeat.rb
 - lib/rocket_job/job.rb
 - lib/rocket_job/job_exception.rb
 - lib/rocket_job/jobs/dirmon_job.rb
+- lib/rocket_job/jobs/housekeeping_job.rb
 - lib/rocket_job/jobs/simple_job.rb
 - lib/rocket_job/performance.rb
 - lib/rocket_job/plugins/cron.rb
 - lib/rocket_job/plugins/document.rb
-- lib/rocket_job/plugins/document/static.rb
 - lib/rocket_job/plugins/job/callbacks.rb
 - lib/rocket_job/plugins/job/defaults.rb
 - lib/rocket_job/plugins/job/logger.rb
@@ -132,6 +119,7 @@ files:
 - lib/rocket_job/plugins/job/worker.rb
 - lib/rocket_job/plugins/processing_window.rb
 - lib/rocket_job/plugins/restart.rb
+- lib/rocket_job/plugins/retry.rb
 - lib/rocket_job/plugins/rufus/cron_line.rb
 - lib/rocket_job/plugins/rufus/zo_time.rb
 - lib/rocket_job/plugins/singleton.rb
@@ -179,10 +167,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Batch Processing System for Ruby
+summary: Ruby's missing batch system.
 test_files:
 - test/config/mongo.yml
 - test/config_test.rb

data/lib/rocket_job/plugins/document/static.rb

@@ -1,53 +0,0 @@
-module RocketJob
-  module Plugins
-    # Extension for Document to implement static keys
-    # Remove when new MongoMapper gem is released
-    module Document
-      module Static
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          attr_writer :static_keys
-
-          def static_keys
-            @static_keys || false
-          end
-
-          def embedded_keys
-            @embedded_keys ||= embedded_associations.collect(&:as)
-          end
-
-          def embedded_key?(key)
-            embedded_keys.include?(key.to_sym)
-          end
-        end
-
-        def read_key(name)
-          if !self.class.static_keys || self.class.key?(name)
-            super
-          else
-            raise MissingKeyError, "Tried to read the key #{name.inspect}, but no key was defined. Either define key :#{name} or set self.static_keys = false"
-          end
-        end
-
-        private
-
-        def write_key(name, value)
-          if !self.class.static_keys || self.class.key?(name)
-            super
-          else
-            raise MissingKeyError, "Tried to write the key #{name.inspect}, but no key was defined. Either define key :#{name} or set self.static_keys = false"
-          end
-        end
-
-        def load_from_database(attrs, with_cast = false)
-          return super if !self.class.static_keys || !attrs.respond_to?(:each)
-
-          attrs = attrs.select { |key, _| self.class.key?(key) || self.class.embedded_key?(key) }
-
-          super(attrs, with_cast)
-        end
-      end
-    end
-  end
-end