brick 1.0.82 → 1.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74df340edd3b41626ea7f72409064b27ae10ddfd6eb41dd66ecc6704044156bd
-  data.tar.gz: 82181c7ffe7a26b6ab02bfc4faaedf031d78e5e4880f6316e1ea2143da8a9655
+  metadata.gz: fd1f37f0785af48f35bc1292e9eec44cd8ebc6a81a6ed7163e53aeaeb753ccc7
+  data.tar.gz: e532a10b06419ce64369e7a397a8eb4d268d87dc5a18c936847ab693cbf159bb
 SHA512:
-  metadata.gz: 644d3d343e774f8682a575c8fad849c27ee60c279e30a689874b608f056b1aee39a936ec85e91878d2200deeaf49ad78188866b6548ccf6dae43fbadbe80752a
-  data.tar.gz: '09f1f3383f9db0f3519215bb372a238478a0ae5176090bd2992a4f43f6e41b8aaef9f2a449573413ee886cc08cd94b868e0ec81a822b20d8dd0cc9e4eebf635e'
+  metadata.gz: 7d9dbf20d1bcdc3d3ac2beaf905392ba4990574a8165c1111bdb8f035bd8b53765f1555bd672da134cd342edadb45a2b62151e49cfa6279ebc957f16d34fc449
+  data.tar.gz: 276c8e4b831a866baa1b4e84a288a0137ae19afba54d08d342432f358ff4b7a45f234521c35f6d1a6ab96fd69ceb68aa30ba41bfb4b18caef7a12e25cedec8ed

data/lib/brick/extensions.rb

@@ -813,6 +813,100 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
   end
 end
 
+if Object.const_defined?('ActionView')
+  module ActionView::Helpers::FormTagHelper
+    def link_to_brick(*args, **kwargs)
+      text = (args.first.is_a?(String) && args.first) || args[1]
+      klass_or_obj = ((args.first.is_a?(ActiveRecord::Relation) ||
+                       args.first.is_a?(ActiveRecord::Base) ||
+                       args.first.is_a?(Class)) &&
+                      args.first) ||
+                     @_brick_model
+      # If not provided, do a best-effort to automatically determine the resource class or object
+      sti_type = nil
+      filter_parts = []
+      klass_or_obj ||= begin
+                         res_names = ::Brick.relations.each_with_object({}) do |v, s|
+                           v_parts = v.first.split('.')
+                           v_parts.shift if v_parts.first == 'public'
+                           s[v_parts.join('.')] = v.first
+                         end
+                         c_path_parts = controller_path.split('/')
+                         klass = nil
+                         while c_path_parts.present?
+                           possible_c_path = c_path_parts.join('.')
+                           possible_c_path_singular = c_path_parts[0..-2] + [c_path_parts.last.singularize]
+                           possible_sti = possible_c_path_singular.join('/').camelize
+                           break if (
+                                      res_name = res_names[possible_c_path] ||
+                                                 ((klass = Brick.config.sti_namespace_prefixes.key?("::#{possible_sti}") && possible_sti.constantize) &&
+                                                  (sti_type = possible_sti)) ||
+                                                 # %%% Used to have the more flexible:  (DidYouMean::SpellChecker.new(dictionary: res_names.keys).correct(possible_c_path)).first
+                                                 res_names[possible_c_path] || res_names[possible_c_path_singular.join('.')]
+                                    ) &&
+                                    (
+                                      klass ||
+                                      ((rel = ::Brick.relations.fetch(res_name, nil)) &&
+                                      (klass ||= rel[:class_name]&.constantize))
+                                    )
+                           c_path_parts.shift
+                         end
+                         if klass
+                           type_col = klass.inheritance_column # Usually 'type'
+                           filter_parts << "#{type_col}=#{sti_type}" if sti_type && klass.column_names.include?(type_col)
+                           path_params = request.path_parameters.dup
+                           path_params.delete(:controller)
+                           path_params.delete(:action)
+                           pk = (klass.primary_key || ActiveRecord::Base.primary_key).to_sym
+                           # Used to also have this but it's a bit too permissive to identify a primary key:  (path_params.length == 1 && path_params.values.first) ||
+                           if ((id = (path_params[pk] || path_params[:id] || path_params["#{klass.name.underscore}_id".to_sym])) && (obj = klass.find_by(pk => id))) ||
+                              (['show', 'edit'].include?(action_name) && (obj = klass.first))
+                             obj
+                           else
+                             # %%% If there is a HMT that refers to some ___id then try to identify an appropriate filter
+                             # %%% If there is a polymorphic association that might relate to stuff in the path_params,
+                             # try to identify an appropriate ___able_id and ___able_type filter
+                             ((klass.column_names - [pk.to_s]) & path_params.keys.map(&:to_s)).each do |path_param|
+                               filter_parts << "#{path_param}=#{path_params[path_param.to_sym]}"
+                             end
+                             klass
+                           end
+                         end
+                       rescue
+                       end
+      if klass_or_obj
+        if klass_or_obj.is_a?(ActiveRecord::Relation)
+          klass_or_obj.where_values_hash.each do |whr|
+            filter_parts << "#{whr.first}=#{whr.last}" unless whr.last.is_a?(Array)
+          end
+          klass_or_obj = klass_or_obj.klass
+        end
+        filter = "?#{filter_parts.join('&')}" if filter_parts.present?
+        if klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base
+          lt_args = [text || "Index for #{klass_or_obj.name.pluralize}",
+                    "#{send("#{klass_or_obj._brick_index}_path")}#{filter}"]
+        else
+          # If there are multiple incoming parameters then last one is probably the actual ID, and first few might be some nested tree of stuff leading up to it
+          lt_args = [text || "Show this #{klass_or_obj.class.name}",
+                    "#{send("#{klass_or_obj.class._brick_index(:singular)}_path", klass_or_obj)}#{filter}"]
+        end
+        link_to(*lt_args, **kwargs)
+      else
+        # puts "Warning:  link_to_brick could not find a class for \"#{controller_path}\" -- consider setting @_brick_model within that controller."
+        # if (hits = res_names.keys & instance_variables.map { |v| v.to_s[1..-1] }).present?
+        links = instance_variables.each_with_object([]) do |name, s|
+                  iv_name = name.to_s[1..-1]
+                  case (val = instance_variable_get(name))
+                  when ActiveRecord::Relation, ActiveRecord::Base
+                    s << link_to_brick(val, iv_name) if val
+                  end
+                end
+        links.join(' &nbsp; ').html_safe
+      end
+    end
+  end
+end
+
 if ActiveSupport::Dependencies.respond_to?(:autoload_module!) # %%% Only works with previous non-zeitwerk auto-loading
   module ActiveSupport::Dependencies
     class << self

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

@@ -166,7 +166,13 @@ module Brick
                     hms_columns << hm_entry
                   when 'show', 'new', 'update'
                     hm_stuff << if hm_fk_name
-                                  "<%= link_to '#{assoc_name}', #{hm_assoc.klass._brick_index}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
+                                  if hm_assoc.klass.column_names.include?(hm_fk_name)
+                                    "<%= link_to '#{assoc_name}', #{hm_assoc.klass._brick_index}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
+                                  else
+                                    puts "Warning:  has_many :#{hm_assoc.name} in model #{hm_assoc.active_record.name} currently looks for a foreign key called \"#{hm_assoc.foreign_key}\".  "\
+                                         "Instead it should use the clause  \"foreign_key: :#{hm_assoc.inverse_of&.foreign_key}\"."
+                                    assoc_name
+                                  end
                                 else # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
                                   assoc_name
                                 end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -547,7 +547,11 @@ In config/initializers/brick.rb appropriate entries would look something like:
   module RouteSet
     def finalize!
       unless ::Rails.application.routes.named_routes.route_defined?(:brick_status_path)
-        existing_controllers = routes.each_with_object({}) { |r, s| c = r.defaults[:controller]; s[c] = nil if c }
+        path_prefix = ::Brick.config.path_prefix
+        existing_controllers = routes.each_with_object({}) do |r, s|
+          c = r.defaults[:controller]
+          s[c] = nil if c
+        end
         ::Rails.application.routes.append do
           tables = []
           views = []
@@ -566,7 +570,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
 
           # %%% 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 = (::Brick.config.path_prefix ? "#{::Brick.config.path_prefix}/" : '')
+          controller_prefix = (path_prefix ? "#{path_prefix}/" : '')
           ::Brick.relations.each do |k, v|
             unless !(controller_name = v.fetch(:resource, nil)&.pluralize) || existing_controllers.key?(controller_name)
               options = {}
@@ -581,9 +585,9 @@ In config/initializers/brick.rb appropriate entries would look something like:
                 send(:get, "#{::Brick.api_root}#{v[:resource]}", { to: "#{controller_prefix}#{controller_name}#index" }) if Object.const_defined?('Rswag::Ui')
               end
               # Now the normal routes
-              if ::Brick.config.path_prefix
-                # Was:  send(:scope, path: ::Brick.config.path_prefix) do
-                send(:namespace, ::Brick.config.path_prefix) do
+              if path_prefix
+                # Was:  send(:scope, path: path_prefix) do
+                send(:namespace, path_prefix) do
                   brick_routes_create.call(schema_name, controller_name, v, options)
                 end
               else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.82
+  version: 1.0.83
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord