duty_free 1.0.2 → 1.0.7

data/lib/duty_free/suggest_template.rb

@@ -40,33 +40,32 @@ module DutyFree
       assocs = {}
       this_klass.reflect_on_all_associations.each do |assoc|
         # PolymorphicReflection AggregateReflection RuntimeReflection
-        is_belongs_to = assoc.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+        is_belongs_to = assoc.belongs_to? # is_a?(ActiveRecord::Reflection::BelongsToReflection)
         # Figure out if it's belongs_to, has_many, or has_one
+        # HasAndBelongsToManyReflection
         belongs_to_or_has_many =
           if is_belongs_to
             'belongs_to'
-          elsif (is_habtm = assoc.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection))
+          elsif (is_habtm = assoc.respond_to?(:macro) ? (assoc.macro == :has_and_belongs_to_many) : assoc.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection))
             'has_and_belongs_to_many'
+          elsif assoc.respond_to?(:macro) ? (assoc.macro == :has_many) : assoc.is_a?(ActiveRecord::Reflection::HasManyReflection)
+            'has_many'
           else
-            (assoc.is_a?(ActiveRecord::Reflection::HasManyReflection) ? 'has_many' : 'has_one')
+            'has_one'
           end
         # Always process belongs_to, and also process has_one and has_many if do_has_many is chosen.
         # Skip any HMT or HABTM. (Maybe break out HABTM into a combo HM and BT in the future.)
         if is_habtm
-          unless ActiveRecord::Base.connection.table_exists?(assoc.join_table)
-            puts "* In the #{this_klass.name} model there's a problem with:  \"has_and_belongs_to_many :#{assoc.name}\"  because join table \"#{assoc.join_table}\" does not exist.  You can create it with a create_join_table migration."
-          end
+          puts "* In the #{this_klass.name} model there's a problem with:  \"has_and_belongs_to_many :#{assoc.name}\"  because join table \"#{assoc.join_table}\" does not exist.  You can create it with a create_join_table migration." unless ActiveRecord::Base.connection.table_exists?(assoc.join_table)
           # %%% Search for other associative candidates to use instead of this HABTM contraption
-          if assoc.options.include?(:through)
-            puts "* In the #{this_klass.name} model there's a problem with:  \"has_and_belongs_to_many :#{assoc.name}\"  because it includes \"through: #{assoc.options[:through].inspect}\" which is pointless and should be removed."
-          end
+          puts "* In the #{this_klass.name} model there's a problem with:  \"has_and_belongs_to_many :#{assoc.name}\"  because it includes \"through: #{assoc.options[:through].inspect}\" which is pointless and should be removed." if assoc.options.include?(:through)
         end
         if (is_through = assoc.is_a?(ActiveRecord::Reflection::ThroughReflection)) && assoc.options.include?(:as)
           puts "* In the #{this_klass.name} model there's a problem with:  \"has_many :#{assoc.name} through: #{assoc.options[:through].inspect}\"  because it also includes \"as: #{assoc.options[:as].inspect}\", so please choose either for this line to be a \"has_many :#{assoc.name} through:\" or to be a polymorphic \"has_many :#{assoc.name} as:\".  It can't be both."
         end
         next if is_through || is_habtm || (!is_belongs_to && !do_has_many) || errored_assocs.include?(assoc)
 
-        if is_belongs_to && assoc.polymorphic? # Polymorphic belongs_to?
+        if is_belongs_to && assoc.options[:polymorphic] # Polymorphic belongs_to?
           # Load all models
           # %%% Note that this works in Rails 5.x, but may not work in Rails 6.0 and later, which uses the Zeitwerk loader by default:
           Rails.configuration.eager_load_namespaces.select { |ns| ns < Rails::Application }.each(&:eager_load!)
@@ -90,7 +89,7 @@ module DutyFree
           end
         else
           # Is it a polymorphic has_many, which is defined using as: :somethingable ?
-          is_polymorphic_hm = assoc.inverse_of&.polymorphic?
+          is_polymorphic_hm = assoc.inverse_of&.options&.fetch(:polymorphic) { nil }
           begin
             # Standard has_one, or has_many, and belongs_to uses assoc.klass.
             # Also polymorphic belongs_to uses assoc.klass.
@@ -106,9 +105,9 @@ module DutyFree
               [[[fk], assoc.active_record], assoc_klass]
             else # has_many or has_one
               inverse_foreign_keys = is_polymorphic_hm ? [assoc.type, assoc.foreign_key] : [assoc.inverse_of&.foreign_key&.to_s]
-              puts "* Missing inverse foreign key for #{assoc.inspect}" if inverse_foreign_keys.first.nil?
               missing_key_columns = inverse_foreign_keys - assoc_klass.columns.map(&:name)
               if missing_key_columns.empty?
+                puts "* Missing inverse foreign key for #{this_klass.name} #{belongs_to_or_has_many} :#{assoc.name}" if inverse_foreign_keys.first.nil?
                 # puts "Has columns #{inverse_foreign_keys.inspect}"
                 [[inverse_foreign_keys, assoc_klass], assoc_klass]
               else
@@ -182,10 +181,11 @@ module DutyFree
     # Find belongs_tos for this model to one more more other klasses
     def self._find_belongs_tos(klass, to_klass, errored_assocs)
       klass.reflect_on_all_associations.each_with_object([]) do |bt_assoc, s|
-        next unless bt_assoc.is_a?(ActiveRecord::Reflection::BelongsToReflection) && !errored_assocs.include?(bt_assoc)
+        # .is_a?(ActiveRecord::Reflection::BelongsToReflection)
+        next unless bt_assoc.belongs_to? && !errored_assocs.include?(bt_assoc)
 
         begin
-          s << bt_assoc if !bt_assoc.polymorphic? && bt_assoc.klass == to_klass
+          s << bt_assoc if !bt_assoc.options[:polymorphic] && bt_assoc.klass == to_klass
         rescue NameError
           errored_assocs << bt_assoc
           puts "* In the #{bt_assoc.active_record.name} model  \"belongs_to :#{bt_assoc.name}\"  could not find a model named #{bt_assoc.class_name}."
@@ -203,9 +203,7 @@ module DutyFree
 
       # Requireds takes its cues from all attributes having a presence validator
       requireds = _find_requireds(klass)
-      if priority_excluded_columns
-        klass_columns = klass_columns.reject { |col| priority_excluded_columns.include?(col.name) }
-      end
+      klass_columns = klass_columns.reject { |col| priority_excluded_columns.include?(col.name) } if priority_excluded_columns
       excluded_columns = %w[created_at updated_at deleted_at]
       unique = [(
         # Find the first text field of a required if one exists
@@ -240,8 +238,14 @@ module DutyFree
           if klass.columns.map(&:name).include?(attrib)
             s << attrib
           else
-            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
+            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 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
           end
         end
       end

data/lib/duty_free/util.rb

@@ -35,20 +35,34 @@ module DutyFree
         end
 
       # ActiveRecord AREL objects
-      elsif piece.is_a?(Arel::Nodes::JoinSource)
-        # The left side is the "FROM" table
-        # names += _recurse_arel(piece.left)
-        # The right side is an array of all JOINs
-        names += piece.right.inject([]) { |s, v| s + _recurse_arel(v) }
       elsif piece.is_a?(Arel::Nodes::Join) # INNER or OUTER JOIN
-        # The left side is the "JOIN" table
-        names += _recurse_arel(piece.left)
-        # (The right side of these is the "ON" clause)
+        # rubocop:disable Style/IdenticalConditionalBranches
+        if piece.right.is_a?(Arel::Table) # Came in from AR < 3.2?
+          # Arel 2.x and older is a little curious because these JOINs work "back to front".
+          # The left side here is either another earlier JOIN, or at the end of the whole tree, it is
+          # the first table.
+          names += _recurse_arel(piece.left)
+          # The right side here at the top is the very last table, and anywhere else down the tree it is
+          # the later "JOIN" table of this pair.  (The table that comes after all the rest of the JOINs
+          # from the left side.)
+          names << (piece.right.table_alias || piece.right.name)
+        else # "Normal" setup, fed from a JoinSource which has an array of JOINs
+          # The left side is the "JOIN" table
+          names += _recurse_arel(piece.left)
+          # (The right side of these is the "ON" clause)
+        end
+        # rubocop:enable Style/IdenticalConditionalBranches
       elsif piece.is_a?(Arel::Table) # Table
-        names << piece.name
+        names << (piece.table_alias || piece.name)
       elsif piece.is_a?(Arel::Nodes::TableAlias) # Alias
         # Can get the real table name from:  self._recurse_arel(piece.left)
         names << piece.right.to_s # This is simply a string; the alias name itself
+      elsif piece.is_a?(Arel::Nodes::JoinSource) # Leaving this until the end because AR < 3.2 doesn't know at all about JoinSource!
+        # The left side is the "FROM" table
+        # names += _recurse_arel(piece.left)
+        names << (piece.left.table_alias || piece.left.name)
+        # The right side is an array of all JOINs
+        names += piece.right.inject([]) { |s, v| s + _recurse_arel(v) }
       end
       names
     end

data/lib/duty_free/version_number.rb

@@ -5,7 +5,7 @@ module DutyFree
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 2
+    TINY = 7
 
     # 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.7
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -204,10 +204,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-description: |
-  An ActiveRecord extension that simplifies importing and exporting of data
-  stored in one or more models.  Source and destination can be CSV, XLS,
-  XLSX, ODT, HTML tables, or simple Ruby arrays.
+description: 'Simplify data imports and exports with this slick ActiveRecord extension
+
+'
 email: lorint@gmail.com
 executables: []
 extensions: []
@@ -243,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.3.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="