brick 1.0.231 → 1.0.233

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b36099e75ec27d9fa4522da84f319af2fb1c98997c629a5246c88a1e6ddcbe3
-  data.tar.gz: '089a28701ee39956f0447801c70f9f044aefd06638ab575f3a6307690746eca4'
+  metadata.gz: 153b8d0a95771a92fad553394bb1dd51633a971e7909b3a32e6cf548dacb2cb9
+  data.tar.gz: '094c6476db206319239def080ffc9349a4e8ec35c915e23a3cf1db3a5d8b425d'
 SHA512:
-  metadata.gz: 0b8ed54764ce53a403f47d0a42ff578445e9a4d03e60f973264bbafb07a8c6a7af8daf15736ceb172472d2919817d14673163b40fdfffbdd87d4511e759c3747
-  data.tar.gz: '0326081b5c6e69ab4f7a6fe94784c73996117db6c715e3b158bc0cde744245e213e53a50e5b5d01bcd44b6cb24d55022548c2a1c83a53de5ccbca04f23c66b65'
+  metadata.gz: 54c76ebb11fead41ed9ae33fee09e2e6e4685aa12c50c073a9da72d1004d08c2065b441d2bf272d06e8aacc2de16401c74636c61f65048d30e6b9d0bd49add8a
+  data.tar.gz: 1c391fa9c4acfbb9ce327d9da410e23ee9c1b183145f1a636ca5be91ac48b369346859432982033f74cf50de99f7d4f9c2011e7111eeefe4830bd76e45d5b931

data/lib/brick/version_number.rb

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

data/lib/generators/brick/airtable_api_caller.rb

@@ -15,6 +15,7 @@ You need only #{usage == :migrations ? 'this scope:' : "these three scopes:
 
 Please provide your Airtable PAT:"
         pat = gets_password
+        pat = ENV['AIRTABLE_PAT'] if pat.blank?
         require 'net/http'
         # Generate a list of bases that can be chosen
         bases = https_get('https://api.airtable.com/v0/meta/bases', pat)
@@ -52,22 +53,22 @@ Please provide your Airtable PAT:"
                               # Queue up to build associative table with two foreign keys
                               camelized = (assoc_name = "#{tbl_name}_#{col_name}_#{frn_tbl}").camelize
                               if associatives.keys.any? { |a| a.camelize == camelized }
-                                puts "Strangely have found two columns in \"#{table.name}\" with a name similar to \"#{col_name}\".  Skipping this to avoid a conflict."
+                                puts "Strangely have found two columns in \"#{table.name}\" with a name similar to \"#{col_name}\".  Skipping one to avoid a conflict."
                                 next
 
                               end
                               associatives[assoc_name] = [col_name, frn_tbl, tbl_name]
-                              fks << [assoc_name, frn_tbl, frn_tbl, col_name.underscore, tbl_name]
+                              fks << [assoc_name, frn_tbl, tbl_name, col_name.underscore, tbl_name]
                             end
                           end
                         else
                           # puts col['type']
                           dt = case col['type']
-                          when 'singleLineText', 'url', 'singleSelect'
+                          when 'singleLineText', 'url', 'email', 'singleSelect'
                             'string'
                           when 'multilineText'
                             'text'
-                          when 'number'
+                          when 'number', 'currency'
                             'decimal'
                           when 'checkbox'
                             'boolean'
@@ -94,18 +95,15 @@ Please provide your Airtable PAT:"
                       }
                     end
         associatives.each do |k, v|
-          pri_pk_col = relations[v[1]][:pkey]&.first&.last&.first
-          frn_pk_col = relations[v[2]][:pkey]&.first&.last&.first
           pri_fk_name = "#{v[1]}_id"
-          frn_fk_name = (frn_fk_name == pri_fk_name) ?
-            "#{v[2]}_2_id" # Self-referencing N:M
-            : "#{v[2]}_id" # Standard N:M
+          frn_fk_base = (v[1] == v[2]) ? "#{v[2]}_2" : v[2] # Accommodates self-referencing N:Ms
+          frn_fk_name = "#{frn_fk_base}_id"
           relations[k] = {
             pkey: { "#{k}_pkey" => ['id'] },
             cols: { 'id' => ['integer', nil, false, false] }
           }
-          fks << [v[1], pri_fk_name, k, pri_fk_name.underscore]
-          fks << [v[2], frn_fk_name, k, frn_fk_name.underscore]
+          fks << [v[1], pri_fk_name, k, v[0].underscore]
+          fks << [v[2], frn_fk_name, k, frn_fk_base.underscore]
         end
         fk_idx = 0
         fks.each do |pri_tbl, fk_col, frn_tbl, airtable_col, assoc_tbl|
@@ -142,7 +140,7 @@ Please provide your Airtable PAT:"
       end
 
       def sane_name(col_name)
-        sane_table_name(col_name.gsub('&', 'and').tr('()?', ''))
+        sane_table_name(col_name.gsub('&', 'and').tr('()?', '').tr('/', '_'))
       end
 
       def sane_table_name(tbl_name)

data/lib/generators/brick/migrations_builder.rb

@@ -183,7 +183,9 @@ module Brick
               #         to_table               column
               mig << "#{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
             end
-            if after_fks.length > 500
+            # If there are LOTS of foreign keys then give extra database maintenance info and initially
+            # disable the final FK migration by using a ".rbx" file extension.
+            fks_extension = if after_fks.length > 500
               minutes = (after_fks.length + 1000) / 1500
               mig << "    if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'\n"
               mig << "      puts 'NOTE:  It could take around #{minutes} #{'minute'.pluralize(minutes)} on a FAST machine for Postgres to do all the final processing for these foreign keys.  Please be patient!'\n"
@@ -194,14 +196,19 @@ module Brick
       execute('VACUUM FULL')
       execute('BEGIN TRANSACTION')
     end\n"
+              'rbx'
+            else
+              'rb'
             end
             mig << +"  end\n"
             current_mig_time[0] += 1.minute
-            versions_to_create << migration_file_write(mig_path, 'create_brick_fks.rbx', current_mig_time, ar_version, mig)
-            puts "Have written out a final migration called 'create_brick_fks.rbx' which creates #{after_fks.length} foreign keys.
-  This file extension (.rbx) will cause it not to run yet when you do a 'rails db:migrate'.
+            versions_to_create << migration_file_write(mig_path, "create_brick_fks.#{fks_extension}", current_mig_time, ar_version, mig)
+            puts "Have written out a final migration called 'create_brick_fks.#{fks_extension}' which creates #{after_fks.length} foreign keys."
+            if fks_extension == 'rbx'
+              puts "  This file extension (.rbx) will cause it not to run yet when you do a 'rails db:migrate'.
   The idea here is to do all data loading first, and then rename that migration file back
   into having a .rb extension, and run a final db:migrate to put the foreign keys in place."
+            end
 
           when 'Create' # Show additional_references entries that can be added into brick.rb
             puts 'Place this block into your brick.rb file:'

data/lib/generators/brick/seeds_builder.rb

@@ -161,14 +161,15 @@ module Brick
                   if relation[:cols].keys.include?(col_name = ::Brick::AirtableApiCaller.sane_name(field.first))
                     s[col_name] = obj['fields'][field.first]
                   else # Consider N:M fks
-                    nm_fk = relation[:fks].find do |_k, fk1|
-                      relations[fk1[:assoc_tbl]]&.fetch(:fks, nil)&.find { |_k, fk2| fk2[:assoc_name] == col_name }
-                    end&.last
-                    if (t_table = nm_fk&.fetch(:inverse_table, nil))
+                    hm_fk = relation[:fks].find { |_k, fk1| !fk1[:is_bt] && fk1[:assoc_name] == ::Brick::AirtableApiCaller.sane_name(field.first) }&.last
+                    if (assoc_table = hm_fk&.fetch(:inverse_table, nil))
+                      associative_fks = relations[assoc_table][:fks]
+                      # near_side_fk = associative_fks.find { |_k, fk1| fk1[:is_bt] && fk1[:assoc_name] == ::Brick::AirtableApiCaller.sane_name(field.first) }&.last
+                      far_side_fk = associative_fks.find { |_k, fk1| fk1[:is_bt] && fk1[:assoc_name] != ::Brick::AirtableApiCaller.sane_name(field.first) }&.last
                       field.last.each do |nm_rec|
-                        nm_fk_col = nm_fk[:assoc_tbl]
-                        airtable_assoc_recids[t_table] << "#{nm_fk[:fk]}: #{nm_fk[:fk].singularize}_#{obj['id'][3..-1]}, " \
-                                                          "#{nm_fk_col}: #{nm_fk_col.singularize}_#{nm_rec[3..-1]}"
+                        # Can trade out:  hm_fk[:fk]  for:  near_side_fk[:inverse_table]
+                        airtable_assoc_recids[assoc_table] << "#{hm_fk[:fk]}: #{hm_fk[:fk].singularize}_#{nm_rec[3..-1]}, " \
+                                                              "#{far_side_fk[:assoc_name]}: #{far_side_fk[:inverse_table].singularize}_#{obj['id'][3..-1]}"
                       end
                     end
                   end
@@ -183,7 +184,7 @@ module Brick
               is_empty = false
               # For Airtable, take off the "rec___" prefix
               pk_val = is_airtable ? airtable_id[3..-1] : brick_escape(obj.attributes_before_type_cast[pkey_cols.first])
-              var_name = "#{tbl.gsub('.', '__')}_#{pk_val}"
+              var_name = "#{tbl.singularize.gsub('.', '__')}_#{pk_val}"
               fk_vals = []
               data = []
               updates = []
@@ -203,6 +204,7 @@ module Brick
                 if fk
                   inv_tbl = fk[:inverse_table].gsub('.', '__')
                   fk_val = if is_airtable
+                    inv_tbl = inv_tbl.singularize
                     # Used to be:  fk[:airtable_col]
                     # Take off the "rec___" prefix
                     obj.attributes_before_type_cast[fk[:assoc_name]]&.first&.[](3..-1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.231
+  version: 1.0.233
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord