brick 1.0.99 → 1.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 431e2aee4c3c199095d8475eeedcc46bd95e86a47c51623e3cea7fbbde59edcd
-  data.tar.gz: 32144a9a9ab6ec60ef297f27ae73e35cc891e5f9462b9beae4e7a0534ab77135
+  metadata.gz: ba0de7f332d1d98502a4e66bc4fda9b44d4f97fe6d6a259ac7527a856c726000
+  data.tar.gz: 45898a638f4c944cf33e98ff73a41da97686819bbdfcc8534257c013a6b28582
 SHA512:
-  metadata.gz: f471bc993d97e92deae3c03e6cac9db0e350e72bd070afe5bcde1d0ca18d650b546db0d018a101009e429e9870a7e2c5e566f980c9e5b1319bc18873271c5550
-  data.tar.gz: 95f128f0f2a29cf0d1af1b5001eae27885b7e11ce23194e4a4da0141a0bfc059edd1917036f4addf1ee2aa4b69f763962e821ca31f9473048a6934dbecd8518e
+  metadata.gz: 28079c58b020d395845c681710c88db3e7a32ae312fbdf607ab496854aab37d29f3a9dfed78a2495a011b3817aed8259260a1d0d5ecd409803d89b4eda70b87f
+  data.tar.gz: 834499603e05412ee19c2f5db90f55df1f927eff85a41488e4f57381065580aeb4477700596988e4cc630282268f40045d1831822bde2c80b659a23e257f692a

data/lib/brick/extensions.rb

@@ -404,21 +404,9 @@ module ActiveRecord
     def brick_select(params, selects = [], order_by = nil, translations = {}, join_array = ::Brick::JoinArray.new)
       is_add_bts = is_add_hms = true
 
-      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
+      # 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
 
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
@@ -426,7 +414,7 @@ module ActiveRecord
       is_distinct = nil
       wheres = {}
       params.each do |k, v|
-        next if ['_brick_schema', '_brick_order', '_brick_api', 'controller', 'action'].include?(k)
+        next if ['_brick_schema', '_brick_order', 'controller', 'action'].include?(k)
 
         if (where_col = (ks = k.split('.')).last)[-1] == '!'
           where_col = where_col[0..-2]
@@ -454,8 +442,6 @@ module ActiveRecord
         #     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}"
@@ -505,6 +491,7 @@ module ActiveRecord
             # binding.pry
             next
           end
+
           key_klass = nil
           key_tbl_name = nil
           dest_pk = nil
@@ -984,7 +971,7 @@ Module.class_exec do
                                    ::Brick.is_oracle ? class_name.upcase : class_name,
                                    (plural_class_name = class_name.pluralize)].find { |s| Brick.db_schemas&.include?(s) }&.camelize ||
                                   (::Brick.config.sti_namespace_prefixes&.key?("::#{class_name}::") && class_name) ||
-                                  (::Brick.config.table_name_prefixes&.values.include?(class_name) && class_name))
+                                  (::Brick.config.table_name_prefixes.values.include?(class_name) && class_name))
                return self.const_get(schema_name) if self.const_defined?(schema_name)
 
                # Build out a module for the schema if it's namespaced
@@ -1590,13 +1577,6 @@ class Object
 
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? model.preload : model.all
 
-            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)
@@ -1611,7 +1591,6 @@ 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

@@ -54,7 +54,7 @@ module Brick
                                       end
 
         # When table names have specific prefixes, automatically place them in their own module with a table_name_prefix.
-        ::Brick.table_name_prefixes = app.config.brick.fetch(:table_name_prefixes, [])
+        ::Brick.table_name_prefixes = app.config.brick.fetch(:table_name_prefixes, {})
 
         # Columns to treat as being metadata for purposes of identifying associative tables for has_many :through
         ::Brick.metadata_columns = app.config.brick.fetch(:metadata_columns, ['created_at', 'updated_at', 'deleted_at'])
@@ -424,14 +424,6 @@ h1, h3 {
   cursor: pointer;
 }
 
-#apiToggle {
-  border: 2px solid purple;
-}
-
-#apiToggle, .apiColName {
-  cursor: pointer;
-}
-
 #dropper {
   background-color: #eee;
 }
@@ -1012,9 +1004,6 @@ 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>
@@ -1088,13 +1077,8 @@ erDiagram
                        end
 
     # Write out the mega-grid
-    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 %>
+    brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, @_brick_incl, @_brick_excl,
+                 cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}}) %>
 
 #{"<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

@@ -137,51 +137,6 @@ 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
 
@@ -231,13 +186,14 @@ document.getElementById(\"apiRender\").addEventListener(\"click\", function () {
         end
       end
       filter = "?#{filter_parts.join('&')}" if filter_parts.present?
+      app_routes = Rails.application.routes # In case we're operating in another engine, reference the application since Brick routes are placed there.
       if (klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base) ||
          (klass_or_obj&.is_a?(ActiveRecord::Base) && klass_or_obj.new_record? && (klass_or_obj = klass_or_obj.class))
-        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj) : "#{send("#{klass_or_obj.base_class._brick_index}_path")}#{filter}"
+        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index, action: :index)}#{filter}"
         lt_args = [text || "Index for #{klass_or_obj.name.pluralize}", path]
       else
         # If there are multiple incoming parameters then last one is probably the actual ID, and first few might be some nested tree of stuff leading up to it
-        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj) : "#{send("#{klass_or_obj.class.base_class._brick_index(:singular)}_path", klass_or_obj)}#{filter}"
+        path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index, action: :show, id: klass_or_obj)}#{filter}"
         lt_args = [text || "Show this #{klass_or_obj.class.name}", path]
       end
       link_to(*lt_args, **kwargs)

data/lib/brick/version_number.rb

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