brick 1.0.158 → 1.0.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326ec09b1c28cf7c54e54bae9ea6ceed7d7e476a177be0a41af14e04f7cc3d11
-  data.tar.gz: 0507c22a2acf86c58737ecfedeb1a1f5ed6979b5263b28c6d6e77b0e9500ab7c
+  metadata.gz: b6fde6ef1ff8f9e3d6787b53c64a881a88c448ce3adfc9ca5e6a25e8f815cc30
+  data.tar.gz: 2bcc9fe939bc4d879168032ff16aba60ceeb08854083b4f5912649b2eb056962
 SHA512:
-  metadata.gz: d6803593a5c3e17ef40005c405017ed4e7519024ca172a077ad377c201a7b2e2caf2a8b4bc5a0ef63f091124a44199ffd3b386db7d6b5d51352f2e3327537d81
-  data.tar.gz: 486b0a15422b0d3150b575c8d19c24cc3434e3fd8f35335d2e490e1e69e423995a2032de913def73b4f4df0e2789c6f4af7d61930db5cc144d0a0cb76be3ebdc
+  metadata.gz: 8ebc0d8bc6765040e3df2a4b9debcec5d4326efd69d41e62188146c29f25bd254d381db651b4687fd6afe77d2f7ef5b6f640edde87fd7ddbd0c9b851bbabe74c
+  data.tar.gz: 97e7320e75a6f9589a8a96e751ad9c082826a4ae7698dcad2e487323075977f13bf2e2f8e2d889bf42d761f5649926b22d0e07e3e395456f9d04adc23fde064c

data/lib/brick/compatibility.rb

@@ -97,11 +97,13 @@ if Object.const_defined?('ActionPack') && !ActionPack.respond_to?(:version)
     end
   end
 end
-require 'action_view' # Needed for Rails <= 4.0
-if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
-  module ActionView
-    def self.version
-      ActionPack.version
+if Bundler.locked_gems&.dependencies.key?('action_view')
+  require 'action_view' # Needed for Rails <= 4.0
+  if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
+    module ActionView
+      def self.version
+        ActionPack.version
+      end
     end
   end
 end

data/lib/brick/extensions.rb

@@ -30,14 +30,14 @@
 
 # Drag something like HierModel#name onto the rows and have it automatically add five columns -- where type=zone / where type = section / etc
 
-# Support for Postgres / MySQL enums (add enum to model, use model enums to make a drop-down in the UI)
-
-# Currently quadrupling up routes
-
 # Modal pop-up things for editing large text / date ranges / hierarchies of data
 
 # For recognised self-references, have the show page display all related objects up to the parent (or the start of a circular reference)
 
+# When creating or updating an object through an auto-generated controller, it always goes to an auto-generated view template even if the user has supplied their own index.html.erb (or similar) view template
+
+# Upon creation of a new object, when going to the index page, highlight this new object and scroll it into view (likely to the very bottom of everything, although might be sorted differently)
+
 # ==========================================================
 # Dynamically create model or controller classes when needed
 # ==========================================================
@@ -972,9 +972,14 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
                                      (!a.options[:polymorphic] && a.klass == klass && klass_cols.include?(a.foreign_key))
                                     )
       end
+
       # ActiveStorage compatibility
       selects << 'service_name' if klass.name == 'ActiveStorage::Blob' && ActiveStorage::Blob.columns_hash.key?('service_name')
       selects << 'blob_id' if klass.name == 'ActiveStorage::Attachment' && ActiveStorage::Attachment.columns_hash.key?('blob_id')
+      # Pay gem compatibility
+      selects << 'processor' if klass.name == 'Pay::Customer' && Pay::Customer.columns_hash.key?('processor')
+      selects << 'customer_id' if klass.name == 'Pay::Subscription' && Pay::Subscription.columns_hash.key?('customer_id')
+
       pieces, my_dsl = klass.brick_parse_dsl(join_array = ::Brick::JoinArray.new, [], translations = {}, false, nil, true)
       brick_select(
         selects, where_values_hash, nil, translations: translations, join_array: join_array,
@@ -1131,6 +1136,20 @@ if Object.const_defined?('ActionView')
       end
     end
   end
+
+  module ActionDispatch::Routing
+    class Mapper
+      module Base
+        # Pro-actively assess Brick routes.  Useful when there is a "catch all" wildcard route
+        # at the end of an existing `routes.rb` file, which would normally steal the show and
+        # not let Brick have any fun.  So just call this right before any wildcard routes, and
+        # you'll be in business!
+        def mount_brick_routes
+          add_brick_routes unless ::Brick.routes_done
+        end
+      end
+    end
+  end
 end
 
 if ActiveSupport::Dependencies.respond_to?(:autoload_module!) # %%% Only works with previous non-zeitwerk auto-loading
@@ -1807,7 +1826,7 @@ class Object
                 cspd.select! { |val| val == "'self'" }
                 cspd << style_value
               else
-                cspd << "'sha256-QHKxqKcUq7AER1QwEu5uQXRQwC8j4iTWkE8mpOmP7ms='"
+                cspd << "'sha256-VbHigzrnU2KiWIjHStrKhnGxWRv25WXQNdKr5qhevD8='"
               end
               cspd << 'https://cdn.jsdelivr.net'
             end
@@ -2199,7 +2218,8 @@ class Object
               render json: { result: ::Brick.unexclude_column(table_name, col) }
             else
               @_lookup_context.instance_variable_set("@#{singular_table_name}".to_sym,
-                                                     model.send(:create, send(params_name_sym)))
+                                                     (created_obj = model.send(:create, send(params_name_sym))))
+              # %%% Surface any errors to the user in a flash message
               @_lookup_context.instance_variable_set(:@_brick_model, model)
               index
               render :index

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

@@ -1667,89 +1667,9 @@ end
      end
 %>
   <br><br>
-<%= form_for(obj.becomes(#{model_name}), options) do |f| %>
-  <table class=\"shadow\">
-  <% has_fields = false
-     # If it's a new record, set any default polymorphic types
-     bts.each do |_k, v|
-       if v[2]
-         @#{obj_name}.send(\"#\{model.brick_foreign_type(v.first)}=\", v[1].first&.first&.name)
-       end
-     end if @#{obj_name}.new_record?
-     rtans = #{model_name}.rich_text_association_names if #{model_name}.respond_to?(:rich_text_association_names)
-     (#{model_name}.column_names + (rtans || [])).each do |k|
-       next if (#{(pk.map(&:to_s) || []).inspect}.include?(k) && !bts.key?(k)) ||
-               ::Brick.config.metadata_columns.include?(k)
-
-       col = #{model_name}.columns_hash[k]
-       if !col && rtans&.include?(k)
-         k = k[10..-1] if k.start_with?('rich_text_')
-         col = (rt_col ||= ActiveRecord::ConnectionAdapters::Column.new(
-                             '', nil, ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: 'varchar', type: :text)
-                           )
-               )
-       end
-       val = @#{obj_name}.attributes[k] %>
-    <tr>
-    <th class=\"show-field\"<%= \" title=\\\"#\{col&.comment}\\\"\".html_safe if col&.respond_to?(:comment) && !col&.comment.blank? %>>
-<%    has_fields = true
-      if (bt = bts[k])
-        # Add a final member in this array with descriptive options to be used in <select> drop-downs
-        bt_name = bt[1].map { |x| x.first.name }.join('/')
-        # %%% Only do this if the user has permissions to edit this bt field
-        if bt[2] # Polymorphic?
-          poly_class_name = orig_poly_name = @#{obj_name}.send(model.brick_foreign_type(bt.first))
-          bt_pair = nil
-          loop do
-            bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
-            # Accommodate any valid STI by going up the chain of inheritance
-            break unless bt_pair.nil? && poly_class_name = ::Brick.existing_stis[poly_class_name]
-          end
-          puts \"*** Might be missing an STI class called #\{orig_poly_name\} whose base class should have this:
-***   has_many :#{table_name}, as: :#\{bt.first\}
-*** Can probably auto-configure everything using these lines in an initialiser:
-***   Brick.sti_namespace_prefixes = { '::#\{orig_poly_name\}' => 'SomeParentModel' }
-***   Brick.polymorphics = { '#{table_name}.#\{bt.first\}' => ['SomeParentModel'] }\" if bt_pair.nil?
-          # descrips = @_brick_bt_descrip[bt.first][bt_class]
-          poly_id = @#{obj_name}.send(\"#\{bt.first\}_id\")
-          # bt_class.order(obj_pk = bt_class.primary_key).each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
-        end
-        bt_pair ||= bt[1].first # If there's no polymorphism (or polymorphism status is unknown), just get the first one
-        bt_class = bt_pair&.first
-        if bt.length < 4
-          bt << (option_detail = [[\"(No #\{bt_name\} chosen)\", '^^^brick_NULL^^^']])
-          # %%% Accommodate composite keys for obj.pk at the end here
-          collection, descrip_cols = bt_class&.order(Arel.sql(\"#\{bt_class.table_name}.#\{obj_pk = bt_class.primary_key}\"))&.brick_list
-          collection&.brick_(:each) do |obj|
-            option_detail << [
-              obj.brick_descrip(
-                descrip_cols&.first&.map { |col2| obj.send(col2.last) },
-                obj_pk
-              ), obj.send(obj_pk)
-            ]
-          end
-        end %>
-        BT <%= bt_class&.bt_link(bt.first) || orig_poly_name %>
-    <% else %>
-      <%= #{model_name}.human_attribute_name(k, { default: k }) %>
-    <% end %>
-    </th>
-    <td>
-      <%= f.brick_field(k, html_options = {}, val, col, bt, bt_class, bt_name, bt_pair) %>
-    </td>
-    </tr>
-  <% end
-  if has_fields %>
-    <tr><td colspan=\"2\"><%= f.submit({ class: 'update' }) %></td></tr>
-  <% else %>
-    <tr><td colspan=\"2\">(No displayable fields)</td></tr>
-  <% end %>
-  </table>#{
-  "<%= begin
-         ::Brick::Rails.display_binary(obj&.blob&.download, 500_000)&.html_safe
-       rescue
-       end %>" if model_name == 'ActiveStorage::Attachment'}
-<%  end %>
+
+<%= # Write out the mega-form
+    brick_form_for(obj, options, #{model_name}, bts, #{pk.inspect}) %>
 
 #{unless args.first == 'new'
   # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #\{model_name} -- Are you sure?' } }"
@@ -2064,6 +1984,10 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
             # In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
             prepend ::Brick::RouteSet
           end
+          ActionDispatch::Routing::Mapper.class_exec do
+            include ::Brick::RouteMapper
+          end
+
           # Do the root route before the Rails Welcome one would otherwise take precedence
           if (route = ::Brick.config.default_route_fallback).present?
             action = "#{route}#{'#index' unless route.index('#')}"

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

@@ -67,9 +67,14 @@ module Brick::Rails::FormBuilder
       when :boolean
         out << self.check_box(method.to_sym)
       when :integer, :decimal, :float
-        digit_pattern = col_type == :integer ? '\d*' : '\d*(?:\.\d*|)'
-        # Used to do this for float / decimal:  self.number_field method.to_sym
-        out << self.text_field(method.to_sym, { pattern: digit_pattern, class: 'check-validity' })
+        if model.respond_to?(:attribute_types) && (enum_type = model.attribute_types[method]).is_a?(ActiveRecord::Enum::EnumType)
+          opts = enum_type.send(:mapping)&.each_with_object([]) { |v, s| s << [v.first, v.first] } || []
+          out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, options)
+        else
+          digit_pattern = col_type == :integer ? '\d*' : '\d*(?:\.\d*|)'
+          # Used to do this for float / decimal:  self.number_field method.to_sym
+          out << self.text_field(method.to_sym, { pattern: digit_pattern, class: 'check-validity' })
+        end
       when *DT_PICKERS.keys
         template.instance_variable_set(:@_date_fields_present, true)
         out << self.text_field(method.to_sym, { class: DT_PICKERS[col_type] })

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

@@ -203,6 +203,101 @@ module Brick::Rails::FormTags
     out.html_safe
   end # brick_grid
 
+  # Our mega show/new/update form
+  def brick_form_for(obj, options = {}, model = obj.class, bts = {}, pk = (obj.class.primary_key || []))
+    pk = [pk] unless pk.is_a?(Array)
+    pk.map!(&:to_s)
+    form_for(obj.becomes(model), options) do |f|
+      out = +'<table class="shadow">'
+      has_fields = false
+      # If it's a new record, set any default polymorphic types
+      bts&.each do |_k, v|
+        if v[2]
+          obj.send("#{model.brick_foreign_type(v.first)}=", v[1].first&.first&.name)
+        end
+      end if obj.new_record?
+      rtans = model.rich_text_association_names if model.respond_to?(:rich_text_association_names)
+      (model.column_names + (rtans || [])).each do |k|
+        next if (pk.include?(k) && !bts.key?(k)) ||
+                ::Brick.config.metadata_columns.include?(k)
+
+        col = model.columns_hash[k]
+        if !col && rtans&.include?(k)
+          k = k[10..-1] if k.start_with?('rich_text_')
+          col = (rt_col ||= ActiveRecord::ConnectionAdapters::Column.new(
+                              '', nil, ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: 'varchar', type: :text)
+                            )
+                )
+        end
+        val = obj.attributes[k]
+        out << "
+    <tr>
+    <th class=\"show-field\"#{" title=\"#{col&.comment}\"".html_safe if col&.respond_to?(:comment) && !col&.comment.blank?}>"
+        has_fields = true
+        if (bt = bts[k])
+          # Add a final member in this array with descriptive options to be used in <select> drop-downs
+          bt_name = bt[1].map { |x| x.first.name }.join('/')
+          # %%% Only do this if the user has permissions to edit this bt field
+          if bt[2] # Polymorphic?
+            poly_class_name = orig_poly_name = obj.send(model.brick_foreign_type(bt.first))
+            bt_pair = nil
+            loop do
+              bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
+              # Accommodate any valid STI by going up the chain of inheritance
+              break unless bt_pair.nil? && poly_class_name = ::Brick.existing_stis[poly_class_name]
+            end
+            table_name = model.name.split('::').last.underscore.pluralize
+            puts "*** Might be missing an STI class called #{orig_poly_name} whose base class should have this:
+***   has_many :#{table_name}, as: :#{bt.first}
+*** Can probably auto-configure everything using these lines in an initialiser:
+***   Brick.sti_namespace_prefixes = { '::#{orig_poly_name}' => 'SomeParentModel' }
+***   Brick.polymorphics = { '#{table_name}.#{bt.first}' => ['SomeParentModel'] }" if bt_pair.nil?
+            # descrips = @_brick_bt_descrip[bt.first][bt_class]
+            poly_id = obj.send("#{bt.first}_id")
+            # bt_class.order(obj_pk = bt_class.primary_key).each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
+          end
+          bt_pair ||= bt[1].first # If there's no polymorphism (or polymorphism status is unknown), just get the first one
+          bt_class = bt_pair&.first
+          if bt.length < 4
+            bt << (option_detail = [["(No #{bt_name} chosen)", '^^^brick_NULL^^^']])
+            # %%% Accommodate composite keys for obj.pk at the end here
+            collection, descrip_cols = bt_class&.order(Arel.sql("#{bt_class.table_name}.#{obj_pk = bt_class.primary_key}"))&.brick_list
+            collection&.brick_(:each) do |obj|
+              option_detail << [
+                obj.brick_descrip(
+                  descrip_cols&.first&.map { |col2| obj.send(col2.last) },
+                  obj_pk
+                ), obj.send(obj_pk)
+              ]
+            end
+          end
+          out << "BT #{bt_class&.bt_link(bt.first) || orig_poly_name}"
+        else
+          out << model.human_attribute_name(k, { default: k })
+        end
+        out << "
+    </th>
+    <td>
+      #{f.brick_field(k, html_options = {}, val, col, bt, bt_class, bt_name, bt_pair)}
+    </td>
+  </tr>"
+      end
+      if has_fields
+        out << "<tr><td colspan=\"2\">#{f.submit({ class: 'update' })}</td></tr>"
+      else
+        out << '<tr><td colspan="2">(No displayable fields)</td></tr>'
+      end
+      out << '</table>'
+      if model.name == 'ActiveStorage::Attachment'
+        begin
+          out << ::Brick::Rails.display_binary(obj&.blob&.download, 500_000)&.html_safe
+        rescue
+        end
+      end
+      out.html_safe
+    end
+  end # brick_form_for
+
   def link_to_brick(*args, **kwargs)
     return unless ::Brick.config.mode == :on
 
@@ -291,7 +386,11 @@ module Brick::Rails::FormTags
       if (links = _brick_resource_from_iv(true)).length == 1 # If there's only one match then use any text that was supplied
         link_to_brick(text || links.first.last.join('/'), links.first.first, **kwargs)
       else
-        links.each_with_object([]) { |v, s| s << link if link = link_to_brick(v.join('/'), v, **kwargs) }.join(' &nbsp; ').html_safe
+        links.each_with_object([]) do |v, s|
+          if (link = link_to_brick(v.join('/'), v, **kwargs))
+            s << link
+          end
+        end.join(' &nbsp; ').html_safe
       end
     end
   end # link_to_brick

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -794,296 +794,303 @@ In config/initializers/brick.rb appropriate entries would look something like:
 
   module RouteSet
     def finalize!
-      routeset_to_use = ::Rails.application.routes
-      return super if self != routeset_to_use || ::Brick.routes_done
+      return super if self != ::Rails.application.routes || ::Brick.routes_done
 
+      append do
+        add_brick_routes
+      end
+      super
+    end
+  end
+
+  module RouteMapper
+    def add_brick_routes
+      routeset_to_use = ::Rails.application.routes
       path_prefix = ::Brick.config.path_prefix
-      existing_controllers = routes.each_with_object({}) do |r, s|
+      existing_controllers = routeset_to_use.routes.each_with_object({}) do |r, s|
         c = r.defaults[:controller]
         s[c] = nil if c
       end
-      append do
-        tables = []
-        views = []
-        table_class_length = 38 # Length of "Classes that can be built from tables:"
-        view_class_length = 37 # Length of "Classes that can be built from views:"
-
-        brick_namespace_create = lambda do |path_names, res_name, options|
-          if path_names&.present?
-            if (path_name = path_names.pop).is_a?(Array)
-              module_name = path_name[1]
-              path_name = path_name.first
-            end
-            send(:scope, { module: module_name || path_name, path: path_name, as: path_name }) do
-              brick_namespace_create.call(path_names, res_name, options)
-            end
-          else
-            send(:resources, res_name.to_sym, **options)
+
+      tables = []
+      views = []
+      table_class_length = 38 # Length of "Classes that can be built from tables:"
+      view_class_length = 37 # Length of "Classes that can be built from views:"
+
+      brick_namespace_create = lambda do |path_names, res_name, options|
+        if path_names&.present?
+          if (path_name = path_names.pop).is_a?(Array)
+            module_name = path_name[1]
+            path_name = path_name.first
           end
+          send(:scope, { module: module_name || path_name, path: path_name, as: path_name }) do
+            brick_namespace_create.call(path_names, res_name, options)
+          end
+        else
+          send(:resources, res_name.to_sym, **options)
         end
+      end
 
-        # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
-        # If auto-controllers and auto-models are both enabled then this makes sense:
-        controller_prefix = (path_prefix ? "#{path_prefix}/" : '')
-        sti_subclasses = ::Brick.config.sti_namespace_prefixes.each_with_object(Hash.new { |h, k| h[k] = [] }) do |v, s|
-                            # Turn something like {"::Spouse"=>"Person", "::Friend"=>"Person"} into {"Person"=>["Spouse", "Friend"]}
-                            s[v.last] << v.first[2..-1] unless v.first.end_with?('::')
-                          end
-        versioned_views = {} # Track which views have already been done for each api_root
-        ::Brick.relations.each do |k, v|
-          if (schema_name = v.fetch(:schema, nil))
-            schema_prefix = "#{schema_name}."
-          end
+      # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
+      # If auto-controllers and auto-models are both enabled then this makes sense:
+      controller_prefix = (path_prefix ? "#{path_prefix}/" : '')
+      sti_subclasses = ::Brick.config.sti_namespace_prefixes.each_with_object(Hash.new { |h, k| h[k] = [] }) do |v, s|
+                          # Turn something like {"::Spouse"=>"Person", "::Friend"=>"Person"} into {"Person"=>["Spouse", "Friend"]}
+                          s[v.last] << v.first[2..-1] unless v.first.end_with?('::')
+                        end
+      versioned_views = {} # Track which views have already been done for each api_root
+      ::Brick.relations.each do |k, v|
+        if (schema_name = v.fetch(:schema, nil))
+          schema_prefix = "#{schema_name}."
+        end
 
-          next if !(resource_name = v.fetch(:resource, nil)) ||
-                  existing_controllers.key?(
-                    controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
-                  )
-
-          object_name = k.split('.').last # Take off any first schema part
-
-          full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
-                                  aps = aps[0..-2] if aps[-1] == '_'
-                                  (schema_prefix&.dup || +'') << "#{aps}."
-                                else
-                                  schema_prefix
-                                end
-
-          # Track routes being built
-          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
-              views
-            else
-              table_class_length = class_name.length if class_name.length > table_class_length
-              tables
-            end << [class_name, aps, resource_name]
-          end
+        next if !(resource_name = v.fetch(:resource, nil)) ||
+                existing_controllers.key?(
+                  controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
+                )
 
-          options = {}
-          options[:only] = [:index, :show] if v.key?(:isView)
-
-          # First do the normal routes
-          prefixes = []
-          prefixes << [aps, v[:class_name]&.split('::')[-2]&.underscore] if aps
-          prefixes << schema_name if schema_name
-          prefixes << path_prefix if path_prefix
-          brick_namespace_create.call(prefixes, v[:resource], options)
-          sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
-            brick_namespace_create.call(prefixes, sc.underscore.tr('/', '_').pluralize, options)
-          end
+        object_name = k.split('.').last # Take off any first schema part
 
-          # Now the API routes if necessary
-          full_resource = nil
-          ::Brick.api_roots&.each do |api_root|
-            api_done_views = (versioned_views[api_root] ||= {})
-            found = nil
-            test_ver_num = nil
-            view_relation = nil
-            # If it's a view then see if there's a versioned one available by searching for resource names
-            # versioned with the closest number (equal to or less than) compared with our API version number.
-            if v.key?(:isView)
-              if (ver = object_name.match(/^v([\d_]*)/)&.captures&.first) && ver[-1] == '_'
-                core_object_name = object_name[ver.length + 1..-1]
-                next if api_done_views.key?(unversioned = "#{schema_prefix}v_#{core_object_name}")
-
-                # Expect that the last item in the path generally holds versioning information
-                api_ver = api_root.split('/')[-1]&.gsub('_', '.')
-                vn_idx = api_ver.rindex(/[^\d._]/) # Position of the first numeric digit at the end of the version number
-                # Was:  .to_d
-                test_ver_num = api_ver_num = api_ver[vn_idx + 1..-1].gsub('_', '.').to_i # Attempt to turn something like "v3" into the decimal value 3
-                # puts [api_ver, vn_idx, api_ver_num, unversioned].inspect
-
-                next if ver.to_i > api_ver_num # Don't surface any newer views in an older API
-
-                test_ver_num -= 1 until test_ver_num.zero? ||
-                                        (view_relation = ::Brick.relations.fetch(
-                                          found = "#{schema_prefix}v#{test_ver_num}_#{core_object_name}", nil
-                                        ))
-                api_done_views[unversioned] = nil # Mark that for this API version this view is done
-
-                # puts "Found #{found}" if view_relation
-                # If we haven't found "v3_view_name" or "v2_view_name" or so forth, at the last
-                # fall back to simply looking for "v_view_name", and then finally  "view_name".
-                no_v_prefix_name = "#{schema_prefix}#{core_object_name}"
-                standard_prefix = 'v_'
-              else
-                core_object_name = object_name
-              end
-              if (rvp = ::Brick.config.api_remove_view_prefix) && core_object_name.start_with?(rvp)
-                core_object_name.slice!(0, rvp.length)
-              end
-              no_prefix_name = "#{schema_prefix}#{core_object_name}"
-              unversioned = "#{schema_prefix}#{standard_prefix}#{::Brick.config.api_add_view_prefix}#{core_object_name}"
+        full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
+                                aps = aps[0..-2] if aps[-1] == '_'
+                                (schema_prefix&.dup || +'') << "#{aps}."
+                              else
+                                schema_prefix
+                              end
+
+        # Track routes being built
+        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
+            views
+          else
+            table_class_length = class_name.length if class_name.length > table_class_length
+            tables
+          end << [class_name, aps, resource_name]
+        end
+
+        options = {}
+        options[:only] = [:index, :show] if v.key?(:isView)
+
+        # First do the normal routes
+        prefixes = []
+        prefixes << [aps, v[:class_name]&.split('::')[-2]&.underscore] if aps
+        prefixes << schema_name if schema_name
+        prefixes << path_prefix if path_prefix
+        brick_namespace_create.call(prefixes, v[:resource], options)
+        sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
+          brick_namespace_create.call(prefixes, sc.underscore.tr('/', '_').pluralize, options)
+        end
+
+        # Now the API routes if necessary
+        full_resource = nil
+        ::Brick.api_roots&.each do |api_root|
+          api_done_views = (versioned_views[api_root] ||= {})
+          found = nil
+          test_ver_num = nil
+          view_relation = nil
+          # If it's a view then see if there's a versioned one available by searching for resource names
+          # versioned with the closest number (equal to or less than) compared with our API version number.
+          if v.key?(:isView)
+            if (ver = object_name.match(/^v([\d_]*)/)&.captures&.first) && ver[-1] == '_'
+              core_object_name = object_name[ver.length + 1..-1]
+              next if api_done_views.key?(unversioned = "#{schema_prefix}v_#{core_object_name}")
+
+              # Expect that the last item in the path generally holds versioning information
+              api_ver = api_root.split('/')[-1]&.gsub('_', '.')
+              vn_idx = api_ver.rindex(/[^\d._]/) # Position of the first numeric digit at the end of the version number
+              # Was:  .to_d
+              test_ver_num = api_ver_num = api_ver[vn_idx + 1..-1].gsub('_', '.').to_i # Attempt to turn something like "v3" into the decimal value 3
+              # puts [api_ver, vn_idx, api_ver_num, unversioned].inspect
+
+              next if ver.to_i > api_ver_num # Don't surface any newer views in an older API
+
+              test_ver_num -= 1 until test_ver_num.zero? ||
+                                      (view_relation = ::Brick.relations.fetch(
+                                        found = "#{schema_prefix}v#{test_ver_num}_#{core_object_name}", nil
+                                      ))
+              api_done_views[unversioned] = nil # Mark that for this API version this view is done
+
+              # puts "Found #{found}" if view_relation
+              # If we haven't found "v3_view_name" or "v2_view_name" or so forth, at the last
+              # fall back to simply looking for "v_view_name", and then finally  "view_name".
+              no_v_prefix_name = "#{schema_prefix}#{core_object_name}"
+              standard_prefix = 'v_'
             else
-              unversioned = k
+              core_object_name = object_name
+            end
+            if (rvp = ::Brick.config.api_remove_view_prefix) && core_object_name.start_with?(rvp)
+              core_object_name.slice!(0, rvp.length)
             end
+            no_prefix_name = "#{schema_prefix}#{core_object_name}"
+            unversioned = "#{schema_prefix}#{standard_prefix}#{::Brick.config.api_add_view_prefix}#{core_object_name}"
+          else
+            unversioned = k
+          end
 
-            view_relation ||= ::Brick.relations.fetch(found = unversioned, nil) ||
-                              (no_v_prefix_name && ::Brick.relations.fetch(found = no_v_prefix_name, nil)) ||
-                              (no_prefix_name && ::Brick.relations.fetch(found = no_prefix_name, nil))
-            if view_relation
-              actions = view_relation.key?(:isView) ? [:index, :show] : ::Brick::ALL_API_ACTIONS # By default all actions are allowed
-              # Call proc that limits which endpoints get surfaced based on version, table or view name, method (get list / get one / post / patch / delete)
-              # Returning nil makes it do nothing, false makes it skip creating this endpoint, and an array of up to
-              # these 3 things controls and changes the nature of the endpoint that gets built:
-              # (updated api_name, name of different relation to route to, allowed actions such as :index, :show, :create, etc)
-              proc_result = if (filter = ::Brick.config.api_filter).is_a?(Proc)
-                              begin
-                                num_args = filter.arity.negative? ? 6 : filter.arity
-                                filter.call(*[unversioned, k, view_relation, actions, api_ver_num, found, test_ver_num][0...num_args])
-                              rescue StandardError => e
-                                puts "::Brick.api_filter Proc error: #{e.message}"
-                              end
+          view_relation ||= ::Brick.relations.fetch(found = unversioned, nil) ||
+                            (no_v_prefix_name && ::Brick.relations.fetch(found = no_v_prefix_name, nil)) ||
+                            (no_prefix_name && ::Brick.relations.fetch(found = no_prefix_name, nil))
+          if view_relation
+            actions = view_relation.key?(:isView) ? [:index, :show] : ::Brick::ALL_API_ACTIONS # By default all actions are allowed
+            # Call proc that limits which endpoints get surfaced based on version, table or view name, method (get list / get one / post / patch / delete)
+            # Returning nil makes it do nothing, false makes it skip creating this endpoint, and an array of up to
+            # these 3 things controls and changes the nature of the endpoint that gets built:
+            # (updated api_name, name of different relation to route to, allowed actions such as :index, :show, :create, etc)
+            proc_result = if (filter = ::Brick.config.api_filter).is_a?(Proc)
+                            begin
+                              num_args = filter.arity.negative? ? 6 : filter.arity
+                              filter.call(*[unversioned, k, view_relation, actions, api_ver_num, found, test_ver_num][0...num_args])
+                            rescue StandardError => e
+                              puts "::Brick.api_filter Proc error: #{e.message}"
                             end
-              # proc_result expects to receive back: [updated_api_name, to_other_relation, allowed_actions]
+                          end
+            # proc_result expects to receive back: [updated_api_name, to_other_relation, allowed_actions]
 
-              case proc_result
-              when NilClass
-                # Do nothing differently than what normal behaviour would be
-              when FalseClass # Skip implementing this endpoint
-                view_relation[:api][api_ver_num] = nil
-                next
-              when Array # Did they give back an array of actions?
-                unless proc_result.any? { |pr| ::Brick::ALL_API_ACTIONS.exclude?(pr) }
-                  proc_result = [unversioned, to_relation, proc_result]
-                end
-                # Otherwise don't change this array because it's probably legit
-              when String
-                proc_result = [proc_result] # Treat this as the surfaced api_name (path) they want to use for this endpoint
-              else
-                puts "::Brick.api_filter Proc warning: Unable to parse this result returned: \n  #{proc_result.inspect}"
-                proc_result = nil # Couldn't understand what in the world was returned
+            case proc_result
+            when NilClass
+              # Do nothing differently than what normal behaviour would be
+            when FalseClass # Skip implementing this endpoint
+              view_relation[:api][api_ver_num] = nil
+              next
+            when Array # Did they give back an array of actions?
+              unless proc_result.any? { |pr| ::Brick::ALL_API_ACTIONS.exclude?(pr) }
+                proc_result = [unversioned, to_relation, proc_result]
               end
+              # Otherwise don't change this array because it's probably legit
+            when String
+              proc_result = [proc_result] # Treat this as the surfaced api_name (path) they want to use for this endpoint
+            else
+              puts "::Brick.api_filter Proc warning: Unable to parse this result returned: \n  #{proc_result.inspect}"
+              proc_result = nil # Couldn't understand what in the world was returned
+            end
 
-              if proc_result&.present?
-                if proc_result[1] # to_other_relation
-                  if (new_view_relation = ::Brick.relations.fetch(proc_result[1], nil))
-                    k = proc_result[1] # Route this call over to this different relation
-                    view_relation = new_view_relation
-                  else
-                    puts "::Brick.api_filter Proc warning: Unable to find new suggested relation with name #{proc_result[1]} -- sticking with #{k} instead."
-                  end
-                end
-                if proc_result.first&.!=(k) # updated_api_name -- a different name than this relation would normally have
-                  found = proc_result.first
+            if proc_result&.present?
+              if proc_result[1] # to_other_relation
+                if (new_view_relation = ::Brick.relations.fetch(proc_result[1], nil))
+                  k = proc_result[1] # Route this call over to this different relation
+                  view_relation = new_view_relation
+                else
+                  puts "::Brick.api_filter Proc warning: Unable to find new suggested relation with name #{proc_result[1]} -- sticking with #{k} instead."
                 end
-                actions &= proc_result[2] if proc_result[2] # allowed_actions
               end
-              (view_relation[:api][api_ver_num] ||= {})[unversioned] = actions # Add to the list of API paths this resource responds to
-
-              # view_ver_num = if (first_part = k.split('_').first) =~ /^v[\d_]+/
-              #                  first_part[1..-1].gsub('_', '.').to_i
-              #                end
-              controller_name = if (last = view_relation.fetch(:resource, nil)&.pluralize)
-                                  "#{full_schema_prefix}#{last}"
-                                else
-                                  found
-                                end.tr('.', '/')
-
-              { :index => 'get', :create => 'post' }.each do |action, method|
-                if actions.include?(action)
-                  # Normally goes to something like:  /api/v1/employees
-                  send(method, "#{api_root}#{unversioned.tr('.', '/')}", { to: "#{controller_prefix}#{controller_name}##{action}" })
-                end
+              if proc_result.first&.!=(k) # updated_api_name -- a different name than this relation would normally have
+                found = proc_result.first
               end
-              # %%% We do not yet surface the #show action
-              if (id_col = view_relation[:pk]&.first) # ID-dependent stuff
-                { :update => ['put', 'patch'], :destroy => ['delete'] }.each do |action, methods|
-                  if actions.include?(action)
-                    methods.each do |method|
-                      send(method, "#{api_root}#{unversioned.tr('.', '/')}/:#{id_col}", { to: "#{controller_prefix}#{controller_name}##{action}" })
-                    end
+              actions &= proc_result[2] if proc_result[2] # allowed_actions
+            end
+            (view_relation[:api][api_ver_num] ||= {})[unversioned] = actions # Add to the list of API paths this resource responds to
+
+            # view_ver_num = if (first_part = k.split('_').first) =~ /^v[\d_]+/
+            #                  first_part[1..-1].gsub('_', '.').to_i
+            #                end
+            controller_name = if (last = view_relation.fetch(:resource, nil)&.pluralize)
+                                "#{full_schema_prefix}#{last}"
+                              else
+                                found
+                              end.tr('.', '/')
+
+            { :index => 'get', :create => 'post' }.each do |action, method|
+              if actions.include?(action)
+                # Normally goes to something like:  /api/v1/employees
+                send(method, "#{api_root}#{unversioned.tr('.', '/')}", { to: "#{controller_prefix}#{controller_name}##{action}" })
+              end
+            end
+            # %%% We do not yet surface the #show action
+            if (id_col = view_relation[:pk]&.first) # ID-dependent stuff
+              { :update => ['put', 'patch'], :destroy => ['delete'] }.each do |action, methods|
+                if actions.include?(action)
+                  methods.each do |method|
+                    send(method, "#{api_root}#{unversioned.tr('.', '/')}/:#{id_col}", { to: "#{controller_prefix}#{controller_name}##{action}" })
                   end
                 end
               end
             end
           end
+        end
 
-          # Trestle compatibility
-          if Object.const_defined?('Trestle') && ::Trestle.config.options&.key?(:site_title) &&
-             !Object.const_defined?("#{(res_name = resource_name.tr('/', '_')).camelize}Admin")
-            begin
-              ::Trestle.resource(res_sym = res_name.to_sym, model: class_name&.constantize) do
-                menu { item res_sym, icon: "fa fa-star" }
-              end
-            rescue
+        # Trestle compatibility
+        if Object.const_defined?('Trestle') && ::Trestle.config.options&.key?(:site_title) &&
+            !Object.const_defined?("#{(res_name = resource_name.tr('/', '_')).camelize}Admin")
+          begin
+            ::Trestle.resource(res_sym = res_name.to_sym, model: class_name&.constantize) do
+              menu { item res_sym, icon: "fa fa-star" }
             end
+          rescue
           end
         end
+      end
 
-        if (named_routes = instance_variable_get(:@set).named_routes).respond_to?(:find)
-          if ::Brick.config.add_status && (status_as = "#{controller_prefix.tr('/', '_')}brick_status".to_sym)
-            (
-              !(status_route = instance_variable_get(:@set).named_routes.find { |route| route.first == status_as }&.last) ||
-              !status_route.ast.to_s.include?("/#{controller_prefix}brick_status/")
-            )
-            get("/#{controller_prefix}brick_status", to: 'brick_gem#status', as: status_as.to_s)
-          end
-
-          if ::Brick.config.add_orphans && (orphans_as = "#{controller_prefix.tr('/', '_')}brick_orphans".to_sym)
-            (
-              !(orphans_route = instance_variable_get(:@set).named_routes.find { |route| route.first == orphans_as }&.last) ||
-              !orphans_route.ast.to_s.include?("/#{controller_prefix}brick_orphans/")
-            )
-            get("/#{controller_prefix}brick_orphans", to: 'brick_gem#orphans', as: 'brick_orphans')
-          end
+      if (named_routes = instance_variable_get(:@set).named_routes).respond_to?(:find)
+        if ::Brick.config.add_status && (status_as = "#{controller_prefix.tr('/', '_')}brick_status".to_sym)
+          (
+            !(status_route = instance_variable_get(:@set).named_routes.find { |route| route.first == status_as }&.last) ||
+            !status_route.ast.to_s.include?("/#{controller_prefix}brick_status/")
+          )
+          get("/#{controller_prefix}brick_status", to: 'brick_gem#status', as: status_as.to_s)
         end
 
-        if instance_variable_get(:@set).named_routes.names.exclude?(:brick_crosstab)
-          get("/#{controller_prefix}brick_crosstab", to: 'brick_gem#crosstab', as: 'brick_crosstab')
-          get("/#{controller_prefix}brick_crosstab/data", to: 'brick_gem#crosstab_data')
+        if ::Brick.config.add_orphans && (orphans_as = "#{controller_prefix.tr('/', '_')}brick_orphans".to_sym)
+          (
+            !(orphans_route = instance_variable_get(:@set).named_routes.find { |route| route.first == orphans_as }&.last) ||
+            !orphans_route.ast.to_s.include?("/#{controller_prefix}brick_orphans/")
+          )
+          get("/#{controller_prefix}brick_orphans", to: 'brick_gem#orphans', as: 'brick_orphans')
         end
+      end
 
-        if Object.const_defined?('Rswag::Ui')
-          rswag_path = routeset_to_use.routes.find { |r| r.app.app == Rswag::Ui::Engine }&.instance_variable_get(:@path_formatter)&.instance_variable_get(:@parts)&.join
-          first_endpoint_parts = nil
-          (doc_endpoints = Rswag::Ui.config.config_object[:urls])&.each do |doc_endpoint|
-            puts "Mounting OpenApi 3.0 documentation endpoint for \"#{doc_endpoint[:name]}\" on #{doc_endpoint[:url]}" unless ::Brick.routes_done
-            send(:get, doc_endpoint[:url], { to: 'brick_openapi#index' })
-            endpoint_parts = doc_endpoint[:url]&.split('/')
-            first_endpoint_parts ||= endpoint_parts
-          end
+      if instance_variable_get(:@set).named_routes.names.exclude?(:brick_crosstab)
+        get("/#{controller_prefix}brick_crosstab", to: 'brick_gem#crosstab', as: 'brick_crosstab')
+        get("/#{controller_prefix}brick_crosstab/data", to: 'brick_gem#crosstab_data')
+      end
+
+      if Object.const_defined?('Rswag::Ui')
+        rswag_path = routeset_to_use.routes.find { |r| r.app.app == Rswag::Ui::Engine }&.instance_variable_get(:@path_formatter)&.instance_variable_get(:@parts)&.join
+        first_endpoint_parts = nil
+        (doc_endpoints = Rswag::Ui.config.config_object[:urls])&.each do |doc_endpoint|
+          puts "Mounting OpenApi 3.0 documentation endpoint for \"#{doc_endpoint[:name]}\" on #{doc_endpoint[:url]}" unless ::Brick.routes_done
+          send(:get, doc_endpoint[:url], { to: 'brick_openapi#index' })
+          endpoint_parts = doc_endpoint[:url]&.split('/')
+          first_endpoint_parts ||= endpoint_parts
         end
-        next if ::Brick.routes_done
+      end
+      return if ::Brick.routes_done
 
-        if Object.const_defined?('Rswag::Ui')
-          if doc_endpoints.present?
-            if rswag_path && first_endpoint_parts
-              puts "API documentation now available when navigating to:  /#{first_endpoint_parts&.find(&:present?)}/index.html"
-            else
-              puts "In order to make documentation available you can put this into your routes.rb:"
-              puts "  mount Rswag::Ui::Engine => '/#{first_endpoint_parts&.find(&:present?) || 'api-docs'}'"
-            end
+      if Object.const_defined?('Rswag::Ui')
+        if doc_endpoints.present?
+          if rswag_path && first_endpoint_parts
+            puts "API documentation now available when navigating to:  /#{first_endpoint_parts&.find(&:present?)}/index.html"
           else
-            sample_path = rswag_path || '/api-docs'
+            puts "In order to make documentation available you can put this into your routes.rb:"
+            puts "  mount Rswag::Ui::Engine => '/#{first_endpoint_parts&.find(&:present?) || 'api-docs'}'"
+          end
+        else
+          sample_path = rswag_path || '/api-docs'
+          puts
+          puts "Brick:  rswag-ui gem detected -- to make OpenAPI 3.0 documentation available from a path such as  '#{sample_path}/v1/swagger.json',"
+          puts '        put code such as this in an initializer:'
+          puts '  Rswag::Ui.configure do |config|'
+          puts "    config.swagger_endpoint '#{sample_path}/v1/swagger.json', 'API V1 Docs'"
+          puts '  end'
+          unless rswag_path
             puts
-            puts "Brick:  rswag-ui gem detected -- to make OpenAPI 3.0 documentation available from a path such as  '#{sample_path}/v1/swagger.json',"
-            puts '        put code such as this in an initializer:'
-            puts '  Rswag::Ui.configure do |config|'
-            puts "    config.swagger_endpoint '#{sample_path}/v1/swagger.json', 'API V1 Docs'"
-            puts '  end'
-            unless rswag_path
-              puts
-              puts '        and put this into your routes.rb:'
-              puts "  mount Rswag::Ui::Engine => '/api-docs'"
-            end
+            puts '        and put this into your routes.rb:'
+            puts "  mount Rswag::Ui::Engine => '/api-docs'"
           end
         end
+      end
 
-        puts "\n" if tables.present? || views.present?
-        if tables.present?
-          puts "Classes that can be built from tables:#{' ' * (table_class_length - 38)}  Path:"
-          puts "======================================#{' ' * (table_class_length - 38)}  ====="
-          ::Brick.display_classes(controller_prefix, tables, table_class_length)
-        end
-        if views.present?
-          puts "Classes that can be built from views:#{' ' * (view_class_length - 37)}  Path:"
-          puts "=====================================#{' ' * (view_class_length - 37)}  ====="
-          ::Brick.display_classes(controller_prefix, views, view_class_length)
-        end
+      puts "\n" if tables.present? || views.present?
+      if tables.present?
+        puts "Classes that can be built from tables:#{' ' * (table_class_length - 38)}  Path:"
+        puts "======================================#{' ' * (table_class_length - 38)}  ====="
+        ::Brick.display_classes(controller_prefix, tables, table_class_length)
+      end
+      if views.present?
+        puts "Classes that can be built from views:#{' ' * (view_class_length - 37)}  Path:"
+        puts "=====================================#{' ' * (view_class_length - 37)}  ====="
+        ::Brick.display_classes(controller_prefix, views, view_class_length)
       end
-      super
       ::Brick.routes_done = true
     end
   end
@@ -1112,20 +1119,22 @@ require 'active_record/relation'
 require 'active_record/relation/query_methods' if ActiveRecord.version < ::Gem::Version.new('5')
 require 'rails/railtie' if ActiveRecord.version < ::Gem::Version.new('4.2')
 
-# Rake tasks
-class Railtie < ::Rails::Railtie
-  Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
-end
+if Object.const_defined?('Rails')
+  # Rake tasks
+  class Railtie < ::Rails::Railtie
+    Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
+  end
 
-# Rails < 4.2 does not have env
-module ::Rails
-  unless respond_to?(:env)
-    def self.env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
-    end
+  # Rails < 4.2 does not have env
+  module ::Rails
+    unless respond_to?(:env)
+      def self.env
+        @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+      end
 
-    def self.env=(environment)
-      @_env = ActiveSupport::StringInquirer.new(environment)
+      def self.env=(environment)
+        @_env = ActiveSupport::StringInquirer.new(environment)
+      end
     end
   end
 end

data/lib/generators/brick/migration_builder.rb

@@ -1,5 +1,7 @@
 module Brick
   module MigrationBuilder
+    include FancyGets
+
     # Many SQL types are the same as their migration data type name:
     #   text, integer, bigint, date, boolean, decimal, float
     # These however are not:

data/lib/generators/brick/migrations_generator.rb

@@ -8,7 +8,6 @@ require 'generators/brick/migration_builder'
 module Brick
   # Auto-generates migration files
   class MigrationsGenerator < ::Rails::Generators::Base
-    include FancyGets
     include ::Brick::MigrationBuilder
 
     desc 'Auto-generates migration files for an existing database.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.158
+  version: 1.0.161
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-29 00:00:00.000000000 Z
+date: 2023-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord