importo 3.0.17 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889fe30458aad6a71cd035c536ccf89a954bfd9876695312da33ed3721008ece
-  data.tar.gz: 30bbe4ad60229d637580bbcdf5a272e8367caa800ab82bc9fcf73513914222fd
+  metadata.gz: 2e37a58ff77d3eae705e41d35a11505ab8c9e4a595c95f3df9697bcc96726a6b
+  data.tar.gz: 3436a1df14ac457d6eb3d62f70f87a7bd045481c144d12310ecb70a2e64be258
 SHA512:
-  metadata.gz: 1199d4f8b28371c6885ac5de06b1dfaee325a229b514995a88ff00faec5e4bb7fc3ea70ea5c20d54893e53e2aa2bb431f560e699d0144b6917f48ff81af44a28
-  data.tar.gz: ba7f56e0c96d24fbdc60ec9503a161ba356015b461ab5f6e961bf0b56e3252d26af091ebd8f83c49db6c02417adf13809982cf857067b89f233654777295582b
+  metadata.gz: f067df4453f21d32e6fa79addc463d33150c3e23bb53e9f9736a440af097dfec656af13ae1a83a208f759fea436f895367e2ab5730c4fc2d19ae306a38aa9a75
+  data.tar.gz: 2c8857c902b0f5db54e7aaef64c46c3b66a430fc74db79782a43ba6e3358529c934c5f4761ade1b8a6a2ec4f73d71c2345634c1f3a29d9565df4fc10ad73029c

data/app/adapters/importo/sidekiq_batch_adapter.rb

@@ -8,10 +8,10 @@ module Importo
       @instance = Sidekiq::Batch.new
     end
 
-    delegate :description=, :bid, to: :@instance
+    delegate :description=, :status, to: :@instance
 
     def on_success(job)
-      @instance.on(:success, job.constantize, properties)
+      @instance.on(:complete, job.constantize, properties)
     end
 
     def add

data/app/importers/concerns/importable.rb

@@ -132,17 +132,16 @@ module Importable
     batch.on_success("Importo::ImportJobCallback")
 
     batch.add do
-      bid = batch.bid
       column_with_delay = columns.select { |k, v| v.delay.present? }
       loop_data_rows do |attributes, index|
         if column_with_delay.present?
-          delay = column_with_delay.map do |k, v|
+          delay = column_with_delay.filter_map do |k, v|
             next unless attributes[k].present?
             v.delay.call(attributes[k])
-          end.compact
+          end
         end
-        Importo::ImportJob.set(wait_until: (delay.max * index).seconds.from_now).perform_async(JSON.dump(attributes), index, import.id, bid) if delay.present?
-        Importo::ImportJob.perform_async(JSON.dump(attributes), index, import.id, bid) unless delay.present?
+        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?
       end
     end
 

data/app/importers/importo/import_job_callback.rb

@@ -2,12 +2,18 @@ module Importo
   class ImportJobCallback
     include Rails.application.routes.url_helpers
 
-    def on_success(_status, options)
+    def on_complete(_status, options)
       options = options.deep_stringify_keys
       import = Import.find(options["import_id"])
       if import.present?
-        import.result.attach(io: import.importer.results_file, filename: import.importer.file_name("results"),
-          content_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+        results_file = import.importer.results_file
+        if results_file.is_a?(StringIO)
+          import.result.attach(io: results_file, filename: import.importer.file_name("results"),
+                               content_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+        else
+          import.result.attach(io: File.open(results_file), filename: import.importer.file_name("results"),
+                               content_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+        end
 
         ActiveRecord::Base.uncached do
           import.result_message = I18n.t("importo.importers.result_message",

data/app/jobs/importo/import_job.rb

@@ -20,7 +20,7 @@ module Importo
       end
     end
 
-    def perform(attributes, index, import_id, bid)
+    def perform(attributes, index, import_id)
       self.class.execute_row(attributes, index, import_id, false, bid)
     end
 
@@ -33,7 +33,7 @@ module Importo
       batch = Importo::SidekiqBatchAdapter.find(bid)
 
       if !import.completed? && import.can_complete? && batch.finished?
-        ImportJobCallback.new.on_success(batch.status, {import_id: import_id})
+        ImportJobCallback.new.on_complete(batch.status, {import_id: import.id})
       end
     end
   end

data/app/models/importo/import.rb

@@ -111,6 +111,8 @@ module Importo
     private
 
     def schedule_import
+      # Since servitium isn't ActiveJob we can't implement a wait, this should be replaced
+      sleep(1)
       ImportService.perform_later(import: self)
     end
 

data/lib/importo/test_helpers.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: true-
 
 require "axlsx"
 require "roo/excelx"
@@ -30,7 +30,7 @@ module Importo
       import.save!
 
       ImportService.perform(import: import)
-      ImportJobCallback.new.on_success({import_id: import.id})
+      ImportJobCallback.new.on_complete("success", {import_id: import.id})
       import
     end
   end

data/lib/importo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importo
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.19
 platform: ruby
 authors:
 - Andre Meij
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx