brick 1.0.111 → 1.0.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb97e4a946526ed99a24e67b1e65d5f6490a40c97dc170dd0680166b087d1ccb
-  data.tar.gz: 48d9c4f2afcd737d9a857f8c771448639c1b0d2d568dc966bbe4b85a97cb4610
+  metadata.gz: 69051263cec00b3672b8d48b0c595ff6875b81f27e7995be72a03d6699ad6d02
+  data.tar.gz: 217687ad2f6b93c33dc781f5930a0475a60fb27d782593109055beaae19f4e55
 SHA512:
-  metadata.gz: 383d9996affbbd4fa049ab125490879143299a5477e98f921d450ea6b5b466d66a4cd210aac8db9c105a6eaf5f10eae8ac181d84d78fb6fc0b4c4151ac9dcee3
-  data.tar.gz: b9902fc959b0de870ef5c402fe75e76d939d0c7c5abc7b8d3c16451b87f56929eb6e329153c6b5697936f10228752ba3b2f5f2a7de6aa5c9c77c105c34dd2cfa
+  metadata.gz: 6eff4c8a9f59673d14be1d890b067e17e631b1d6938a22b81c1ec45c3785489195d5d9e93939a38c681d36d844df2ad9a932584d8269b0fd2ef678de428c805c
+  data.tar.gz: 723425258d449708f18e086f289147b3402f728c93fbcba3a16654c3d15b4fe715022e427cb3f87e731bf9b73d693a5d4f43a500bdbde3641b69ac61e4c35e35

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

@@ -322,18 +322,26 @@ window.addEventListener(\"popstate\", linkSchemas);
             end
 
             def set_brick_model(find_args)
-              # Need to return true if we can fill in the blanks for a missing one
-              # args will be something like:  ["index", ["categories"]]
-              if (class_name = find_args[1].last&.singularize)
-                find_args[1][find_args[1].length - 1] = class_name # Make sure the last item, defining the class name, is singular
-                if (model = find_args[1].map(&:camelize).join('::').constantize) && (
-                     ['index', 'show'].include?(find_args.first) || # Everything has index and show
-                     # Only CUD stuff has create / update / destroy
-                     (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
-                   )
-                  @_brick_model = model
+              # Return an appropriate model for a given view template request.
+              # find_args will generally be something like:  ["index", ["categories"]]
+              # and must cycle through all of find_args[1] because in some cases such as with Devise we get something like:
+              # ["create", ["users/sessions", "sessions", "devise/sessions", "devise", "application"], false, []]
+              find_args[1]&.any? do |resource_name|
+                if (class_name = (resource_parts = resource_name.split('/')).last&.singularize)
+                  resource_parts[-1] = class_name # Make sure the last part, defining the class name, is singular
+                  begin
+                    if (model = Object.const_get(resource_parts.map(&:camelize).join('::')))&.is_a?(Class) && (
+                         ['index', 'show'].include?(find_args.first) || # Everything has index and show
+                         # Only CUD stuff has create / update / destroy
+                         (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
+                       )
+                      @_brick_model = model
+                    end
+                  rescue
+                  end
                 end
               end
+              @_brick_model
             end
 
             def path_keys(hm_assoc, fk_name, pk)
@@ -356,6 +364,7 @@ window.addEventListener(\"popstate\", linkSchemas);
 
             alias :_brick_find_template :find_template
             def find_template(*args, **options)
+              find_template_err = nil
               unless (model_name = @_brick_model&.name) ||
                      (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
                      (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']]) ||
@@ -364,10 +373,11 @@ window.addEventListener(\"popstate\", linkSchemas);
                   if (possible_template = _brick_find_template(*args, **options))
                     return possible_template
                   end
-                rescue
+                rescue StandardError => e
+                  find_template_err = e # Can come up with stuff like Devise which has its own view templates
                 end
                 # Used to also have:  ActionView.version < ::Gem::Version.new('5.0') &&
-                model_name = (args[1].is_a?(Array) ? set_brick_model(args) : nil)&.name
+                model_name = set_brick_model(args)&.name
               end
 
               if @_brick_model
@@ -1154,7 +1164,7 @@ erDiagram
        td_count += 1 %>
     <td><%= link_to_brick(
         avo_svg,
-        { index_proc: Proc.new do |avo_model, relation|
+        { index_proc: Proc.new do |_avo_model, relation|
                         path_helper = \"resources_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{model.model_name.route_key}_path\".to_sym
                         ::Avo.railtie_routes_url_helpers.send(path_helper) if ::Avo.railtie_routes_url_helpers.respond_to?(path_helper)
                       end,
@@ -1436,11 +1446,9 @@ end
       <% when :boolean %>
         <%= f.check_box k.to_sym %>
       <% when :integer, :decimal, :float %>
-        <%= if col_type == :integer
-              f.text_field k.to_sym, { pattern: '\\d*', class: 'check-validity' }
-            else
-              f.number_field k.to_sym
-            end %>
+        <%= digit_pattern = col_type == :integer ? '\\d*' : '\\d*(?:\\.\\d*|)'
+            # Used to do this for float / decimal:  f.number_field k.to_sym
+            f.text_field k.to_sym, { pattern: digit_pattern, class: 'check-validity' } %>
       <% when *dt_pickers.keys
            is_includes_dates = true %>
         <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %>
@@ -1542,7 +1550,12 @@ end}
 </body>
 </html>
 "
-
+                       else # args.first isn't index / show / edit / new / orphans / status
+                         if find_template_err # Can surface when gems have their own view templates
+                           raise find_template_err
+                         else # Can surface if someone made their own controller which has a screwy action
+                           puts "Couldn't work with action #{args.first}"
+                         end
                        end
               unless is_crosstab
                 inline << "

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 111
+    TINY = 112
 
     # 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.111
+  version: 1.0.112
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord