brick 1.0.195 → 1.0.197

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48a47a4a4fd18918a7e1b3f90ffb1953afb11c569e19664920d3921e4806b4fe
-  data.tar.gz: 2a50f06d5790c7facfec994693c5f88f747b96825f62cf6b51a81dbf97f88aca
+  metadata.gz: bfd8798f339e1bb363ca73f7b3285cdb32471cbae2c6ff5a500b43db6536840a
+  data.tar.gz: be5744fd98d6323ecb33be2b77f50e9ee5b872bc8356ef4d08372cddab4d9920
 SHA512:
-  metadata.gz: dc9840fb52d71e04ef8a899d16289276d11556f55492d9190aaf6387659d520c105c7885c80c65a5ddba5a4294c0f088cbf03adb70969b9f948dd85721865fe2
-  data.tar.gz: 2846f746ad0f325ea5915b8ad68db9bb39d8a81061adf3ca6dfa996bc209d193887eea22b4eb9c6bdf65131c1c82f2ce980eedea9f7be886b0d9084017fcd553
+  metadata.gz: 8848e2c6a93a75f454b0b9ebd4712769c39868583fc6d6659548c6eb3818eec12bfb7968580a4c684eab67095fca754553a42bc4b71729b223f79882731ebfd3
+  data.tar.gz: b764da2f667e22e5d02e6f5354e3b4b30164827c5b40647b7fca672038f7435ebe14f32dc22d05c54375a29e94c68d82b61dc590099f9e26f2b4843092861bed

data/lib/brick/extensions.rb

@@ -436,13 +436,9 @@ module ActiveRecord
       order_by = ordering&.each_with_object([]) do |ord_part, s| # %%% If a term is also used as an eqi-condition in the WHERE clause, it can be omitted from ORDER BY
                    case ord_part
                    when String
-                     ord_expr = if ord_part.index('^^^')
-                                  ord_part.gsub('^^^', _br_quoted_name(table_name))
-                                else
-                                  _br_quoted_name(ord_part)
-                                end
+                     ord_expr = _br_quoted_name(ord_part.gsub('^^^', table_name))
                      s << Arel.sql(ord_expr)
-                     order_by_txt&.<<("Arel.sql(#{ord_expr.inspect})")
+                     order_by_txt&.<<(ord_expr.index('.') ? "Arel.sql(#{ord_expr.inspect})" : ord_expr)
                    else # Expecting only Symbol
                      ord_part = ord_part.to_s
                      if ord_part[0] == '-' # First char '-' means descending order
@@ -1917,7 +1913,7 @@ class Object
                 cspd.select! { |val| val == "'self'" }
                 cspd << style_value
               else
-                cspd << "'sha256-ZMGrNwNigXBkvHBZrPrNurCVlJycGWtt2uvoEigUowg='"
+                cspd << "'sha256-0Vb7j3kDGE3oNfwMpRLClTSCUo/q74bvbt3p6kG/gkM='"
               end
               cspd << 'https://cdn.jsdelivr.net'
             end
@@ -3472,9 +3468,9 @@ module Brick
       separator ||= '_'
       res_name = (tbl_name_parts = tbl_name.split('.'))[0..-2].first
       res_name << '.' if res_name
-      (res_name ||= +'') << (relation || ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
+      (res_name ||= +'') << (relation ||= ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
 
-      res_parts = ((mode == :singular) ? res_name.singularize : res_name).split('.')
+      res_parts = ((mode == :singular) ? tbl_name.singularize : tbl_name).split('.')
       res_parts.shift if ::Brick.apartment_multitenant && res_parts.length > 1 && res_parts.first == ::Brick.apartment_default_tenant
       if (aps = relation&.fetch(:auto_prefixed_schema, nil)) && res_parts.last.start_with?(aps)
         last_part = res_parts.last[aps.length..-1]
@@ -3491,7 +3487,7 @@ module Brick
       index = index.tr('_', 'x') if separator == 'x'
       # Rails applies an _index suffix to that route when the resource name isn't something plural
       index << '_index' if mode != :singular && separator == '_' &&
-                           index == (path_prefix + [name&.underscore&.tr('/', '_') || '_']).join(separator)
+                           index == (path_prefix + [relation[:class_name]&.underscore&.tr('/', '_') || '_']).join(separator)
       index
     end
 

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

@@ -940,7 +940,11 @@ tr th a {
 .add-hm-related {
   float: right;
 }
-
+#tblAddCol {
+  position: relative;
+  z-index: 2;
+  border: 2px solid blue;
+}
 tr th, tr td {
   padding: 0.2em 0.5em;
 }
@@ -998,6 +1002,12 @@ a.big-arrow {
 .right {
   text-align: right;
 }
+.paddingBottomZero {
+  padding-bottom: 0px;
+}
+.paddingTopZero {
+  padding-top: 0px;
+}
 .orphan {
   color: red;
   white-space: nowrap;
@@ -1193,18 +1203,18 @@ erDiagram
  # Make into a server control with a javascript snippet
  # Have post back go to a common "brick_schema" endpoint, this one for add_column
 "
-  <table style=\"position: relative; z-index: 2; border: 2px solid blue;\"><tr>
+  <table id=\"tblAddCol\"><tr>
     <td rowspan=\"2\">Add<br>Column</td>
-    <td style=\"padding-bottom: 0px\">Type</td><td style=\"padding-bottom: 0px\">Name</td>
+    <td class=\"paddingBottomZero\">Type</td><td class=\"paddingBottomZero\">Name</td>
     <td rowspan=\"2\"><input type=\"button\" id=\"btnAddCol\" value=\"+\"></td>
-  </tr><tr><td style=\"padding-top: 0px\">
+  </tr><tr><td class=\"paddingTopZero\">
     <select id=\"ddlColType\">
    <option value=\"string\">String</option>
    <option value=\"text\">Text</option>
    <option value=\"integer\">Integer</option>
    <option value=\"bool\">Boolean</option>
  </select></td>
- <td style=\"padding-top: 0px\"><input id=\"txtColName\"></td>
+ <td class=\"paddingTopZero\"><input id=\"txtColName\"></td>
  </tr></table>
  <script>
  var btnAddCol = document.getElementById(\"btnAddCol\");
@@ -1590,9 +1600,12 @@ end %>#{"
 <table id=\"resourceName\"><td><h1><%= page_title %></h1></td>
 <% rel = Brick.relations[#{model_name}.table_name]
    if (in_app = rel.fetch(:existing, nil)&.fetch(:show, nil))
-     in_app = send(\"#\{in_app}_path\", #{pk.is_a?(String) ? "obj.#{pk}" : '[' + pk.map { |pk_part| "obj.#{pk_part}" }.join(', ') + ']' }) if in_app.is_a?(Symbol) %>
+     begin
+       in_app = send(\"#\{in_app}_path\", #{pk.is_a?(String) ? "obj.#{pk}" : '[' + pk.map { |pk_part| "obj.#{pk_part}" }.join(', ') + ']' }) if in_app.is_a?(Symbol) %>
      <td><%= link_to(::Brick::Rails::IN_APP.html_safe, in_app) %></td>
-<% end
+<%   rescue ActionController::UrlGenerationError
+     end
+   end
 
    if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
   <td><%= link_to_brick(

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

@@ -47,9 +47,12 @@ module Brick::Rails::FormTags
 "
       end
       if rel && show_in_app_button != false && (in_app = rel.fetch(:existing, nil)&.fetch(:index, nil))
-        in_app = send("#{in_app}_path") if in_app.is_a?(Symbol)
-        out << "      <td title=\"Show in app\">#{link_to(::Brick::Rails::IN_APP.html_safe, in_app)}</td>
+        begin
+          in_app = send("#{in_app}_path") if in_app.is_a?(Symbol)
+          out << "      <td title=\"Show in app\">#{link_to(::Brick::Rails::IN_APP.html_safe, in_app)}</td>
 "
+        rescue ActionController::UrlGenerationError # Avoid snags like "No route matches {:action=>"index", :controller=>"categories/products"}, missing required keys: [:category_id]"
+        end
       end
       if show_avo_button != false && Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) && klass.name.exclude?('::')
         out << "

data/lib/brick/route_mapper.rb

@@ -74,7 +74,7 @@ module Brick
           schema_prefix = "#{schema_name}."
         end
 
-        resource_name = v.fetch(:resource, nil)
+        resource_name = v.fetch(:resource, nil) || k
         next if !resource_name ||
                 existing_controllers.key?(
                   controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
@@ -82,7 +82,7 @@ module Brick
 
         object_name = k.split('.').last # Take off any first schema part
 
-        full_schema_prefix = if (full_aps = aps = v.fetch(:auto_prefixed_schema, nil))
+        full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
                                aps = aps[0..-2] if aps[-1] == '_'
                                (schema_prefix&.dup || +'') << "#{aps}."
                              else
@@ -90,7 +90,6 @@ module Brick
                              end
 
         # Track routes being built
-        resource_name = v.fetch(:resource, nil) || k
         if (class_name = v.fetch(:class_name, nil))
           if v.key?(:isView)
             view_class_length = class_name.length if class_name.length > view_class_length
@@ -98,7 +97,7 @@ module Brick
           else
             table_class_length = class_name.length if class_name.length > table_class_length
             tables
-          end << [class_name, aps, "#{"#{schema_name}/" if schema_name}#{resource_name[full_aps&.length || 0 .. -1]}"]
+          end << [class_name, aps, "#{"#{schema_name}/" if schema_name}#{resource_name}"]
         end
 
         options = {}

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 195
+    TINY = 197
 
     # 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.195
+  version: 1.0.197
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord