importo 3.0.24 → 3.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab14d9e5565f7313de5ff1453e203bbf3f64670eb12d0f1f76c0f7149f747ee7
-  data.tar.gz: d9ab88a3625c778c7379def02f3f1680247c4228697e90fdd8d5f1f3599af954
+  metadata.gz: 58de2b19f5aa87cb2464fd8b9ca56d5d6e4e58ed2561ab9e33a8b31689ab1391
+  data.tar.gz: e55c5dfcaa8f59694b33fd00f8abd31bfd8873d2cf317f0133e828c8ea4c3d37
 SHA512:
-  metadata.gz: 41719578949eb007165adfac5c64ce78ce301dc12283cf6b66b29cf075bc3cab2ccd53c57b25bee71b88df7795a4b96285e1ce168fc2fa93b15f52e02215e892
-  data.tar.gz: 4c45ad49b70c9199c9ea9d7cc6766b1b937851fd730df733dc0985e8db00abbb89fcae86639022ecd7c69272de33ebb304870996b75831924a57adf230971127
+  metadata.gz: f711dee28330a128c7c1b17c89f5648008e86b207a0a08a7500ddbcd89d93b66cb0221bcbf1bcb9b44ecc9cd853289ea94535c2fdcdf9f34d661799b26689053
+  data.tar.gz: 667e0ef7154a7a9895b15d1bc22c6301c5e451dc0c780856d86e2bf64c257dd2b3654c48e86de2af9381a533aed23fd1dad777f3ad217a48c48b9d94e5bce248

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Andre Meij
+Copyright 2017 Andre Meij & Tom de Grunt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,26 +1,8 @@
-# frozen_string_literal: true
-
-begin
-  require "bundler/setup"
-rescue LoadError
-  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
-end
-
-require "rdoc/task"
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "Importo"
-  rdoc.options << "--line-numbers"
-  rdoc.rdoc_files.include("README.md")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-end
+require "bundler/setup"
 
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
-load "rails/tasks/statistics.rake"
-
 require "bundler/gem_tasks"
 
 require "rake/testtask"
@@ -28,7 +10,8 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"
-  t.verbose = false
+  t.verbose = true
+  t.warning = false
 end
 
 task default: :test

data/app/controllers/importo/imports_controller.rb

@@ -11,37 +11,37 @@ module Importo
     def preview
       @import = Import.find(params[:id])
       if @import&.original&.attachment.present?
-        @original = Tempfile.new(['ActiveStorage', @import.original.filename.extension_with_delimiter])
+        @original = Tempfile.new(["ActiveStorage", @import.original.filename.extension_with_delimiter])
         @original.binmode
         @import.original.download { |block| @original.write(block) }
         @original.flush
         @original.rewind
-        sheet =  Roo::Excelx.new(@original.path)
+        sheet = Roo::Excelx.new(@original.path)
         @sheet_data = sheet.parse(headers: true)
-        @check_header = @sheet_data.reject{ |h| h.keys == h.values }.map{|h| h.transform_values(&:to_s).compact_blank}.reduce({}, :merge).keys
+        @check_header = @sheet_data.reject { |h| h.keys == h.values }.map { |h| h.transform_values(&:to_s).compact_blank }.reduce({}, :merge).keys
       end
-      if @sheet_data.nil? || @sheet_data.reject{ |h| h.keys == h.values }.blank?
-        Signum.error(Current.user, text: t('.no_file'))
+      if @sheet_data.nil? || @sheet_data.reject { |h| h.keys == h.values }.blank?
+        Signum.error(Current.user, text: t(".no_file"))
         redirect_to action: :new
       end
     end
 
     def create
-      unless import_params
-        @import = Import.new(kind: params[:kind], locale: I18n.locale)
+      unless import_params["original"].present?
+        @import = Import.new(kind: import_params[:kind], locale: I18n.locale)
         Signum.error(Current.user, text: t(".flash.no_file"))
         render :new
         return
       end
       @import = Import.new(import_params.merge(locale: I18n.locale,
-                                               importo_ownable: Importo.config.current_import_owner.call))
+        importo_ownable: Importo.config.current_import_owner.call))
       if params["commit"] == "Upload" && @import.valid? && @import.save!
         @import.confirm!
         @import.schedule!
-        redirect_to importo.new_import_path(params[:kind] || @import.kind)                                         
+        redirect_to importo.new_import_path(params[:kind] || @import.kind)
       elsif params["commit"] == "Preview" && @import.valid?
         @import.save!
-        redirect_to action: :preview, id: @import.id, kind: @import.kind 
+        redirect_to action: :preview, id: @import.id, kind: @import.kind
       else
         Signum.error(Current.user, text: t(".flash.error", error: @import.errors&.full_messages&.join(".")))
         render :new
@@ -51,7 +51,7 @@ module Importo
     def cancel
       @import = Import.find(params[:id])
       @import.original.purge if @import.concept?
-      Signum.error(Current.user, text: t('.flash.cancel', id: @import.id))
+      Signum.error(Current.user, text: t(".flash.cancel", id: @import.id))
       @import.destroy!
       redirect_to action: :new, kind: @import.kind
     end
@@ -61,7 +61,7 @@ module Importo
       if @import.can_revert? && @import.revert
         redirect_to action: :index, notice: "Import reverted"
       else
-        redirect_to action: :index, alert: 'Import could not be reverted'
+        redirect_to action: :index, alert: "Import could not be reverted"
       end
     end
 
@@ -72,7 +72,7 @@ module Importo
       if @import.valid? && @import.schedule!
         redirect_to action: :index
       else
-        Signum.error(Current.user, text: t('.flash.error', id: @import.id))
+        Signum.error(Current.user, text: t(".flash.error", id: @import.id))
         render :new
       end
     end

data/app/importers/concerns/exportable.rb

@@ -81,9 +81,9 @@ module Exportable
       end
       styles = export_columns.map do |_, c|
         if c.options.dig(:export, :format) == "number" || (c.options.dig(:export, :format).nil? && c.options.dig(:export, :example).is_a?(Numeric))
-          number = workbook.styles.add_style format_code: "#"
+          workbook.styles.add_style format_code: "0"
         elsif c.options.dig(:export, :format) == "text" || (c.options.dig(:export, :format).nil? && c.options.dig(:export, :example).is_a?(String))
-          text = workbook.styles.add_style format_code: "@"
+          workbook.styles.add_style format_code: "@"
         elsif c.options.dig(:export, :format)
           workbook.styles.add_style format_code: c.options.dig(:export, :format).to_s
         else

data/app/importers/concerns/importable.rb

@@ -21,7 +21,7 @@ module Importable
     columns.each do |k, col|
       next if col.proc.blank? || row[k].nil?
 
-      attr = col.options[:attribute]
+      col.options[:attribute]
 
       row[k] = import.column_overrides[col.attribute] if import.column_overrides[col.attribute]
 
@@ -88,7 +88,7 @@ module Importable
   end
 
   #
-  # Callbakcs
+  # Callbacks
   #
   def before_build(_record, _row)
   end
@@ -124,12 +124,12 @@ module Importable
   # Does the actual import
   #
   def import!(checked_columns)
-    raise ArgumentError, 'Invalid data structure' unless structure_valid?
+    raise ArgumentError, "Invalid data structure" unless structure_valid?
 
-    batch = Importo.config.batch_adapter.new
+    batch = Importo.config.batch_adapter_name.constantize.new
     batch.description = "#{import.original.filename} - #{import.kind}"
     batch.properties = {import_id: import.id}
-    if Importo.config.batch_adapter == Importo::SidekiqBatchAdapter
+    if Importo.sidekiq?
       batch.on_success("Importo::ImportJobCallback")
     else
       batch.on_success = "Importo::ImportJobCallback"
@@ -144,14 +144,14 @@ module Importable
             v.delay.call(attributes[k])
           end
         end
-        Importo::ImportJob.set(wait_until: (delay.max * index).seconds.from_now).perform_async(JSON.dump(attributes), index, import.id) if delay.present?
-        Importo::ImportJob.perform_async(JSON.dump(attributes), index, import.id) unless delay.present?
+
+        method = Importo.sidekiq? ? "perform_async" : "perform_later"
+        Importo::ImportJob.set(wait_until: (delay.max * index).seconds.from_now).send(method, JSON.dump(attributes), index, import.id) if delay.present?
+        Importo::ImportJob.send(method, JSON.dump(attributes), index, import.id) unless delay.present?
       end
     end
 
-    if defined?(GoodJob::Batch) && Importo.config.batch_adapter == GoodJob::Batch
-      batch.enqueue
-    end
+    batch.enqueue if Importo.good_job?
 
     true
   rescue => e

