duty_free 1.0.0 → 1.0.5

data/lib/duty_free/suggest_template.rb

@@ -40,26 +40,25 @@ 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."
@@ -167,7 +166,7 @@ module DutyFree
                 # belongs_to is more involved since there may be multiple foreign keys which point
                 # from the foreign table to this primary one, so exclude all these links.
                 _find_belongs_tos(assoc.first.last, assoc.last, errored_assocs).map do |f_assoc|
-                  [f_assoc.foreign_key.to_s, f_assoc.active_record]
+                  [[f_assoc.foreign_key.to_s], f_assoc.active_record]
                 end
               end
             # puts "New Poison: #{new_poison_links.inspect}"
@@ -182,7 +181,8 @@ 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
@@ -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,18 +238,24 @@ 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
+            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)
+              names
+            end
+            unless 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
     end
 
-    # Show a "pretty" version of IMPORT_COLUMNS, to be placed in a model
+    # Show a "pretty" version of IMPORT_TEMPLATE, to be placed in a model
     def self._template_pretty_print(template, indent = 0, child_count = 0, is_hash_in_hash = false)
       unless indent.negative?
         if indent.zero?
-          print 'IMPORT_COLUMNS = '
+          print 'IMPORT_TEMPLATE = '
         else
           puts unless is_hash_in_hash
         end
@@ -305,7 +309,7 @@ module DutyFree
       if indent == 2
         puts
         indent = 0
-        puts '}'
+        puts '}.freeze'
       elsif indent >= 0
         print "#{' ' unless child_count.zero?}}"
       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.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
       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.name
+        # The right side is an array of all JOINs
+        names += piece.right.inject([]) { |s, v| s + _recurse_arel(v) }
       end
       names
     end
@@ -57,11 +71,11 @@ module DutyFree
       prefixes.reject(&:blank?).join(separator || '.')
     end
 
-    def self._clean_name(name, import_columns_as)
+    def self._clean_name(name, import_template_as)
       return name if name.is_a?(Symbol)
 
       # Expand aliases
-      (import_columns_as || []).each do |k, v|
+      (import_template_as || []).each do |k, v|
         if (k[-1] == ' ' && name.start_with?(k)) || name == k
           name.replace(v + name[k.length..-1])
           break

data/lib/duty_free/version_number.rb

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

data/lib/generators/duty_free/USAGE

@@ -1,2 +1,2 @@
 Description:
-  Generates (but does not run) a migration to add a versions table.
+  Modifies an existing model so that it includes an IMPORT_TEMPLATE.

data/lib/generators/duty_free/install_generator.rb

@@ -4,18 +4,10 @@ require 'rails/generators'
 require 'rails/generators/active_record'
 
 module DutyFree
-  # Installs DutyFree in a rails app.
+  # Auto-generates an IMPORT_TEMPLATE entry for one or more models
   class InstallGenerator < ::Rails::Generators::Base
     include ::Rails::Generators::Migration
 
-    # Class names of MySQL adapters.
-    # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
-    # - `Mysql2Adapter` - Used by `mysql2` gem.
-    MYSQL_ADAPTERS = [
-      'ActiveRecord::ConnectionAdapters::MysqlAdapter',
-      'ActiveRecord::ConnectionAdapters::Mysql2Adapter'
-    ].freeze
-
     source_root File.expand_path('templates', __dir__)
     class_option(
       :with_changes,
@@ -68,8 +60,14 @@ module DutyFree
       "[#{major}.#{ActiveRecord::VERSION::MINOR}]"
     end
 
+    # Class names of MySQL adapters.
+    # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
+    # - `Mysql2Adapter` - Used by `mysql2` gem.
     def mysql?
-      MYSQL_ADAPTERS.include?(ActiveRecord::Base.connection.class.name)
+      [
+        'ActiveRecord::ConnectionAdapters::MysqlAdapter',
+        'ActiveRecord::ConnectionAdapters::Mysql2Adapter'
+      ].freeze.include?(ActiveRecord::Base.connection.class.name)
     end
 
     # Even modern versions of MySQL still use `latin1` as the default character

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duty_free
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-20 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:
   - - ">="