abstract_importer 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1a26d52ad8e17f1b2539d5abbcf996a4c80ac157139a988fefd4a417c4fe03e
-  data.tar.gz: 388a9123f67dd9b52c35ae50a8added3c6995d2b8d71d703269dd317e13e8918
+  metadata.gz: beb6af75a939202a48788cb3cbd6513c074ff514f1d8c7d104b32700ffdcfe63
+  data.tar.gz: 7ce453f1c101cb56a17642d5b0d21414db6cfd7de3221567f5bce75b4850e93f
 SHA512:
-  metadata.gz: 19531db43b5cd36a2831384fcef16092930b23cc9fa622c1aaa1b1bdc193d73df0d824deda4bdc5ce427d80272bd1d48cd972efea15011187fffa1c5720cb4cf
-  data.tar.gz: 14d9f5e0d630fc2e15be68bd83ef61ca610bf4cec4442af820cfa429915020320d88416af4c8f2fc5d7779daa8b83900c7b0be7e4a87bc21aa73985dd0a58c17
+  metadata.gz: b17a2f043ce0a0a7fde5e6de5f1bea224d27142c7bfece25a3e890be4bfb0b4110d6413384949a8d3af4eeec19ad688a8e940556a55e65fa6ef9450468332a20
+  data.tar.gz: 70a4b060155c6f3104f57654340af8dc43816cddbd1a83c49295b647241e326f7e1edc163f7bf673a3d251cf7d02b7734c320cfceae85e3e277705676756f096

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: Tests
+on: [push]
+
+jobs:
+  ruby:
+    name: Tests
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:10.11
+        env:
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: abstract_importer_test
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+          bundler-cache: true
+      - name: Run the Tests
+        env:
+          DATABASE_URL: postgres://postgres:password@localhost:5432/abstract_importer_test
+        run: bundle exec rake test
+

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+## v1.7.0 (2021 Nov 19)
+* Updated to handle `insert_all` and `upsert_all` to `has_many through:` relations in Rails 6.1+
+
 ## v1.6.0 (2019 Sept 23)
 * BREAKING: Updated to use Rails 6 and its `insert_all` and `upsert_all` methods and arguments

data/abstract_importer.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest-reporters-turn_reporter"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "pg", "~> 0.18"
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rr"
   spec.add_development_dependency "database_cleaner"

data/lib/abstract_importer/strategies/insert_strategy.rb

@@ -54,7 +54,11 @@ module AbstractImporter
       def insert_batch(batch)
         return if batch.empty?
 
-        result = collection.scope.public_send(@bulk_operation, batch, @insert_options)
+        scope = collection.scope
+        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)
         add_batch_to_id_map(result) if remap_ids?
       end
 

data/lib/abstract_importer/version.rb

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

data/test/default_strategy_test.rb

@@ -147,7 +147,7 @@ class DefaultStrategyTest < ActiveSupport::TestCase
       import!
       assert_equal 2, account.students.map(&:pet).compact.count, "Expected two students to still be linked to their pets upon import"
       assert_kind_of Owl, account.students.find_by_name("Harry Potter").pet, "Expected Harry's pet to be an Owl"
-      assert_kind_of Cat, account.students.find_by_name("Hermione Granger").pet, "Expected Harry's pet to be a Cat"
+      assert_kind_of Cat, account.students.find_by_name("Hermione Granger").pet, "Expected Hermione's pet to be a Cat"
     end
   end
 

data/test/insert_strategy_test.rb

@@ -4,7 +4,7 @@ require "test_helper"
 class InsertStrategyTest < ActiveSupport::TestCase
 
   setup do
-    options.merge!(strategy: {students: :insert})
+    options.merge!(strategy: {students: :insert, perils: :insert})
   end
 
 
@@ -99,6 +99,20 @@ class InsertStrategyTest < ActiveSupport::TestCase
     end
   end
 
+  context "When importing a has_many through: relationship" do
+    setup do
+      plan do |import|
+        import.locations
+        import.perils
+      end
+    end
+
+    should "handle has_many, through: relations" do
+      import!
+      assert_equal 1, account.perils.count
+    end
+  end
+
 
 
   context "Given an ID generator" do

data/test/support/mock_data_source.rb

@@ -58,5 +58,11 @@ class MockDataSource
     end
   end
 
+  def perils
+    Enumerator.new do |e|
+      e.yield id: 801, name: "Dementors", location_id: 6
+    end
+  end
+
 
 end

data/test/support/mock_objects.rb

@@ -17,6 +17,7 @@ class Parent < ActiveRecord::Base
 end
 
 class Location < ActiveRecord::Base
+  has_many :perils
   validates :slug, format: {with: /\A[a-z0-9\-]+\z/}
 end
 
@@ -37,6 +38,8 @@ class Account < ActiveRecord::Base
   has_many :locations
   has_many :cats
   has_many :owls
+
+  has_many :perils, through: :locations
 end
 
 class Cat < ActiveRecord::Base
@@ -52,3 +55,7 @@ end
 class Ability < ActiveRecord::Base
   belongs_to :pet, inverse_of: :abilities, polymorphic: true
 end
+
+class Peril < ActiveRecord::Base
+  belongs_to :location
+end

data/test/support/schema.rb

@@ -72,4 +72,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.index    "legacy_id", :unique => true
   end
 
+  create_table "perils", :force => true do |t|
+    t.string    "name"
+    t.integer   "location_id"
+    t.integer   "legacy_id"
+    t.index     "legacy_id", :unique => true
+  end
+
 end

data/test/test_helper.rb

@@ -22,11 +22,15 @@ require "minitest/autorun"
 
 system "psql -c 'create database abstract_importer_test'"
 
-ActiveRecord::Base.establish_connection(
-  adapter: "postgresql",
-  host: "localhost",
-  database: "abstract_importer_test",
-  verbosity: "quiet")
+if ENV["DATABASE_URL"]
+  ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
+else
+  ActiveRecord::Base.establish_connection(
+    adapter: "postgresql",
+    host: "localhost",
+    database: "abstract_importer_test",
+    verbosity: "quiet")
+end
 
 load File.join(File.dirname(__FILE__), "support", "schema.rb")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstract_importer
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -126,16 +126,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -213,9 +213,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-rvm:
-  - 2.6.3
-
-# Use Postgres 9.5
-# https://www.brandur.org/fragments/postgres-95-travis
-dist: trusty
-sudo: required
-addons:
-  postgresql: "9.5"
-
-before_install: gem update bundler
-script: bundle exec rake test
-
-# To stop Travis from running tests for a new commit,
-# add the following to your commit message: [ci skip]
-# You should add this when you edit documentation or comments, etc.