abstract_importer 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c34dc2d6f5558255316b38ea0f37d7090e18081a7d86a0af0d0a9a9370e30b5
-  data.tar.gz: ccd295d5ff7fe47394b8629db231ca8933501e9c55bec8af8d303ab7e8e1d384
+  metadata.gz: e6ccc6e819a1519872b187dac45ceba5e56244f9036474f9c8fd2cb71770f8da
+  data.tar.gz: d6f43a92567a9cabc4883a1acfe3ebab3522f1e7b77fd3ac1df58c76a7d8096d
 SHA512:
-  metadata.gz: dbeb628bcc04d3f1572721f7c97de4f0a2ec83c0b06ede1c4f61456318ce3da42fe129eecec6edb376ae4bdc656de25e993291ed6c2375788f1f11dc4cdcfb62
-  data.tar.gz: ea4e8446bda13ca443274afb141a0f9c2e965ba010da76cca5dcc3b6a6e480654e109a15d154a3510a94f10f9246adfaf7c65b774f9f7c8ff70f6a0e26c16448
+  metadata.gz: d0468d11985538e014eaa54f72d0097f41d3b9ce674cab8b5dbd19ba9361ff1dc1ed921701d16c5cab773f03470b2e7f1c423e720806048b750344b3208760b0
+  data.tar.gz: 32ea6b37fcfebc6c7bddf3d31397ad30f1cd102e495fe7419d02706ef4c3eb43e39e5ead633d36a2c6d2d401e28d196335546a8a977095e8f7803fff23cf393e

data/.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:10.11
+        image: postgres:17
         env:
           POSTGRES_PASSWORD: password
           POSTGRES_DB: abstract_importer_test
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 4.0
           bundler-cache: true
       - name: Run the Tests
         env:

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.DS_Store
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.ruby-version

@@ -1 +1 @@
-3.0.5
+4.0.6

data/abstract_importer.gemspec

@@ -17,9 +17,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 6.0"
-  spec.add_dependency "activesupport", ">= 6.0"
+  spec.add_dependency "activerecord", ">= 7.0"
+  spec.add_dependency "activesupport", ">= 7.0"
   spec.add_dependency "progressbar"
+  spec.add_dependency "benchmark", ">= 0.4.0"
+  spec.add_dependency "ostruct"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest-reporters"

data/lib/abstract_importer/base.rb

@@ -1,3 +1,4 @@
+require "benchmark"
 require "active_support/core_ext/module/delegation"
 require "abstract_importer/import_options"
 require "abstract_importer/import_plan"
@@ -109,12 +110,12 @@ module AbstractImporter
       {}.tap do |results|
         reporter.start_all(self)
 
-        setup_ms = Benchmark.ms do
+        setup_ms = benchmark do
           setup
         end
         reporter.finish_setup(self, setup_ms)
 
-        ms = Benchmark.ms do
+        ms = benchmark do
           with_transaction do
             collection_importers.each do |importer|
               results[importer.name] = importer.perform!
@@ -122,7 +123,7 @@ module AbstractImporter
           end
         end
 
-        teardown_ms = Benchmark.ms do
+        teardown_ms = benchmark do
           teardown
         end
         reporter.finish_teardown(self, teardown_ms)
@@ -302,5 +303,9 @@ module AbstractImporter
       end
     end
 
+    def benchmark
+      Benchmark.realtime { yield } * 1_000
+    end
+
   end
 end

data/lib/abstract_importer/collection_importer.rb

@@ -1,3 +1,4 @@
+require "benchmark"
 require "abstract_importer/strategies"
 require "abstract_importer/mapping"
 require "abstract_importer/polymorphic_mapping"
@@ -39,7 +40,7 @@ module AbstractImporter
       prepare!
 
       invoke_callback(:before_all)
-      summary.ms = Benchmark.ms do
+      summary.ms = 1000 * Benchmark.realtime do
         each_new_record do |attributes|
           strategy.process_record(attributes)
         end

data/lib/abstract_importer/strategies/insert_strategy.rb

@@ -84,7 +84,12 @@ module AbstractImporter
 
       def cast_result(result, table_name)
         types_by_column = result.columns.each_with_object({}) do |column_name, types|
-          types[column_name] = collection.scope.connection.lookup_cast_type_from_column(collection.scope.columns.find { |column| column.name == column_name })
+          connection = collection.scope.connection
+          column = collection.scope.columns.find { |column| column.name == column_name }
+
+          types[column_name] = connection.respond_to?(:lookup_cast_type_from_column) ?
+            connection.lookup_cast_type_from_column(column) :
+            connection.lookup_cast_type(column.sql_type)
         end
 
         result.to_a.map { |row|

data/lib/abstract_importer/version.rb

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

data/test/insert_strategy_test.rb

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

data/test/test_helper.rb

@@ -6,7 +6,7 @@ SimpleCov.start do
 end
 
 require "minitest/reporters/turn_reporter"
-MiniTest::Reporters.use! Minitest::Reporters::TurnReporter.new
+Minitest::Reporters.use! Minitest::Reporters::TurnReporter.new
 
 require "pry"
 require "rr"
@@ -20,7 +20,7 @@ require "minitest/autorun"
 
 
 
-system "psql -c 'create database abstract_importer_test'"
+system "psql -h localhost -U postgres -c 'create database abstract_importer_test'"
 
 if ENV["DATABASE_URL"]
   ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
@@ -28,6 +28,7 @@ else
   ActiveRecord::Base.establish_connection(
     adapter: "postgresql",
     host: "localhost",
+    user: "postgres",
     database: "abstract_importer_test",
     verbosity: "quiet")
 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 }, unique_by: anything, returning: anything)
+      mock.proxy.instance_of(ActiveRecord::Relation).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,13 @@
 --- !ruby/object:Gem::Specification
 name: abstract_importer
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Bob Lail
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +51,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +233,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - bob.lail@cph.org
 executables: []
@@ -260,7 +286,6 @@ homepage: https://github.com/cph/abstract_importer
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -275,8 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Provides services for the mass-import of complex relational data
 test_files: