abstract_importer 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827772f8267bf04e58720c203493a53c9c45f4ce
-  data.tar.gz: 6c0b1d51976d1948edf91f77ba11b975ef2bb7f9
+  metadata.gz: ddf30730dc02843631c647c8f342623ebc46a87e
+  data.tar.gz: 571852378a10de0e78df4952ad9241c0af25092d
 SHA512:
-  metadata.gz: cf95cb9bdc64b7f0b318e2ff811eddeecf579a9fbc7255eb107c2b894306d62d996de088ffe239b6d5e1fc1705d58f06b0fc238e2baf29145938f1569e68e2b9
-  data.tar.gz: c07595116a66d93ce567bbf4d6209fd0dfc8911d697899ffee5afab679efe6c9b214f7bfc432ecfa9ea8da141aa981d8c69ae1fc4101e9b78ef7aaecdbaf8abb
+  metadata.gz: ac466e7b1f05a6074ae42d8e9dc188b641f8210caf95277e54830a4dd05a0c73a794392a8ee77dca07c5c600fb4ff47b9d5acc54f41c5f3c677c396db788ead9
+  data.tar.gz: 3283e7ad8cb0b45d5364d917efdc28565755114f099113000b358411c1ec25e5c5fe3e3a75cf78b483b825bcf19cf6f1d4f655aca1ba8aaec5fa7420c434da45

data/abstract_importer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", ">= 5.0"
   spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "activerecord-insert_many", ">= 0.4.1"
+  spec.add_dependency "activerecord-insert_many", ">= 0.4.3"
   spec.add_dependency "progressbar"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/abstract_importer/base.rb

@@ -206,7 +206,7 @@ module AbstractImporter
   protected
 
     def scope_for(collection_name)
-      parent.public_send(collection_name)
+      parent.public_send(collection_name).unscope(:order)
     end
 
   private

data/lib/abstract_importer/strategies/insert_strategy.rb

@@ -10,6 +10,7 @@ module AbstractImporter
         @batch = []
         @batch_size = options.fetch(:batch_size, 250)
         @insert_options = options.slice(:on_conflict)
+        @insert_options.merge!(returning: [:legacy_id, :id]) if remap_ids?
       end
 
 
@@ -43,8 +44,6 @@ module AbstractImporter
 
         insert_batch(@batch)
 
-        id_map_record_batch(@batch) if remap_ids?
-
         summary.created += @batch.length
         reporter.batch_inserted(@batch.length)
 
@@ -53,7 +52,8 @@ module AbstractImporter
 
 
       def insert_batch(batch)
-        collection.scope.insert_many(batch, @insert_options)
+        result = collection.scope.insert_many(batch, @insert_options)
+        add_batch_to_id_map(result) if remap_ids?
       end
 
 
@@ -65,10 +65,11 @@ module AbstractImporter
       end
 
 
-      def id_map_record_batch(batch)
-        return if generate_id
-        id_map.merge! collection.table_name,
-          collection.scope.where(legacy_id: @batch.map { |hash| hash[:legacy_id] })
+      def add_batch_to_id_map(result)
+        map = result.each_with_object({}) do |attrs, map|
+          map[attrs.fetch("legacy_id")] = attrs.fetch("id")
+        end
+        id_map.merge! collection.table_name, map
       end
 
 

data/lib/abstract_importer/version.rb

@@ -1,3 +1,3 @@
 module AbstractImporter
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 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_many(satisfy { |arg| arg.length == 3 }, {})
+      mock.proxy(Student).insert_many(satisfy { |arg| arg.length == 3 }, 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.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement