brick 1.0.195 → 1.0.196

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48a47a4a4fd18918a7e1b3f90ffb1953afb11c569e19664920d3921e4806b4fe
-  data.tar.gz: 2a50f06d5790c7facfec994693c5f88f747b96825f62cf6b51a81dbf97f88aca
+  metadata.gz: 9f5cff29063c150d35653274752bcda0ed44ce462563824f8b8a974dfacc8a81
+  data.tar.gz: 2d26e1e8a62b3a9e69c6a28a37e640fa5c5e0ced28a6527db4b68d2abdfc47f5
 SHA512:
-  metadata.gz: dc9840fb52d71e04ef8a899d16289276d11556f55492d9190aaf6387659d520c105c7885c80c65a5ddba5a4294c0f088cbf03adb70969b9f948dd85721865fe2
-  data.tar.gz: 2846f746ad0f325ea5915b8ad68db9bb39d8a81061adf3ca6dfa996bc209d193887eea22b4eb9c6bdf65131c1c82f2ce980eedea9f7be886b0d9084017fcd553
+  metadata.gz: 150e669bb088db49139311839cbca472317b371d24ab85bc096bea94221331c1f7122b8ed521a9c87691d9ded450d723954c2bd7d833b56fd07f248be5624339
+  data.tar.gz: cf000d92773ce9ec8db6a412e7f4fe642e6e9bc07db9412459931a69ebc7dff7fb41de9d1824d068b9c8568827cdbd1881073f3404b85eab1fc1c5670cd625ff

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

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/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 195
+    TINY = 196
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.195
+  version: 1.0.196
 platform: ruby
 authors:
 - Lorin Thwaits