duty_free 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa22e01d02997c6b8bc562f19805d1f0f529e17793b0dd14282f43840ea2c86c
-  data.tar.gz: afa848b412ea1514e0afeaa36ba1093ccb1baecdd4384d225b07f76145e9457e
+  metadata.gz: 4451cbb29d90fb32347b1ff91e91a249da97769e7a64f2524efa912b8971bf86
+  data.tar.gz: ee3b06059aa89be48329ef48605287e8cb1725dd9f61460d9b3d044354405540
 SHA512:
-  metadata.gz: c60d6f2a72d34f4f99d3f9fea16b0ed2d1ff71b6088e4b6782a0b54decc15ef5ba45cef17f846079f4e5a55fd2f5dfcf25945b80351ff6006318b59fedcffd13
-  data.tar.gz: 6be734a732268268ef86768d88215e62b947c97326d823f3b631bab16de3f919877fedbf4184da1e1490904a752ed8e675bb173966cb9f2922860ae0b606020d
+  metadata.gz: 953bb38945daf16d0f22daa921ad1e0f46881583d51145a59b1983869da8d79c0675640677f1774dbdb9321695aeb69dc29dd4f66250704be0199fed33ab84b6
+  data.tar.gz: 8e3a0c166acb9bc22919218764e1e39ffa9d495e22ea93eaeb8ef6810b545a99f6af08bf594cc3958e7d9169ccfe5a7841c08b2799e4981066cb47968daaf26b

data/lib/duty_free/extensions.rb

@@ -14,6 +14,7 @@ module DutyFree
 
     # :nodoc:
     module ClassMethods
+      MAX_ID = Arel.sql('MAX(id)')
       # def self.extended(model)
       # end
 
@@ -203,8 +204,9 @@ module DutyFree
               is_do_save = true
               existing_unique = valid_unique.inject([]) do |s, v|
                 s << if v.last.is_a?(Array)
-                       v.last[0].where(v.last[1] => row[v.last[2]]).limit(1).pluck('MAX(id)').first.to_s
+                       v.last[0].where(v.last[1] => row[v.last[2]]).limit(1).pluck(MAX_ID).first.to_s
                      else
+                       binding.pry if v.last.nil?
                        row[v.last].to_s
                      end
               end
@@ -292,19 +294,21 @@ module DutyFree
                                      if klass == sub_obj.class # Self-referencing thing pointing to us?
                                        # %%% This should be more general than just for self-referencing things.
                                        sub_cols = cols.map { |c| c.start_with?(trim_prefix) ? c[trim_prefix.length..-1] : nil }
-                                       sub_bt, criteria = klass.find_existing(uniques, sub_cols, starred, import_template, keepers, assoc, row, klass, all, trim_prefix)
+                                       # assoc
+                                       sub_bt, criteria = klass.find_existing(uniques, sub_cols, starred, import_template, keepers, nil, row, klass, all, '')
                                      else
                                        sub_bt, criteria = klass.find_existing(uniques, cols, starred, import_template, keepers, nil, row, klass, all, trim_prefix)
                                      end
                                    rescue ::DutyFree::NoUniqueColumnError
                                      sub_unique = nil
                                    end
-                                   # binding.pry if sub_obj.is_a?(Employee) && sub_obj.first_name == 'Nancy' &&
-                                   #   sub_bt.is_a?(Employee)
+                                   # Self-referencing shouldn't build a new one if it couldn't find one
                                    # %%% Can criteria really ever be nil anymore?
-                                   sub_bt ||= klass.new(criteria || {})
+                                   unless klass == sub_obj.class && criteria.empty?
+                                     sub_bt ||= klass.new(criteria || {})
+                                   end
                                    sub_obj.send("#{path_part}=", sub_bt)
-                                   sub_bt # unless klass == sub_obj.class # Don't go further if it's self-referencing
+                                   sub_bt
                                  end
                     end
                     # Look for possible missing polymorphic detail
@@ -328,6 +332,7 @@ module DutyFree
                       sub_hm, criteria = 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?
@@ -342,8 +347,10 @@ module DutyFree
                       sub_objects[this_path] = sub_next if this_path.present?
                     end
                   end
-                  sub_obj = sub_next unless sub_next.nil?
+                  # binding.pry if sub_obj.reports_to
+                  sub_obj = sub_next #if sub_next
                 end
+                # binding.pry if sub_obj.nil?
                 next if sub_obj.nil?
 
                 sym = "#{v.name}=".to_sym
@@ -366,6 +373,7 @@ module DutyFree
                     row_errors[v.name] << "Boolean value \"#{row[key]}\" in column #{key + 1} not recognized"
                   end
                 end
+                # binding.pry if v.name.to_s == 'first_name' && sub_obj.first_name == 'Nancy'
                 sub_obj.send(sym, row[key])
                 # else
                 #   puts "  #{sub_class.name} doesn't respond to #{sym}"
@@ -475,48 +483,76 @@ module DutyFree
         # Might have to do a deferred save kind of thing, and also make sure the product stuff came first
         # before the other stuff
 
+        # Find by all corresponding columns
+
         # Add in any foreign key stuff we can find from other belongs_to associations
         # %%% This is starting to look like the other BelongsToAssociation code above around line
         # 697, so it really needs to be turned into something recursive instead of this two-layer
         # thick thing at best.
+
+        # First check the belongs_tos
+        criteria = {}
+        bt_criteria = {}
+        bt_criteria_all_nil = true
+        bt_col_indexes = []
+        only_valid_uniques = (train_we_came_in_here_on == false)
         bts = reflect_on_all_associations.each_with_object([]) do |sn_assoc, s|
           if sn_assoc.is_a?(ActiveRecord::Reflection::BelongsToReflection) &&
-             (!train_we_came_in_here_on || sn_assoc != train_we_came_in_here_on) &&
-             sn_assoc.klass != self # Omit stuff pointing to us (like self-referencing stuff)
+             (!train_we_came_in_here_on || sn_assoc != train_we_came_in_here_on) # &&
+             # sn_assoc.klass != self # Omit stuff pointing to us (like self-referencing stuff)
             # %%% Make sure there's a starred column we know about from this one
-            ret[sn_assoc.foreign_key] = nil if train_we_came_in_here_on == false
+            ret[sn_assoc.foreign_key] = nil if only_valid_uniques
             s << sn_assoc
           end
           s
         end
-
-        # Find by all corresponding columns
-        criteria = {}
-        if train_we_came_in_here_on != false
-          criteria = ret.each_with_object({}) do |v, s|
-            s[v.first.to_sym] = row[v.last]
-            s
-          end
-        end
-
         bts.each do |sn_bt|
           # This search prefix becomes something like "Order Details Product "
+          # binding.pry
           cols.each_with_index do |bt_col, idx|
-            next unless bt_col.start_with?(trim_prefix + "#{sn_bt.name.to_s.underscore.tr('_', ' ').titleize} ")
+            next if bt_col_indexes.include?(idx) ||
+                    !bt_col&.start_with?(trim_prefix + "#{sn_bt.name.to_s.underscore.tr('_', ' ').titleize} ")
 
             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
+                      # %%% Need to stack these up in case there are multiple
+                      # (like first_name, last_name on a referenced employee)
+                      # binding.pry
+                      sn_bt.klass.where(keepers[idx].name => row[idx]).limit(1).pluck(MAX_ID).first
                     else
                       [sn_bt.klass, keepers[idx].name, idx]
                     end
-            criteria[sn_bt.foreign_key] = fk_id
+            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
+            # %%% Rails older than 5.0 handles this stuff differently!
+            unless sn_bt.options[:optional] || !sn_bt.klass.belongs_to_required_by_default
+              criteria[fk_name] = fk_id
+            else # Should not have this fk as a requirement
+              ret.delete(fk_name) if only_valid_uniques && ret.include?(fk_name)
+            end
+          end
+        end
+
+        new_criteria_all_nil = bt_criteria_all_nil
+        if train_we_came_in_here_on != false
+          criteria = ret.each_with_object({}) do |v, s|
+            next if bt_col_indexes.include?(v.last)
+
+            new_criteria_all_nil = false if (s[v.first.to_sym] = row[v.last])
+            s
           end
         end
 
         # Short-circuiting this to only get back the valid_uniques?
-        return ret.merge(criteria) if train_we_came_in_here_on == false
+        return ret.merge(criteria) if only_valid_uniques
+
+        # binding.pry if obj.is_a?(Order)
+        # 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
         sub_hm = obj.find do |hm_obj|
@@ -532,7 +568,7 @@ module DutyFree
         # Try looking it up through ActiveRecord
         # %%% Should we perhaps do this first before the more intensive find routine above?
         sub_hm = obj.find_by(criteria) if sub_hm.nil?
-        [sub_hm, criteria]
+        [sub_hm, criteria.merge(bt_criteria)]
       end
 
     private

data/lib/duty_free/version_number.rb

@@ -5,7 +5,7 @@ module DutyFree
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 2
+    TINY = 3
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duty_free
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement