brick 1.0.98 → 1.0.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4285ef6fb81d75bd90ceffc7d66c7fa096f04fb998da590f291f28fc9dfb45d
-  data.tar.gz: 2d031b156fd9c82d19af9b7818387eaecdd8cfadf939cbcf3b3b479474a77b54
+  metadata.gz: 431e2aee4c3c199095d8475eeedcc46bd95e86a47c51623e3cea7fbbde59edcd
+  data.tar.gz: 32144a9a9ab6ec60ef297f27ae73e35cc891e5f9462b9beae4e7a0534ab77135
 SHA512:
-  metadata.gz: 5967ede119f86cd92f88abb0f43bd2049eda4272c14ae7fa1c3f9ecc54c813c4c227be2d99aaa501363e42ef34a3eb5d0a0924ac4e540ab668e40a9a9d28311e
-  data.tar.gz: ab01005e485b9335c67ba48bb01a13db78fed3ce31293122fae8fbf1317b3bc0c3197adb087ec4b125e2ff7153e52fb55d8b7fc675b1e7759233cf8d42769ac7
+  metadata.gz: f471bc993d97e92deae3c03e6cac9db0e350e72bd070afe5bcde1d0ca18d650b546db0d018a101009e429e9870a7e2c5e566f980c9e5b1319bc18873271c5550
+  data.tar.gz: 95f128f0f2a29cf0d1af1b5001eae27885b7e11ce23194e4a4da0141a0bfc059edd1917036f4addf1ee2aa4b69f763962e821ca31f9473048a6934dbecd8518e

data/lib/brick/extensions.rb

@@ -398,15 +398,27 @@ module ActiveRecord
     # Links from ActiveRecord association pathing names over to real table correlation names
     # that get chosen when the AREL AST tree is walked.
     def brick_links
-      @brick_links ||= {}
+      @brick_links ||= { '' => table_name }
     end
 
     def brick_select(params, selects = [], order_by = nil, translations = {}, join_array = ::Brick::JoinArray.new)
       is_add_bts = is_add_hms = true
 
-      # Build out cust_cols, bt_descrip and hm_counts now so that they are available on the
-      # model early in case the user wants to do an ORDER BY based on any of that.
-      model._brick_calculate_bts_hms(translations, join_array) if is_add_bts || is_add_hms
+      if selects.empty?
+        # Build out cust_cols, bt_descrip and hm_counts now so that they are available on the
+        # model early in case the user wants to do an ORDER BY based on any of that.
+        model._brick_calculate_bts_hms(translations, join_array) if is_add_bts || is_add_hms
+      else
+        is_api = true
+        # If there are any provided selects, treat them as API columns and build them as cust_cols since they
+        # can be built using DSL.
+        # false = not polymorphic, and true = yes -- please emit_dsl
+        selects.each do |api_col|
+          pieces, my_dsl = brick_parse_dsl(join_array, [], translations, false, "[#{api_col}]", true)
+          _br_cust_cols[api_col.tr('.', '_')] = [pieces, my_dsl]
+        end
+        selects.clear # Now these have become custom columns
+      end
 
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
@@ -414,7 +426,7 @@ module ActiveRecord
       is_distinct = nil
       wheres = {}
       params.each do |k, v|
-        next if ['_brick_schema', '_brick_order', 'controller', 'action'].include?(k)
+        next if ['_brick_schema', '_brick_order', '_brick_api', 'controller', 'action'].include?(k)
 
         if (where_col = (ks = k.split('.')).last)[-1] == '!'
           where_col = where_col[0..-2]
@@ -436,11 +448,14 @@ module ActiveRecord
 
       # %%% Skip the metadata columns
       if selects.empty? # Default to all columns
+        id_parts = (id_col = klass.primary_key).is_a?(Array) ? id_col : [id_col]
         tbl_no_schema = table.name.split('.').last
         # %%% Have once gotten this error with MSSQL referring to http://localhost:3000/warehouse/cold_room_temperatures__archive
         #     ActiveRecord::StatementInvalid (TinyTds::Error: DBPROCESS is dead or not enabled)
         #     Relevant info here:  https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues/402
         columns.each do |col|
+          next if is_api && id_parts.exclude?(col.name) # Only keep the ID columns if this is an API request
+
           col_alias = " AS #{col.name}_" if (col_name = col.name) == 'class'
           selects << if is_mysql
                        "`#{tbl_no_schema}`.`#{col_name}`#{col_alias}"
@@ -490,22 +505,28 @@ module ActiveRecord
             # binding.pry
             next
           end
-
           key_klass = nil
           key_tbl_name = nil
           dest_pk = nil
           key_alias = nil
           cc.first.each do |cc_part|
-            dest_klass = cc_part[0..-2].inject(klass) { |kl, cc_part_term| kl.reflect_on_association(cc_part_term).klass }
+            dest_klass = cc_part[0..-2].inject(klass) do |kl, cc_part_term|
+              # %%% Clear column info properly so we can do multiple subsequent requests
+              # binding.pry unless kl.reflect_on_association(cc_part_term)
+              kl.reflect_on_association(cc_part_term)&.klass || klass
+            end
             tbl_name = rel_dupe.brick_links[cc_part[0..-2].map(&:to_s).join('.')]
             # Deal with the conflict if there are two parts in the custom column named the same,
             # "category.name" and "product.name" for instance will end up with aliases of "name"
             # and "product__name".
-            cc_part_idx = cc_part.length - 1
-            while cc_part_idx > 0 &&
-                  (col_alias = "br_cc_#{k}__#{cc_part[cc_part_idx..-1].map(&:to_s).join('__')}") &&
-                  used_col_aliases.key?(col_alias)
-              cc_part_idx -= 1
+            if (cc_part_idx = cc_part.length - 1).zero?
+              col_alias = "br_cc_#{k}__#{table_name.tr('.', '_')}"
+            else
+              while cc_part_idx > 0 &&
+                    (col_alias = "br_cc_#{k}__#{cc_part[cc_part_idx..-1].map(&:to_s).join('__').tr('.', '_')}") &&
+                    used_col_aliases.key?(col_alias)
+                cc_part_idx -= 1
+              end
             end
             used_col_aliases[col_alias] = nil
             # Set up custom column links by preparing key_klass and key_alias
@@ -1372,7 +1393,7 @@ class Object
       when Symbol
         order_tbl[order_default] || order_default
       else
-        pk.map(&:to_sym) # If it's not a custom ORDER BY, just use the key
+        pk.map { |part| "#{table_name}.#{part}"}.join(', ') # If it's not a custom ORDER BY, just use the key
       end
     end
 
@@ -1568,7 +1589,15 @@ class Object
             order_by, _ = model._brick_calculate_ordering(ordering, true) # Don't do the txt part
 
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? model.preload : model.all
-            @_brick_params = ar_relation.brick_select(params, (selects = []), order_by,
+
+            if (cc = params['_brick_api']&.split(','))
+              is_api = true
+              selects = cc
+              counts = [] # No need for any extra HM count columns
+              model._br_cust_cols.clear
+            end
+
+            @_brick_params = ar_relation.brick_select(params, (selects ||= []), order_by,
                                                                translations = {},
                                                                join_array = ::Brick::JoinArray.new)
             # %%% Add custom HM count columns
@@ -1582,6 +1611,7 @@ class Object
                      "b_r_#{v.first}.c_t_ AS \"b_r_#{v.first}_ct\""
                    end
             end
+
             ar_select = ar_relation.respond_to?(:_select!) ? ar_relation.dup._select!(*selects, *counts) : ar_relation.select(selects + counts)
             instance_variable_set("@#{table_name.pluralize}".to_sym, ar_select)
             if namespace && (idx = lookup_context.prefixes.index(table_name))

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

@@ -424,6 +424,14 @@ h1, h3 {
   cursor: pointer;
 }
 
+#apiToggle {
+  border: 2px solid purple;
+}
+
+#apiToggle, .apiColName {
+  cursor: pointer;
+}
+
 #dropper {
   background-color: #eee;
 }
@@ -1004,6 +1012,9 @@ erDiagram
 <p style=\"color: green\"><%= notice %></p>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
+
+<%= pick_api(#{model_name}).html_safe %>
+
 <table id=\"resourceName\"><tr>
   <td><h1>#{model_name}</h1></td>
   <td id=\"imgErd\" title=\"Show ERD\"></td>
@@ -1077,8 +1088,13 @@ erDiagram
                        end
 
     # Write out the mega-grid
-    brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, @_brick_incl, @_brick_excl,
-                 cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}}) %>
+    if params['_brick_api'] # API response?
+      brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, [], @_brick_excl,
+                 cols, poly_cols, {}, [], {})
+    else
+      brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, @_brick_incl, @_brick_excl,
+                 cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}})
+    end %>
 
 #{"<hr><%= link_to \"New #{obj_name}\", new_#{path_obj_name}_path %>" unless @_brick_model.is_view?}
 #{script}

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

@@ -11,7 +11,7 @@ module Brick::Rails::FormTags
       out << "<th x-order=\"#{pk.join(',')}\"></th>"
     end
 
-    col_keys = relation.columns.each_with_object([]) do |col, s|
+    col_keys ||= relation.columns.each_with_object([]) do |col, s|
       col_name = col.name
       next if inclusions&.exclude?(col_name) ||
               (pk.include?(col_name) && [:integer, :uuid].include?(col.type) && !bts.key?(col_name)) ||
@@ -122,7 +122,7 @@ module Brick::Rails::FormTags
         if (link_id = obj.send(cust_col.last[1]) if cust_col.last)
           out << link_to(cust_txt, send("#{cust_col.last.first._brick_index(:singular)}_path", link_id))
         else
-          out << cust_txt
+          out << (cust_txt || '')
         end
       else # Bad column name!
         out << '?'
@@ -137,6 +137,51 @@ module Brick::Rails::FormTags
     out.html_safe
   end # brick_grid
 
+  # Recursively render UL and LI to choose columns to include
+  def pick_api(model, is_last = nil, visited = [])
+    out = +''
+    if visited.empty?
+      out << '<span id="apiToggle">API buffet</span><div id="apiBuffet" style="display: none;">'
+      out << '<textarea id="apiCode" cols="100"></textarea>'
+      out << '<input type="button" id="apiRender" value="Render">'
+    end
+    out << "\n#{indent = '  ' * visited.length}<ul>"
+    model.column_names.each { |col_name| out << "\n#{indent}  <li class=\"apiColName\" x-nm=\"#{visited.map { |v| "#{v.last}." }.join}#{col_name}\">#{col_name}</li>" }
+    unless is_last || visited.length == 2
+      model.reflect_on_all_associations.each_with_object({}) do |v, s|
+        next if v.macro == :has_many || v.polymorphic?
+
+        out << "\n#{indent}  <li><b>#{v.name}</b>#{pick_api(v.klass, visited.map(&:first).include?(v.klass),
+                                                   visited.dup << [v.klass, v.name]
+                                                  )}"
+        out << "\n#{indent}  </li>"
+        s[v.name] = nil
+      end
+    end
+    out << "\n#{indent}</ul>"
+    if visited.empty?
+      out << '</div><script>[... document.getElementsByClassName("apiColName")].forEach(function (li) {li.addEventListener("click", apiColClick);});'
+      out << "
+var colList = [];
+var apiBuffet = document.getElementById(\"apiBuffet\");
+var apiCode = document.getElementById(\"apiCode\");
+function apiColClick(evt) {
+  apiCode.innerHTML += this.getAttribute(\"x-nm\") + \",\\n\";
+}
+document.getElementById(\"apiToggle\").addEventListener(\"click\", function () {
+  apiBuffet.style.display = (apiBuffet.style.display === \"block\" ? \"none\" : \"block\");
+});
+// Cheap and cheerful way to render a list of columns just for the demo
+document.getElementById(\"apiRender\").addEventListener(\"click\", function () {
+  var changecolList = apiCode.innerHTML.substring(0, apiCode.innerHTML.length - 2);
+  location.href = changeout(location.href, \"_brick_api\", changecolList);
+});
+</script>
+"
+    end
+    out
+  end
+
   def link_to_brick(*args, **kwargs)
     return unless ::Brick.config.mode == :on
 

data/lib/brick/version_number.rb

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