abstract_importer 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a64bcc8c97755427d62459b7f1089c22d3806501
-  data.tar.gz: d8ef7bf828aa70c7294dd77f8d50a93857324a57
+  metadata.gz: f9366e2d43d5040adc38eca851c665c22a8f15ee
+  data.tar.gz: 441e4ea070305989b22e5ba88d9111782012dd5f
 SHA512:
-  metadata.gz: 830be8e79c0c5fbc3c8cc7fa372fc808f689dc78bc8518143a0395ad13a5dc1d7cc88ad6ebdbc81c1427688e19a40f5c5902282fa6126975ced79e5a034f4f25
-  data.tar.gz: 596609a81ff049f029baad8492aa8b4902c20e31e6a53237b02011c0a4cb7ed3d77070f93e27849b5c70f980852eb5747fc4d09667c9d49068a102a6f1108008
+  metadata.gz: 4b886e1366ec2c04c3291a25e9b0c0f6ce3b970197aefbd5598a0894a21be79e598b23396969edde8f7e83291bf60ef36cd1f01e4e50979217fd9e729daf0388
+  data.tar.gz: 0bfd28f4e398e928d49fa6dbcfc3f5dc31f7d30517b35acdd5dbb2e57f38b3e1021b27a8b338544b11da79c4abb450835faa4430dff9470c2935de187ad0d6e9

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/abstract_importer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Bob Lail"]
   spec.email         = ["bob.lail@cph.org"]
   spec.summary       = %q{Provides services for the mass-import of complex relational data}
-  spec.homepage      = "https://github.com/concordia-publishing-house/abstract_importer"
+  spec.homepage      = "https://github.com/cph/abstract_importer"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/abstract_importer/base.rb

@@ -21,7 +21,11 @@ module AbstractImporter
         @dependencies = dependencies
       end
 
-      attr_reader :import_plan, :dependencies
+      def dependencies
+        @dependencies ||= []
+      end
+
+      attr_reader :import_plan
     end
 
 
@@ -185,9 +189,21 @@ module AbstractImporter
 
 
 
+  protected
+
+    def scope_for(collection_name)
+      parent.public_send(collection_name)
+    end
 
   private
 
+    def has_scope_for?(collection_name)
+      scope_for(collection_name)
+      true
+    rescue NoMethodError
+      false
+    end
+
     def verify_source!
       import_plan.keys.each do |collection|
         next if source.respond_to?(collection)
@@ -199,14 +215,14 @@ module AbstractImporter
 
     def verify_parent!
       import_plan.keys.each do |collection|
-        next if parent.respond_to?(collection)
+        next if has_scope_for?(collection)
 
         raise "#{parent.class} does not have a collection named `#{collection}`; " <<
               "but #{self.class} plans to import records with that name"
       end
 
-      Array(self.class.dependencies).each do |collection|
-        next if parent.respond_to?(collection)
+      self.class.dependencies.each do |collection|
+        next if has_scope_for?(collection)
 
         raise "#{parent.class} does not have a collection named `#{collection}`; " <<
               "but #{self.class} declares it as a dependency"
@@ -215,26 +231,16 @@ module AbstractImporter
 
     def instantiate_collections!
       @collections = import_plan.map do |name, block|
-        reflection = parent.class.reflect_on_association(name)
-        model = reflection.klass
-        table_name = model.table_name
-        scope = parent.public_send(name)
-
         options = ImportOptions.new
         instance_exec(options, &block) if block
 
-        Collection.new(name, model, table_name, scope, options)
+        Collection.new(name, scope_for(name), options)
       end
     end
 
     def dependencies
-      @dependencies ||= Array(self.class.dependencies).map do |name|
-        reflection = parent.class.reflect_on_association(name)
-        model = reflection.klass
-        table_name = model.table_name
-        scope = parent.public_send(name)
-
-        Collection.new(name, model, table_name, scope, nil)
+      @dependencies ||= self.class.dependencies.map do |name|
+        Collection.new(name, scope_for(name))
       end
     end
 

data/lib/abstract_importer/collection.rb

@@ -1,6 +1,10 @@
 module AbstractImporter
   class Collection < Struct.new(:name, :model, :table_name, :scope, :options)
 
+    def initialize(name, scope, options=nil)
+      super name, scope.model, scope.table_name, scope, options
+    end
+
     def association_attrs
       return @association_attrs if defined?(@association_attrs)
 
@@ -9,11 +13,13 @@ module AbstractImporter
       # can call `Person.new(__.merge(tenant_id: id))`.
       @association_attrs = {}
       association = scope.instance_variable_get(:@association)
-      unless association.is_a?(ActiveRecord::Associations::HasManyThroughAssociation)
-        @association_attrs.merge!(association.reflection.foreign_key.to_sym => association.owner.id)
-      end
-      if association.reflection.inverse_of && association.reflection.inverse_of.polymorphic?
-        @association_attrs.merge!(association.reflection.inverse_of.foreign_type.to_sym => association.owner.class.name)
+      if association
+        unless association.is_a?(ActiveRecord::Associations::HasManyThroughAssociation)
+          @association_attrs.merge!(association.reflection.foreign_key.to_sym => association.owner.id)
+        end
+        if association.reflection.inverse_of && association.reflection.inverse_of.polymorphic?
+          @association_attrs.merge!(association.reflection.inverse_of.foreign_type.to_sym => association.owner.class.name)
+        end
       end
       @association_attrs.freeze
     end

data/lib/abstract_importer/strategies/insert_strategy.rb

@@ -9,6 +9,7 @@ module AbstractImporter
         super
         @batch = []
         @batch_size = options.fetch(:batch_size, 250)
+        @insert_options = options.slice(:on_conflict)
       end
 
 
@@ -49,7 +50,7 @@ module AbstractImporter
 
 
       def insert_batch(batch)
-        collection.scope.insert_many(batch)
+        collection.scope.insert_many(batch, @insert_options)
       end
 
 

data/lib/abstract_importer/strategies/upsert_strategy.rb

@@ -5,21 +5,16 @@ module AbstractImporter
   module Strategies
     class UpsertStrategy < InsertStrategy
 
+      def initialize(collection, options={})
+        super
+        @insert_options.merge!(on_conflict: { column: remap_ids? ? :legacy_id : :id, do: :update })
+      end
 
       # We won't skip any records for already being imported
       def already_imported?(hash)
         false
       end
 
-
-      def insert_batch(batch)
-        collection.scope.insert_many(batch, on_conflict: {
-          column: remap_ids? ? :legacy_id : :id,
-          do: :update
-        })
-      end
-
-
     end
   end
 end

data/lib/abstract_importer/version.rb

@@ -1,3 +1,3 @@
 module AbstractImporter
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 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 }, {})
       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.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -267,7 +267,7 @@ files:
 - test/support/schema.rb
 - test/test_helper.rb
 - test/upsert_strategy_test.rb
-homepage: https://github.com/concordia-publishing-house/abstract_importer
+homepage: https://github.com/cph/abstract_importer
 licenses:
 - MIT
 metadata: {}
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Provides services for the mass-import of complex relational data