duty_free 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9ac922dd807fc18539ff130c1ccf63412e837acbe4eba0127423235c11d0f1e
-  data.tar.gz: e5c27fe4a58718dcbbd4c5ebc1aed2dbb5e7e4b386c977e0ec31269cfad08d48
+  metadata.gz: b16ccd7258656d274fc6b1f8798c5b5d1f3822570bdd9600f10d55e486a1308d
+  data.tar.gz: 9174b6bb8521edfacd9ddde72decc8a5b9274f33049740914cdd5077f9d52c59
 SHA512:
-  metadata.gz: 54811a68bd34fd5bb881fa19006a7297a8697a3a1575b7060ba7d82e6fcd6d36f545e1d5cfcfc51c756a5b87880e445c415924d2f54aa39471f0b884f0b4c6c4
-  data.tar.gz: 32ccb88e429e64bccb59c7741955b99537c661d6416d6f8c352cb384df728081d5b54079cb2dbd904203fbcf1c60abb1a4a7c70bee9c2764fa1622eaaeb6843f
+  metadata.gz: 8ba849219eca3426c396be95fc29828c9fe60cd4c538004796d9cc9c17d8be11541c1b18f3d6ed0a89e2980570caafe88dbfc9772ca2d48fe17239c5417d71d8
+  data.tar.gz: 54fa0c8b8bd4719863ebeb246f1d1fd21decec7ed1061b9ab8b447e2d38216a52ad427e2a3964564d19a6016ee572b6a95d7f269ed409e90df4c96cbbec01910

data/lib/duty_free.rb

@@ -137,7 +137,8 @@ ActiveSupport.on_load(:active_record) do
                            # This aliasing avoids the warning:
                            # "no type cast defined for type "numeric" with oid 1700. Please cast this type
                            # explicitly to TEXT to be safe for future changes."
-                           PG::BasicTypeRegistry.alias_type(0, 'numeric', 'text')
+                           PG::BasicTypeRegistry.alias_type(0, 'numeric', 'text') # oid 1700
+                           PG::BasicTypeRegistry.alias_type(0, 'time', 'text') # oid 1083
                            PG::BasicTypeMapForResults.new(klass.connection.raw_connection)
                          end.call
                        rslt.to_a
@@ -244,6 +245,14 @@ ActiveSupport.on_load(:active_record) do
     PGError = PG::Error
   end
 
+  unless DateTime.instance_methods.include?(:nsec)
+    class DateTime < Date
+      def nsec
+        (sec_fraction * 1000000000).to_i
+      end
+    end
+  end
+
   include ::DutyFree::Extensions
 end
 

data/lib/duty_free/extensions.rb

@@ -59,6 +59,9 @@ module DutyFree
 
           # So we can properly create the SELECT list, create a mapping between our
           # column alias prefixes and the aliases AREL creates.
+          # %%% If with Rails 3.1 and older you get "NoMethodError: undefined method `eq' for nil:NilClass"
+          # when trying to call relation.arel, then somewhere along the line while navigating a has_many
+          # relationship it can't find the proper foreign key.
           core = relation.arel.ast.cores.first
           # Accommodate AR < 3.2
           arel_alias_names = if core.froms.is_a?(Arel::Table)
@@ -284,7 +287,19 @@ module DutyFree
                         sub_next = klass.new(criteria || {})
                         to_be_saved << [sub_next, sub_obj, bt_name, sub_next]
                       end
+                      # This wires it up in memory, but doesn't yet put the proper foreign key ID in
+                      # place when the primary object is a new one (and thus not having yet been saved
+                      # doesn't yet have an ID).
+                      # binding.pry if !sub_next.new_record? && sub_next.name == 'Squidget Widget' # !sub_obj.changed?
+                      # # %%% Question is -- does the above set changed? when a foreign key is not yet set
+                      # # and only the in-memory object has changed?
+                      is_yet_changed = sub_obj.changed?
                       sub_obj.send(bt_name, sub_next)
+
+                      # We need this in the case of updating the primary object across a belongs_to when
+                      # the foreign one already exists and is not otherwise changing, such as when it is
+                      # not a new one, so wouldn't otherwise be getting saved.
+                      to_be_saved << [sub_obj] if !sub_obj.new_record? && !is_yet_changed && sub_obj.changed?
                     # From a has_many or has_one?
                     # Rails 4.0 and later can do:  sub_next.is_a?(ActiveRecord::Associations::CollectionProxy)
                     elsif [:has_many, :has_one].include?(assoc.macro) && !assoc.options[:through]
@@ -302,9 +317,11 @@ module DutyFree
                       if sub_hm
                         sub_next = sub_hm
                       elsif assoc.macro == :has_one
-                        bt_name = "#{assoc.inverse.name}="
+                        # assoc.active_record.name.underscore is only there to support older Rails
+                        # that doesn't do automatic inverse_of
+                        ho_name = "#{assoc.inverse_of&.name || assoc.active_record.name.underscore}="
                         sub_next = assoc.klass.new(criteria)
-                        to_be_saved << [sub_next, sub_obj, bt_name, sub_next]
+                        to_be_saved << [sub_next, sub_next, ho_name, sub_obj]
                       else
                         # Two other methods that are possible to check for here are :conditions and
                         # :sanitized_conditions, which do not exist in Rails 4.0 and later.
@@ -360,20 +377,18 @@ module DutyFree
                     row_errors[v.name] << "Boolean value \"#{row[key]}\" in column #{key + 1} not recognized"
                   end
                 end
+
+                is_yet_changed = sub_obj.changed?
                 sub_obj.send(sym, row[key])
+                # If this one is transitioning from having not changed to now having been changed,
+                # and is not a new one anyway that would already be lined up to get saved, then we
+                # mark it to now be saved.
+                to_be_saved << [sub_obj] if !sub_obj.new_record? && !is_yet_changed && sub_obj.changed?
                 # else
                 #   puts "  #{sub_obj.class.name} doesn't respond to #{sym}"
               end
+              # Try to save final sub-object(s) if any exist
               ::DutyFree::Extensions._save_pending(to_be_saved)
-              # Try to save a final sub-object if one exists
-              # sub_obj.save if sub_obj && this_path && !is_has_one && sub_obj.valid?
-
-              # # Wire up has_one associations
-              # has_ones.each do |hasone|
-              #   parent = sub_objects[hasone[0..-2].map(&:to_s).join(',')] || obj
-              #   hasone_object = sub_objects[hasone.map(&:to_s).join(',')]
-              #   parent.send("#{hasone[-1]}=", hasone_object) if parent.new_record? || hasone_object.valid?
-              # end
 
               # Reinstate any missing polymorphic _type and _id values
               polymorphics.each do |poly|
@@ -454,9 +469,13 @@ module DutyFree
         # Don't let this fool you -- we really are in search of the foreign key name here,
         # and Rails 3.0 and older used some fairly interesting conventions, calling it instead
         # the "primary_key_name"!
-        if assoc.respond_to?(:primary_key_name) && (fk_name = assoc.primary_key_name) &&
-           col_names.include?(fk_name.to_s)
-          return fk_name
+        if assoc.respond_to?(:primary_key_name)
+          if (fk_name = assoc.primary_key_name) && col_names.include?(fk_name.to_s)
+            return fk_name
+          end
+          if (fk_name = assoc.inverse_of.primary_key_name) && col_names.include?(fk_name.to_s)
+            return fk_name
+          end
         end
 
         puts "* Wow, had no luck at all finding a foreign key for #{assoc.inspect}"
@@ -721,6 +740,11 @@ module DutyFree
     # can be added properly to those new objects.  Finally at the end also called to save everything.
     def self._save_pending(to_be_saved)
       while (tbs = to_be_saved.pop)
+        # puts "Will be calling #{tbs[1].class.name} #{tbs[1]&.id} .#{tbs[2]} #{tbs[3].class.name} #{tbs[3]&.id}"
+
+        # Wire this one up if it had came from a has_one association
+        tbs[1].send(tbs[2], tbs[3]) if tbs[0] == tbs[1]
+
         ais = (tbs.first.class.respond_to?(:around_import_save) && tbs.first.class.method(:around_import_save)) ||
               (respond_to?(:around_import_save) && method(:around_import_save))
         if ais
@@ -735,11 +759,12 @@ module DutyFree
         else
           puts "* Unable to save #{tbs.first.inspect}"
         end
-        # puts "Save #{tbs.first.class.name} #{tbs.first&.id} #{!tbs.first.new_record?}"
-        unless tbs[1].nil? || tbs.first.new_record?
-          # puts "Calling #{tbs[1].class.name} #{tbs[1]&.id} .#{tbs[2]} #{tbs[3].class.name} #{tbs[3]&.id}"
-          tbs[1].send(tbs[2], tbs[3])
-        end
+
+        next if tbs[1].nil? || # From a has_many?
+                tbs[0] == tbs[1] || # From a has_one?
+                tbs.first.new_record?
+
+        tbs[1].send(tbs[2], tbs[3])
       end
     end
 

data/lib/duty_free/suggest_template.rb

@@ -238,11 +238,11 @@ module DutyFree
           if klass.columns.map(&:name).include?(attrib)
             s << attrib
           else
-            bt_names = klass.reflect_on_all_associations.each_with_object([]) do |assoc, names|
-              names << assoc.name.to_s if assoc.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+            ho_and_bt_names = klass.reflect_on_all_associations.each_with_object([]) do |assoc, names|
+              names << assoc.name.to_s if assoc.belongs_to? || assoc.macro == :has_one
               names
             end
-            unless bt_names.include?(attrib)
+            unless ho_and_bt_names.include?(attrib)
               puts "* In the #{klass.name} model  \"validates_presence_of :#{attrib}\"  should be removed as it does not refer to any existing column."
               errored_columns << klass_col
             end

data/lib/duty_free/version_number.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duty_free
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Lorin Thwaits