data/app/importers/concerns/original.rb

@@ -110,7 +110,7 @@ module Original
     duplicate(row_hash, id)
   end
 
-  def loop_data_rows(checked_columns =  nil)
+  def loop_data_rows(checked_columns = nil)
     (data_start_row..spreadsheet.last_row).map do |index|
       row = cells_from_row(index, false)
 
@@ -121,8 +121,8 @@ module Original
       end.to_h
       attributes.reject! { |k, _v| headers_added_by_import.include?(k) }
       if checked_columns&.dig(:checked_columns).present?
-        selected_columns = checked_columns[:checked_columns].map{|i| col_for(i)&.first}
-        attributes.reject!{|k, _v| selected_columns.exclude?(k) }
+        selected_columns = checked_columns[:checked_columns].map { |i| col_for(i)&.first }
+        attributes.reject! { |k, _v| selected_columns.exclude?(k) }
       end
       yield attributes, index
     end

data/app/importers/concerns/result_feedback.rb

@@ -35,7 +35,7 @@ module ResultFeedback
         attributes.map do |column, value|
           export_format = columns[column]&.options&.dig(:export, :format)
           format_code = if export_format == "number" || (export_format.nil? && value.is_a?(Numeric))
-            "#"
+            "0"
           elsif export_format == "text" || (export_format.nil? && value.is_a?(String))
             "@"
           elsif export_format
@@ -66,7 +66,7 @@ module ResultFeedback
     base = friendly_name || model.class.name
     base = base.to_s unless base.is_a?(String)
     base = base.gsub(/[_\s-]/, "_").pluralize.downcase
-    "#{base}#{suffix.present? ? "_#{suffix}" : ""}.xlsx"
+    "#{base}#{"_#{suffix}" if suffix.present?}.xlsx"
   end
 
   private

data/app/importers/importo/import_job_callback.rb

@@ -1,10 +1,11 @@
 module Importo
   class ImportJobCallback < ActiveJob::Base
-    include Sidekiq::Batch::Callback
+    include Sidekiq::Batch::Callback if Importo.sidekiq?
     include Rails.application.routes.url_helpers
 
-    def perform(batch, import_id)
-      import = Import.find(import_id)
+    # This is for good_job
+    def perform(batch, context)
+      import = Import.find(batch.properties[:import_id])
       complete_import(import)
     end
 
@@ -29,11 +30,11 @@ module Importo
       end
     end
 
+    # This is for sidekiq
     def on_complete(status, options)
       options = options.deep_stringify_keys
       import = Import.find(options["import_id"])
       complete_import(import)
     end
-
   end
 end

data/app/jobs/importo/application_job.rb

@@ -1,4 +1,5 @@
 module Importo
   class ApplicationJob < ActiveJob::Base
+    include GoodJob::ActiveJobExtensions::Batches if Importo.good_job?
   end
 end

data/app/jobs/importo/import_job.rb

@@ -1,24 +1,9 @@
 module Importo
-  base_class =
-    if Importo.config.batch_adapter == Importo::SidekiqBatchAdapter
-      Object
-    else
-      ApplicationJob
-    end
-
-  class ImportJob < base_class
-
+  class ImportJob < Importo.import_job_base_class_name.constantize
     # No options here, gets added from the adapter
 
     def perform(attributes, index, import_id)
-      batch_id = if defined?(bid)
-        bid
-      else
-        batch.id
-      end
-      batch
-
-      self.class.execute_row(attributes, index, import_id, false, batch_id)
+      self.class.execute_row(attributes, index, import_id, false, defined?(bid) ? bid : batch.id)
     end
 
     def self.execute_row(attributes, index, import_id, last_attempt, bid)
@@ -27,17 +12,20 @@ module Importo
       import = Import.find(import_id)
       import.importer.process_data_row(attributes, index, last_attempt: last_attempt)
 
+      # This should not be needed:
+      # https://github.com/sidekiq/sidekiq/wiki/Batches#callbacks
+      #
       # Between sidekiq and good job, there's a big difference:
       # - Sidekiq calls on_complete callback when all jobs ran at least once.
       # - GoodJob calls on_complete callback when all jobs are done (including retries).
       # i.e. this logic is only needed for sidekiq
-      if Importo.config.batch_adapter == Importo::SidekiqBatchAdapter
-        batch = Importo::SidekiqBatchAdapter.find(bid)
+      # return unless Importo.sidekiq?
+
+      # batch = Importo::SidekiqBatchAdapter.find(bid)
 
-        if !import.completed? && import.can_complete? && batch.finished?
-          ImportJobCallback.perform_now(batch, import.id)
-        end
-      end
+      # if !import.completed? && import.can_complete? && batch.finished?
+      #   ImportJobCallback.perform_now(batch, import.id)
+      # end
     end
   end
 end

data/app/jobs/importo/import_scheduled_job.rb

@@ -1,6 +1,6 @@
 module Importo
-  class ImportScheduledJob < ApplicationJob
-    def perform()
+  class ImportScheduledJob < ActiveJob::Base
+    def perform
       imports = Import.where(state: "scheduled", created_at: ..30.minutes.ago)
 
       imports.each do |import|

data/app/jobs/importo/purge_import_job.rb

@@ -1,7 +1,6 @@
 module Importo
-  class PurgeImportJob < ApplicationJob
-    def perform(owner, months,state = nil)
-
+  class PurgeImportJob < ActiveJob::Base
+    def perform(owner, months, state = nil)
       imports = Import.where(importo_ownable: owner, created_at: ..months.months.ago.beginning_of_day)
       imports = imports.where(state: state) if state
 

data/app/models/importo/import.rb

@@ -12,12 +12,9 @@ module Importo
     validates :kind, presence: true
     validates :original, presence: true
     validate :content_validator
-    begin
-      has_one_attached :original
-      has_one_attached :result
-    rescue NoMethodError
-      # Weird loading sequence error, is fixed by the lib/importo/helpers
-    end
+
+    has_one_attached :original
+    has_one_attached :result
 
     state_machine :state, initial: :concept do
       state :confirmed
@@ -115,7 +112,7 @@ module Importo
     private
 
     def schedule_import
-      ImportService.perform_later(import: self, checked_columns: self.checked_columns)
+      ImportService.perform_later(import: self, checked_columns: checked_columns)
     end
 
     def schedule_revert

data/app/services/importo/import_context.rb

@@ -2,7 +2,7 @@
 
 module Importo
   class ImportContext < ApplicationContext
-      attribute :import, type: Import, typecaster: ->(value) { value.is_a?(Import) ? value : Import.find(value) }
-      attribute :checked_columns, type: Array, typecaster: ->(value){ value.is_a?(Array) ? value : [] }
+    attribute :import, type: Import, typecaster: ->(value) { value.is_a?(Import) ? value : Import.find(value) }
+    attribute :checked_columns, type: Array, typecaster: ->(value) { value.is_a?(Array) ? value : [] }
   end
 end

data/app/services/importo/import_service.rb

@@ -4,8 +4,8 @@ module Importo
   class ImportService < ApplicationService
     def perform
       context.import.import!
-      context.import.importer.import!(checked_columns: context.checked_columns )
-    rescue StandardError
+      context.import.importer.import!(checked_columns: context.checked_columns)
+    rescue
       context.import.failure!
       context.fail!
     end

data/config/routes.rb

@@ -8,9 +8,9 @@ Importo::Engine.routes.draw do
       post :cancel
     end
   end
-  get ':kind/new', to: 'imports#new', as: :new_import
-  get ':kind/sample', to: 'imports#sample', as: :sample_import
-  get ':kind/export', to: 'imports#export', as: :export
-  get ':kind/:id/preview', to: 'imports#preview', as: :preview
-  root to: 'imports#index'
+  get ":kind/new", to: "imports#new", as: :new_import
+  get ":kind/sample", to: "imports#sample", as: :sample_import
+  get ":kind/export", to: "imports#export", as: :export
+  get ":kind/:id/preview", to: "imports#preview", as: :preview
+  root to: "imports#index"
 end

data/lib/importo/adapters/sidekiq_batch_adapter.rb

@@ -8,7 +8,6 @@ if !defined?(Sidekiq::Batch)
   end
 end
 
-
 module Importo
   class SidekiqBatchAdapter
     attr_reader :description
@@ -32,13 +31,13 @@ module Importo
     end
 
     def finished?
-      status = Sidekiq::Batch::Status.new( @instance.bid)
+      status = Sidekiq::Batch::Status.new(@instance.bid)
       status.complete?
     end
 
     class << self
-      def import_job_base_class
-        Object
+      def import_job_base_class_name
+        "Object"
       end
 
       def find(id)
@@ -76,6 +75,5 @@ end
 
 require_relative "../../../app/jobs/importo/import_job"
 
-
 Importo::ImportJob.send(:include, Sidekiq::Job)
 Importo::ImportJob.send(:include, Importo::SidekiqBatchAdapter::ImportJobIncludes)

data/lib/importo/configuration.rb

@@ -46,7 +46,7 @@ module Importo
     option :current_import_owner, default: lambda {}
     option :queue_name, default: :import
     # You can either use GoodJob::Batch or Importo::SidekiqBatchAdapter
-    option :batch_adapter, default: lambda { GoodJob::Batch }, proc: true
+    option :batch_adapter_name, default: "Importo::SidekiqBatchAdapter"
 
     option :admin_visible_imports, default: lambda { Importo::Import.where(importo_ownable: Importo.config.current_import_owner) }
     option(:admin_can_destroy,
@@ -54,10 +54,6 @@ module Importo
         false
       end)
 
-    # You can either use GoodJob::Batch or Importo::SidekiqBatchAdapter
-    option :batch_adapter, default: lambda { Importo::SidekiqBatchAdapter }, proc: true
-    option :import_job_base_class, default: "Object"
-
     # Extra links relevant for this import: { link_name: { icon: 'far fa-..', url: '...' } }
     option(:admin_extra_links,
       default: lambda do |import|
@@ -84,5 +80,22 @@ module Importo
     def reset_config!
       @config = Configuration.new
     end
+
+    def sidekiq?
+      config.batch_adapter_name == "Importo::SidekiqBatchAdapter"
+    end
+
+    def good_job?
+      config.batch_adapter_name == "GoodJob::Batch"
+    end
+
+    def import_job_base_class_name
+      if sidekiq?
+        "Object"
+      else
+        require_dependency "importo/application_job"
+        "::Importo::ApplicationJob"
+      end
+    end
   end
 end

data/lib/importo/engine.rb

@@ -13,16 +13,5 @@ require "with_advisory_lock"
 module Importo
   class Engine < ::Rails::Engine
     isolate_namespace Importo
-
-    initializer "importo.active_storage.attached" do
-      config.after_initialize do
-        ActiveSupport.on_load(:active_record) do
-          Importo::Import.include(ImportHelpers)
-
-          # For now put this here to ensure compatibility
-          require "importo/adapters/sidekiq_batch_adapter"
-        end
-      end
-    end
   end
 end

data/lib/importo/test_helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true-
 
-require "axlsx"
-require "roo/excelx"
+# require "axlsx"
+# require "roo/excelx"
 
 module Importo
   module TestHelpers
@@ -30,11 +30,10 @@ module Importo
       import.save!
       import.confirm
       import.schedule
-      ImportService.perform(import: import)
-      if Importo.config.batch_adapter == Importo::SidekiqBatchAdapter
-        ImportJobCallback.new.on_success(:success,{import_id: import.id})
+      if Importo.sidekiq?
+        ImportJobCallback.new.on_complete(:success, {import_id: import.id})
       end
-      import
+      import.reload
     end
   end
 end

data/lib/importo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Importo
-  VERSION = "3.0.24"
+  VERSION = "3.0.25"
 end

data/lib/importo.rb

@@ -3,7 +3,6 @@
 require_relative "importo/engine"
 require_relative "importo/acts_as_import_owner"
 require_relative "importo/import_column"
-require_relative "importo/import_helpers"
 require_relative "importo/configuration"
 
 module Importo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importo
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.25
 platform: ruby
 authors:
 - Andre Meij
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-09 00:00:00.000000000 Z
+date: 2026-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -59,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: roo-xls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: satis
   requirement: !ruby/object:Gem::Requirement
@@ -345,21 +345,6 @@ files:
 - db/migrate/20190827093548_add_selected_fields_to_import.rb
 - db/migrate/20230510051447_remove_result_from_imports.rb
 - db/migrate/20230510083043_create_importo_results.rb
-- db/migrate/20251117132125_create_good_jobs.rb
-- db/migrate/20251117132126_create_good_job_settings.rb
-- db/migrate/20251117132127_create_index_good_jobs_jobs_on_priority_created_at_when_unfinished.rb
-- db/migrate/20251117132128_create_good_job_batches.rb
-- db/migrate/20251117132129_create_good_job_executions.rb
-- db/migrate/20251117132130_create_good_jobs_error_event.rb
-- db/migrate/20251117132131_recreate_good_job_cron_indexes_with_conditional.rb
-- db/migrate/20251117132132_create_good_job_labels.rb
-- db/migrate/20251117132133_create_good_job_labels_index.rb
-- db/migrate/20251117132134_remove_good_job_active_id_index.rb
-- db/migrate/20251117132135_create_index_good_job_jobs_for_candidate_lookup.rb
-- db/migrate/20251117132136_create_good_job_execution_error_backtrace.rb
-- db/migrate/20251117132137_create_good_job_process_lock_ids.rb
-- db/migrate/20251117132138_create_good_job_process_lock_indexes.rb
-- db/migrate/20251117132139_create_good_job_execution_duration.rb
 - lib/generators/importo/USAGE
 - lib/generators/importo/importer_generator.rb
 - lib/generators/importo/install_generator.rb
@@ -376,7 +361,6 @@ files:
 - lib/importo/configuration.rb
 - lib/importo/engine.rb
 - lib/importo/import_column.rb
-- lib/importo/import_helpers.rb
 - lib/importo/test_helpers.rb
 - lib/importo/version.rb
 homepage: https://github.com/entdec/importo

data/db/migrate/20251117132125_create_good_jobs.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobs < ActiveRecord::Migration[7.0]
-  def change
-    # Uncomment for Postgres v12 or earlier to enable gen_random_uuid() support
-    # enable_extension 'pgcrypto'
-
-    create_table :good_jobs, id: :uuid do |t|
-      t.text :queue_name
-      t.integer :priority
-      t.jsonb :serialized_params
-      t.datetime :scheduled_at
-      t.datetime :performed_at
-      t.datetime :finished_at
-      t.text :error
-
-      t.timestamps
-
-      t.uuid :active_job_id
-      t.text :concurrency_key
-      t.text :cron_key
-      t.uuid :retried_good_job_id
-      t.datetime :cron_at
-    end
-
-    create_table :good_job_processes, id: :uuid do |t|
-      t.timestamps
-      t.jsonb :state
-    end
-
-    add_index :good_jobs, :scheduled_at, where: "(finished_at IS NULL)", name: :index_good_jobs_on_scheduled_at
-    add_index :good_jobs, [:queue_name, :scheduled_at], where: "(finished_at IS NULL)", name: :index_good_jobs_on_queue_name_and_scheduled_at
-    add_index :good_jobs, [:active_job_id, :created_at], name: :index_good_jobs_on_active_job_id_and_created_at
-    add_index :good_jobs, :concurrency_key, where: "(finished_at IS NULL)", name: :index_good_jobs_on_concurrency_key_when_unfinished
-    add_index :good_jobs, [:cron_key, :created_at], name: :index_good_jobs_on_cron_key_and_created_at
-    add_index :good_jobs, [:cron_key, :cron_at], name: :index_good_jobs_on_cron_key_and_cron_at, unique: true
-    add_index :good_jobs, [:active_job_id], name: :index_good_jobs_on_active_job_id
-    add_index :good_jobs, [:finished_at], where: "retried_good_job_id IS NULL AND finished_at IS NOT NULL", name: :index_good_jobs_jobs_on_finished_at
-  end
-end

data/db/migrate/20251117132126_create_good_job_settings.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobSettings < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.table_exists?(:good_job_settings)
-      end
-    end
-
-    create_table :good_job_settings, id: :uuid do |t|
-      t.timestamps
-      t.text :key
-      t.jsonb :value
-      t.index :key, unique: true
-    end
-  end
-end

data/db/migrate/20251117132127_create_index_good_jobs_jobs_on_priority_created_at_when_unfinished.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class CreateIndexGoodJobsJobsOnPriorityCreatedAtWhenUnfinished < ActiveRecord::Migration[7.0]
-  disable_ddl_transaction!
-
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.index_name_exists?(:good_jobs, :index_good_jobs_jobs_on_priority_created_at_when_unfinished)
-      end
-    end
-
-    add_index :good_jobs, [:priority, :created_at], order: { priority: "DESC NULLS LAST", created_at: :asc },
-      where: "finished_at IS NULL", name: :index_good_jobs_jobs_on_priority_created_at_when_unfinished,
-      algorithm: :concurrently
-  end
-end

data/db/migrate/20251117132128_create_good_job_batches.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobBatches < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.table_exists?(:good_job_batches)
-      end
-    end
-
-    create_table :good_job_batches, id: :uuid do |t|
-      t.timestamps
-      t.text :description
-      t.jsonb :serialized_properties
-      t.text :on_finish
-      t.text :on_success
-      t.text :on_discard
-      t.text :callback_queue_name
-      t.integer :callback_priority
-      t.datetime :enqueued_at
-      t.datetime :discarded_at
-      t.datetime :finished_at
-    end
-
-    change_table :good_jobs do |t|
-      t.uuid :batch_id
-      t.uuid :batch_callback_id
-
-      t.index :batch_id, where: "batch_id IS NOT NULL"
-      t.index :batch_callback_id, where: "batch_callback_id IS NOT NULL"
-    end
-  end
-end

data/db/migrate/20251117132129_create_good_job_executions.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobExecutions < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.table_exists?(:good_job_executions)
-      end
-    end
-
-    create_table :good_job_executions, id: :uuid do |t|
-      t.timestamps
-
-      t.uuid :active_job_id, null: false
-      t.text :job_class
-      t.text :queue_name
-      t.jsonb :serialized_params
-      t.datetime :scheduled_at
-      t.datetime :finished_at
-      t.text :error
-
-      t.index [:active_job_id, :created_at], name: :index_good_job_executions_on_active_job_id_and_created_at
-    end
-
-    change_table :good_jobs do |t|
-      t.boolean :is_discrete
-      t.integer :executions_count
-      t.text :job_class
-    end
-  end
-end

data/db/migrate/20251117132130_create_good_jobs_error_event.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobsErrorEvent < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.column_exists?(:good_jobs, :error_event)
-      end
-    end
-
-    add_column :good_jobs, :error_event, :integer, limit: 2
-    add_column :good_job_executions, :error_event, :integer, limit: 2
-  end
-end

data/db/migrate/20251117132131_recreate_good_job_cron_indexes_with_conditional.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class RecreateGoodJobCronIndexesWithConditional < ActiveRecord::Migration[7.0]
-  disable_ddl_transaction!
-
-  def change
-    reversible do |dir|
-      dir.up do
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_created_at_cond)
-          add_index :good_jobs, [:cron_key, :created_at], where: "(cron_key IS NOT NULL)",
-                    name: :index_good_jobs_on_cron_key_and_created_at_cond, algorithm: :concurrently
-        end
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_cron_at_cond)
-          add_index :good_jobs, [:cron_key, :cron_at], where: "(cron_key IS NOT NULL)", unique: true,
-                    name: :index_good_jobs_on_cron_key_and_cron_at_cond, algorithm: :concurrently
-        end
-
-        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_created_at)
-          remove_index :good_jobs, name: :index_good_jobs_on_cron_key_and_created_at
-        end
-        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_cron_at)
-          remove_index :good_jobs, name: :index_good_jobs_on_cron_key_and_cron_at
-        end
-      end
-
-      dir.down do
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_created_at)
-          add_index :good_jobs, [:cron_key, :created_at],
-                    name: :index_good_jobs_on_cron_key_and_created_at, algorithm: :concurrently
-        end
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_cron_at)
-          add_index :good_jobs, [:cron_key, :cron_at], unique: true,
-                    name: :index_good_jobs_on_cron_key_and_cron_at, algorithm: :concurrently
-        end
-
-        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_created_at_cond)
-          remove_index :good_jobs, name: :index_good_jobs_on_cron_key_and_created_at_cond
-        end
-        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_cron_at_cond)
-          remove_index :good_jobs, name: :index_good_jobs_on_cron_key_and_cron_at_cond
-        end
-      end
-    end
-  end
-end

data/db/migrate/20251117132132_create_good_job_labels.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobLabels < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.column_exists?(:good_jobs, :labels)
-      end
-    end
-
-    add_column :good_jobs, :labels, :text, array: true
-  end
-end

data/db/migrate/20251117132133_create_good_job_labels_index.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobLabelsIndex < ActiveRecord::Migration[7.0]
-  disable_ddl_transaction!
-
-  def change
-    reversible do |dir|
-      dir.up do
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_labels)
-          add_index :good_jobs, :labels, using: :gin, where: "(labels IS NOT NULL)",
-            name: :index_good_jobs_on_labels, algorithm: :concurrently
-        end
-      end
-
-      dir.down do
-        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_labels)
-          remove_index :good_jobs, name: :index_good_jobs_on_labels
-        end
-      end
-    end
-  end
-end

data/db/migrate/20251117132134_remove_good_job_active_id_index.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveGoodJobActiveIdIndex < ActiveRecord::Migration[7.0]
-  disable_ddl_transaction!
-
-  def change
-    reversible do |dir|
-      dir.up do
-        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_active_job_id)
-          remove_index :good_jobs, name: :index_good_jobs_on_active_job_id
-        end
-      end
-
-      dir.down do
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_active_job_id)
-          add_index :good_jobs, :active_job_id, name: :index_good_jobs_on_active_job_id
-        end
-      end
-    end
-  end
-end

data/db/migrate/20251117132135_create_index_good_job_jobs_for_candidate_lookup.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class CreateIndexGoodJobJobsForCandidateLookup < ActiveRecord::Migration[7.0]
-  disable_ddl_transaction!
-
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.index_name_exists?(:good_jobs, :index_good_job_jobs_for_candidate_lookup)
-      end
-    end
-
-    add_index :good_jobs, [:priority, :created_at], order: { priority: "ASC NULLS LAST", created_at: :asc },
-      where: "finished_at IS NULL", name: :index_good_job_jobs_for_candidate_lookup,
-      algorithm: :concurrently
-  end
-end

data/db/migrate/20251117132136_create_good_job_execution_error_backtrace.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobExecutionErrorBacktrace < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.column_exists?(:good_job_executions, :error_backtrace)
-      end
-    end
-
-    add_column :good_job_executions, :error_backtrace, :text, array: true
-  end
-end

data/db/migrate/20251117132137_create_good_job_process_lock_ids.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobProcessLockIds < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.column_exists?(:good_jobs, :locked_by_id)
-      end
-    end
-
-    add_column :good_jobs, :locked_by_id, :uuid
-    add_column :good_jobs, :locked_at, :datetime
-    add_column :good_job_executions, :process_id, :uuid
-    add_column :good_job_processes, :lock_type, :integer, limit: 2
-  end
-end

data/db/migrate/20251117132138_create_good_job_process_lock_indexes.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobProcessLockIndexes < ActiveRecord::Migration[7.0]
-  disable_ddl_transaction!
-
-  def change
-    reversible do |dir|
-      dir.up do
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked)
-          add_index :good_jobs, [:priority, :scheduled_at],
-                    order: { priority: "ASC NULLS LAST", scheduled_at: :asc },
-                    where: "finished_at IS NULL AND locked_by_id IS NULL",
-                    name: :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked,
-                    algorithm: :concurrently
-        end
-
-        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_locked_by_id)
-          add_index :good_jobs, :locked_by_id,
-                    where: "locked_by_id IS NOT NULL",
-                    name: :index_good_jobs_on_locked_by_id,
-                    algorithm: :concurrently
-        end
-
-        unless connection.index_name_exists?(:good_job_executions, :index_good_job_executions_on_process_id_and_created_at)
-          add_index :good_job_executions, [:process_id, :created_at],
-                    name: :index_good_job_executions_on_process_id_and_created_at,
-                    algorithm: :concurrently
-        end
-      end
-
-      dir.down do
-        remove_index(:good_jobs, name: :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked) if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked)
-        remove_index(:good_jobs, name: :index_good_jobs_on_locked_by_id) if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_locked_by_id)
-        remove_index(:good_job_executions, name: :index_good_job_executions_on_process_id_and_created_at) if connection.index_name_exists?(:good_job_executions, :index_good_job_executions_on_process_id_and_created_at)
-      end
-    end
-  end
-end

data/db/migrate/20251117132139_create_good_job_execution_duration.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class CreateGoodJobExecutionDuration < ActiveRecord::Migration[7.0]
-  def change
-    reversible do |dir|
-      dir.up do
-        # Ensure this incremental update migration is idempotent
-        # with monolithic install migration.
-        return if connection.column_exists?(:good_job_executions, :duration)
-      end
-    end
-
-    add_column :good_job_executions, :duration, :interval
-  end
-end

data/lib/importo/import_helpers.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Importo::ImportHelpers
-  extend ActiveSupport::Concern
-
-  included do
-    has_one_attached :original
-    has_one_attached :result
-  end
-end