brick 1.0.51 → 1.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0c2c69187f4d9b8eaa4a22777d3e517546bf355316012bf3e333064f8939b7
-  data.tar.gz: 33fcb2f6ca4373eba2db3a2891de392d9ef71ea693687328f72d23837cabdc46
+  metadata.gz: e3d0b398d1d3926fa3e59281c976fe2f7a54bfc16de4f99683928ce71d7ace97
+  data.tar.gz: 344c0de3e8691583e9a940ee451ad29015d46b0cbc55756d3b36e10d9ce27edb
 SHA512:
-  metadata.gz: 7136cb61d19325c1916e9d2e8e6cd7ed6c1d6838c77a216c5275bf4cc0d3540eeabf5caae152b49b9f5cf0d5ea7307bebd98f2fdbc03e651310c1cfc6fbec436
-  data.tar.gz: 81007bc391e9871ab0bbe80fc5aaa440da2685e1abe16d65d09419e31e93529232757db173cf97ba78ad3e719af760cac2d83b57cb7d97fa488399d93d3d2f76
+  metadata.gz: e0cff4e30c30d33dd13bd5a6a4a888d52e0552fc692369c42a53846da00e9ce677ab48ba840ef1396728d339984e5f7ff35d9ce33ea60f8421b9fa19edc14575
+  data.tar.gz: 5971fcc802dd1732f71d3bcd015e4b616f7775028a10205c7e4b9b1fa41d13c0318f581c966c223e9a0661b8b9fa52e1197ae78c007144e93ec96de61b084663

data/lib/brick/extensions.rb

@@ -1124,9 +1124,7 @@ class Object
         is_pk_string = nil
         if (pk_col = model&.primary_key)
           code << "  def show\n"
-          code << (find_by_id = "    id = params[:id]&.split(/[\\/,_]/)
-    id = id.first if id.is_a?(Array) && id.length == 1
-    @#{singular_table_name} = #{model.name}.find(id)\n")
+          code << "    #{find_by_name = "find_#{singular_table_name}"}\n"
           code << "  end\n"
           self.define_method :show do
             ::Brick.set_db_schema(params)
@@ -1137,35 +1135,47 @@ class Object
                    params[:id]&.split(/[\/,_]/)
                  end
             id = id.first if id.is_a?(Array) && id.length == 1
-            instance_variable_set("@#{singular_table_name}".to_sym, model.find(id))
+            instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
           end
         end
 
         # By default, views get marked as read-only
-        unless is_swagger # model.readonly # (relation = relations[model.table_name]).key?(:isView)
-          code << "  # (Define :new, :create)\n"
+        # unless model.readonly # (relation = relations[model.table_name]).key?(:isView)
+          code << "  def new\n"
+          code << "    @#{singular_table_name} = #{model.name}.new\n"
+          code << "  end\n"
+          self.define_method :new do
+            ::Brick.set_db_schema(params)
+            instance_variable_set("@#{singular_table_name}".to_sym, model.new)
+          end
+
+          params_name_sym = (params_name = "#{singular_table_name}_params").to_sym
+
+          code << "  def create\n"
+          code << "    @#{singular_table_name} = #{model.name}.create(#{params_name})\n"
+          code << "  end\n"
+          self.define_method :create do
+            ::Brick.set_db_schema(params)
+            instance_variable_set("@#{singular_table_name}".to_sym,
+                                  model.send(:create, send(params_name_sym)))
+          end
 
-          if model.primary_key
+          if pk_col
             # if (schema = ::Brick.config.schema_behavior[:multitenant]&.fetch(:schema_to_analyse, nil)) && ::Brick.db_schemas&.include?(schema)
             #   ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?;", schema)
             # end
 
             is_need_params = true
-            # code << "  # (Define :destroy)\n"
             code << "  def edit\n"
-            code << find_by_id
+            code << "    #{find_by_name}\n"
             code << "  end\n"
             self.define_method :edit do
               ::Brick.set_db_schema(params)
-              id = is_pk_string ? params[:id] : params[:id]&.split(/[\/,_]/)
-              id = id.first if id.is_a?(Array) && id.length == 1
-              instance_variable_set("@#{singular_table_name}".to_sym, model.find(id))
+              instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
             end
 
             code << "  def update\n"
-            code << find_by_id
-            params_name = "#{singular_table_name}_params"
-            code << "    @#{singular_table_name}.update(#{params_name})\n"
+            code << "    #{find_by_name}.update(#{params_name})\n"
             code << "  end\n"
             self.define_method :update do
               ::Brick.set_db_schema(params)
@@ -1184,31 +1194,50 @@ class Object
               #   return
               end
 
+              instance_variable_set("@#{singular_table_name}".to_sym, (obj = find_obj))
+              obj.send(:update, send(params_name_sym))
+            end
+
+            code << "  def destroy\n"
+            code << "    #{find_by_name}.destroy\n"
+            code << "  end\n"
+            self.define_method :destroy do
+              ::Brick.set_db_schema(params)
+              instance_variable_set("@#{singular_table_name}".to_sym, find_obj.send(:destroy))
+            end
+          end
+
+          code << "private\n" if pk_col || is_need_params
+
+          if pk_col
+            code << "  def find_#{singular_table_name}
+    id = params[:id]&.split(/[\\/,_]/)
+    @#{singular_table_name} = #{model.name}.find(id.is_a?(Array) && id.length == 1 ? id.first : id)
+  end\n"
+            self.define_method :find_obj do
               id = is_pk_string ? params[:id] : params[:id]&.split(/[\/,_]/)
-              id = id.first if id.is_a?(Array) && id.length == 1
-              instance_variable_set("@#{singular_table_name}".to_sym, (obj = model.find(id)))
-              obj = obj.first if obj.is_a?(Array)
-              obj.send(:update, send(params_name = params_name.to_sym))
+              model.find(id.is_a?(Array) && id.length == 1 ? id.first : id)
             end
           end
 
           if is_need_params
-            code << "private\n"
             code << "  def #{params_name}\n"
-            permits = model.columns_hash.keys.map { |c| c.to_sym.inspect } +
-                      model.reflect_on_all_associations.each_with_object([]) do |assoc, s|
-                        s << "#{assoc.name.to_s.singularize}_ids: []" if assoc.macro == :has_many && assoc.options[:through]
-                      end
+            permits = model.columns_hash.keys.map(&:to_sym)
+            permits_txt = permits.map(&:inspect) +
+                          model.reflect_on_all_associations.select { |assoc| assoc.macro == :has_many && assoc.options[:through] }.map do |assoc|
+                            permits << { "#{assoc.name.to_s.singularize}_ids".to_sym => [] }
+                            "#{assoc.name.to_s.singularize}_ids: []"
+                          end
             code << "    params.require(:#{require_name = model.name.underscore.tr('/', '_')
-                             }).permit(#{permits.join(', ')})\n"
+                             }).permit(#{permits_txt.join(', ')})\n"
             code << "  end\n"
             self.define_method(params_name) do
-              params.require(require_name.to_sym).permit(model.columns_hash.keys)
+              params.require(require_name.to_sym).permit(permits)
             end
             private params_name
             # Get column names for params from relations[model.table_name][:cols].keys
           end
-        end
+        # end
         code << "end # #{namespace_name}#{class_name}\n\n"
       end # class definition
       [built_controller, code]

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

@@ -133,25 +133,21 @@ module Brick
                   case args.first
                   when 'index'
                     hms_columns << if hm_assoc.macro == :has_many
-                                     set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
-                                                'nil'
-                                              else
-                                                # Postgres column names are limited to 63 characters
-                                                attrib_name = "_br_#{assoc_name}_ct"[0..62]
-                                                "#{obj_name}.#{attrib_name} || 0"
-                                              end
                                      if hm_fk_name
-"<%= ct = #{set_ct}
-     link_to \"#\{ct || 'View'\} #{assoc_name}\", #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)} }) unless ct&.zero? %>\n"
+                                       set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
+                                                   'nil'
+                                                 else
+                                                   # Postgres column names are limited to 63 characters
+                                                   attrib_name = "_br_#{assoc_name}_ct"[0..62]
+                                                   "#{obj_name}.#{attrib_name} || 0"
+                                                 end
+                                       "#{hm_assoc.name}: [#{assoc_name.inspect}, #{set_ct}, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}]"
                                      else # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
-"#{assoc_name}\n"
+                                       "#{hm_assoc.name}: [#{assoc_name.inspect}]"
                                      end
                                    else # has_one
                                      # 0..62 because Postgres column names are limited to 63 characters
-"<%= descrips = @_brick_bt_descrip[#{hm.first.inspect}][ho_class = #{hm[1].klass.name}]
-     ho_txt = ho_class.brick_descrip(#{obj_name}, descrips[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, (ho_id_col = descrips.last))
-     ho_id = ho_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) }
-     ho_id&.first ? link_to(ho_txt, send(\"#\{ho_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, ho_id)) : ho_txt %>\n"
+                                     "#{hm_assoc.name}: [#{assoc_name.inspect}, nil, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}]"
                                    end
                   when 'show', 'update'
                     hm_stuff << if hm_fk_name
@@ -285,8 +281,8 @@ input+svg.revert {
   color: #FFF;
 }
 </style>
-<% is_includes_dates = nil
 
+<% is_includes_dates = nil
 def is_bcrypt?(val)
   val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
 end
@@ -555,46 +551,46 @@ if (headerTop) {
 <br>
 <table id=\"headerTop\">
 <table id=\"#{table_name}\">
-  <thead><tr>#{"<th x-order=\"#{pk.join(',')}\"></th>" if pk.present?}<%
+  <thead><tr>#{"<th x-order=\"#{pk.join(',')}\"></th>" if pk.present?}<%=
      col_order = []
-     @#{table_name}.columns.each do |col|
-       next if (#{(pk || []).inspect}.include?(col_name = col.name) && col.type == :integer && !bts.key?(col_name)) ||
-               ::Brick.config.metadata_columns.include?(col_name) || poly_cols.include?(col_name)
-
-       col_order << col_name
-    %><th<%= \" title=\\\"#\{col.comment}\\\"\".html_safe if col.respond_to?(:comment) && !col.comment.blank? %><%
-       if (bt = bts[col_name]) %>
-         <%= \" x-order=\\\"#\{bt.first}\\\"\".html_safe unless bt[2] # Allow sorting any BT except polymorphics
-         %>>BT <%
-         bt[1].each do |bt_pair| %><%=
-           bt_pair.first.bt_link(bt.first) %> <%
-         end %><%
-       else %><%= \" x-order=\\\"#\{col_name}\\\"\".html_safe if true # Currently we always allow click to sort
-         %>><%= col_name %><%
-       end
-    %></th><%
-     end
      # Consider getting the name from the association -- h.first.name -- if a more \"friendly\" alias should be used for a screwy table name
-  %>#{hms_headers.map do |h|
-        # Currently we always allow click to sort
-        "<th#{" x-order=\"#{h.first.name}\"" if true}>" +
-        if h.first.options[:through] && !h.first.through_reflection
-    "#{h[1]} #{h[2]} %></th>" # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
-        else
-    "#{h[1]} <%= link_to('#{h[2]}', #{h.first.klass.name.underscore.tr('/', '_').pluralize}_path) %></th>"
-        end
-      end.join
-  }</tr></thead>
-
+     hms_hdrs = {#{hms_headers.map do |hm|
+                    "#{hm.first.name}: [#{hm.first.name.inspect}, #{(hm.first.options[:through] && !hm.first.through_reflection).inspect}, #{hm.first.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
+                  end.join(', ')}}
+     (@#{table_name}.columns + hms_hdrs.values).each_with_object(+'') do |col, s|
+       if col.is_a?(ActiveRecord::ConnectionAdapters::Column)
+         next if (#{(pk || []).inspect}.include?(col_name = col.name) && col.type == :integer && !bts.key?(col_name)) ||
+                 ::Brick.config.metadata_columns.include?(col_name) || poly_cols.include?(col_name)
+
+         col_order << col_name
+         s << if (bt = bts[col_name])
+                \"<th#\{' x-order=\"' + bt.first.to_s + '\"' unless bt[2]}>BT \" + # Allow sorting any BT except polymorphics
+                bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')
+              else
+                # Currently we always allow click to sort on non-BT columns
+                \"<th#\{' x-order=\"' + col_name + '\"' if true}>#\{col_name}\"
+              end + '</th>'
+       else # Currently we always allow click to sort on all HM columns (col is the hm array)
+         col_order << col.first # hm.name
+         s << \"<th#\{' x-order=\"' + col.first.to_s + '\"' if true}>\"
+         s << if col[1]
+                \"#\{col[3]} #\{col[4]}\" # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
+              else
+                \"#\{col[3]} #\{link_to(col[4], send(\"#\{col[2].name.underscore.tr('/', '_').pluralize}_path\"))}\"
+              end + '</th>'
+       end
+     end.html_safe
+  %></tr></thead>
   <tbody>
-  <% @#{table_name}.each do |#{obj_name}| %>
+  <% @#{table_name}.each do |#{obj_name}|
+       hms_cols = {#{hms_columns.join(', ')}} %>
   <tr>#{"
     <td><%= link_to '⇛', #{path_obj_name}_path(#{obj_pk}), { class: 'big-arrow' } %></td>" if obj_pk}
     <% col_order.each do |col_name|
          val = #{obj_name}.attributes[col_name] %>
-      <td>
-      <% if (bt = bts[col_name]) %>
-        <% if bt[2] # Polymorphic?
+      <td><%
+         if (bt = bts[col_name])
+           if bt[2] # Polymorphic?
              bt_class = #{obj_name}.send(\"#\{bt.first\}_type\")
              base_class = (::Brick.existing_stis[bt_class] || bt_class).constantize.base_class.name.underscore
              poly_id = #{obj_name}.send(\"#\{bt.first\}_id\")
@@ -610,12 +606,26 @@ if (headerTop) {
           <%= bt_id&.first ? link_to(bt_txt, send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_id)) : bt_txt %>
           <%#= Previously was:  bt_obj = bt[1].first.first.find_by(bt[2] => val); link_to(bt_obj.brick_descrip, send(\"#\{bt[1].first.first.name.underscore\}_path\".to_sym, bt_obj.send(bt[1].first.first.primary_key.to_sym))) if bt_obj %>
         <% end %>
-      <% else %>
-        <%= hide_bcrypt(val) %>
-      <% end %>
-      </td>
+      <% elsif (hms_col = hms_cols[col_name])
+           if hms_col.length == 1 %>
+         <%= hms_col.first %>
+        <% else
+             klass = (col = hms_hdrs[col_name])[2]
+             txt = if col[3] == 'HO'
+                     descrips = @_brick_bt_descrip[col_name][klass]
+                     ho_txt = klass.brick_descrip(#{obj_name}, descrips[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, (ho_id_col = descrips.last))
+                     ho_id = ho_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) }
+                     ho_id&.first ? link_to(ho_txt, send(\"#\{klass.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, ho_id)) : ho_txt
+                   else
+                     \"#\{hms_col[1] || 'View'\} #\{hms_col.first}\"
+                   end %>
+         <%= link_to txt, send(\"#\{klass.name.underscore.tr('/', '_').pluralize}_path\".to_sym, hms_col[2]) unless hms_col[1]&.zero? %>
+        <% end %>
+      <% else
+      %><%= hide_bcrypt(val) %><%
+         end
+    %></td>
     <% end %>
-    #{hms_columns.each_with_object(+'') { |hm_col, s| s << "<td>#{hm_col}</td>" }}
   </tr>
   <% end %>
   </tbody>

data/lib/brick/version_number.rb

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