abstract_importer 1.7.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb6af75a939202a48788cb3cbd6513c074ff514f1d8c7d104b32700ffdcfe63
-  data.tar.gz: 7ce453f1c101cb56a17642d5b0d21414db6cfd7de3221567f5bce75b4850e93f
+  metadata.gz: 0c34dc2d6f5558255316b38ea0f37d7090e18081a7d86a0af0d0a9a9370e30b5
+  data.tar.gz: ccd295d5ff7fe47394b8629db231ca8933501e9c55bec8af8d303ab7e8e1d384
 SHA512:
-  metadata.gz: b17a2f043ce0a0a7fde5e6de5f1bea224d27142c7bfece25a3e890be4bfb0b4110d6413384949a8d3af4eeec19ad688a8e940556a55e65fa6ef9450468332a20
-  data.tar.gz: 70a4b060155c6f3104f57654340af8dc43816cddbd1a83c49295b647241e326f7e1edc163f7bf673a3d251cf7d02b7734c320cfceae85e3e277705676756f096
+  metadata.gz: dbeb628bcc04d3f1572721f7c97de4f0a2ec83c0b06ede1c4f61456318ce3da42fe129eecec6edb376ae4bdc656de25e993291ed6c2375788f1f11dc4cdcfb62
+  data.tar.gz: ea4e8446bda13ca443274afb141a0f9c2e965ba010da76cca5dcc3b6a6e480654e109a15d154a3510a94f10f9246adfaf7c65b774f9f7c8ff70f6a0e26c16448

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.0.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.9.0 (2023 Mar 8)
+* Updated to support Ruby version 3.0+
+
+## v1.8.0 (2021 Dec 10)
+* Added `prepare_scope` as another callback that can be used when importing a collection
+
 ## v1.7.0 (2021 Nov 19)
 * Updated to handle `insert_all` and `upsert_all` to `has_many through:` relations in Rails 6.1+
 

data/lib/abstract_importer/import_options.rb

@@ -2,6 +2,7 @@ module AbstractImporter
   class ImportOptions
     CALLBACKS = [ :finder,
                   :rescue,
+                  :prepare_scope,
                   :before_build,
                   :before_batch,
                   :before_create,

data/lib/abstract_importer/strategies/insert_strategy.rb

@@ -58,7 +58,10 @@ module AbstractImporter
         if scope.respond_to?(:proxy_association) && scope.proxy_association.reflection.through_reflection?
           scope = scope.klass
         end
-        result = scope.public_send(@bulk_operation, batch, @insert_options)
+
+        scope = invoke_callback(:prepare_scope, scope) || scope
+
+        result = scope.public_send(@bulk_operation, batch, **@insert_options)
         add_batch_to_id_map(result) if remap_ids?
       end
 

data/lib/abstract_importer/version.rb

@@ -1,3 +1,3 @@
 module AbstractImporter
-  VERSION = "1.7.0"
+  VERSION = "1.9.0"
 end

data/test/insert_strategy_test.rb

@@ -17,7 +17,7 @@ class InsertStrategyTest < ActiveSupport::TestCase
     end
 
     should "import the records in batches" do
-      mock.proxy(Student).insert_all(satisfy { |arg| arg.length == 3 }, anything)
+      mock.proxy(Student).insert_all(satisfy { |arg| arg.length == 3 }, returning: anything)
       import!
       assert_equal [456, 457, 458], account.students.pluck(:legacy_id)
     end

data/test/upsert_strategy_test.rb

@@ -17,7 +17,7 @@ class UpsertStrategyTest < ActiveSupport::TestCase
     end
 
     should "import the records in batches" do
-      mock.proxy(Student).upsert_all(satisfy { |arg| arg.length == 3 }, anything)
+      mock.proxy(Student).upsert_all(satisfy { |arg| arg.length == 3 }, unique_by: anything, returning: anything)
       import!
       assert_equal [456, 457, 458], account.students.pluck(:legacy_id)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstract_importer
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Bob Lail
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,7 +206,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - bob.lail@cph.org
 executables: []
@@ -260,7 +260,7 @@ homepage: https://github.com/cph/abstract_importer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -275,8 +275,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Provides services for the mass-import of complex relational data
 test_files: