brick 1.0.193 → 1.0.195

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a05212d96b2f91b494d68d5273b61397a413daa1804a0bee4a6a13c90443ac5
-  data.tar.gz: 2b5ec052357bddf4a7d8b6b390764a5f29b2078547292cd340733f8a1fe25597
+  metadata.gz: 48a47a4a4fd18918a7e1b3f90ffb1953afb11c569e19664920d3921e4806b4fe
+  data.tar.gz: 2a50f06d5790c7facfec994693c5f88f747b96825f62cf6b51a81dbf97f88aca
 SHA512:
-  metadata.gz: ce5fd867d92ed2df58c8b3c33395ea4517e9441b693af40a4463fb4d0babaf5d5d74ddde213ffe25c9fbc21ca07933f09653620ba33b3c0a80bb8947aab25a22
-  data.tar.gz: bb8e6e40af956eb1fd99f991747069240143cf52002c3af0cc57813c9d4dc0c136773a7901a8dc81dce81505fbf20d6c6ef9b46c01235d281d83158731332feb
+  metadata.gz: dc9840fb52d71e04ef8a899d16289276d11556f55492d9190aaf6387659d520c105c7885c80c65a5ddba5a4294c0f088cbf03adb70969b9f948dd85721865fe2
+  data.tar.gz: 2846f746ad0f325ea5915b8ad68db9bb39d8a81061adf3ca6dfa996bc209d193887eea22b4eb9c6bdf65131c1c82f2ce980eedea9f7be886b0d9084017fcd553

data/lib/brick/extensions.rb

@@ -436,12 +436,12 @@ 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
+                     ord_expr = if ord_part.index('^^^')
+                                  ord_part.gsub('^^^', _br_quoted_name(table_name))
+                                else
+                                  _br_quoted_name(ord_part)
+                                end
+                     s << Arel.sql(ord_expr)
                      order_by_txt&.<<("Arel.sql(#{ord_expr.inspect})")
                    else # Expecting only Symbol
                      ord_part = ord_part.to_s
@@ -1860,14 +1860,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 +1917,7 @@ class Object
                 cspd.select! { |val| val == "'self'" }
                 cspd << style_value
               else
-                cspd << "'sha256-Q8t+pETkz0RtyV4XprwdP+uEkVaFyMnx1mXif0wDoxw='"
+                cspd << "'sha256-ZMGrNwNigXBkvHBZrPrNurCVlJycGWtt2uvoEigUowg='"
               end
               cspd << 'https://cdn.jsdelivr.net'
             end
@@ -2035,6 +2035,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 +2221,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 +2260,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 +2563,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 +2613,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 +3081,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 +3096,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

@@ -1002,6 +1002,10 @@ a.big-arrow {
   color: red;
   white-space: nowrap;
 }
+.thumbImg {
+  max-width: 96px;
+  max-height: 96px;
+}
 .danger {
   background-color: red;
   color: white;
@@ -1376,7 +1380,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 +1422,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 +1454,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"

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

@@ -229,6 +229,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 = 193
+    TINY = 195
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/generators/brick/controllers_generator.rb

@@ -27,7 +27,7 @@ module Brick
       model_info = Hash.new { |h, k| h[k] = {} }
       tableless = Hash.new { |h, k| h[k] = [] }
       existing_controllers = ActionController::Base.descendants.reject do |c|
-        c.name.start_with?('Turbo::Native::')
+        c.name.nil? || c.name&.start_with?('Turbo::Native::')
       end.map(&:name)
       controllers = ::Brick.relations.each_with_object([]) do |rel, s|
         next if rel.first.is_a?(Symbol)
@@ -64,7 +64,8 @@ module Brick
                     else
                       Object
                     end
-        _built_controller, code = Object.send(:build_controller, namespace, controller_parts.last, controller_parts.last.pluralize, controller_option.model, relations)
+        controller_parts[controller_parts.length - 1] = (controller_name = "#{controller_parts.last.pluralize}Controller")
+        _built_controller, code = Object.send(:build_controller, namespace, controller_name, controller_name, controller_option.model, relations)
         path = ['controllers']
         path.concat(controller_parts.map(&:underscore))
         dir = +"#{::Rails.root}/app"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.193
+  version: 1.0.195
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-26 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