brick 1.0.61 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67de1c0cde3f28379388dfe0c2aa488197c5cfaad1a108408b506ba66ab64b38
-  data.tar.gz: 7d3e40960043e5e09e483dee791dd5f7c1d0f54f692a39ec2ef85b1b5cba1073
+  metadata.gz: c48ee6a2f143563e2e443f6edf0dc0e04e800e8fae6951e05b0362956129e950
+  data.tar.gz: f632f6e795dcf9b3aeb97e36a37c8074302c5967206b5f415a9a4b862bb4fda7
 SHA512:
-  metadata.gz: 90ae5f021e562d3188c4bde03e9b71a744417c5223f5736cff97cce90646b8b06860b245dcb718414fdce00df2c772bcbe1ad0d102310d7f3ff030641591387d
-  data.tar.gz: 704f2dde1c0043a141d96ff272346ac583e7f784df494bb4ce39f4bf5e2cd06ffadfa37783a1bfb0671c5a5fd120819c9f286e5c9bd0608764aa10338840d881
+  metadata.gz: 0cd5e05899a2f780a0bbf378f8f49e49f604b90cf122f2cd7efe34839c434af814c9a228f36bd18b112cd8e40b6736e88742ea0f2a1a0b55ac3f8f573e614918
+  data.tar.gz: a34a9f47746159f6b4b39f8a3cd994055e022be9eefe8737b73c63e5d475b283ae3b99a6a11e3faf140ca6efbf67d7f400e03147a757c237c8875f11ea2c0ea4

data/lib/brick/extensions.rb

@@ -1132,6 +1132,7 @@ class Object
           @_brick_bt_descrip = model._br_bt_descrip
           @_brick_hm_counts = model._br_hm_counts
           @_brick_join_array = join_array
+          @_brick_erd = params['_brick_erd']&.to_i
         end
 
         _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk))
@@ -1542,8 +1543,10 @@ module ActiveRecord::ConnectionHandling
         ON kcu.CONSTRAINT_SCHEMA = tc.CONSTRAINT_SCHEMA
         AND kcu.TABLE_NAME = tc.TABLE_NAME
         AND kcu.CONSTRAINT_NAME = tc.constraint_name
-    WHERE t.table_schema #{
-         is_postgres ? "NOT IN ('information_schema', 'pg_catalog')" : "= '#{ActiveRecord::Base.connection.current_database.tr("'", "''")}'"}#{"
+    WHERE t.table_schema #{is_postgres ?
+        "NOT IN ('information_schema', 'pg_catalog')"
+        :
+        "= '#{ActiveRecord::Base.connection.current_database.tr("'", "''")}'"}#{"
       AND t.table_schema = COALESCE(current_setting('SEARCH_PATH'), 'public')" if is_postgres && schema }
   --          AND t.table_type IN ('VIEW') -- 'BASE TABLE', 'FOREIGN TABLE'
       AND t.table_name NOT IN ('pg_stat_statements', ?, ?)

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

@@ -47,7 +47,10 @@ module Brick
       end
 
       # After we're initialized and before running the rest of stuff, put our configuration in place
-      ActiveSupport.on_load(:after_initialize) do
+      ActiveSupport.on_load(:after_initialize) do |app|
+        assets_path = File.expand_path("#{__dir__}/../../../../vendor/assets")
+        (app.config.assets.precompile ||= []) << "#{assets_path}/images/brick_erd.png"
+        (app.config.assets.paths ||= []) << assets_path
         # ====================================
         # Dynamically create generic templates
         # ====================================
@@ -179,6 +182,28 @@ module Brick
 h1, h3 {
   margin-bottom: 0;
 }
+#imgErd {
+  background-image:url(assets/brick_erd.png);
+  background-size: 100% 100%;
+  width: 2.2em;
+  height: 2.2em;
+  cursor: pointer;
+}
+#mermaidErd {
+  position: relative;
+  display: none;
+}
+#mermaidErd .exclude {
+  position: absolute;
+  color: red;
+  top: 0;
+  right: 0;
+  cursor: pointer;
+}
+.relatedModel {
+  cursor: pointer;
+}
+
 #dropper {
   background-color: #eee;
 }
@@ -196,6 +221,8 @@ table {
   border-collapse: collapse;
   font-size: 0.9em;
   font-family: sans-serif;
+}
+table.shadow {
   min-width: 400px;
   box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
 }
@@ -213,6 +240,7 @@ tr th {
   display: none;
   top: 0;
   right: 0;
+  cursor: pointer;
 }
 #headerTop tr th:hover {
   background-color: #18B090;
@@ -245,7 +273,7 @@ tr th, tr td {
   color: #80B8D2;
 }
 
-table tbody tr {
+table.shadow tbody tr {
   border-bottom: thin solid #dddddd;
 }
 
@@ -253,7 +281,7 @@ table tbody tr:nth-of-type(even) {
   background-color: #f3f3f3;
 }
 
-table tbody tr:last-of-type {
+table.shadow tbody tr:last-of-type {
   border-bottom: 2px solid #009879;
 }
 
@@ -327,6 +355,28 @@ def hide_bcrypt(val, max_len = 200)
     end
     val
   end
+end
+def display_value(col_type, val)
+  case col_type
+  when 'geometry'
+    if Object.const_defined?('RGeo')
+      @is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2' if @is_mysql.nil?
+      if @is_mysql
+        # MySQL's \"Internal Geometry Format\" is like WKB, but with an initial 4 bytes that indicates the SRID.
+        srid = val[..3].unpack('I')
+        val = val[4..]
+      end
+      RGeo::WKRep::WKBParser.new.parse(val)
+    else
+      '(Add RGeo gem to parse geometry detail)'
+    end
+  else
+    if col_type
+      hide_bcrypt(val)
+    else
+      '?'
+    end
+  end
 end %>"
 
               if ['index', 'show', 'update'].include?(args.first)
@@ -401,25 +451,28 @@ window.addEventListener(\"pageshow\", function() {
 
 function changeout(href, param, value, trimAfter) {
   var hrefParts = href.split(\"?\");
-  if (param === undefined || param === null) {
+  var params = hrefParts.length > 1 ? hrefParts[1].split(\"&\") : [];
+  if (param === undefined || param === null || param === -1) {
     hrefParts = hrefParts[0].split(\"://\");
     var pathParts = hrefParts[hrefParts.length - 1].split(\"/\");
     if (value === undefined)
       // A couple possibilities if it's namespaced, starting with two parts in the path -- and then try just one
       return [pathParts.slice(1, 3).join('/'), pathParts.slice(1, 2)[0]];
-    else
-      return hrefParts[0] + \"://\" + pathParts[0] + \"/\" + value;
+    else {
+      var queryString = param ? \"?\" + params.join(\"&\") : \"\";
+      return hrefParts[0] + \"://\" + pathParts[0] + \"/\" + value + queryString;
+    }
   }
   if (trimAfter) {
     var pathParts = hrefParts[0].split(\"/\");
     while (pathParts.lastIndexOf(trimAfter) !== pathParts.length - 1) pathParts.pop();
     hrefParts[0] = pathParts.join(\"/\");
   }
-  var params = hrefParts.length > 1 ? hrefParts[1].split(\"&\") : [];
-  params = params.reduce(function (s, v) { var parts = v.split(\"=\"); s[parts[0]] = parts[1]; return s; }, {});
+  params = params.reduce(function (s, v) { var parts = v.split(\"=\"); if (parts[1]) s[parts[0]] = parts[1]; return s; }, {});
   if (value === undefined) return params[param];
   params[param] = value;
-  return hrefParts[0] + \"?\" + Object.keys(params).reduce(function (s, v) { s.push(v + \"=\" + params[v]); return s; }, []).join(\"&\");
+  var finalParams = Object.keys(params).reduce(function (s, v) { if (params[v]) s.push(v + \"=\" + params[v]); return s; }, []).join(\"&\");
+  return hrefParts[0] + (finalParams.length > 0 ? \"?\" + finalParams : \"\");
 }
 
 // Snag first TR for sticky header
@@ -583,7 +636,10 @@ if (headerTop) {
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.config.schema_behavior[:multitenant] && ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
-<h1>#{model_plural = model_name.pluralize}</h1>#{template_link}<%
+<table id=\"resourceName\"><tr>
+  <td><h1>#{model_plural = model_name.pluralize}</h1></td>
+  <td id=\"imgErd\" title=\"Show ERD\"></td>
+</tr></table>#{template_link}<%
    if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %><%=
      description %><br><%
    end
@@ -614,10 +670,69 @@ if (headerTop) {
       });
     });
   </script>
+<% end
+   if true # @_brick_erd
+%><div id=\"mermaidErd\" class=\"mermaid\">
+erDiagram
+<% model_short_name = #{@_brick_model.name.split('::').last.inspect}
+   callbacks = {}
+   @_brick_bt_descrip.each do |bt|
+     bt_class = bt[1].first.first
+     callbacks[bt_name = bt_class.name.split('::').last] = bt_class
+     is_has_one = #{@_brick_model.name}.reflect_on_association(bt.first).inverse_of&.macro == :has_one ||
+                  ::Brick.config.has_ones&.fetch('#{@_brick_model.name}', nil)&.key?(bt.first.to_s)
+    %>  <%= \"#\{model_short_name} #\{is_has_one ? '||' : '}o'}--|| #\{bt_name} : \\\"#\{
+        bt.first unless bt.first.to_s == bt[1].first.first.name.underscore.singularize.tr('/', '_')
+        }\\\"\".html_safe %>
+<% end
+   last_through = nil
+   @_brick_hm_counts.each do |hm|
+     # Skip showing self-referencing HM links since they would have already been drawn while evaluating the BT side
+     next if (hm_class = hm.last.klass) == #{@_brick_model.name}
+
+     callbacks[hm_name = hm_class.name.split('::').last] = hm_class
+     if (through = hm.last.options[:through]&.to_s) # has_many :through  (HMT)
+       callbacks[through.singularize.camelize] = (through_assoc = hm.last.source_reflection).active_record
+       if last_through == through # Same HM, so no need to build it again, and for clarity just put in a blank line
+%><%=    \"\n\"
+%><%   else
+%>  <%= \"#\{model_short_name} ||--o{ #\{through_assoc.active_record.name}\".html_safe %> : \"\"
+<%       last_through = through
+       end
+%>    <%= \"#\{through_assoc.active_record.name} }o--|| #\{hm_name}\".html_safe %> : \"\"
+    <%= \"#\{model_short_name} }o..o{ #\{hm_name} : \\\"#\{hm.first}\\\"\".html_safe %><%
+     else # has_many
+%>  <%= \"#\{model_short_name} ||--o{ #\{hm_name} : \\\"#\{
+            hm_name unless hm.first.to_s == hm_class.name.underscore.pluralize.tr('/', '_')
+          }\\\"\".html_safe %><%
+     end %>
+<% end
+   callbacks.merge({model_short_name => #{@_brick_model.name}}).each do |cb_k, cb_class|
+     cb_relation = ::Brick.relations[cb_class.table_name]
+     pkeys = cb_relation[:pkey]&.first&.last
+     fkeys = cb_relation[:fks]&.values&.each_with_object([]) { |fk, s| s << fk[:fk] if fk.fetch(:is_bt, nil) }
+ %>  <%= cb_k %> {<%
+     pkeys&.each do |pk| %>
+    <%= \"int #\{pk} \\\"PK#\{' fk' if fkeys&.include?(pk)}\\\"\".html_safe %><%
+     end %><%
+     fkeys&.each do |fk|
+       if fk.is_a?(Array)
+         fk.each do |fk_part| %>
+    <%= \"int #\{fk_part} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk_part) %><%
+         end
+       else %>
+    <%= \"int #\{fk} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk) %><%
+       end
+     end %>
+  }
+<% end
+ # callback < %= cb_k % > erdClick
+ %>
+</div>
 <% end
 
-%><table id=\"headerTop\">
-<table id=\"#{table_name}\">
+%><table id=\"headerTop\"></table>
+<table id=\"#{table_name}\" class=\"shadow\">
   <thead><tr>#{"<th x-order=\"#{pk.join(',')}\"></th>" if pk.present?}<%=
      # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
      cols = {#{hms_keys = []
@@ -683,7 +798,7 @@ if (headerTop) {
         <% end
          elsif (hms_col = hms_cols[col_name])
            if hms_col.length == 1 %>
-         <%= hms_col.first %>
+        <%=  hms_col.first %>
         <% else
              klass = (col = cols[col_name])[1]
              txt = if col[2] == 'HO'
@@ -696,8 +811,8 @@ if (headerTop) {
                    end %>
          <%= link_to txt, send(\"#\{klass.name.underscore.tr('/', '_').pluralize}_path\".to_sym, hms_col[2]) unless hms_col[1]&.zero? %>
         <% end
-         elsif cols.key?(col_name)
-      %><%= hide_bcrypt(val) %><%
+         elsif (col = cols[col_name])
+    %><%=  display_value(col&.type || col&.sql_type, val) %><%
          else # Bad column name!
       %>?<%
          end
@@ -720,7 +835,7 @@ if (headerTop) {
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.config.schema_behavior[:multitenant] && ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
 <h1>Status</h1>
-<table id=\"status\"><thead><tr>
+<table id=\"status\" class=\"shadow\"><thead><tr>
   <th>Resource</th>
   <th>Table</th>
   <th>Migration</th>
@@ -754,7 +869,7 @@ if (headerTop) {
                %></td>
   <tr>
 <% end %>
-</tbody><table>
+</tbody></table>
 #{script}"
 
                        when 'orphans'
@@ -796,7 +911,7 @@ end
     # path_options << { '_brick_schema':  } if
     # url = send(:#{model_name.underscore}_path, obj.#{pk})
     form_for(obj.becomes(#{model_name})) do |f| %>
-  <table>
+  <table class=\"shadow\">
   <% has_fields = false
     @#{obj_name}.attributes.each do |k, val|
       col = #{model_name}.columns_hash[k] %>
@@ -853,7 +968,7 @@ end
     <% else
     html_options = {}
     html_options[:class] = 'dimmed' unless val
-    case (col_type = #{model_name}.column_for_attribute(k).type)
+    case (col_type = col.type || col.sql_type)
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>
           <%= hide_bcrypt(val, 1000) %>
@@ -883,6 +998,8 @@ end
           # If it's not yet enabled then:  create extension ltree;
           val %>
       <% when :binary, :primary_key %>
+      <% else %>
+        <%= display_value(col_type, val) %>
       <% end %>
     <% end %>
     </td>
@@ -903,7 +1020,7 @@ end
     if (pk = hm.first.klass.primary_key)
       hm_singular_name = (hm_name = hm.first.name.to_s).singularize.underscore
       obj_pk = (pk.is_a?(Array) ? pk : [pk]).each_with_object([]) { |pk_part, s| s << "#{hm_singular_name}.#{pk_part}" }.join(', ')
-      s << "<table id=\"#{hm_name}\">
+      s << "<table id=\"#{hm_name}\" class=\"shadow\">
         <tr><th>#{hm[3]}</th></tr>
         <% collection = @#{obj_name}.#{hm_name}
         collection = collection.is_a?(ActiveRecord::Associations::CollectionProxy) ? collection.order(#{pk.inspect}) : [collection].compact
@@ -938,7 +1055,62 @@ flatpickr(\".datetimepicker\", {enableTime: true});
 flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 </script>
 <% end %>
+
+<% if true # @_brick_erd
+%>
 <script>
+  var imgErd = document.getElementById(\"imgErd\");
+  var mermaidErd = document.getElementById(\"mermaidErd\");
+  var mermaidCode;
+  var cbs = {<%= callbacks.map { |k, v| \"#\{k}: \\\"#\{v.name.underscore.pluralize}\\\"\" }.join(', ').html_safe %>};
+  imgErd.addEventListener(\"click\", showErd);
+  function showErd() {
+    imgErd.style.display = \"none\";
+    mermaidErd.style.display = \"inline-block\";
+    if (mermaidCode) return; // Cut it short if we've already rendered the diagram
+
+    mermaidCode = document.createElement(\"SCRIPT\");
+    mermaidCode.setAttribute(\"src\", \"https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js\");
+    mermaidCode.addEventListener(\"load\", function () {
+      mermaid.initialize({
+        startOnLoad: true,
+        securityLevel: \"loose\",
+        mermaid: {callback: function(objId) {
+          var svg = document.getElementById(objId);
+          svg.removeAttribute(\"width\");
+          var cb;
+          for(cb in cbs) {
+            var gErd = svg.getElementById(cb);
+            gErd.setAttribute(\"class\", \"relatedModel\");
+            gErd.addEventListener(\"click\",
+              function (evt) {
+                location.href = changeout(changeout(location.href, -1, cbs[this.id]), \"_brick_erd\", \"1\");
+              }
+            );
+          }
+        }}
+      });
+      mermaid.contentLoaded();
+      // Add <span> at the end
+      var span = document.createElement(\"SPAN\");
+      span.className = \"exclude\";
+      span.innerHTML = \"X\";
+      span.addEventListener(\"click\", function (e) {
+        e.stopPropagation();
+        imgErd.style.display = \"table-cell\";
+        mermaidErd.style.display = \"none\";
+        window.history.pushState({}, '', changeout(location.href, '_brick_erd', null));
+      });
+      mermaidErd.appendChild(span);
+    });
+    document.body.appendChild(mermaidCode);
+  }
+  <%= \"  showErd();\n\" if (@_brick_erd || 0) > 0
+%></script>
+
+<% end
+
+%><script>
 <% # Make column headers sort when clicked
    # %%% Create a smart javascript routine which can do this client-side %>
 [... document.getElementsByTagName(\"TH\")].forEach(function (th) {

data/lib/brick/version_number.rb

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

data/lib/generators/brick/migrations_generator.rb

@@ -21,7 +21,7 @@ module Brick
                   'timestamp with time zone' => 'timestamp',
                   'time without time zone' => 'time',
                   'time with time zone' => 'time',
-                  'double precision' => 'float', # might work with 'double'
+                  'double precision' => 'float',
                   'smallint' => 'integer' } # %%% Need to put in "limit: 2"
     # (Still need to find what "inet" and "json" data types map to.)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.61
+  version: 1.0.64
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord