brick 1.0.44 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d43e8d88203f6496d0e86f57a3de2638f254a74da070d6a0f0ae107bf596a87
-  data.tar.gz: d5ce2e3814f36fa758762e3c4774032c70ce18a101cdd1e30622dd86c757ab1a
+  metadata.gz: 678e1295006174594606dc731cd650afa60d2cc727be08bd416c9503faeb1ca4
+  data.tar.gz: b00802df45b7e388523b29cfab38feaaaf7c61d057cf509c71a6a08860373b15
 SHA512:
-  metadata.gz: 36b8bf590c1d980655b8c465e52659fdbcdf3e13b7050e46dcb41c2b3fba44ebc9ff14db823afddbb49b3e6b736a33fa1ef794ed6062aba4e35ade3cd95c5bbd
-  data.tar.gz: d1bd0954d0400068aaf8f7c83cc599f283fbe9c75e347fd4193d1fa3973c0d2bd3198f3265990cd3d24f406cd3b55f3174518bd6a991801c75a06d1c749cc157
+  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

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

@@ -168,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;
@@ -240,6 +240,10 @@ a.big-arrow {
 .dimmed {
   background-color: #C0C0C0;
 }
+.orphan {
+  color: red;
+  white-space: nowrap;
+}
 
 #revertTemplate {
   display: none;
@@ -255,13 +259,14 @@ 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
 
@@ -580,8 +585,8 @@ if (headerTop) {
                # 0..62 because Postgres column names are limited to 63 characters
                #{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 = bt_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) } if bt_id_col&.present? %>
+             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 %>
@@ -689,18 +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
+      <% when :integer, :decimal, :float %>
         <%= if col_type == :integer
               f.text_field k.to_sym, { pattern: '\\d*', class: 'check-validity' }
             else
@@ -710,10 +718,11 @@ end
            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 %>
+        <%=
+          # 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 %>
@@ -721,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 %>

data/lib/brick/version_number.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.44
+  version: 1.0.45
 platform: ruby
 authors:
 - Lorin Thwaits