abstract_importer 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75b8682cc7102c4700ff606c17d5761a3bd93bfe
-  data.tar.gz: a79b16c14e77b902400ce9a6149a4629d5b3d2d0
+  metadata.gz: 31e3cc0171a843a214b22c3e6e3ae23cbedcd5e3
+  data.tar.gz: 1a59ba701e8554d5961241e523ed9a6e4ef86cc8
 SHA512:
-  metadata.gz: 260320a2d92c89d560866290b1871499ef2bbb83a64ec669cd1fd6b6e0d686b08813b785214c4f3bdbd246aa34d81c190a2f957f79ed53904aa3d9cdda000477
-  data.tar.gz: 11d5dbffe9b22088cdaa785ceb2c764055c465beb6afc87ddbf7163143ad083bb17672cef4b54d0a563669e4ef1ceedd4b4884a8c872d2a586c3aab154e85c70
+  metadata.gz: aa2eb7be342b3a8852019174770cae2eb20cbb71fd22ae06f2fb5f61fe0787558ab2799e368767f286430c8479ea62cb90ef233e2735bf90e0131a69291d7071
+  data.tar.gz: 55ddab55d457e31cc62f6e17cc47e253a05c2237e37a1915b37b97feefd24aeccc27841c8e2617a5d016e324158ea10a7d0625dbb159c7b6ba9fd098397455f4

data/lib/abstract_importer/base.rb

@@ -95,10 +95,10 @@ module AbstractImporter
       {}.tap do |results|
         reporter.start_all(self)
 
-        ms = Benchmark.ms do
+        setup_ms = Benchmark.ms do
           setup
         end
-        reporter.finish_setup(self, ms)
+        reporter.finish_setup(self, setup_ms)
 
         ms = Benchmark.ms do
           with_transaction do
@@ -108,12 +108,12 @@ module AbstractImporter
           end
         end
 
-        ms = Benchmark.ms do
+        teardown_ms = Benchmark.ms do
           teardown
         end
-        reporter.finish_teardown(self, ms)
+        reporter.finish_teardown(self, teardown_ms)
 
-        reporter.finish_all(self, ms)
+        reporter.finish_all(self, setup_ms + ms + teardown_ms)
       end
     end
 
@@ -128,10 +128,10 @@ module AbstractImporter
 
     def collection_counts
       @collection_counts ||= Hash.new do |counts, collection_name|
-        counts[collection_name] = if self.source.respond_to?(:"#{collection_name}_count")
-          self.source.public_send(:"#{collection_name}_count")
+        counts[collection_name] = if source.respond_to?(:"#{collection_name}_count")
+          source.public_send(:"#{collection_name}_count")
         else
-          self.source.public_send(collection_name).count
+          source.public_send(collection_name).count
         end
       end
     end

data/lib/abstract_importer/collection_importer.rb

@@ -1,4 +1,6 @@
 require "abstract_importer/strategies"
+require "abstract_importer/mapping"
+require "abstract_importer/polymorphic_mapping"
 
 module AbstractImporter
   class CollectionImporter
@@ -27,7 +29,6 @@ module AbstractImporter
              :use_id_map_for?,
              :remap_foreign_key?,
              :id_map,
-             :map_foreign_key,
              :generate_id,
              :to => :importer
 
@@ -72,40 +73,16 @@ module AbstractImporter
         next unless remap_foreign_key?(name, foreign_key)
 
         if association.options[:polymorphic]
-          mappings << prepare_polymorphic_mapping!(association)
+          mappings << AbstractImporter::PolymorphicMapping.new(self, association)
         else
-          mappings << prepare_mapping!(association)
+          mappings << AbstractImporter::Mapping.new(self, association)
         end
       end
       mappings
     end
 
-    def prepare_mapping!(association)
-      depends_on = association.table_name.to_sym
-      foreign_key = association.foreign_key.to_sym
-
-      Proc.new do |attrs|
-        if attrs.key?(foreign_key)
-          attrs[foreign_key] = map_foreign_key(attrs[foreign_key], name, foreign_key, depends_on)
-        else
-          reporter.count_notice "#{name}.#{foreign_key} will not be mapped because it is not used"
-        end
-      end
-    end
-
-    def prepare_polymorphic_mapping!(association)
-      foreign_key = association.foreign_key.to_sym
-      foreign_type = association.foreign_key.gsub(/_id$/, "_type").to_sym
-
-      Proc.new do |attrs|
-        if attrs.key?(foreign_key) && attrs.key?(foreign_type)
-          foreign_model = attrs[foreign_type]
-          depends_on = foreign_model.constantize.table_name.to_sym if foreign_model
-          attrs[foreign_key] = depends_on && map_foreign_key(attrs[foreign_key], name, foreign_key, depends_on)
-        else
-          reporter.count_notice "#{name}.#{foreign_key} will not be mapped because it is not used"
-        end
-      end
+    def map_foreign_key(legacy_id, foreign_key, depends_on)
+      importer.map_foreign_key(legacy_id, name, foreign_key, depends_on)
     end
 
 
@@ -119,8 +96,12 @@ module AbstractImporter
 
 
     def remap_foreign_keys!(hash)
-      @mappings.each do |proc|
-        proc.call(hash)
+      @mappings.each_with_index do |mapping, i|
+        if mapping.applicable?(hash)
+          mapping.apply!(hash)
+        else
+          reporter.count_notice "#{mapping} will not be mapped because it is not used"
+        end
       end
     end
 

data/lib/abstract_importer/mapping.rb

@@ -0,0 +1,32 @@
+module AbstractImporter
+  class Mapping
+    attr_reader :collection, :foreign_key, :depends_on
+
+    def initialize(collection, association)
+      @collection = collection
+      @depends_on = association.table_name.to_sym
+      @foreign_key = association.foreign_key.to_sym
+    end
+
+    def applicable?(attrs)
+      attrs.key?(foreign_key)
+    end
+
+    def apply!(attrs)
+      attrs[foreign_key] = apply(attrs)
+    end
+
+    def apply(attrs)
+      collection.map_foreign_key(attrs[foreign_key], foreign_key, depends_on)
+    end
+
+    def inspect
+      "#<#{self.class.name} #{self}>"
+    end
+
+    def to_s
+      "#{collection.name}.#{foreign_key}"
+    end
+
+  end
+end

data/lib/abstract_importer/polymorphic_mapping.rb

@@ -0,0 +1,40 @@
+module AbstractImporter
+  class PolymorphicMapping < AbstractImporter::Mapping
+    attr_reader :collection, :foreign_key, :foreign_type
+
+    def initialize(collection, association)
+      @collection = collection
+      @foreign_key = association.foreign_key.to_sym
+      @foreign_type = association.foreign_key.gsub(/_id$/, "_type").to_sym
+      @table_name_by_foreign_model = Hash.new do |map, foreign_model|
+        map[foreign_model] = foreign_model && foreign_model.constantize.table_name.to_sym
+      end
+    end
+
+    def applicable?(attrs)
+      attrs.key?(foreign_key) && attrs.key?(foreign_type)
+    end
+    alias applies_to? applicable?
+
+    def foreign_model_for(attrs)
+      attrs[foreign_type]
+    end
+
+    def foreign_table_for(attrs)
+      table_name_for(foreign_model_for(attrs))
+    end
+
+    def apply(attrs)
+      depends_on = foreign_table_for(attrs)
+      collection.map_foreign_key(attrs[foreign_key], foreign_key, depends_on) if depends_on
+    end
+    alias [] apply
+
+  private
+
+    def table_name_for(foreign_model)
+      @table_name_by_foreign_model[foreign_model]
+    end
+
+  end
+end

data/lib/abstract_importer/strategies/base.rb

@@ -41,7 +41,9 @@ module AbstractImporter
 
         if remap_ids?
           hash = hash.merge(legacy_id: hash.delete(:id))
-          hash[:id] = generate_id.call if generate_id
+          if generate_id
+            hash[:id] = generate_id.arity.zero? ? generate_id.call : generate_id.call(hash)
+          end
         end
 
         hash.merge(association_attrs)

data/lib/abstract_importer/version.rb

@@ -1,3 +1,3 @@
 module AbstractImporter
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstract_importer
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -242,6 +242,8 @@ files:
 - lib/abstract_importer/id_map.rb
 - lib/abstract_importer/import_options.rb
 - lib/abstract_importer/import_plan.rb
+- lib/abstract_importer/mapping.rb
+- lib/abstract_importer/polymorphic_mapping.rb
 - lib/abstract_importer/reporters.rb
 - lib/abstract_importer/reporters/base_reporter.rb
 - lib/abstract_importer/reporters/debug_reporter.rb