importo 3.0.14 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4b3db91de0cb6d968bd01d4bf0bad047d780c4107b6c93516c24167b57c0de
-  data.tar.gz: 85acd9762cb804e328bb74f4d7a89f903e63815b624510d011d065cb6fdf722d
+  metadata.gz: 67757044a87ce6eda6eceddd937b93404eda3cc979298f2d22316ea6db0e6eb1
+  data.tar.gz: 603c9602c07ac03a0fab0ed20f9dc81fec5df0bfb153f758add2d05f29bd418e
 SHA512:
-  metadata.gz: 4776bb7d6af56b198ad1e2786b9f77fba192e4d75717e113924634fc67278afc30505b2ce180ee77c5fb327e1833c23fd2f48c4c05f78e6a6ebb772a3d8cc3b3
-  data.tar.gz: 76f821df633edfb58fad53d99229d26891d349f2cc7bc99421afc36f24a72f22ba1fa4863bf11bd6838b6628b5013540c38d21de519f29d60ec306803292bcf1
+  metadata.gz: '070083420acdf0dd06ab2b59c1595e4e76906b8594944ac00c091baf82c9465efd56c8a90b270d368d7f2571322ee6ec5134195f3e83f4b1764bb97880ad9015'
+  data.tar.gz: 744f9d63c5d552c673ab7bb4e83a147605e8c1558e60e3545a95e298cac6683114e96385d74794db6ac1fff02ab4e963d214c3f2a720f77e9653c6a1c8d2233c

data/Rakefile

@@ -32,7 +32,3 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
-
-# Adds the Auxilium semver task
-spec = Gem::Specification.find_by_name "auxilium"
-load "#{spec.gem_dir}/lib/tasks/semver.rake"

data/app/adapters/importo/sidekiq_batch_adapter.rb

@@ -0,0 +1,35 @@
+module Importo
+  class SidekiqBatchAdapter
+    attr_reader :description
+    attr_accessor :properties
+    attr_writer :instance
+
+    def initialize
+      @instance = Sidekiq::Batch.new
+    end
+
+    delegate :description=, :bid, to: :@instance
+
+    def on_success(job)
+      @instance.on(:success, job.constantize, properties)
+    end
+
+    def add
+      @instance.jobs do
+        yield
+      end
+    end
+
+    def finished?
+      @instance.status.complete?
+    end
+
+    class << self
+      def find(id)
+        instance = new
+        instance.instance = Sidekiq::Batch.new(id)
+        instance
+      end
+    end
+  end
+end

data/app/controllers/importo/imports_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency 'importo/application_controller'
+require_dependency "importo/application_controller"
 
 module Importo
   class ImportsController < ApplicationController
@@ -11,16 +11,16 @@ module Importo
     def create
       unless import_params
         @import = Import.new(kind: params[:kind], locale: I18n.locale)
-        Signum.error(Current.user, text: t('.flash.no_file'))
+        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 @import.valid? && @import.schedule!
         redirect_to importo.new_import_path(params[:kind] || @import.kind)
       else
-        Signum.error(Current.user, text: t('.flash.error', error: @import.errors&.full_messages&.join('.')))
+        Signum.error(Current.user, text: t(".flash.error", error: @import.errors&.full_messages&.join(".")))
         render :new
       end
     end
@@ -28,15 +28,15 @@ module Importo
     def undo
       @import = Import.where(importo_ownable: Importo.config.current_import_owner.call).find(params[:id])
       if @import.can_revert? && @import.revert
-        redirect_to action: :index, notice: 'Import reverted'
+        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
 
     def destroy
       @import = Import.find(params[:id])
-      redirect_to(action: :index, alert: 'Not allowed') && return unless Importo.config.admin_can_destroy.call(@import)
+      redirect_to(action: :index, alert: "Not allowed") && return unless Importo.config.admin_can_destroy.call(@import)
 
       @import.destroy
       redirect_to action: :index
@@ -45,13 +45,13 @@ module Importo
     def sample
       import = Import.new(kind: params[:kind], locale: I18n.locale)
       send_data import.importer.sample_file.read,
-                type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', filename: import.importer.file_name('sample')
+        type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", filename: import.importer.file_name("sample")
     end
 
     def export
       import = Import.new(kind: params[:kind], locale: I18n.locale)
       send_data import.importer.export_file.read,
-                type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', filename: import.importer.file_name('export')
+        type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", filename: import.importer.file_name("export")
     end
 
     def index
@@ -62,7 +62,7 @@ module Importo
 
     def import_params
       params.require(:import).permit(:original, :kind, :column_overrides,
-                                     column_overrides: params.dig(:import, :column_overrides)&.keys)
+        column_overrides: params.dig(:import, :column_overrides)&.keys)
     end
   end
 end

data/app/importers/concerns/importable.rb

@@ -126,11 +126,13 @@ module Importable
   def import!
     raise ArgumentError, "Invalid data structure" unless structure_valid?
 
-    batch = Sidekiq::Batch.new
+    batch = Importo::SidekiqBatchAdapter.new
     batch.description = "#{import.original.filename} - #{import.kind}"
-    batch.on(:success, Importo::ImportJobCallback, import_id: import.id)
+    batch.properties = {import_id: import.id}
+    batch.on_success("Importo::ImportJobCallback")
 
-    batch.jobs do
+    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?
@@ -139,8 +141,8 @@ module Importable
             v.delay.call(attributes[k])
           end.compact
         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?
+        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?
       end
     end
 

data/app/importers/importo/import_job_callback.rb

@@ -2,7 +2,7 @@ module Importo
   class ImportJobCallback
     include Rails.application.routes.url_helpers
 
-    def on_complete(_status, options)
+    def on_success(_status, options)
       options = options.deep_stringify_keys
       import = Import.find(options["import_id"])
       if import.present?
@@ -21,9 +21,5 @@ module Importo
         end
       end
     end
-
-    def on_success(status, options)
-      on_complete(status, options)
-    end
   end
 end

data/app/jobs/importo/import_job.rb

@@ -20,7 +20,7 @@ module Importo
       end
     end
 
-    def perform(attributes, index, import_id)
+    def perform(attributes, index, import_id, bid)
       self.class.execute_row(attributes, index, import_id, false, bid)
     end
 
@@ -30,10 +30,10 @@ module Importo
       import = Import.find(import_id)
       record = import.importer.process_data_row(attributes, index, last_attempt: last_attempt)
 
-      batch = Sidekiq::Batch.new(bid)
+      batch = Importo::SidekiqBatchAdapter.find(bid)
 
-      if !import.completed? && import.can_complete? && batch.status.complete?
-        ImportJobCallback.new.on_complete(batch.status, {import_id: import_id})
+      if !import.completed? && import.can_complete? && batch.finished?
+        ImportJobCallback.new.on_success(batch.status, {import_id: import_id})
       end
     end
   end

data/app/jobs/importo/import_scheduled_job.rb

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

data/app/models/importo/import.rb

@@ -76,7 +76,7 @@ module Importo
             invalid_headers: importer.invalid_header_names.join(", ")))
       end
     rescue => e
-      errors.add(:original, I18n.t("importo.errors.parse_error", error: e.message))
+      errors.add(:original, I18n.t("importo.errors.parse_error", error: e.message)) unless state == "failed"
     end
 
     def importer

data/app/services/importo/import_context.rb

@@ -1,9 +1,16 @@
 # frozen_string_literal: true
 
 module Importo
-  class ImportContext < ApplicationContext
-    input do
-      attribute :import, type: Import, typecaster: ->(value) { value.is_a?(Import) ? value : Import.find(value) }
+  if defined?(Servitium) && ApplicationContext < Servitium::Context
+    class ImportContext < ApplicationContext
+      input do
+        attribute :import, type: Import, typecaster: ->(value) { value.is_a?(Import) ? value : Import.find(value) }
+      end
     end
+  else
+    class ImportContext < ApplicationContext
+      attribute :import, :model, class_name: "Importo::Import"
+    end
+
   end
 end

data/app/services/importo/import_service.rb

@@ -6,8 +6,7 @@ module Importo
       context.import.import!
       context.import.importer.import!
     rescue
-      context.import.failure!
-      context.fail!
+        context.import.failure!
     end
   end
 end

data/app/tables/importo/imports_table.rb

@@ -2,38 +2,38 @@
 
 if defined? ActionTable
   class Importo::ImportsTable < ActionTable::ActionTable
-  model Importo::Import
+    model Importo::Import
 
-  column(:created_at, html_value: proc { |import| l(import.created_at.in_time_zone(Time.zone), format: :short).to_s })
-  column(:user, sortable: false) { |import| import.importo_ownable.name }
-  column(:kind, sortable: false)
-  column(:original, sortable: false) { |import| link_to(import.original.filename, main_app.rails_blob_path(import.original, disposition: "attachment"), target: "_blank") }
-  column(:state)
-  column(:result, sortable: false) { |import| import.result.attached? ? link_to(import.result_message, main_app.rails_blob_path(import.result, disposition: "attachment"), target: "_blank") : import.result_message }
-  column(:extra_links, sortable: false) { |import| Importo.config.admin_extra_links.call(import).map { |name, link| link_to(link[:text], link[:url], title: link[:title], target: "_blank", class: link[:icon]) } }
+    column(:created_at, html_value: proc { |import| l(import.created_at.in_time_zone(Time.zone), format: :short).to_s })
+    column(:user, sortable: false) { |import| import.importo_ownable.name }
+    column(:kind, sortable: false)
+    column(:original, sortable: false) { |import| link_to(import.original.filename, main_app.rails_blob_path(import.original, disposition: "attachment"), target: "_blank") }
+    column(:state)
+    column(:result, sortable: false) { |import| import.result.attached? ? link_to(import.result_message, main_app.rails_blob_path(import.result, disposition: "attachment"), target: "_blank") : import.result_message }
+    column(:extra_links, sortable: false) { |import| Importo.config.admin_extra_links.call(import).map { |name, link| link_to(link[:text], link[:url], title: link[:title], target: "_blank", class: link[:icon]) } }
 
-  column :actions, title: "", sortable: false do |import|
-    content_tag(:span) do
-      if import.can_revert?
-        concat link_to(content_tag(:i, nil, class: "fa fa-undo"), importo.undo_import_path(import), data: {turbo_method: :post, turbo_confirm: "Are you sure? This will undo this import."})
-      end
-      if Importo.config.admin_can_destroy.call(import)
-        concat link_to(content_tag(:i, nil, class: "fa fa-trash"), importo.import_path(import), class: "float-right", data: {turbo_method: :delete, turbo_confirm: "Are you sure? This will prevent duplicate imports from being detected."})
+    column :actions, title: "", sortable: false do |import|
+      content_tag(:span) do
+        if import.can_revert?
+          concat link_to(content_tag(:i, nil, class: "fa fa-undo"), importo.undo_import_path(import), data: {turbo_method: :post, turbo_confirm: "Are you sure? This will undo this import."})
+        end
+        if Importo.config.admin_can_destroy.call(import)
+          concat link_to(content_tag(:i, nil, class: "fa fa-trash"), importo.import_path(import), class: "float-right", data: {turbo_method: :delete, turbo_confirm: "Are you sure? This will prevent duplicate imports from being detected."})
+        end
       end
     end
-  end
 
-  # filter(:importo_ownable){ parameter: :ownable, collection_proc: -> { Importo::Import.order(created_at: :desc).limit(200).map(&:importo_ownable).uniq.sort_by(&:name).map { |o| [o.name, "#{o.class.name}##{o.id}"] } } } )
+    # filter(:importo_ownable){ parameter: :ownable, collection_proc: -> { Importo::Import.order(created_at: :desc).limit(200).map(&:importo_ownable).uniq.sort_by(&:name).map { |o| [o.name, "#{o.class.name}##{o.id}"] } } } )
 
-  initial_order :created_at, :desc
+    initial_order :created_at, :desc
 
-  private
+    private
 
-  def scope
-    @scope = Importo.config.admin_visible_imports.call
-    @scope
+    def scope
+      @scope = Importo.config.admin_visible_imports.call
+      @scope
+    end
   end
-end
 else
   class Importo::ImportsTable
   end

data/app/tables/importo/mensa_imports_table.rb

@@ -38,7 +38,6 @@ if defined? Mensa
         end
       end
 
-
       order created_at: :desc
     end
 

data/lib/importo/test_helpers.rb

@@ -23,13 +23,14 @@ module Importo
       Roo::Excelx.new(excel.set_encoding("BINARY"))
     end
 
-    def import_sheet(kind, sheet, filename: 'import.xlsx', locale: I18n.locale, owner: users(:admin))
+    def import_sheet(kind, sheet, filename: "import.xlsx", locale: I18n.locale, owner: @owner)
       import = Importo::Import.new(kind: kind, locale: locale, importo_ownable: owner)
 
       import.original.attach(io: sheet, filename: filename, content_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", identify: false)
       import.save!
 
       ImportService.perform(import: import)
+      ImportJobCallback.new.on_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.14"
+  VERSION = "3.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importo
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.16
 platform: ruby
 authors:
 - Andre Meij
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -96,47 +96,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: signum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: state_machines-activerecord
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: signum
+  name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -264,19 +264,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +302,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/adapters/importo/sidekiq_batch_adapter.rb
 - app/assets/config/importo_manifest.js
 - app/assets/javascripts/importo/application.js
 - app/assets/stylesheets/importo/application.css
@@ -319,6 +320,7 @@ files:
 - app/importers/importo/import_job_callback.rb
 - app/jobs/importo/application_job.rb
 - app/jobs/importo/import_job.rb
+- app/jobs/importo/import_scheduled_job.rb
 - app/jobs/importo/purge_import_job.rb
 - app/mailers/importo/application_mailer.rb
 - app/models/importo/application_record.rb