brick 1.0.63 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28a4db728e9312def40be9a9a790f1f22f464c6d6ade2b6e12f255730cd4111
-  data.tar.gz: c2e75de42686c9ad0707fd6eca3d0b0a12207e051d77622d70276845d9af0949
+  metadata.gz: c48ee6a2f143563e2e443f6edf0dc0e04e800e8fae6951e05b0362956129e950
+  data.tar.gz: f632f6e795dcf9b3aeb97e36a37c8074302c5967206b5f415a9a4b862bb4fda7
 SHA512:
-  metadata.gz: a897f30028aac1b6e14edc967a82c268aa58236cd424ecf977409a0c893d42b9e291c11ac2b2a411f00dc35c23b80a4ed6adecde394587c96d11b9f51c173fd8
-  data.tar.gz: 538d694b6a0717045c6e23ec536a000a552bc0ece9009f74511e33013e0dde97f8cefadbc61a45d4b7ea884dd0c1dd985f5defc58175ec51318d345a7e561c2d
+  metadata.gz: 0cd5e05899a2f780a0bbf378f8f49e49f604b90cf122f2cd7efe34839c434af814c9a228f36bd18b112cd8e40b6736e88742ea0f2a1a0b55ac3f8f573e614918
+  data.tar.gz: a34a9f47746159f6b4b39f8a3cd994055e022be9eefe8737b73c63e5d475b283ae3b99a6a11e3faf140ca6efbf67d7f400e03147a757c237c8875f11ea2c0ea4

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

@@ -182,8 +182,6 @@ module Brick
 h1, h3 {
   margin-bottom: 0;
 }
-#resourceName {
-}
 #imgErd {
   background-image:url(assets/brick_erd.png);
   background-size: 100% 100%;
@@ -453,25 +451,27 @@ 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(\"=\"); if (parts[1] !== null) 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;
-  var finalParams = Object.keys(params).reduce(function (s, v) { if (params[v] !== null) 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 : \"\");
 }
 
@@ -677,25 +677,53 @@ erDiagram
 <% model_short_name = #{@_brick_model.name.split('::').last.inspect}
    callbacks = {}
    @_brick_bt_descrip.each do |bt|
-     bt_full_name = bt[1].first.first.name
-     callbacks[bt_name = bt_full_name.split('::').last] = bt_full_name
-     # binding.pry
-    %>  <%= \"#\{model_short_name} #\{'||'}--#\{
-        'o{'} #\{bt_name} : \\\"#\{
+     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 %>
-<% @_brick_hm_counts.each do |hm|
-     hm_full_name = hm.last.klass.name
-     callbacks[hm_name = hm_full_name.split('::').last] = hm_full_name
-    %>  <%= \"#\{model_short_name} #\{'}o'}--#\{
-        '||'} #\{hm_name} : \\\"#\{
-        hm.first unless hm.first.to_s == hm_full_name.underscore.pluralize.tr('/', '_')
-        }\\\"\".html_safe %>
-<% end %>
-<% callbacks.keys.each do |cb|
- %>  <%= cb %> {
-    int id
+<% 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
@@ -1034,7 +1062,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
   var imgErd = document.getElementById(\"imgErd\");
   var mermaidErd = document.getElementById(\"mermaidErd\");
   var mermaidCode;
-  var cbs = {<%= callbacks.map { |k, v| \"#\{k}: \\\"#\{v.underscore.pluralize}\\\"\" }.join(', ').html_safe %>};
+  var cbs = {<%= callbacks.map { |k, v| \"#\{k}: \\\"#\{v.name.underscore.pluralize}\\\"\" }.join(', ').html_safe %>};
   imgErd.addEventListener(\"click\", showErd);
   function showErd() {
     imgErd.style.display = \"none\";
@@ -1049,13 +1077,14 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: 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, null, cbs[this.id]), \"_brick_erd\", \"1\");
+                location.href = changeout(changeout(location.href, -1, cbs[this.id]), \"_brick_erd\", \"1\");
               }
             );
           }

data/lib/brick/version_number.rb

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

metadata

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