brick 1.0.42 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a385c606282392cbefea1eaa045dc6a023bd05f56044013bc3835ef06a630b87
-  data.tar.gz: 261e21a2eb02ac1b199c831e1bba5eeec3add7b5faf0b2567fbb94a3252d817f
+  metadata.gz: 678e1295006174594606dc731cd650afa60d2cc727be08bd416c9503faeb1ca4
+  data.tar.gz: b00802df45b7e388523b29cfab38feaaaf7c61d057cf509c71a6a08860373b15
 SHA512:
-  metadata.gz: 686a6ad73671511c36c6871e86fd6d02f7b8b48b2e1bacb033ec5348a85cedfc1c6848c92293e4144c0ca95ab79888c5993dcdbb7f440d93265a6c65b5c74a6b
-  data.tar.gz: 04e0cb25404beb9fead5d07ff3c76066bc23d097fb2a01c53b689737e1a5d70cfef94b432b89f45f61497074171bb171fae0064aef970c2c025f3ce05de23557
+  metadata.gz: 7962bbc61bd43b68062d188ac3565e38f4840d52ca76b4c675e0da55d213104f13e007578658441359323899ed881d10497bb8285384abe42a2d15bd9c26b64b
+  data.tar.gz: 449e74d3ab9558eed77c89aac5a871927ed0842fc043c910d04d1cca29221508332a7def78940ed67048a29e4384576aa8a176beb117c0bc7ff8a48a87f64af6

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
@@ -354,6 +353,7 @@ module ActiveRecord
           next if bt[2] # Polymorphic?
 
           # join_array will receive this relation name when calling #brick_parse_dsl
+          # binding.pry if bt.length > 2
           bt_descrip[bt.first] = if bt[1].is_a?(Array)
                                    bt[1].each_with_object({}) { |bt_class, s| s[bt_class] = bt_class.brick_parse_dsl(join_array, bt.first, translations, true) }
                                  else
@@ -364,7 +364,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 +655,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 +755,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 +810,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]
@@ -826,8 +832,14 @@ class Object
                 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
+                  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 +850,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 +857,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

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;
@@ -236,6 +240,10 @@ a.big-arrow {
 .dimmed {
   background-color: #C0C0C0;
 }
+.orphan {
+  color: red;
+  white-space: nowrap;
+}
 
 #revertTemplate {
   display: none;
@@ -251,16 +259,16 @@ 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
+<% is_includes_dates = nil
 
 def is_bcrypt?(val)
   val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
@@ -334,7 +342,13 @@ window.addEventListener(\"pageshow\", function() {
   });
 
   if (tblSelect) { // Always present
-    tblSelect.value = changeout(location.href)[schemaSelect ? 1 : 0];
+    var i = schemaSelect ? 1 : 0,
+        changeoutList = changeout(location.href);
+    for (; i < changeoutList.length; ++i) {
+      tblSelect.value = changeoutList[i];
+      if (tblSelect.value !== \"\") break;
+    }
+
     tblSelect.addEventListener(\"change\", function () {
       var lhr = changeout(location.href, null, this.value);
       if (brickSchema)
@@ -357,7 +371,7 @@ function changeout(href, param, value, trimAfter) {
   }
   if (trimAfter) {
     var pathParts = hrefParts[0].split(\"/\");
-    while (pathParts.lastIndexOf(trimAfter) != pathParts.length - 1) pathParts.pop();
+    while (pathParts.lastIndexOf(trimAfter) !== pathParts.length - 1) pathParts.pop();
     hrefParts[0] = pathParts.join(\"/\");
   }
   var params = hrefParts.length > 1 ? hrefParts[1].split(\"&\") : [];
@@ -569,11 +583,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 %>
@@ -680,22 +694,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
@@ -704,6 +717,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 %>
@@ -711,7 +730,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 %>
@@ -757,6 +776,7 @@ end
 <script>
 flatpickr(\".datepicker\");
 flatpickr(\".datetimepicker\", {enableTime: true});
+flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 </script>
 <% end %>
 <script>
@@ -772,8 +792,11 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
         inp.checked = origVal;
       else
         inp.value = origVal;
-        revert.style.display = \"none\";
-        if (!inp._flatpickr) inp.focus();
+      revert.style.display = \"none\";
+      if (inp._flatpickr)
+        inp._flatpickr.setDate(origVal);
+      else
+        inp.focus();
     });
   inp.addEventListener(inp.type === \"checkbox\" ? \"change\" : \"input\", function (e) {
     if(inp.className.split(\" \").indexOf(\"check-validity\") > 0) {
@@ -787,7 +810,8 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
       // And if it was the result of selecting a date, the calendar can now close.
       if (inp._flatpickr &&
            // Test only for changes in the date portion of a date or datetime
-           ((giv = getInpVal()) && giv.split(' ')[0]) !== (prevVal && prevVal.split(' ')[0])
+           ((giv = getInpVal()) && (giv1 = giv.split(' ')[0])) !== (prevVal && prevVal.split(' ')[0]) &&
+           giv1.indexOf(\":\") < 0 // (definitely not any part of a time thing)
          )
         inp._flatpickr.close();
       prevVal = getInpVal();

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -224,8 +224,8 @@ 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[:multitenant][:schema_to_analyse].inspect}" :
+#{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.42
+  version: 1.0.45
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-10 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord