rocketjob 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc6fef03f96de2e2645a4419a4f4f0cdf409da64a7bb708bcddb24ae0fc6c4f
-  data.tar.gz: 4c8573924fae294676afc2114a83b522c64a3b259e679a2a343fc4b34f7bab8f
+  metadata.gz: d487b34621338794b4e3da43753d858bf174b45f4f0dff6c9f478e212a71db8e
+  data.tar.gz: b6c3ddf2688a54dee0ad6ae6d1c4e4fc38448674dcbb7e0052d0295e57258f2d
 SHA512:
-  metadata.gz: e21ca8c550d28e77d48a6b47b3f7e0c822350e72ba557e56749277f8a2536cd669f63b86b20c39bc264b8619196f40a2aa38940cb04aedaad1a1a07daa36b666
-  data.tar.gz: cd3202dd8ecf093ba591385aab9529f8f8f2d1bf7f286252db9ab7589f49c86293d96f3e72bd5ba85eed6b344eb92f35414cc3c32ee327dcf00f722b4929d2a4
+  metadata.gz: 83e61b6520e71e370b2519ee8f937bdf69060050e67ca4ec3146e6a9306a6c26fd0307cb54c94189c2149eb3f8e14fbe7aa8f3fc6f9c17d6b06804745ecaf570
+  data.tar.gz: 20d83702151f6a1333152aa7ee903e7f7c4a79593291496f80670b7952c170734edec16280f0f449db01483e77e7e3af48c8100905688a5bd8998da573f74160

data/lib/rocket_job/batch/tabular/input.rb

@@ -12,6 +12,7 @@ module RocketJob
         included do
           field :tabular_input_header, type: Array, class_attribute: true, user_editable: true
           field :tabular_input_format, type: Symbol, default: :csv, class_attribute: true, user_editable: true
+          field :tabular_input_options, type: Hash, class_attribute: true
 
           # tabular_input_mode: [:line | :array | :hash]
           #   :line
@@ -53,7 +54,9 @@ module RocketJob
           input_stream = stream.nil? ? nil : IOStreams.new(stream)
 
           if stream && (tabular_input_type == :text)
-            input_stream.option_or_stream(:encode, encoding: "UTF-8", cleaner: :printable, replace: "")
+            # Cannot change the length of fixed width lines
+            replace = tabular_input_format == :fixed ? " " : ""
+            input_stream.option_or_stream(:encode, encoding: "UTF-8", cleaner: :printable, replace: replace)
           end
 
           # If an input header is not required, then we don't extract it'
@@ -96,14 +99,15 @@ module RocketJob
             allowed_columns:  tabular_input_white_list,
             required_columns: tabular_input_required,
             skip_unknown:     tabular_input_skip_unknown,
-            format:           tabular_input_format
+            format:           tabular_input_format,
+            format_options:   tabular_input_options&.deep_symbolize_keys
           )
         end
 
         def tabular_input_render
-          unless tabular_input_header.blank? && tabular_input.header?
-            @rocket_job_input = tabular_input.record_parse(@rocket_job_input)
-          end
+          return if tabular_input_header.blank? && tabular_input.header?
+
+          @rocket_job_input = tabular_input.record_parse(@rocket_job_input)
         end
 
         # Cleanse custom input header if supplied.

data/lib/rocket_job/batch/tabular/output.rb

@@ -12,6 +12,7 @@ module RocketJob
         included do
           field :tabular_output_header, type: Array, class_attribute: true, user_editable: true, copy_on_restart: true
           field :tabular_output_format, type: Symbol, default: :csv, class_attribute: true, user_editable: true, copy_on_restart: true
+          field :tabular_output_options, type: Hash, class_attribute: true
 
           validates_inclusion_of :tabular_output_format, in: IOStreams::Tabular.registered_formats
 
@@ -31,8 +32,9 @@ module RocketJob
 
         # Overrides: `RocketJob::Batch::IO#download` to add the `tabular_output_header`.
         def download(file_name_or_io = nil, category: :main, **args, &block)
-          # No header required
-          return super(file_name_or_io, category: category, **args, &block) unless tabular_output.requires_header?(category)
+          unless tabular_output.requires_header?(category)
+            return super(file_name_or_io, category: category, **args, &block)
+          end
 
           header = tabular_output.render_header(category)
           super(file_name_or_io, header_line: header, category: category, **args, &block)
@@ -43,7 +45,11 @@ module RocketJob
         # Delimited instance used for this slice, by a single worker (thread)
         def tabular_output
           @tabular_output ||= Tabular.new(
-            main: IOStreams::Tabular.new(columns: tabular_output_header, format: tabular_output_format)
+            main: IOStreams::Tabular.new(
+              columns:        tabular_output_header,
+              format:         tabular_output_format,
+              format_options: tabular_output_options&.deep_symbolize_keys
+            )
           )
         end
 

data/lib/rocket_job/batch/worker.rb

@@ -46,7 +46,7 @@ module RocketJob
               next if slice.failed?
 
               slice.fail_on_exception!(re_raise_exceptions) { rocket_job_process_slice(slice) }
-            elsif record_count && rocket_job_batch_complete?(worker.name)
+            elsif record_count && fail_on_exception!(re_raise_exceptions) { rocket_job_batch_complete?(worker.name) }
               return false
             else
               logger.debug "No more work available for this job"

data/lib/rocket_job/extensions/mongoid/remove_warnings.rb

@@ -0,0 +1,12 @@
+require "mongoid/fields/validators/macro"
+require "semantic_logger"
+module RocketJob
+  module RemoveMongoidWarnings
+    # Remove annoying warnings about Symbols type being deprecated.
+    def validate_options(*params)
+      SemanticLogger.silence(:error) { super(*params) }
+    end
+  end
+end
+
+::Mongoid::Fields::Validators::Macro.extend(RocketJob::RemoveMongoidWarnings)

data/lib/rocket_job/jobs/copy_file_job.rb

@@ -25,7 +25,7 @@ module RocketJob
 
       self.destroy_on_complete = false
       # Number of times to automatically retry the copy. Set to `0` for no retry attempts.
-      self.retry_limit = 5
+      self.retry_limit = 10
 
       # File names in IOStreams URL format.
       field :source_url, type: String, user_editable: true

data/lib/rocket_job/jobs/re_encrypt/relational_job.rb

@@ -1,8 +1,5 @@
-begin
-  require "active_record"
-rescue LoadError
-  raise 'RocketJob::Jobs::ReEncrypt::RelationalJob uses ActiveRecord to obtain the database connection, please install the gem "activerecord".'
-end
+require "active_record"
+require "sync_attr"
 
 # Batch Worker to Re-encrypt all encrypted fields in MySQL that start with `encrytped_`.
 #

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

@@ -73,12 +73,13 @@ module RocketJob
             if failed? || !may_fail?
               self.exception        = JobException.from_exception(e)
               exception.worker_name = worker_name
-              save! unless new_record? || destroyed?
-            elsif new_record? || destroyed?
-              fail(worker_name, e)
             else
-              fail!(worker_name, e)
+              fail(worker_name, e)
             end
+
+            # Prevent validation failures from failing the job
+            save(validate: false) unless new_record? || destroyed?
+
             raise e if re_raise_exceptions
           end
         end

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = "5.3.2".freeze
+  VERSION = "5.3.3".freeze
 end

data/lib/rocketjob.rb

@@ -13,6 +13,9 @@ require "rocket_job/extensions/mongoid/clients/options"
 require "rocket_job/extensions/mongoid/contextual/mongo"
 require "rocket_job/extensions/mongoid/factory"
 
+# Apply patches for deprecated Symbol type
+require "rocket_job/extensions/mongoid/remove_warnings"
+
 # @formatter:off
 module RocketJob
   autoload :ActiveWorker,       "rocket_job/active_worker"
@@ -71,7 +74,9 @@ module RocketJob
     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"
+      if defined?(ActiveRecord) && defined?(SyncAttr)
+        autoload :RelationalJob, "rocket_job/jobs/re_encrypt/relational_job"
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -148,6 +148,7 @@ 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/remove_warnings.rb
 - lib/rocket_job/extensions/rocket_job_adapter.rb
 - lib/rocket_job/heartbeat.rb
 - lib/rocket_job/job.rb
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ruby's missing batch processing system.