duty_free 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9a4a9d552788b5fa4d273e4c000d8d12bbd7f8808eb7904c69bc57c7ccbd61
-  data.tar.gz: 3e7ccb0be3785814ef2c2bcb488b73d52a956c9ebcc6365ab9a0e3a4160a3924
+  metadata.gz: 51bb54397528578ae7d4d43a04d1d6c31f81d1417d9c076f1fb751b18c09afaa
+  data.tar.gz: 8561d19c0a0166462c011f6a310429944de9b95751dbf9b36dbbb32fdce4bf76
 SHA512:
-  metadata.gz: 10df4b7fbf2d78d2f4c9d24ea318461465e61064697b315e5f84ed92e2d342347a17d0c07e2440858f19453fe0a128524ba70b1adb7c7a564ed84d786ffca7b1
-  data.tar.gz: 1e377aa74a39e3fe9b3f4accda7ef83535bf3ca2b0fe36de1b3b50289df30a96192d6eca22265e4d6749cf2101b4316cc29211fb450aeb0c2112f84b64f031d8
+  metadata.gz: 02ae8681512885e5ab618aaef343ae88375338fc396ec711b28db78bd97daad361949b86c18c1ca81401e3a15f6629814900a751145bf8a270e50f1fa5669cab
+  data.tar.gz: 0444426a5468f3dcf7143f3f8859f79f2808db968b6a59561ff0351223993b0071aa94e95b4e50924d99ccbf4ae78f7a9b190a617eac6c21305d8ae0e7dd7f87

data/lib/duty_free.rb

@@ -62,7 +62,137 @@ module DutyFree
   end
 end
 
+# Major compatibility fixes for ActiveRecord < 4.2
+# ================================================
 ActiveSupport.on_load(:active_record) do
+  # ActiveRecord before 4.0 didn't have #version
+  unless ActiveRecord.respond_to?(:version)
+    module ActiveRecord
+      def self.version
+        ::Gem::Version.new(ActiveRecord::VERSION::STRING)
+      end
+    end
+  end
+
+  # Rails < 4.0 cannot do #find_by, or do #pluck on multiple columns, so here are the patches:
+  if ActiveRecord.version < ::Gem::Version.new('4.0')
+    module ActiveRecord
+      module Calculations # Normally find_by is in FinderMethods, which older AR doesn't have
+        def find_by(*args)
+          where(*args).limit(1).to_a.first
+        end
+
+        def pluck(*column_names)
+          column_names.map! do |column_name|
+            if column_name.is_a?(Symbol) && self.column_names.include?(column_name.to_s)
+              "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column_name)}"
+            else
+              column_name
+            end
+          end
+
+          # Same as:  if has_include?(column_names.first)
+          if eager_loading? || (includes_values.present? && (column_names.first || references_eager_loaded_tables?))
+            construct_relation_for_association_calculations.pluck(*column_names)
+          else
+            relation = clone # spawn
+            relation.select_values = column_names
+            result = if respond_to?(:bind_values)
+                       klass.connection.select_all(relation.arel, nil, bind_values)
+                     else
+                       klass.connection.select_all(relation.arel.to_sql, nil)
+                     end
+            if result.empty?
+              []
+            else
+              columns = result.first.keys.map do |key|
+                # rubocop:disable Style/SingleLineMethods Naming/MethodParameterName
+                klass.columns_hash.fetch(key) do
+                  Class.new { def type_cast(v); v; end }.new
+                end
+                # rubocop:enable Style/SingleLineMethods Naming/MethodParameterName
+              end
+
+              result = result.map do |attributes|
+                values = klass.initialize_attributes(attributes).values
+
+                columns.zip(values).map do |column, value|
+                  column.type_cast(value)
+                end
+              end
+              columns.one? ? result.map!(&:first) : result
+            end
+          end
+        end
+      end
+
+      unless Base.is_a?(Calculations)
+        class Base
+          class << self
+            delegate :pluck, :find_by, to: :scoped
+          end
+        end
+      end
+
+      # ActiveRecord < 3.2 doesn't have initialize_attributes, used by .pluck()
+      unless AttributeMethods.const_defined?('Serialization')
+        class Base
+          class << self
+            def initialize_attributes(attributes, options = {}) #:nodoc:
+              serialized = (options.delete(:serialized) { true }) ? :serialized : :unserialized
+              # super(attributes, options)
+
+              serialized_attributes.each do |key, coder|
+                attributes[key] = Attribute.new(coder, attributes[key], serialized) if attributes.key?(key)
+              end
+
+              attributes
+            end
+          end
+        end
+      end
+
+      # This only gets added for ActiveRecord < 3.2
+      module Reflection
+        unless AssociationReflection.instance_methods.include?(:foreign_key)
+          class AssociationReflection < MacroReflection
+            alias foreign_key association_foreign_key
+          end
+        end
+      end
+    end
+  end
+
+  # Rails < 4.2 is not innately compatible with Ruby 2.4 and later, and comes up with:
+  # "TypeError: Cannot visit Integer" unless we patch like this:
+  unless ::Gem::Version.new(RUBY_VERSION) < ::Gem::Version.new('2.4')
+    unless Arel::Visitors::DepthFirst.private_instance_methods.include?(:visit_Integer)
+      module Arel
+        module Visitors
+          class DepthFirst < Visitor
+            alias visit_Integer terminal
+          end
+
+          class Dot < Visitor
+            alias visit_Integer visit_String
+          end
+
+          class ToSql < Visitor
+          private
+
+            # ActiveRecord before v3.2 uses Arel < 3.x, which does not have Arel#literal.
+            unless private_instance_methods.include?(:literal)
+              def literal(obj)
+                obj
+              end
+            end
+            alias visit_Integer literal
+          end
+        end
+      end
+    end
+  end
+
   include ::DutyFree::Extensions
 end
 

data/lib/duty_free/column.rb

@@ -5,15 +5,15 @@ require 'duty_free/util'
 module DutyFree
   # Holds detail about each column as we recursively explore the scope of what to import
   class Column
-    attr_accessor :name, :pre_prefix, :prefix, :prefix_assocs, :import_columns_as
+    attr_accessor :name, :pre_prefix, :prefix, :prefix_assocs, :import_template_as
     attr_writer :obj_class
 
-    def initialize(name, pre_prefix, prefix, prefix_assocs, obj_class, import_columns_as)
+    def initialize(name, pre_prefix, prefix, prefix_assocs, obj_class, import_template_as)
       self.name = name
       self.pre_prefix = pre_prefix
       self.prefix = prefix
       self.prefix_assocs = prefix_assocs
-      self.import_columns_as = import_columns_as
+      self.import_template_as = import_template_as
       self.obj_class = obj_class
     end
 
@@ -28,27 +28,25 @@ module DutyFree
       # sql_col = ::DutyFree::Util._prefix_join([table_name.compact.join('_'), name])
 
       # Foolproof way, using the AREL mapping:
-      sql_col = ::DutyFree::Util._prefix_join([mapping["#{pre_prefix.tr('.', '_')}_#{prefix}_"], name])
+      this_pre_prefix = pre_prefix.tr('.', '_')
+      this_pre_prefix << '_' unless pre_prefix.blank?
+      sql_col = ::DutyFree::Util._prefix_join([mapping["#{this_pre_prefix}#{prefix}_"], name])
       sym = to_sym.to_s
       sql_col == sym ? sql_col : "#{sql_col} AS #{sym}"
     end
 
     def titleize
-      @titleized ||= sym_string.titleize
+      @titleized ||= to_sym.titleize
     end
 
-    delegate :to_sym, to: :sym_string
-
     def path
       @path ||= ::DutyFree::Util._prefix_join([pre_prefix, prefix]).split('.').map(&:to_sym)
     end
 
-  private
-
     # The snake-cased column name to be used for building the full list of template_columns
-    def sym_string
+    def to_sym
       @sym_string ||= ::DutyFree::Util._prefix_join(
-        [pre_prefix, prefix, ::DutyFree::Util._clean_name(name, import_columns_as)],
+        [pre_prefix, prefix, ::DutyFree::Util._clean_name(name, import_template_as)],
         '_'
       ).tr('.', '_')
     end

data/lib/duty_free/extensions.rb

@@ -2,10 +2,7 @@
 
 require 'duty_free/column'
 require 'duty_free/suggest_template'
-# require 'duty_free/attribute_serializers/object_attribute'
-# require 'duty_free/attribute_serializers/object_changes_attribute'
 # require 'duty_free/model_config'
-# require 'duty_free/record_trail'
 
 # :nodoc:
 module DutyFree
@@ -17,36 +14,63 @@ module DutyFree
 
     # :nodoc:
     module ClassMethods
+      MAX_ID = Arel.sql('MAX(id)')
       # def self.extended(model)
       # end
 
       # Export at least column header, and optionally include all existing data as well
-      def df_export(is_with_data = true, import_columns = nil)
+      def df_export(is_with_data = true, import_template = nil, use_inner_joins = false)
+        use_inner_joins = true unless respond_to?(:left_joins)
         # In case they are only supplying the columns hash
-        if is_with_data.is_a?(Hash) && !import_columns
-          import_columns = is_with_data
+        if is_with_data.is_a?(Hash) && !import_template
+          import_template = is_with_data
           is_with_data = true
         end
-        import_columns ||= if constants.include?(:IMPORT_COLUMNS)
-                             self::IMPORT_COLUMNS
-                           else
-                             suggest_template(0, false, false)
-                           end
-        rows = [friendly_columns(import_columns)]
+        import_template ||= if constants.include?(:IMPORT_TEMPLATE)
+                              self::IMPORT_TEMPLATE
+                            else
+                              suggest_template(0, false, false)
+                            end
+
+        # Friendly column names that end up in the first row of the CSV
+        # Required columns get prefixed with a *
+        requireds = (import_template[:required] || [])
+        rows = ::DutyFree::Extensions._template_columns(self, import_template).map do |col|
+          is_required = requireds.include?(col)
+          col = col.to_s.titleize
+          # Alias-ify the full column names
+          aliases = (import_template[:as] || [])
+          aliases.each do |k, v|
+            if col.start_with?(v)
+              col = k + col[v.length..-1]
+              break
+            end
+          end
+          (is_required ? '* ' : '') + col
+        end
+        rows = [rows]
+
         if is_with_data
           # Automatically create a JOINs strategy and select list to get back all related rows
-          template_cols, template_joins = recurse_def(import_columns[:all], import_columns)
-          relation = joins(template_joins)
+          template_cols, template_joins = ::DutyFree::Extensions._recurse_def(self, import_template[:all], import_template)
+          relation = use_inner_joins ? joins(template_joins) : left_joins(template_joins)
 
           # So we can properly create the SELECT list, create a mapping between our
           # column alias prefixes and the aliases AREL creates.
-          # Warning: Delegating ast to arel is deprecated and will be removed in Rails 6.0
-          arel_alias_names = ::DutyFree::Util._recurse_arel(relation.ast.cores.first.source)
-          our_names = ::DutyFree::Util._recurse_arel(template_joins)
+          core = relation.arel.ast.cores.first
+          # Accommodate AR < 3.2
+          arel_alias_names = if core.froms.is_a?(Arel::Table)
+                               # All recent versions of AR have #source which brings up an Arel::Nodes::JoinSource
+                               ::DutyFree::Util._recurse_arel(core.source)
+                             else
+                               # With AR < 3.2, "froms" brings up the top node, an Arel::Nodes::InnerJoin
+                               ::DutyFree::Util._recurse_arel(core.froms)
+                             end
+          our_names = ['_'] + ::DutyFree::Util._recurse_arel(template_joins)
           mapping = our_names.zip(arel_alias_names).to_h
 
           relation.select(template_cols.map { |x| x.to_s(mapping) }).each do |result|
-            rows << template_columns(import_columns).map do |col|
+            rows << ::DutyFree::Extensions._template_columns(self, import_template).map do |col|
               value = result.send(col)
               case value
               when true
@@ -63,12 +87,16 @@ module DutyFree
       end
 
       # With an array of incoming data, the first row having column names, perform the import
-      def df_import(data, import_columns = nil)
-        import_columns ||= if constants.include?(:IMPORT_COLUMNS)
-                             self::IMPORT_COLUMNS
-                           else
-                             suggest_template(0, false, false)
-                           end
+      def df_import(data, import_template = nil)
+        instance_variable_set(:@defined_uniques, nil)
+        instance_variable_set(:@valid_uniques, nil)
+
+        import_template ||= if constants.include?(:IMPORT_TEMPLATE)
+                              self::IMPORT_TEMPLATE
+                            else
+                              suggest_template(0, false, false)
+                            end
+        # puts "Chose #{import_template}"
         inserts = []
         updates = []
         counts = Hash.new { |h, k| h[k] = [] }
@@ -79,17 +107,19 @@ module DutyFree
         cols = nil
         starred = []
         partials = []
-        all = import_columns[:all]
+        all = import_template[:all]
         keepers = {}
         valid_unique = nil
         existing = {}
         devise_class = ''
+        ret = nil
 
+        # Multi-tenancy gem Apartment can be used if there are separate schemas per tenant
         reference_models = if Object.const_defined?('Apartment')
                              Apartment.excluded_models
                            else
                              []
-        end
+                           end
 
         if Object.const_defined?('Devise')
           Object.const_get('Devise') # If this fails, devise_class will remain a blank string.
@@ -101,10 +131,13 @@ module DutyFree
 
         # Did they give us a filename?
         if data.is_a?(String)
-          data = if data.length <= 4096 && data.split('\n').length == 1
+          # Filenames with full paths can not be longer than 4096 characters, and can not
+          # include newline characters
+          data = if data.length <= 4096 && !data.index('\n')
                    File.open(data)
                  else
-                   # Hope that other multi-line strings might be CSV data
+                   # Any multi-line string is likely CSV data
+                   # %%% Test to see if TAB characters are present on the first line, instead of commas
                    CSV.new(data)
                  end
         end
@@ -123,13 +156,20 @@ module DutyFree
         # Will show as just one transaction when using auditing solutions such as PaperTrail
         ActiveRecord::Base.transaction do
           # Check to see if they want to do anything before the whole import
-          if before_import ||= (import_columns[:before_import]) # || some generic before_import)
-            before_import.call(data)
+          # First if defined in the import_template, then if there is a method in the class,
+          # and finally (not yet implemented) a generic global before_import
+          my_before_import = import_template[:before_import]
+          my_before_import ||= respond_to?(:before_import) && method(:before_import)
+          # my_before_import ||= some generic my_before_import
+          if my_before_import
+            last_arg_idx = my_before_import.parameters.length - 1
+            arguments = [data, import_template][0..last_arg_idx]
+            data = ret if (ret = my_before_import.call(*arguments)).is_a?(Enumerable)
           end
           data.each_with_index do |row, row_num|
             row_errors = {}
             if is_first # Anticipate that first row has column names
-              uniques = import_columns[:uniques]
+              uniques = import_template[:uniques]
 
               # Look for UTF-8 BOM in very first cell
               row[0] = row[0][3..-1] if row[0].start_with?([239, 187, 191].pack('U*'))
@@ -154,34 +194,37 @@ module DutyFree
                   col.strip!
                 end
               end
-              defined_uniques(uniques, cols, starred)
-              cols.map! { |col| ::DutyFree::Util._clean_name(col, import_columns[:as]) } # %%%
+              cols.map! { |col| ::DutyFree::Util._clean_name(col, import_template[:as]) }
+              defined_uniques(uniques, cols, cols.join('|'), starred)
               # Make sure that at least half of them match what we know as being good column names
-              template_column_objects = recurse_def(import_columns[:all], import_columns).first
+              template_column_objects = ::DutyFree::Extensions._recurse_def(self, import_template[:all], import_template).first
               cols.each_with_index do |col, idx|
                 # prefixes = col_detail.pre_prefix + (col_detail.prefix.blank? ? [] : [col_detail.prefix])
                 keepers[idx] = template_column_objects.find { |col_obj| col_obj.titleize == col }
                 # puts "Could not find a match for column #{idx + 1}, #{col}" if keepers[idx].nil?
               end
-              if keepers.length < (cols.length / 2) - 1
-                raise ::DutyFree::LessThanHalfAreMatchingColumnsError, I18n.t('import.altered_import_template_coumns')
-              end
+              raise ::DutyFree::LessThanHalfAreMatchingColumnsError, I18n.t('import.altered_import_template_coumns') if keepers.length < (cols.length / 2) - 1
 
               # Returns just the first valid unique lookup set if there are multiple
-              valid_unique = valid_uniques(uniques, cols, starred, import_columns)
+              valid_unique = find_existing(uniques, cols, starred, import_template, keepers, false)
               # Make a lookup from unique values to specific IDs
-              existing = pluck(*([:id] + valid_unique.keys)).each_with_object(existing) { |v, s| s[v[1..-1].map(&:to_s)] = v.first; }
+              existing = pluck(*([:id] + valid_unique.keys)).each_with_object(existing) do |v, s|
+                s[v[1..-1].map(&:to_s)] = v.first
+                s
+              end
               is_first = false
             else # Normal row of data
               is_insert = false
-              is_do_save = true
               existing_unique = valid_unique.inject([]) do |s, v|
-                s << row[v.last].to_s
+                s << if v.last.is_a?(Array)
+                       # binding.pry
+                       v.last[0].where(v.last[1] => row[v.last[2]]).limit(1).pluck(MAX_ID).first.to_s
+                     else
+                       row[v.last].to_s
+                     end
               end
               # Check to see if they want to preprocess anything
-              if @before_process ||= import_columns[:before_process]
-                existing_unique = @before_process.call(valid_unique, existing_unique)
-              end
+              existing_unique = @before_process.call(valid_unique, existing_unique) if @before_process ||= import_template[:before_process]
               obj = if existing.include?(existing_unique)
                       find(existing[existing_unique])
                     else
@@ -195,22 +238,26 @@ module DutyFree
               sub_objects = {}
               this_path = nil
               keepers.each do |key, v|
-                klass = nil
                 next if v.nil?
 
                 # Not the same as the last path?
                 if this_path && v.path != this_path.split(',').map(&:to_sym) && !is_has_one
-                  if sub_obj&.valid?
-                    # %%% Perhaps send them even invalid objects so they can be made valid here?
-                    if around_import_save
-                      around_import_save(sub_obj) do |yes_do_save|
-                        sub_obj.save if yes_do_save && sub_obj&.valid?
-                      end
+                  # puts sub_obj.class.name
+                  if respond_to?(:around_import_save)
+                    # Send them the sub_obj even if it might be invalid so they can choose
+                    # to make it valid if they wish.
+                    # binding.pry
+                    around_import_save(sub_obj) do |modded_obj = nil|
+                      modded_obj = (modded_obj || sub_obj)
+                      modded_obj.save if sub_obj&.valid?
                     end
+                  elsif sub_obj&.valid?
+                    sub_obj.save
                   end
                 end
                 sub_obj = obj
-                this_path = ''
+                this_path = +''
+                # puts "p: #{v.path}"
                 v.path.each_with_index do |path_part, idx|
                   this_path << (this_path.blank? ? path_part.to_s : ",#{path_part}")
                   unless (sub_next = sub_objects[this_path])
@@ -233,59 +280,48 @@ module DutyFree
                     # This works for belongs_to or has_one.  has_many gets sorted below.
                     # Get existing related object, or create a new one
                     if (sub_next = sub_obj.send(path_part)).nil?
-                      is_has_one = assoc.is_a?(ActiveRecord::Reflection::HasOneReflection)
                       klass = Object.const_get(assoc&.class_name)
-                      sub_next = if is_has_one
+                      # assoc.is_a?(ActiveRecord::Reflection::HasOneReflection)
+                      # %%% When we support only AR 4.2 and above then we can do:  assoc.has_one?
+                      sub_next = if assoc.macro == :has_one
                                    has_ones << v.path
                                    klass.new
                                  else
                                    # Try to find a unique item if one is referenced
-                                   trim_prefix = v.titleize[0..-(v.name.length + 2)]
+                                   sub_bt = nil
                                    begin
-                                     sub_unique = assoc.klass.valid_uniques(uniques, cols, starred, import_columns, all, trim_prefix)
+                                     trim_prefix = v.titleize[0..-(v.name.length + 2)]
+                                     trim_prefix << ' ' unless trim_prefix.blank?
+                                     sub_bt, criteria = klass.find_existing(uniques, cols, starred, import_template, keepers, nil, row, klass, all, trim_prefix)
                                    rescue ::DutyFree::NoUniqueColumnError
-                                     sub_unique = nil
                                    end
-                                   # Find by all corresponding columns
-                                   criteria = sub_unique&.inject({}) do |s, v|
-                                     s[v.first.to_sym] = row[v.last]
-                                     s
-                                   end
-                                   # Try looking up this belongs_to object through ActiveRecord
-                                   sub_bt = assoc.klass.find_by(criteria) if criteria
-                                   sub_bt || sub_obj.send("#{path_part}=", klass.new(criteria || {}))
+                                   # %%% Can criteria really ever be nil anymore?
+                                   sub_bt ||= klass.new(criteria || {}) unless klass == sub_obj.class && criteria.empty?
+                                   sub_obj.send("#{path_part}=", sub_bt)
+                                   sub_bt
                                  end
                     end
                     # Look for possible missing polymorphic detail
+                    # Maybe can test for this via assoc.through_reflection
                     if assoc.is_a?(ActiveRecord::Reflection::ThroughReflection) &&
                        (delegate = assoc.send(:delegate_reflection)&.active_record&.reflect_on_association(assoc.source_reflection_name)) &&
                        delegate.options[:polymorphic]
                       polymorphics << { parent: sub_next, child: sub_obj, type_col: delegate.foreign_type, id_col: delegate.foreign_key.to_s }
                     end
                     # From a has_many?
-                    if sub_next.is_a?(ActiveRecord::Associations::CollectionProxy)
+                    # Rails 4.0 and later can do:  sub_next.is_a?(ActiveRecord::Associations::CollectionProxy)
+                    if assoc.macro == :has_many && !assoc.options[:through]
                       # Try to find a unique item if one is referenced
                       # %%% There is possibility that when bringing in related classes using a nil
-                      # in IMPORT_COLUMNS[:all] that this will break.  Need to test deeply nested things.
+                      # in IMPORT_TEMPLATE[:all] that this will break.  Need to test deeply nested things.
                       start = (v.pre_prefix.blank? ? 0 : v.pre_prefix.length)
                       trim_prefix = v.titleize[start..-(v.name.length + 2)]
-                      puts sub_next.klass
-                      sub_unique = sub_next.klass.valid_uniques(uniques, cols, starred, import_columns, all, trim_prefix)
-                      # Find by all corresponding columns
-                      criteria = sub_unique.each_with_object({}) { |v, s| s[v.first.to_sym] = row[v.last]; }
-                      sub_hm = sub_next.find do |hm_obj|
-                        is_good = true
-                        criteria.each do |k, v|
-                          if hm_obj.send(k).to_s != v.to_s
-                            is_good = false
-                            break
-                          end
-                        end
-                        is_good
-                      end
-                      # Try looking it up through ActiveRecord
-                      sub_hm = sub_next.find_by(criteria) if sub_hm.nil?
+                      trim_prefix << ' ' unless trim_prefix.blank?
+                      # assoc.inverse_of is the belongs_to side of the has_many train we came in here on.
+                      sub_hm, criteria = assoc.klass.find_existing(uniques, cols, starred, import_template, keepers, assoc.inverse_of, row, sub_next, all, trim_prefix)
+
                       # If still not found then create a new related object using this has_many collection
+                      # (criteria.empty? ? nil : sub_next.new(criteria))
                       sub_next = sub_hm || sub_next.new(criteria)
                     end
                     unless sub_next.nil?
@@ -300,25 +336,23 @@ module DutyFree
                       sub_objects[this_path] = sub_next if this_path.present?
                     end
                   end
-                  sub_obj = sub_next unless sub_next.nil?
+                  sub_obj = sub_next # if sub_next
                 end
                 next if sub_obj.nil?
 
-                sym = "#{v.name}=".to_sym
-                sub_class = sub_obj.class
-                next unless sub_obj.respond_to?(sym)
+                next unless sub_obj.respond_to?(sym = "#{v.name}=".to_sym)
 
-                col_type = sub_class.columns_hash[v.name.to_s]&.type
-                if col_type.nil? && (virtual_columns = import_columns[:virtual_columns]) &&
+                col_type = sub_obj.class.columns_hash[v.name.to_s]&.type
+                if col_type.nil? && (virtual_columns = import_template[:virtual_columns]) &&
                    (virtual_columns = virtual_columns[this_path] || virtual_columns)
                   col_type = virtual_columns[v.name]
                 end
                 if col_type == :boolean
                   if row[key].nil?
                     # Do nothing when it's nil
-                  elsif %w[yes y].include?(row[key]&.downcase) # Used to cover 'true', 't', 'on'
+                  elsif %w[true t yes y].include?(row[key]&.strip&.downcase) # Used to cover 'on'
                     row[key] = true
-                  elsif %w[no n].include?(row[key]&.downcase) # Used to cover 'false', 'f', 'off'
+                  elsif %w[false f no n].include?(row[key]&.strip&.downcase) # Used to cover 'off'
                     row[key] = false
                   else
                     row_errors[v.name] ||= []
@@ -327,7 +361,7 @@ module DutyFree
                 end
                 sub_obj.send(sym, row[key])
                 # else
-                #   puts "  #{sub_class.name} doesn't respond to #{sym}"
+                #   puts "  #{sub_obj.class.name} doesn't respond to #{sym}"
               end
               # Try to save a final sub-object if one exists
               sub_obj.save if sub_obj && this_path && !is_has_one && sub_obj.valid?
@@ -347,13 +381,18 @@ module DutyFree
                 end
               end
 
-              # Give a window of opportinity to tweak user objects controlled by Devise
-              is_do_save = before_devise_save(obj, existing) if before_devise_save && obj.class.name == devise_class
+              # Give a window of opportunity to tweak user objects controlled by Devise
+              obj_class = obj.class
+              is_do_save = if obj_class.respond_to?(:before_devise_save) && obj_class.name == devise_class
+                             obj_class.before_devise_save(obj, existing)
+                           else
+                             true
+                           end
 
               if obj.valid?
                 obj.save if is_do_save
                 # Snag back any changes to the unique columns.  (For instance, Devise downcases email addresses.)
-                existing_unique = valid_unique.keys.inject([]) { |s, v| s << obj.send(v) }
+                existing_unique = valid_unique.keys.inject([]) { |s, v| s << obj.send(v).to_s }
                 # Update the duplicate counts and inserted / updated results
                 counts[existing_unique] << row_num
                 (is_insert ? inserts : updates) << { row_num => existing_unique } if is_do_save
@@ -365,106 +404,233 @@ module DutyFree
               errors << { row_num => row_errors } unless row_errors.empty?
             end
           end
-          duplicates = counts.inject([]) do |s, v|
-            s + v.last[1..-1].map { |line_num| { line_num => v.first } } if v.last.count > 1
+          duplicates = counts.each_with_object([]) do |v, s|
+            s += v.last[1..-1].map { |line_num| { line_num => v.first } } if v.last.count > 1
+            s
           end
-          # Check to see if they want to do anything before the whole import
           ret = { inserted: inserts, updated: updates, duplicates: duplicates, errors: errors }
-          if @after_import ||= (import_columns[:after_import]) # || some generic after_import)
-            ret = ret2 if (ret2 = @after_import.call(ret)).is_a?(Hash)
+
+          # Check to see if they want to do anything after the import
+          # First if defined in the import_template, then if there is a method in the class,
+          # and finally (not yet implemented) a generic global after_import
+          my_after_import = import_template[:after_import]
+          my_after_import ||= respond_to?(:after_import) && method(:after_import)
+          # my_after_import ||= some generic my_after_import
+          if my_after_import
+            last_arg_idx = my_after_import.parameters.length - 1
+            arguments = [ret][0..last_arg_idx]
+            ret = ret2 if (ret2 = my_after_import.call(*arguments)).is_a?(Hash)
           end
         end
         ret
       end
 
-      # Friendly column names that end up in the first row of the CSV
-      # Required columns get prefixed with a *
-      def friendly_columns(import_columns = self::IMPORT_COLUMNS)
-        requireds = (import_columns[:required] || [])
-        template_columns(import_columns).map do |col|
-          is_required = requireds.include?(col)
-          col = col.to_s.titleize
-          # Alias-ify the full column names
-          aliases = (import_columns[:as] || [])
-          aliases.each do |k, v|
-            if col.start_with?(v)
-              col = k + col[v.length..-1]
-              break
-            end
+      # For use with importing, based on the provided column list calculate all valid combinations
+      # of unique columns.  If there is no valid combination, throws an error.
+      # Returns an object found by this means.
+      def find_existing(uniques, cols, starred, import_template, keepers, train_we_came_in_here_on,
+                        row = nil, klass_or_collection = nil, all = nil, trim_prefix = '')
+        unless trim_prefix.blank?
+          cols = cols.map { |c| c.start_with?(trim_prefix) ? c[trim_prefix.length..-1] : nil }
+          starred = starred.each_with_object([]) do |v, s|
+            s << v[trim_prefix.length..-1] if v.start_with?(trim_prefix)
+            s
           end
-          (is_required ? '* ' : '') + col
         end
-      end
+        col_list = cols.join('|')
 
-      # The snake-cased column alias names used in the query to export data
-      def template_columns(import_columns = nil)
-        if @template_import_columns != import_columns
-          @template_import_columns = import_columns
-          @template_detail_columns = nil
-        end
-        @template_detail_columns ||= recurse_def(import_columns[:all], import_columns).first.map(&:to_sym)
-      end
+        # First add in foreign key stuff we can find from belongs_to associations (other than the
+        # one we might have arrived here upon).
+        criteria = {} # Enough detail to find or build a new object
+        bt_criteria = {}
+        bt_criteria_all_nil = true
+        bt_col_indexes = []
+        available_bts = []
+        only_valid_uniques = (train_we_came_in_here_on == false)
+        uniq_lookups = {} # The data, or how to look up the data
 
-      # For use with importing, based on the provided column list calculate all valid combinations
-      # of unique columns.  If there is no valid combination, throws an error.
-      def valid_uniques(uniques, cols, starred, import_columns, all = nil, trim_prefix = '')
-        col_name_offset = (trim_prefix.blank? ? 0 : trim_prefix.length + 1)
-        @valid_uniques ||= {} # Fancy memoisation
-        col_list = cols.join('|')
-        unless (vus = @valid_uniques[col_list])
+        vus = ((@valid_uniques ||= {})[col_list] ||= {}) # Fancy memoisation
+
+        if (is_new_vus = vus.empty?)
+          #   # Let's do general attributes before the tricky foreign key stuff
           # Find all unique combinations that are available based on incoming columns, and
           # pair them up with column number mappings.
-          template_column_objects = recurse_def(all || import_columns[:all], import_columns).first
+          template_column_objects = ::DutyFree::Extensions._recurse_def(self, all || import_template[:all], import_template).first
           available = if trim_prefix.blank?
                         template_column_objects.select { |col| col.pre_prefix.blank? && col.prefix.blank? }
                       else
                         trim_prefix_snake = trim_prefix.downcase.tr(' ', '_')
                         template_column_objects.select do |col|
-                          trim_prefix_snake == ::DutyFree::Util._prefix_join([col.pre_prefix, col.prefix], '_').tr('.', '_')
+                          this_prefix = ::DutyFree::Util._prefix_join([col.pre_prefix, col.prefix], '_').tr('.', '_')
+                          trim_prefix_snake == "#{this_prefix}_"
                         end
                       end.map { |avail| avail.name.to_s.titleize }
-          vus = defined_uniques(uniques, cols, starred).select do |k, _v|
+          all_vus = defined_uniques(uniques, cols, nil, starred, trim_prefix)
+          #   k, v = all_vus.first
+          #   k.each_with_index do |col, idx|
+          #     if available.include?(col) # || available_bts.include?(col)
+          #       vus[col] ||= v[idx]
+          #     end
+          #     # if available_bts.include?(k)
+        end
+
+        # %%% Ultimately may consider making this recursive
+        reflect_on_all_associations.each do |sn_bt|
+          next unless sn_bt.belongs_to? && (!train_we_came_in_here_on || sn_bt != train_we_came_in_here_on)
+
+          # # %%% Make sure there's a starred column we know about from this one
+          # uniq_lookups[sn_bt.foreign_key] = nil if only_valid_uniques
+
+          # This search prefix becomes something like "Order Details Product "
+          cols.each_with_index do |bt_col, idx|
+            next if bt_col_indexes.include?(idx) ||
+                    !bt_col&.start_with?(bt_prefix = (trim_prefix + "#{sn_bt.name.to_s.underscore.tr('_', ' ').titleize} "))
+
+            available_bts << bt_col
+            fk_id = if row
+                      # Max ID so if there are multiple, only the most recent one is picked.
+                      # %%% Need to stack these up in case there are multiple
+                      # (like first_name, last_name on a referenced employee)
+                      sn_bt.klass.where(keepers[idx].name => row[idx]).limit(1).pluck(MAX_ID).first
+                    else
+                      # elsif is_new_vus
+                      #   # Add to our criteria if this belongs_to is required
+                      #   bt_req_by_default = sn_bt.klass.respond_to?(:belongs_to_required_by_default) &&
+                      #                       sn_bt.klass.belongs_to_required_by_default
+                      #   unless !vus.values.first&.include?(idx) &&
+                      #          (sn_bt.options[:optional] || (sn_bt.options[:required] == false) || !bt_req_by_default)
+                      #     # # Add this fk to the criteria
+                      #     # criteria[fk_name] = fk_id
+
+                      #     ref = [keepers[idx].name, idx]
+                      #     # bt_criteria[(fk_name = sn_bt.foreign_key)] ||= [sn_bt.klass, []]
+                      #     # bt_criteria[fk_name].last << ref
+                      #     # bt_criteria[bt_col] = [sn_bt.klass, ref]
+
+                      #     # Maybe this is the most useful
+                      #     # First array is friendly column names, second is references
+                      #     foreign_uniques = (bt_criteria[sn_bt.name] ||= [sn_bt.klass, [], []])
+                      #     foreign_uniques[1] << ref
+                      #     foreign_uniques[2] << bt_col
+                      #     vus[bt_col] = foreign_uniques # And we can look up this growing set from any foreign column
+                      [sn_bt.klass, keepers[idx].name, idx]
+                    end
+            if fk_id
+              bt_col_indexes << idx
+              bt_criteria_all_nil = false
+            end
+            bt_criteria[(fk_name = sn_bt.foreign_key)] = fk_id
+
+            # Add to our criteria if this belongs_to is required
+            bt_req_by_default = sn_bt.klass.respond_to?(:belongs_to_required_by_default) &&
+                                sn_bt.klass.belongs_to_required_by_default
+
+            # The first check, "!all_vus.keys.first.exists { |k| k.start_with?(bt_prefix) }"
+            # is to see if one of the columns we're working with from the unique that we've chosen
+            # comes from the table referenced by this belongs_to (sn_bt).
+            next if all_vus.keys.first.none? { |k| k.start_with?(bt_prefix) } &&
+                    (sn_bt.options[:optional] || !bt_req_by_default)
+
+            # Add to the criteria
+            criteria[fk_name] = fk_id
+          end
+        end
+
+        if is_new_vus
+          available += available_bts
+          all_vus.each do |k, v|
+            combined_k = []
+            combined_v = []
+            k.each_with_index do |key, idx|
+              if available.include?(key)
+                combined_k << key
+                combined_v << v[idx]
+              end
+            end
+            vus[combined_k] = combined_v unless combined_k.empty?
+          end
+        end
+
+        # uniq_lookups = vus.inject({}) do |s, v|
+        #   return s if available_bts.include?(v.first) # These will be provided in criteria, and not uniq_lookups
+
+        #   # uniq_lookups[k[trim_prefix.length..-1].downcase.tr(' ', '_').to_sym] = val[idx] if k.start_with?(trim_prefix)
+        #   s[v.first.downcase.tr(' ', '_').to_sym] = v.last
+        #   s
+        # end
+
+        new_criteria_all_nil = bt_criteria_all_nil
+
+        # Make sure they have at least one unique combination to take cues from
+        unless vus.empty? # raise NoUniqueColumnError.new(I18n.t('import.no_unique_column_error'))
+          # Convert the first entry to a simplified hash, such as:
+          #   {[:investigator_institutions_name, :investigator_institutions_email] => [8, 9], ...}
+          #     to {:name => 8, :email => 9}
+          key, val = vus.first # Utilise the first identified set of valid uniques
+          key.each_with_index do |k, idx|
+            next if available_bts.include?(k) # These will be provided in criteria, and not uniq_lookups
+
+            # uniq_lookups[k[trim_prefix.length..-1].downcase.tr(' ', '_').to_sym] = val[idx] if k.start_with?(trim_prefix)
+            k_sym = k.downcase.tr(' ', '_').to_sym
+            v = val[idx]
+            uniq_lookups[k_sym] = v # The column number in which to find the data
+
+            next if only_valid_uniques || bt_col_indexes.include?(v)
+
+            # Find by all corresponding columns
+            if (row_value = row[v])
+              new_criteria_all_nil = false
+              criteria[k_sym] = row_value # The data, or how to look up the data
+            end
+          end
+        end
+
+        # Short-circuiting this to only get back the valid_uniques?
+        # unless uniq_lookups == criteria
+        #   puts "Compare #{uniq_lookups.inspect}"
+        #   puts "Compare #{criteria.inspect}"
+        # end
+        return uniq_lookups.merge(criteria) if only_valid_uniques
+
+        # If there's nothing to match upon then we're out
+        return [nil, {}] if new_criteria_all_nil
+
+        # With this criteria, find any matching has_many row we can so we can update it
+        # First try looking it up through ActiveRecord
+        found_object = klass_or_collection.find_by(criteria)
+        # If not successful, such as when fields are exposed via helper methods instead of being
+        # real columns in the database tables, try this more intensive routine.
+        unless found_object || klass_or_collection.is_a?(Array)
+          found_object = klass_or_collection.find do |obj|
             is_good = true
-            k.each do |k_col|
-              unless k_col.start_with?(trim_prefix) && available.include?(k_col[col_name_offset..-1])
+            criteria.each do |k, v|
+              if obj.send(k).to_s != v.to_s
                 is_good = false
                 break
               end
             end
             is_good
           end
-          @valid_uniques[col_list] = vus
-        end
-
-        # Make sure they have at least one unique combination to take cues from
-        raise ::DutyFree::NoUniqueColumnError, I18n.t('import.no_unique_column_error') if vus.empty?
-
-        # Convert the first entry to a simplified hash, such as:
-        #   {[:investigator_institutions_name, :investigator_institutions_email] => [8, 9], ...}
-        #     to {:name => 8, :email => 9}
-        key, val = vus.first
-        ret = {}
-        key.each_with_index do |k, idx|
-          ret[k[col_name_offset..-1].downcase.tr(' ', '_').to_sym] = val[idx]
         end
-        ret
+        [found_object, criteria.merge(bt_criteria)]
       end
 
     private
 
-      def defined_uniques(uniques, cols = [], starred = [])
-        @defined_uniques ||= {}
-        unless (defined_uniques = @defined_uniques[cols])
+      def defined_uniques(uniques, cols = [], col_list = nil, starred = [], trim_prefix = '')
+        col_list ||= cols.join('|')
+        unless (defined_uniq = (@defined_uniques ||= {})[col_list])
           utilised = {} # Track columns that have been referenced thusfar
-          defined_uniques = uniques.each_with_object({}) do |unique, s|
+          defined_uniq = uniques.each_with_object({}) do |unique, s|
             if unique.is_a?(Array)
               key = []
               value = []
               unique.each do |unique_part|
-                val = cols.index(unique_part_name = unique_part.to_s.titleize)
-                next if val.nil?
+                val = (unique_part_name = unique_part.to_s.titleize).start_with?(trim_prefix) &&
+                      cols.index(upn = unique_part_name[trim_prefix.length..-1])
+                next unless val
 
-                key << unique_part_name
+                key << upn
                 value << val
               end
               unless key.empty?
@@ -472,54 +638,77 @@ module DutyFree
                 utilised[key] = nil
               end
             else
-              val = cols.index(unique_part_name = unique.to_s.titleize)
-              unless val.nil?
-                s[[unique_part_name]] = [val]
-                utilised[[unique_part_name]] = nil
+              val = (unique_name = unique.to_s.titleize).start_with?(trim_prefix) &&
+                    cols.index(un = unique_name[trim_prefix.length..-1])
+              if val
+                s[[un]] = [val]
+                utilised[[un]] = nil
               end
             end
+            s
+          end
+          if defined_uniq.empty?
+            (starred - utilised.keys).each { |star| defined_uniq[[star]] = [cols.index(star)] }
+            # %%% puts "Tried to establish #{defined_uniq.inspect}"
           end
-          (starred - utilised.keys).each { |star| defined_uniques[[star]] = [cols.index(star)] }
-          @defined_uniques[cols] = defined_uniques
+          @defined_uniques[col_list] = defined_uniq
         end
-        defined_uniques
+        defined_uniq
       end
+    end # module ClassMethods
 
-      # Recurse and return two arrays -- one with all columns in sequence, and one a hierarchy of
-      # nested hashes to be used with ActiveRecord's .joins() to facilitate export.
-      def recurse_def(array, import_columns, assocs = [], joins = [], pre_prefix = '', prefix = '')
-        # Confirm we can actually navigate through this association
-        prefix_assoc = (assocs.last&.klass || self).reflect_on_association(prefix) if prefix.present?
-        assocs = assocs.dup << prefix_assoc unless prefix_assoc.nil?
-        prefixes = ::DutyFree::Util._prefix_join([pre_prefix, prefix])
-        array = array.inject([]) do |s, col|
-          s += if col.is_a?(Hash)
-                 col.inject([]) do |s2, v|
-                   joins << { v.first.to_sym => (joins_array = []) }
-                   s2 += recurse_def((v.last.is_a?(Array) ? v.last : [v.last]), import_columns, assocs, joins_array, prefixes, v.first.to_sym).first
-                 end
-               elsif col.nil?
-                 if assocs.empty?
-                   []
-                 else
-                   # Bring in from another class
-                   joins << { prefix => (joins_array = []) }
-                   # %%% Also bring in uniques and requireds
-                   recurse_def(assocs.last.klass::IMPORT_COLUMNS[:all], import_columns, assocs, joins_array, prefixes).first
-                 end
-               else
-                 [::DutyFree::Column.new(col, pre_prefix, prefix, assocs, self, import_columns[:as])]
-               end
-          s
-        end
-        [array, joins]
+    # The snake-cased column alias names used in the query to export data
+    def self._template_columns(klass, import_template = nil)
+      template_detail_columns = klass.instance_variable_get(:@template_detail_columns)
+      if klass.instance_variable_get(:@template_import_columns) != import_template
+        klass.instance_variable_set(:@template_import_columns, import_template)
+        klass.instance_variable_set(:@template_detail_columns, (template_detail_columns = nil))
       end
-    end # module ClassMethods
+      unless template_detail_columns
+        # puts "* Redoing *"
+        template_detail_columns = _recurse_def(klass, import_template[:all], import_template).first.map(&:to_sym)
+        klass.instance_variable_set(:@template_detail_columns, template_detail_columns)
+      end
+      template_detail_columns
+    end
+
+    # Recurse and return two arrays -- one with all columns in sequence, and one a hierarchy of
+    # nested hashes to be used with ActiveRecord's .joins() to facilitate export.
+    def self._recurse_def(klass, array, import_template, assocs = [], joins = [], pre_prefix = '', prefix = '')
+      # Confirm we can actually navigate through this association
+      prefix_assoc = (assocs.last&.klass || klass).reflect_on_association(prefix) if prefix.present?
+      assocs = assocs.dup << prefix_assoc unless prefix_assoc.nil?
+      prefixes = ::DutyFree::Util._prefix_join([pre_prefix, prefix])
+      array = array.inject([]) do |s, col|
+        s + if col.is_a?(Hash)
+              col.inject([]) do |s2, v|
+                joins << { v.first.to_sym => (joins_array = []) }
+                s2 + _recurse_def(klass, (v.last.is_a?(Array) ? v.last : [v.last]), import_template, assocs, joins_array, prefixes, v.first.to_sym).first
+              end
+            elsif col.nil?
+              if assocs.empty?
+                []
+              else
+                # Bring in from another class
+                joins << { prefix => (joins_array = []) }
+                # %%% Also bring in uniques and requireds
+                _recurse_def(klass, assocs.last.klass::IMPORT_TEMPLATE[:all], import_template, assocs, joins_array, prefixes).first
+              end
+            else
+              [::DutyFree::Column.new(col, pre_prefix, prefix, assocs, klass, import_template[:as])]
+            end
+      end
+      [array, joins]
+    end
   end # module Extensions
 
-  class NoUniqueColumnError < ActiveRecord::RecordNotUnique
+  # Rails < 4.0 doesn't have ActiveRecord::RecordNotUnique, so use the more generic ActiveRecord::ActiveRecordError instead
+  ar_not_unique_error = ActiveRecord.const_defined?('RecordNotUnique') ? ActiveRecord::RecordNotUnique : ActiveRecord::ActiveRecordError
+  class NoUniqueColumnError < ar_not_unique_error
   end
 
-  class LessThanHalfAreMatchingColumnsError < ActiveRecord::RecordInvalid
+  # Rails < 4.2 doesn't have ActiveRecord::RecordInvalid, so use the more generic ActiveRecord::ActiveRecordError instead
+  ar_invalid_error = ActiveRecord.const_defined?('RecordInvalid') ? ActiveRecord::RecordInvalid : ActiveRecord::ActiveRecordError
+  class LessThanHalfAreMatchingColumnsError < ar_invalid_error
   end
 end