brick 1.0.194 → 1.0.196

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241617832338faa570f73caad241a98dd065fc9e1428fe54801bfbb57a26a392
-  data.tar.gz: 86a7427f5b382bc478eec07e42c42eac1f5aeda56e29bad839e947acfec6c08f
+  metadata.gz: 9f5cff29063c150d35653274752bcda0ed44ce462563824f8b8a974dfacc8a81
+  data.tar.gz: 2d26e1e8a62b3a9e69c6a28a37e640fa5c5e0ced28a6527db4b68d2abdfc47f5
 SHA512:
-  metadata.gz: 25392afb2c248e305decfe4c641c415f96f7836c46aeda2bad56b59016ee140c780a008dfa57a563d987ed75c7be929d786d95bfa2f15aa58128f67a043429b7
-  data.tar.gz: afc21602ca3c3be41b686534c78b49507f1d1c06a6abe90a224c5302e8ebefaf5963bc75e181b4bd31b7b5eae9fe0970c871f33945ec192fe63bcb4e336b7baa
+  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
-                     if ord_part.index('^^^')
-                       ord_expr = ord_part.gsub('^^^', _br_quoted_name(table_name))
-                       s << Arel.sql(ord_expr)
-                     else
-                       s << Arel.sql(_br_quoted_name(ord_part))
-                     end
-                     order_by_txt&.<<("Arel.sql(#{ord_expr.inspect})")
+                     ord_expr = _br_quoted_name(ord_part.gsub('^^^', table_name))
+                     s << Arel.sql(ord_expr)
+                     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
@@ -1860,14 +1856,14 @@ class Object
       end
     end
 
-    def default_ordering(table_name, pk)
+    def default_ordering(table_name, pk, omit_table_name = nil)
       case (order_tbl = ::Brick.config.order[table_name]) && (order_default = order_tbl[:_brick_default])
       when Array
         order_default.map { |od_part| order_tbl[od_part] || od_part }
       when Symbol
         order_tbl[order_default] || order_default
       else
-        pk.map { |part| "#{table_name}.#{part}"} # If it's not a custom ORDER BY, just use the key
+        pk.map { |part| "#{"#{table_name}." unless omit_table_name}#{part}"} # If it's not a custom ORDER BY, just use the key
       end
     end
 
@@ -1917,7 +1913,7 @@ class Object
                 cspd.select! { |val| val == "'self'" }
                 cspd << style_value
               else
-                cspd << "'sha256-Q8t+pETkz0RtyV4XprwdP+uEkVaFyMnx1mXif0wDoxw='"
+                cspd << "'sha256-0Vb7j3kDGE3oNfwMpRLClTSCUo/q74bvbt3p6kG/gkM='"
               end
               cspd << 'https://cdn.jsdelivr.net'
             end
@@ -2035,6 +2031,7 @@ class Object
         end
 
         self.protect_from_forgery unless: -> { self.request.format.js? }
+        plural_table_name = table_name.split('.').last.pluralize
         unless is_avo
           self.define_method :index do
             request_ver = request.path.split('/')[-2]
@@ -2220,7 +2217,7 @@ class Object
                    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.split('.').last}".to_sym, ar_select)
+            instance_variable_set("@#{plural_table_name}".to_sym, ar_select)
             table_name_no_schema = singular_table_name.pluralize
             if namespace && (idx = lookup_context.prefixes.index(table_name_no_schema))
               lookup_context.prefixes[idx] = "#{namespace.name.underscore}/#{lookup_context.prefixes[idx]}"
@@ -2259,10 +2256,10 @@ class Object
             end
           end
 
-          _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk)) if pk
+          _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk, true)) if pk
           code << "  def index\n"
-          code << "    @#{table_name.pluralize} = #{model.name}#{pk&.present? ? ".order(#{order_by_txt.join(', ')})" : '.all'}\n"
-          code << "    @#{table_name.pluralize}.brick_select(params)\n"
+          code << "    @#{plural_table_name} = #{model.name}#{pk&.present? ? ".order(#{order_by_txt.join(', ')})" : '.all'}\n"
+          code << "    @#{plural_table_name}.brick_select(params)\n"
           code << "  end\n"
 
           is_pk_string = nil
@@ -2562,12 +2559,8 @@ class Object
                                     assoc_name = assoc_parts.join('.')
                                   else
                                     class_name_parts = ::Brick.namify(hm_assoc[:inverse_table], :underscore).split('.')
-                                    last_idx = class_name_parts.length - 1
-                                    class_name_parts[last_idx] = class_name_parts[last_idx].singularize
-                                    real_name = class_name_parts.map(&:camelize).join('::')
-                                    needs_class = (real_name != hm_assoc[:inverse_table].camelize)
+                                    needs_class = assoc_name.singularize.camelize != class_name_parts.last.singularize.camelize
                                   end
-                                  # hm_assoc[:assoc_name] = assoc_name
                                   [assoc_name, needs_class]
                                 end
       # Already have the HM class around?
@@ -2616,7 +2609,7 @@ end.class_exec do
       #   https://discuss.rubyonrails.org/t/failed-write-transaction-upgrades-in-sqlite3/81480/2
       if ActiveRecord::Base.connection.adapter_name == 'SQLite'
         arca = ::ActiveRecord::ConnectionAdapters
-        db_statements = arca::SQLite3::DatabaseStatements
+        db_statements = arca::SQLite3.const_defined?('DatabaseStatements') ? arca::SQLite3::DatabaseStatements : arca::SQLite3::SchemaStatements
         # Rails 7.1 and later
         if arca::AbstractAdapter.private_instance_methods.include?(:with_raw_connection)
           db_statements.define_method(:begin_db_transaction) do
@@ -3084,7 +3077,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         INNER JOIN pg_class child ON pg_inherits.inhrelid = child.oid
         INNER JOIN pg_catalog.pg_namespace n ON n.oid = parent.relnamespace#{
     if schema
-      params = params << schema
+      params << schema
       "
       WHERE n.nspname = COALESCE(?, 'public')"
     end}
@@ -3099,7 +3092,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       FROM pg_class
         INNER JOIN pg_catalog.pg_namespace n ON n.oid = pg_class.relnamespace#{
     if schema
-      params = params << schema
+      params << schema
       "
       WHERE n.nspname = COALESCE(?, 'public')"
     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,10 +1002,20 @@ a.big-arrow {
 .right {
   text-align: right;
 }
+.paddingBottomZero {
+  padding-bottom: 0px;
+}
+.paddingTopZero {
+  padding-top: 0px;
+}
 .orphan {
   color: red;
   white-space: nowrap;
 }
+.thumbImg {
+  max-width: 96px;
+  max-height: 96px;
+}
 .danger {
   background-color: red;
   color: white;
@@ -1189,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\");
@@ -1376,7 +1390,7 @@ end %>#{"
   end
   \"<tr><td colspan=\\\"#\{td_count}\\\">Children: #\{child_links.join(' ')}</tr>\".html_safe
 end
-%><%= if (page_num = @#{table_name}._brick_page_num)
+%><%= if (page_num = @#{res_name = table_name.pluralize}._brick_page_num)
            \"<tr><td colspan=\\\"#\{td_count}\\\">Page #\{page_num}</td></tr>\".html_safe
          end %></table>#{template_link}<%
    if description.present? %><span class=\"__brick\"><%=
@@ -1418,19 +1432,19 @@ end
 
 <%= # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
     # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
-    @#{table_name} ||= if (dym_list = instance_variables.reject do |entry|
+    @#{res_name} ||= if (dym_list = instance_variables.reject do |entry|
                              entry.to_s.start_with?('@_') ||
                              ['@cache_hit', '@marked_for_same_origin_verification', '@view_renderer', '@view_flow', '@output_buffer', '@virtual_path'].include?(entry.to_s)
                            end).present?
-                         msg = +\"Can't find resource \\\"#{table_name}\\\".\"
+                         msg = +\"Can't find resource \\\"#{res_name}\\\".\"
                          # Can't be sure otherwise of what is up, so check DidYouMean and offer a suggestion.
-                         if (dym = DidYouMean::SpellChecker.new(dictionary: dym_list).correct('@#{table_name}')).present?
+                         if (dym = DidYouMean::SpellChecker.new(dictionary: dym_list).correct('@#{res_name}')).present?
                            msg << \"\nIf you meant \\\"#\{found_dym = dym.first[1..-1]}\\\" then to avoid this message add this entry into inflections.rb:\n\"
                            msg << \"  inflect.irregular '#{obj_name}', '#\{found_dym}'\"
                            puts
                            puts \"WARNING:  #\{msg}\"
                            puts
-                           @#{table_name} = instance_variable_get(dym.first.to_sym)
+                           @#{res_name} = instance_variable_get(dym.first.to_sym)
                          else
                            raise ActiveRecord::RecordNotFound.new(msg)
                          end
@@ -1450,7 +1464,7 @@ end
     # Rails.application.reloader.to_prepare do ... end
     self.class.class_exec { include ::Brick::Rails::FormTags } unless respond_to?(:brick_grid)
     # Write out the mega-grid
-    brick_grid(@#{table_name}, @_brick_sequence, @_brick_incl, @_brick_excl,
+    brick_grid(@#{res_name}, @_brick_sequence, @_brick_incl, @_brick_excl,
                cols, bt_descrip: @_brick_bt_descrip, poly_cols: poly_cols, bts: bts, hms_keys: #{hms_keys.inspect}, hms_cols: {#{hms_columns.join(', ')}}) %>
 
 #{"<hr><%= link_to(\"New #{new_path_name = "new_#{path_obj_name}_path"
@@ -1586,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_builder.rb

@@ -55,7 +55,10 @@ module Brick::Rails::FormBuilder
           is_revert = false
           out << ::Brick::Rails::FormBuilder.hide_bcrypt(val, nil, 1000)
         elsif col_type == :string
-          if model.respond_to?(:enumerized_attributes) && (opts = (attr = model.enumerized_attributes[method])&.options).present?
+          if model.respond_to?(:uploaders) && model.uploaders.key?(col.name&.to_sym) &&
+             (url = self.object.send(col.name)&.url) # Carrierwave image?
+            out << "<img src=\"#{url}\" title=\"#{val}\">"
+          elsif model.respond_to?(:enumerized_attributes) && (opts = (attr = model.enumerized_attributes[method])&.options).present?
             enum_html_options = attr.kind_of?(Enumerize::Multiple) ? html_options.merge({ multiple: true, size: opts.length + 1 }) : html_options
             out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, enum_html_options)
           else
@@ -149,9 +152,10 @@ module Brick::Rails::FormBuilder
     else
       if val.is_a?(String)
         return ::Brick::Rails.display_binary(val) unless (val_utf8 = val.dup.force_encoding('UTF-8')).valid_encoding?
+
         val = val_utf8.strip
         return CGI.escapeHTML(val) if is_xml
-  
+
         if val.length > max_len
           if val[0] == '<' # Seems to be HTML?
             cur_len = 0

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 << "
@@ -229,6 +232,9 @@ module Brick::Rails::FormTags
           # binding.pry if col.is_a?(Array)
           out << if @_brick_monetized_attributes&.include?(col_name)
                    val ? Money.new(val.to_i).format : ''
+                 elsif klass.respond_to?(:uploaders) && klass.uploaders.key?(col_name.to_sym) &&
+                    (url = obj.send(col_name)&.url) # Carrierwave image?
+                   "<img class=\"thumbImg\" src=\"#{url}\" title=\"#{val}\">"
                  else
                    lat_lng = if [:float, :decimal].include?(col.type) &&
                                 (

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 194
+    TINY = 196
 
     # 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.194
+  version: 1.0.196
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2023-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone