brick 1.0.43 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8387796a98b0bcf24586c6b31f091cfdc4cca1b45b73d02de3bdba17430625f7
-  data.tar.gz: 1c7509e21a1a9a6c8c52f3015b0a7e34222ff944433e028be314f8525ee948b8
+  metadata.gz: 1442fb46672a819689a1f15aa16e2dd53647a057ea38948431746d3d8baf66f0
+  data.tar.gz: 38d26e09e226d37e87737cba35f76ee3b2413dc4474ac8ecba582297205789aa
 SHA512:
-  metadata.gz: 75222971d2407d8ffb3b8412694da3fe6ad0d3f27f147159f6d75aa712d1dfe8a9d54627cb2c816fdfc8cb7c44de4407f180fbc559b9c811719c22a016c913f5
-  data.tar.gz: 44e03a9d2ddec85969d5b1aca67a9426a4b3dd33f196c058d57b380fa77e78424768dd3e97a40227b2372bec4ccd81dfd1b7760b65e2c5b292c8b47c0d27e2c7
+  metadata.gz: 8cb9e747cffb1e33f045f07656891b8e17ac4349661f897aa01886bae6fb7c2e4687f1021e04173266ab60cf330ec71f58514aeb670669f30ea8c6dd4140e943
+  data.tar.gz: 54166ef84adaeab00c2d6408e9a9a6c5da5998bd278b0db490943d2d8da2701938cdc87a4c40ff65ac2cbe7196a7eb014a4b3b08dfd2ff5aa2ec426af00d38ab

data/lib/brick/extensions.rb

@@ -274,7 +274,6 @@ module ActiveRecord
             table = table.left
           end
           (_brick_chains[table._arel_table_type] ||= []) << (alias_name || table.table_alias || table.name)
-          # puts "YES! #{self.object_id}"
         end
         # rubocop:enable Style/IdenticalConditionalBranches
       when Arel::Table # Table
@@ -286,9 +285,9 @@ module ActiveRecord
         # Spin up an empty set of Brick alias name chains at the start
         @_brick_chains = {}
         # The left side is the "FROM" table
-        # names += _recurse_arel(piece.left)
         names << (this_name = [piece.left._arel_table_type, (piece.left.table_alias || piece.left.name)])
-        (_brick_chains[this_name.first] ||= []) << this_name.last
+        # # Do not currently need the root "FROM" table in our list of chains
+        # (_brick_chains[this_name.first] ||= []) << this_name.last
         # The right side is an array of all JOINs
         piece.right.each { |join| names << _recurse_arel(join) }
       end
@@ -364,7 +363,12 @@ module ActiveRecord
         hms.each do |k, hm|
           next if skip_klass_hms.key?(k)
 
-          hm_counts[k] = hm
+          if hm.macro == :has_one
+            # For our purposes a :has_one is similar enough to a :belongs_to that we can just join forces
+            bt_descrip[k] = { hm.klass => hm.klass.brick_parse_dsl(join_array, k, translations) }
+          else # Standard :has_many
+            hm_counts[k] = hm
+          end
         end
       end
 
@@ -650,10 +654,11 @@ class Object
   private
 
     def build_model(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
-      full_name = if (::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') && schema_name == Apartment.default_schema)
-                    relation = relations["#{schema_name}.#{matching}"]
-                    inheritable_name || model_name
-                  elsif schema_name.blank?
+      if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+         schema_name == Apartment.default_schema
+        relation = relations["#{schema_name}.#{matching}"]
+      end
+      full_name = if relation || schema_name.blank?
                     inheritable_name || model_name
                   else # Prefix the schema to the table name + prefix the schema namespace to the class name
                     schema_module = if schema_name.instance_of?(Module) # from an auto-STI namespace?
@@ -749,10 +754,10 @@ class Object
               if assoc[:is_bt]
                 invs = invs.first # Just do the first one of what would be multiple identical polymorphic belongs_to
               else
-                invs.each { |inv| build_bt_or_hm(relations, model_name, relation, hmts, assoc, inverse_assoc_name, inv, code) }
+                invs.each { |inv| build_bt_or_hm(full_name, relations, relation, hmts, assoc, inverse_assoc_name, inv, code) }
               end
             end
-            build_bt_or_hm(relations, model_name, relation, hmts, assoc, inverse_assoc_name, invs, code) unless invs.is_a?(Array)
+            build_bt_or_hm(full_name, relations, relation, hmts, assoc, inverse_assoc_name, invs, code) unless invs.is_a?(Array)
             hmts
           end
           # # Not NULLables
@@ -804,7 +809,7 @@ class Object
       [built_model, code]
     end
 
-    def build_bt_or_hm(relations, model_name, relation, hmts, assoc, inverse_assoc_name, inverse_table, code)
+    def build_bt_or_hm(full_name, relations, relation, hmts, assoc, inverse_assoc_name, inverse_table, code)
       singular_table_name = inverse_table&.singularize
       options = {}
       macro = if assoc[:is_bt]
@@ -825,9 +830,15 @@ class Object
                   need_fk = "#{assoc_name}_id" != assoc[:fk]
                 end
                 if (inverse = assoc[:inverse])
-                  inverse_assoc_name, _x = _brick_get_hm_assoc_name(relations[inverse_table], inverse)
-                  has_ones = ::Brick.config.has_ones&.fetch(inverse[:alternate_name].camelize, nil)
-                  if has_ones&.key?(singular_inv_assoc_name = ActiveSupport::Inflector.singularize(inverse_assoc_name))
+                  # If it's multitenant with something like:  public.____ ...
+                  if (it_parts = inverse_table.split('.')).length > 1 &&
+                     ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+                     it_parts.first == Apartment.default_schema
+                    it_parts.shift # ... then ditch the generic schema name
+                  end
+                  inverse_assoc_name, _x = _brick_get_hm_assoc_name(relations[inverse_table], inverse, it_parts.join('_').singularize)
+                  has_ones = ::Brick.config.has_ones&.fetch(it_parts.join('/').singularize.camelize, nil)
+                  if has_ones&.key?(singular_inv_assoc_name = ActiveSupport::Inflector.singularize(inverse_assoc_name.tr('.', '_')))
                     inverse_assoc_name = if has_ones[singular_inv_assoc_name]
                                            need_inverse_of = true
                                            has_ones[singular_inv_assoc_name]
@@ -838,7 +849,6 @@ class Object
                 end
                 :belongs_to
               else
-                # need_class_name = ActiveSupport::Inflector.singularize(assoc_name) == ActiveSupport::Inflector.singularize(table_name.underscore)
                 # Are there multiple foreign keys out to the same table?
                 assoc_name, need_class_name = _brick_get_hm_assoc_name(relation, assoc)
                 if assoc.key?(:polymorphic)
@@ -846,8 +856,8 @@ class Object
                 else
                   need_fk = "#{ActiveSupport::Inflector.singularize(assoc[:inverse][:inverse_table].split('.').last)}_id" != assoc[:fk]
                 end
-                # fks[table_name].find { |other_assoc| other_assoc.object_id != assoc.object_id && other_assoc[:assoc_name] == assoc[assoc_name] }
-                if (has_ones = ::Brick.config.has_ones&.fetch(model_name, nil))&.key?(singular_assoc_name = ActiveSupport::Inflector.singularize(assoc_name))
+                has_ones = ::Brick.config.has_ones&.fetch(full_name, nil)
+                if has_ones&.key?(singular_assoc_name = ActiveSupport::Inflector.singularize(assoc_name.tr('.', '_')))
                   assoc_name = if (custom_assoc_name = has_ones[singular_assoc_name])
                                  need_class_name = custom_assoc_name != singular_assoc_name
                                  custom_assoc_name
@@ -1074,9 +1084,9 @@ class Object
       [built_controller, code]
     end
 
-    def _brick_get_hm_assoc_name(relation, hm_assoc)
+    def _brick_get_hm_assoc_name(relation, hm_assoc, source = nil)
       if (relation[:hm_counts][hm_assoc[:assoc_name]]&.> 1) &&
-         hm_assoc[:alternate_name] != hm_assoc[:inverse][:assoc_name]
+         hm_assoc[:alternate_name] != (source || name.underscore)
         plural = ActiveSupport::Inflector.pluralize(hm_assoc[:alternate_name])
         new_alt_name = (hm_assoc[:alternate_name] == name.underscore) ? "#{hm_assoc[:assoc_name].singularize}_#{plural}" : plural
         # uniq = 1

data/lib/brick/frameworks/rails/engine.rb

@@ -129,7 +129,11 @@ module Brick
 "#{assoc_name}\n"
                                      end
                                    else # has_one
-"<%= obj = #{obj_name}.#{hm.first}; link_to(obj.brick_descrip, obj) if obj %>\n"
+                                     # 0..62 because Postgres column names are limited to 63 characters
+"<%= descrips = @_brick_bt_descrip[#{hm.first.inspect}][ho_class = #{hm[1].klass.name}]
+     ho_txt = ho_class.brick_descrip(#{obj_name}, descrips[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, (ho_id_col = descrips.last))
+     ho_id = ho_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) }
+     ho_id&.first ? link_to(ho_txt, send(\"#\{ho_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, ho_id)) : ho_txt %>\n"
                                    end
                   when 'show', 'update'
                     hm_stuff << if hm_fk_name
@@ -164,10 +168,10 @@ module Brick
 }
 
 #headerTop {
-	position: sticky;
-	top: 0px;
-	background-color: white;
-	z-index: 1;
+  position: sticky;
+  top: 0px;
+  background-color: white;
+  z-index: 1;
 }
 table {
   border-collapse: collapse;
@@ -214,9 +218,6 @@ table tbody tr.active-row {
   color: #009879;
 }
 
-td.val {
-  display: block;
-}
 a.show-arrow {
   font-size: 1.5em;
   text-decoration: none;
@@ -236,6 +237,10 @@ a.big-arrow {
 .dimmed {
   background-color: #C0C0C0;
 }
+.orphan {
+  color: red;
+  white-space: nowrap;
+}
 
 #revertTemplate {
   display: none;
@@ -251,13 +256,13 @@ input+svg.revert {
   top: 0.5em;
 }
 
-input[type=submit] {
+.update {
+  position: sticky;
+  right: 1em;
+  float: right;
   background-color: #004998;
   color: #FFF;
 }
-.right {
-  text-align: right;
-}
 </style>
 <% is_includes_dates = nil
 
@@ -574,11 +579,11 @@ if (headerTop) {
            else
              bt_txt = (bt_class = bt[1].first.first).brick_descrip(
                # 0..62 because Postgres column names are limited to 63 characters
-               #{obj_name}, (descrips = @_brick_bt_descrip[bt.first][bt_class])[0..-2].map { |z| #{obj_name}.send(z.last[0..62]) }, (bt_id_col = descrips.last)
+               #{obj_name}, (descrips = @_brick_bt_descrip[bt.first][bt_class])[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, (bt_id_col = descrips.last)
              )
-             bt_txt ||= \"<< Orphaned ID: #\{val} >>\" if val
-             bt_id = #{obj_name}.send(*bt_id_col) if bt_id_col&.present? %>
-          <%= bt_id ? link_to(bt_txt, send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_id)) : bt_txt %>
+             bt_txt ||= \"<span class=\\\"orphan\\\">&lt;&lt; Orphaned ID: #\{val} >></span>\".html_safe if val
+             bt_id = bt_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) } %>
+          <%= bt_id&.first ? link_to(bt_txt, send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_id)) : bt_txt %>
           <%#= Previously was:  bt_obj = bt[1].first.first.find_by(bt[2] => val); link_to(bt_obj.brick_descrip, send(\"#\{bt[1].first.first.name.underscore\}_path\".to_sym, bt_obj.send(bt[1].first.first.primary_key.to_sym))) if bt_obj %>
         <% end %>
       <% else %>
@@ -676,7 +681,7 @@ end
       <%= k %>
     <% end %>
     </th>
-    <td class=\"val\">
+    <td>
     <% dt_pickers = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
     if bt
       html_options = { prompt: \"Select #\{bt_name\}\" }
@@ -685,22 +690,21 @@ end
       <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
             link_to('⇛', send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
           elsif val
-            \"<span>Orphaned ID: #\{val}</span>\".html_safe
+            \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
           end %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
-    <% else case (col_type = #{model_name}.column_for_attribute(k).type)
+    <% else
+    html_options = {}
+    html_options[:class] = 'dimmed' unless val
+    case (col_type = #{model_name}.column_for_attribute(k).type)
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>
           <%= hide_bcrypt(val, 1000) %>
         <% else %>
-          <div class=\"wide-input\"><%= f.text_field k.to_sym %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg></div>
+          <div class=\"wide-input\"><%= f.text_field(k.to_sym, html_options) %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg></div>
         <% end %>
       <% when :boolean %>
         <%= f.check_box k.to_sym %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
-      <% when :integer, :decimal, :float
-         # What happens when keys are UUID?
-         # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
-         # If it's not yet enabled then:  enable_extension 'uuid-ossp'
-         # ActiveUUID gem created a new :uuid type %>
+      <% when :integer, :decimal, :float %>
         <%= if col_type == :integer
               f.text_field k.to_sym, { pattern: '\\d*', class: 'check-validity' }
             else
@@ -709,6 +713,12 @@ end
       <% when *dt_pickers.keys
            is_includes_dates = true %>
         <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
+      <% when :uuid %>
+        <%=
+          # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
+          # If it's not yet enabled then:  enable_extension 'uuid-ossp'
+          # ActiveUUID gem created a new :uuid type
+          val %>
       <% when :binary, :primary_key %>
       <% end %>
     <% end %>
@@ -716,7 +726,7 @@ end
     </tr>
   <% end
   if has_fields %>
-    <tr><td colspan=\"2\" class=\"right\"><%= f.submit %></td></tr>
+    <tr><td colspan=\"2\"><%= f.submit({ class: 'update' }) %></td></tr>
   <% else %>
     <tr><td colspan=\"2\">(No displayable fields)</td></tr>
   <% end %>

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -224,7 +224,7 @@ module Brick
 # # Database schema to use when analysing existing data, such as deriving a list of polymorphic classes in the case that
 # # it wasn't originally specified.
 # Brick.schema_behavior = :namespaced
-#{Brick.config.schema_behavior ? "Brick.schema_behavior = { multitenant: { schema_to_analyse: #{
+#{Brick.config.schema_behavior.present? ? "Brick.schema_behavior = { multitenant: { schema_to_analyse: #{
   Brick.config.schema_behavior[:multitenant]&.fetch(:schema_to_analyse, nil).inspect}" :
 "# Brick.schema_behavior = { multitenant: { schema_to_analyse: 'engineering'"
 } } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.46
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord