brick 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24731ac9bd56261179224610406247cc4438c61e411aa3fe96205b2e97fc8cb8
-  data.tar.gz: 785d12e36fcf788c05cff3a02ca2ec17fc418b0ea15b54cb6923c83c6f362d3b
+  metadata.gz: 96ba9e8b4ddc54e5feaaf8652c93e5d9e1ffe15345a8cad719674e051b296718
+  data.tar.gz: 3901467e7918ece559f55740759bd555bababe96c407488307fcb01298c14034
 SHA512:
-  metadata.gz: '090a3c4d1b3cb4761799e05adf5caa0c83f60cf985f97ed6856beb05620014e9e7401689719209488092c6c4a7605e53781cdb71ad9e7ec204ccaddca0d92cca'
-  data.tar.gz: 8d1f9512c948359e7d73cd7cc32302f226df7e3e744fab562e01e16170830be28d0e2e15bcd7b437f66ed79e366b0ff33b7f578e4c76ffde1dd62cdcec059069
+  metadata.gz: aa73995e69947be5ca83597a71751cfffb2433551d04fb00b760bc51c199bcd9890d7a05c0deb2f2c07c2c89205acf52b942d00ae78e1d7c0a26544acf70a4d0
+  data.tar.gz: 2328082844a0c993ada29c02eab22cf0d04efbcf3e4479c804e16f7d2a39a42d28debcd5592620fecd3bc9c404458fe3b5ff448f1f2c1b7f0d2e13557f5f9fa8

data/lib/brick/extensions.rb

@@ -115,8 +115,8 @@ module ActiveRecord
     # If available, parse simple DSL attached to a model in order to provide a friendlier name.
     # Object property names can be referenced in square brackets like this:
     # { 'User' => '[profile.firstname] [profile.lastname]' }
-    def brick_descrip
-      self.class.brick_descrip(self)
+    def brick_descrip(data = nil, pk_alias = nil)
+      self.class.brick_descrip(self, data, pk_alias)
     end
 
     def self.brick_descrip(obj, data = nil, pk_alias = nil)
@@ -136,11 +136,7 @@ module ActiveRecord
                         this_obj = obj
                         bracket_name.split('.').each do |part|
                           obj_name += ".#{part}"
-                          this_obj = if caches.key?(obj_name)
-                                       caches[obj_name]
-                                     else
-                                       (caches[obj_name] = this_obj&.send(part.to_sym))
-                                     end
+                          this_obj = caches.fetch(obj_name) { caches[obj_name] = this_obj&.send(part.to_sym) }
                         end
                         this_obj&.to_s || ''
                       end
@@ -160,7 +156,8 @@ module ActiveRecord
       end
       if is_brackets_have_content
         output
-      elsif pk_alias
+      elsif (pk_alias ||= primary_key)
+        pk_alias = [pk_alias] unless pk_alias.is_a?(Array)
         id = []
         pk_alias.each do |pk_alias_part|
           if (pk_part = obj.send(pk_alias_part))
@@ -282,6 +279,23 @@ module ActiveRecord
       # , is_add_bts, is_add_hms
     )
       is_add_bts = is_add_hms = true
+      wheres = {}
+      has_hm = false
+      params.each do |k, v|
+        case (ks = k.split('.')).length
+        when 1
+          next unless klass._brick_get_fks.include?(k)
+        when 2
+          assoc_name = ks.first.to_sym
+          # Make sure it's a good association name and that the model has that column name
+          next unless (assoc = klass.reflect_on_association(assoc_name))&.klass&.columns&.map(&:name)&.include?(ks.last)
+
+          # There is some potential for duplicates when there is an HM-based where in play.  De-duplicate if so.
+          has_hm ||= assoc.macro == :has_many
+          join_array[assoc_name] = nil # Store this relation name in our special collection for .joins()
+        end
+        wheres[k] = v.split(',')
+      end
 
       # %%% Skip the metadata columns
       if selects&.empty? # Default to all columns

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

@@ -274,96 +274,97 @@ function changeout(href, param, value) {
                            template_link = "
   <%= link_to 'CSV', #{table_name}_path(format: :csv) %> &nbsp; <a href=\"#\" id=\"sheetsLink\">Sheets</a>
   <div id=\"dropper\" contenteditable=\"true\"></div>
-  <input type=\"button\" id=\"btnImport\" value=\"Import\">"
-                         end
-"#{css}
-<p style=\"color: green\"><%= notice %></p>#{"
-<select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
-<select id=\"tbl\">#{table_options}</select>
-<h1>#{model_name.pluralize}</h1>#{template_link}
+  <input type=\"button\" id=\"btnImport\" value=\"Import\">
+
 <script>
-var dropperDiv = document.getElementById(\"dropper\");
-var btnImport = document.getElementById(\"btnImport\");
-var droppedTSV;
-if (dropperDiv) { // Other interesting events: blur keyup input
-  dropperDiv.addEventListener(\"paste\", function (evt) {
-    droppedTSV = evt.clipboardData.getData('text/plain');
-    var html = evt.clipboardData.getData('text/html');
-    var tbl = html.substring(html.indexOf(\"<tbody>\") + 7, html.lastIndexOf(\"</tbody>\"));
-    console.log(tbl);
-    btnImport.style.display = droppedTSV.length > 0 ? \"block\" : \"none\";
-  });
-  btnImport.addEventListener(\"click\", function () {
-    fetch(changeout(<%= #{obj_name}_path(-1, format: :csv).inspect.html_safe %>, \"_brick_schema\", brickSchema), {
-      method: 'PATCH',
-      headers: { 'Content-Type': 'text/tab-separated-values' },
-      body: droppedTSV
-    }).then(function (tsvResponse) {
-      btnImport.style.display = \"none\";
-      console.log(\"toaster\", tsvResponse);
+  var dropperDiv = document.getElementById(\"dropper\");
+  var btnImport = document.getElementById(\"btnImport\");
+  var droppedTSV;
+  if (dropperDiv) { // Other interesting events: blur keyup input
+    dropperDiv.addEventListener(\"paste\", function (evt) {
+      droppedTSV = evt.clipboardData.getData('text/plain');
+      var html = evt.clipboardData.getData('text/html');
+      var tbl = html.substring(html.indexOf(\"<tbody>\") + 7, html.lastIndexOf(\"</tbody>\"));
+      console.log(tbl);
+      btnImport.style.display = droppedTSV.length > 0 ? \"block\" : \"none\";
     });
-  });
-}
-var sheetUrl;
-var spreadsheetId;
-var sheetsLink = document.getElementById(\"sheetsLink\");
-function gapiLoaded() {
-  // Have a click on the sheets link to bring up the sign-in window.  (Must happen from some kind of user click.)
-  sheetsLink.addEventListener(\"click\", async function (evt) {
-    evt.preventDefault();
-    await gapi.load(\"client\", function () {
-      gapi.client.init({ // Load the discovery doc to initialize the API
-        clientId: \"487319557829-fgj4u660igrpptdji7ev0r5hb6kh05dh.apps.googleusercontent.com\",
-        scope: \"https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive.file\",
-        discoveryDocs: [\"https://sheets.googleapis.com/$discovery/rest?version=v4\"]
-      }).then(function () {
-        gapi.auth2.getAuthInstance().isSignedIn.listen(updateSignInStatus);
-        updateSignInStatus(gapi.auth2.getAuthInstance().isSignedIn.get());
+    btnImport.addEventListener(\"click\", function () {
+      fetch(changeout(<%= #{obj_name}_path(-1, format: :csv).inspect.html_safe %>, \"_brick_schema\", brickSchema), {
+        method: 'PATCH',
+        headers: { 'Content-Type': 'text/tab-separated-values' },
+        body: droppedTSV
+      }).then(function (tsvResponse) {
+        btnImport.style.display = \"none\";
+        console.log(\"toaster\", tsvResponse);
       });
     });
-  });
-}
+  }
+  var sheetUrl;
+  var spreadsheetId;
+  var sheetsLink = document.getElementById(\"sheetsLink\");
+  function gapiLoaded() {
+    // Have a click on the sheets link to bring up the sign-in window.  (Must happen from some kind of user click.)
+    sheetsLink.addEventListener(\"click\", async function (evt) {
+      evt.preventDefault();
+      await gapi.load(\"client\", function () {
+        gapi.client.init({ // Load the discovery doc to initialize the API
+          clientId: \"487319557829-fgj4u660igrpptdji7ev0r5hb6kh05dh.apps.googleusercontent.com\",
+          scope: \"https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive.file\",
+          discoveryDocs: [\"https://sheets.googleapis.com/$discovery/rest?version=v4\"]
+        }).then(function () {
+          gapi.auth2.getAuthInstance().isSignedIn.listen(updateSignInStatus);
+          updateSignInStatus(gapi.auth2.getAuthInstance().isSignedIn.get());
+        });
+      });
+    });
+  }
 
-async function updateSignInStatus(isSignedIn) {
-  if (isSignedIn) {
-    console.log(\"turds!\");
-    await gapi.client.sheets.spreadsheets.create({
-      properties: {
-        title: #{table_name.inspect},
-      },
-      sheets: [
-        // sheet1, sheet2, sheet3
-      ]
-    }).then(function (response) {
-      sheetUrl = response.result.spreadsheetUrl;
-      spreadsheetId = response.result.spreadsheetId;
-      sheetsLink.setAttribute(\"href\", sheetUrl); // response.result.spreadsheetUrl
-      console.log(\"x1\", sheetUrl);
-
-      // Get JSON data
-      fetch(changeout(<%= #{table_name}_path(format: :js).inspect.html_safe %>, \"_brick_schema\", brickSchema)).then(function (response) {
-        response.json().then(function (data) {
-          gapi.client.sheets.spreadsheets.values.append({
-            spreadsheetId: spreadsheetId,
-            range: \"Sheet1\",
-            valueInputOption: \"RAW\",
-            insertDataOption: \"INSERT_ROWS\"
-          }, {
-            range: \"Sheet1\",
-            majorDimension: \"ROWS\",
-            values: data,
-          }).then(function (response2) {
-//            console.log(\"beefcake\", response2);
+  async function updateSignInStatus(isSignedIn) {
+    if (isSignedIn) {
+      console.log(\"turds!\");
+      await gapi.client.sheets.spreadsheets.create({
+        properties: {
+          title: #{table_name.inspect},
+        },
+        sheets: [
+          // sheet1, sheet2, sheet3
+        ]
+      }).then(function (response) {
+        sheetUrl = response.result.spreadsheetUrl;
+        spreadsheetId = response.result.spreadsheetId;
+        sheetsLink.setAttribute(\"href\", sheetUrl); // response.result.spreadsheetUrl
+        console.log(\"x1\", sheetUrl);
+
+        // Get JSON data
+        fetch(changeout(<%= #{table_name}_path(format: :js).inspect.html_safe %>, \"_brick_schema\", brickSchema)).then(function (response) {
+          response.json().then(function (data) {
+            gapi.client.sheets.spreadsheets.values.append({
+              spreadsheetId: spreadsheetId,
+              range: \"Sheet1\",
+              valueInputOption: \"RAW\",
+              insertDataOption: \"INSERT_ROWS\"
+            }, {
+              range: \"Sheet1\",
+              majorDimension: \"ROWS\",
+              values: data,
+            }).then(function (response2) {
+  //            console.log(\"beefcake\", response2);
+            });
           });
         });
       });
-    });
-    window.open(sheetUrl, '_blank');
+      window.open(sheetUrl, '_blank');
+    }
   }
-}
 </script>
 <script async defer src=\"https://apis.google.com/js/api.js\" onload=\"gapiLoaded()\"></script>
-
+"
+                         end
+"#{css}
+<p style=\"color: green\"><%= notice %></p>#{"
+<select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
+<select id=\"tbl\">#{table_options}</select>
+<h1>#{model_name.pluralize}</h1>#{template_link}
 
 <% if @_brick_params&.present? %><h3>where <%= @_brick_params.each_with_object([]) { |v, s| s << \"#\{v.first\} = #\{v.last.inspect\}\" }.join(', ') %></h3><% end %>
 <table id=\"#{table_name}\">
@@ -400,8 +401,7 @@ async function updateSignInStatus(isSignedIn) {
       <% end %>
       </td>
     <% end %>
-    <td>#{hms_columns.join('</td><td>')}</td>
-    <!-- td>X</td -->
+    #{hms_columns.each_with_object(+'') { |hm_col, s| s << "<td>#{hm_col}</td>" }}
   </tr>
   </tbody>
   <% end %>
@@ -422,19 +422,21 @@ async function updateSignInStatus(isSignedIn) {
    # url = send(:#{model_name.underscore}_path, obj.#{pk})
    form_for(obj.becomes(#{model_name})) do |f| %>
   <table>
-  <% @#{obj_name}.first.attributes.each do |k, val| %>
+  <% has_fields = false
+    @#{obj_name}.first.attributes.each do |k, val| %>
     <tr>
     <%# %%% Accommodate composite keys %>
     <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
     <th class=\"show-field\">
-    <% if (bt = bts[k])
+    <% has_fields = true
+      if (bt = bts[k])
       # Add a final member in this array with descriptive options to be used in <select> drop-downs
       bt_name = bt[1].name
       # %%% Only do this if the user has permissions to edit this bt field
       if bt.length < 4
         bt << (option_detail = [[\"(No #\{bt_name\} chosen)\", '^^^brick_NULL^^^']])
         # %%% Accommodate composite keys for obj.pk at the end here
-        bt[1].order(bt[1].primary_key).each { |obj| option_detail << [obj.brick_descrip, obj.send(bt[1].primary_key)] }
+        bt[1].order(obj_pk = bt[1].primary_key).each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
       end %>
       BT <%= bt[1].bt_link(bt.first) %>
     <% else %>
@@ -467,8 +469,12 @@ async function updateSignInStatus(isSignedIn) {
     <% end %>
     </td>
     </tr>
+    <% end
+    if has_fields %>
+      <tr><td colspan=\"2\" class=\"right\"><%= f.submit %></td></tr>
+    <% else %>
+      <tr><td colspan=\"2\">(No displayable fields)</td></tr>
     <% end %>
-    <tr><td colspan=\"2\" class=\"right\"><%= f.submit %></td></tr>
   </table>
   <% end %>
 
@@ -482,6 +488,7 @@ async function updateSignInStatus(isSignedIn) {
           <tr><td>(none)</td></tr>
         <% else %>
           <% collection.uniq.each do |#{hm_singular_name = hm_name.singularize.underscore}| %>
+            <%# %%% accommodate composite primary key %>
             <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm.first.klass.name.underscore}_path(#{hm_singular_name}.#{pk})) %></td></tr>
           <% end %>
         <% end %>

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 23
+    TINY = 24
 
     # 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.23
+  version: 1.0.24
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord