hot-glue 0.6.14 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e3938ec168ea29eb7311c82742601f1d19ceb5c670e909ddd6ab5efda1a8bca
-  data.tar.gz: 4a2a21046045ab745e0c2d3ba3b5faddab2507628e245d5caae159f9c6c8bca2
+  metadata.gz: '09ebf223206d1bf224f02aaafe2796774bfa6b3d61c6892c1b0144ec2a8dd0f3'
+  data.tar.gz: 1fd04b5e1909ebcf2ecc9eeb5c4e212f7a6878d49c0fe918305e43e441cd73d3
 SHA512:
-  metadata.gz: 37aa5ce09632029e929cd9d085c48bab155ee4db0560e76d9a8bf9aac5ab541929fd604111674da4390383c123e3b7c53b2826a0a374e2de507f665bb440d49c
-  data.tar.gz: 50b1a2f1fac6ae0e144bb949c9febb63165a3eeec7d0780035998234e7b854631c949246c06886d0a75c9dc0baf83fe8103948981d2fec3167086ecff1c8fa34
+  metadata.gz: c01e39699fe999a7024850b9d738d5e205b4e5abe8c39d3619d10efa74fbed2384ac6cadfa4010d52c0a9fdea3878ae599aa23002cd439d323701f4b8524c3eb
+  data.tar.gz: 79c20e1f78772f79e396cecfc81990a70b3a0d17988962baebd6c2ea0b10eabedea59ebd8624f34d0ad7ce864d59bf7ad7be2afb8c712ef01f605ab06e272fce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.12)
+    hot-glue (0.6.15)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -140,14 +140,14 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.5.8)
     nokogiri (1.13.9)

data/README.md

@@ -790,6 +790,23 @@ end
 Because Hot Glue detects the `*_able?` methods at build time, if you add them to your policy, you will have to rebuild your scaffold.
 
 
+### `--pundit-policy-override`
+if you use the flag `--pundit-policy-override` your controller operations will bypass the invisible (pundit provided) access control and use the pundit policy you specify.
+
+example
+
+`rails generate hot_glue:scaffold Invoice --gd --pundit-policy-override='UniqueInvoicePolicy'`
+
+You will implement a Pundit policy for `UniqueInvoicePolicy` and it should implement actions with question mark `?` endings corresponding to the same actions you are building, `new?`, `create?`, `edit?`, `update?`, and `destroy?`
+
+If provided, the output code looks something like (in this example, showing the `edit?` method)
+
+```
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! UniqueInvoicePolicy.edit?
+```
+
+
 ### `--show-only=`
 (separate field names by COMMA)
 
@@ -1751,6 +1768,46 @@ These automatic pickups for partials are detected at build time. This means that
 
 # VERSION HISTORY
 
+#### 2025-03-31 v0.6.16
+
+• Bootstrap Tab Panes For Downnested Portals
+Downnested portals are now built with bootstrap tab panes (always) and are no longer stacked on top of one another.
+
+It looks like this:
+https://getbootstrap.com/docs/5.0/components/navs-tabs/#javascript-behavior
+
+• inline_list_labels can be set in hot_glue.yml
+• typeaheads nested inside of routes are fixed
+• switches back to current_timezone implementation, displaying times relative to the user's set timezone
+• load all code now sets query parameters
+
+• Pundit Policy Override
+if you use the flag `--pundit-policy-override` your controller operations will bypass the invisible (pundit provided) access control and use the pundit policy you specify.
+
+example
+
+`rails generate hot_glue:scaffold Invoice --gd --pundit-policy-override='UniqueInvoicePolicy'`
+
+Implement  `UniqueInvoicePolicy` using actions with question mark `?` endings corresponding to the same actions you are building, `new?`, `create?`, `edit?`, `update?`, and `destroy?`
+
+
+• Bootstrap column builder has been changed.
+The bootstrap column bulder previously defaulted all real columns to col-sm-2 (or whichever bootstrap column with you set)
+
+The builder has been refactored to allow for a per-column width generated automatically by the builder. If there are unused bootstrap columns, the builder will add width to the first columns in your layout, making them wider. 
+
+
+
+
+
+
+#### 2025-03-17 - v0.6.15
+
+• now store on your current_user model (this is automatically passed into the method modify_date_inputs_on_params). HG will set user-inputted values correctly to daylight savings time during April-Nov months only (#195)
+• fixes issue with turbo frame name after create is rendered (#194)
+• removes vestigates of optionalized partents
+
+
 #### 2025-02-28 - v0.6.14
 
 • fixes bug in association field involving scaffolds built without nesting

data/app/helpers/hot_glue/controller_helper.rb

@@ -68,8 +68,16 @@ module HotGlue
       end
     end
 
+    def is_dst_now?
+      Time.now.utc.month > 3 && Time.now.month < 11 ||
+        (Time.now.utc.month == 3 && Time.now.day >= (14 - Time.now.utc.wday)) ||
+        (Time.now.utc.month == 11 && Time.now.utc.day < (7 - Time.now.utc.wday))
+    end
+
     def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = nil)
       use_timezone = (current_user_object.try(:timezone)) || Time.zone
+      uses_dst = (current_user_object.try(:locale_uses_dst)) || false
+
       modified_params = modified_params.tap do |params|
         params.keys.each{|k|
 
@@ -88,7 +96,9 @@ module HotGlue
               # if they already exist in your database, you should zero them out
               # or apply .change(sec: 0) when displaying them as output in the form
               # this will prevent seconds from being added by the browser
-              params[k] = Time.strptime(parse_date, "%Y-%m-%d %H:%M %Z")
+              parsed_time = Time.strptime(parse_date, "%Y-%m-%d %H:%M %Z")
+              parsed_time = parsed_time.to_time - 60.minutes if uses_dst && is_dst_now?
+              params[k] = parsed_time
             end
           end
         }

data/lib/generators/hot_glue/field_factory.rb

@@ -12,8 +12,6 @@ require_relative "fields/uuid_field"
 require_relative "fields/attachment_field"
 require_relative "fields/related_set_field"
 
-
-
 class FieldFactory
   attr_accessor :field, :class_name
   def initialize(type: , name: , generator: )
@@ -51,6 +49,9 @@ class FieldFactory
             end
     @class_name = class_name
 
+    if field_class.nil?
+      raise "Field type could be identified  #{name} "
+    end
 
     @field = field_class.new(name: name,
                              layout_strategy: generator.layout_strategy,

data/lib/generators/hot_glue/fields/association_field.rb

@@ -155,6 +155,7 @@ class AssociationField < Field
         hawked_association = "#{assoc.class_name}.all"
       end
 
+
       (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
         "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: #{singular}.#{name} }, class: 'form-control') %>\n" +
         (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
@@ -253,6 +254,13 @@ class AssociationField < Field
     #   "\n     "
   end
 
+  def newline_after_field?
+    if modify_as && modify_as[:typeahead]
+      false
+    else
+      true
+    end
+  end
 
   def where_query_statement
     ".where(*#{name}_query)"

data/lib/generators/hot_glue/fields/enum_field.rb

@@ -32,6 +32,7 @@ class EnumField < Field
 
   def form_field_output
     enum_type = eval("#{class_name}.columns.select{|x| x.name == '#{name}'}[0].sql_type")
+
     if eval("defined? #{class_name}.#{enum_type}_labels") == "method"
       enum_definer = "#{class_name}.#{enum_type}_labels"
     else

data/lib/generators/hot_glue/fields/field.rb

@@ -219,4 +219,9 @@ class Field
   def code_to_reset_match_if_search_is_blank
     nil
   end
+
+  def newline_after_field?
+    false
+  end
+
 end

data/lib/generators/hot_glue/layout/builder.rb

@@ -40,7 +40,8 @@ module HotGlue
         layout_object = {
           columns: {
             size_each: smart_layout ? bootstrap_column_width : (specified_grouping_mode ? nil : 1),
-            container: [] # array of arrays
+            container: [] , # array of arrays,
+            bootstrap_column_width: []
           },
           portals:  {
 
@@ -99,7 +100,7 @@ module HotGlue
             }
             layout_object[:columns][:container] = (0..available_columns-1).collect { |x|  [columns[x]] }
             layout_object[:columns][:container].reject!{|x| x == [nil]}
-            layout_object[:columns][:size_each] = bootstrap_column_width
+            # layout_object[:columns][:size_each] = bootstrap_column_width
           end
         elsif ! specified_grouping_mode
           # not smart and no specified grouping
@@ -117,22 +118,33 @@ module HotGlue
           # input control
 
           user_layout_columns = @include_setting.split(":")
-          size_each = (bootstrap_columns / user_layout_columns.count).floor # this is the bootstrap size
 
-          layout_object[:columns][:size_each] = size_each
+          extra_columns = available_columns - user_layout_columns.size
+          # size_each = (bootstrap_columns / user_layout_columns.count).floor # this is the bootstrap size
+          #
+          # layout_object[:columns][:size_each] = size_each
 
-          if user_layout_columns.size > available_columns
-            raise "Your include statement #{@include_setting } has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
-          end
+          # if user_layout_columns.size > available_columns
+          #   raise "Your include statement #{@include_setting } has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
+          # end
           user_layout_columns.each_with_index  do |column,i|
             layout_object[:columns][:container][i] = column.split(",").collect(&:to_sym)
+
+            default_col_width = 1
+            if extra_columns > 0
+              default_col_width += 1
+              extra_columns -= 1
+            end
+            layout_object[:columns][:bootstrap_column_width][i] = default_col_width
           end
 
           if user_layout_columns.size < layout_object[:columns][:container].size
             layout_object[:columns][:container].reject!{|x| x == []}
           end
+
         end
 
+
         puts "*** constructed smart layout columns #{layout_object.inspect}"
         layout_object
       end

data/lib/generators/hot_glue/layout_strategy/bootstrap.rb

@@ -17,20 +17,20 @@ class LayoutStrategy::Bootstrap < LayoutStrategy::Base
   end
 
 
-  def column_classes_for_form_fields
-    "col-md-#{builder.layout_object[:columns][:size_each]}"
+  def column_classes_for_form_fields(size = nil)
+    "col-md-#{size || builder.layout_object[:columns][:size_each]}"
   end
 
-  def column_classes_for_column_headings
-    column_classes_for_line_fields
+  def column_classes_for_column_headings(size = nil)
+    column_classes_for_line_fields(size)
   end
 
   def container_name
     "container"
   end
 
-  def column_classes_for_line_fields
-    "col-sm-#{builder.layout_object[:columns][:size_each]}"
+  def column_classes_for_line_fields(size = nil)
+    "col-sm-#{size || builder.layout_object[:columns][:size_each]}"
   end
 
   def column_width

data/lib/generators/hot_glue/layout_strategy/hot_glue.rb

@@ -39,18 +39,18 @@ class LayoutStrategy::HotGlue < LayoutStrategy::Base
     "scaffold-row"
   end
 
-  def column_classes_for_form_fields
+  def column_classes_for_form_fields(size = nil)
     "scaffold-cell"
   end
 
   def row_heading_classes
     "scaffold-heading-row"
   end
-  def column_classes_for_line_fields
+  def column_classes_for_line_fields(size = nil)
     "scaffold-cell"
   end
 
-  def column_classes_for_column_headings
+  def column_classes_for_column_headings(size = nil)
     "scaffold-cell"
   end
 

data/lib/generators/hot_glue/layout_strategy/tailwind.rb

@@ -6,9 +6,9 @@ class LayoutStrategy::Tailwind < LayoutStrategy::Base
   def button_style ; ""; end
   def column_headings_col_style; "" ; end
   def column_width; ""; end
-  def column_classes_for_line_fields; ""; end
-  def column_classes_for_form_fields; ""; end
-  def column_classes_for_column_headings; ""; end
+  def column_classes_for_line_fields(size = nil); ""; end
+  def column_classes_for_form_fields(size = nil); ""; end
+  def column_classes_for_column_headings(size = nil); ""; end
   def col_width; 100; end
   def container_name; ""; end
   def downnest_style ; ""; end

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -76,13 +76,14 @@ module  HotGlue
       }.join("\n")
     end
 
-    def list_column_headings(col_identifier: ,
-                             column_width:, singular: )
+    def list_column_headings(column_width:, singular: )
       col_style = @layout_strategy.column_headings_col_style
 
       columns = layout_object[:columns][:container]
-      result = columns.map{ |column|
-        "<div class='#{col_identifier} hg-heading-row heading--#{singular}--#{column.join("-")}' " + col_style + ">" +
+      result = columns.map.with_index{ |column,i|
+
+        size = layout_object[:columns][:bootstrap_column_width][i]
+        "<div class='#{layout_strategy.column_classes_for_column_headings(size)} hg-heading-row heading--#{singular}--#{column.join("-")}' " + col_style + ">" +
           column.map(&:to_s).map{|col_name| "#{col_name.humanize}"}.join("<br />")  + "</div>"
       }.join("\n")
       return result
@@ -95,7 +96,6 @@ module  HotGlue
 
     def search_input_area
       columns = layout_object[:columns][:container]
-      column_classes = layout_strategy.column_classes_for_form_fields
 
       res =+ "<\%= form_with url: #{form_path}, method: :get, html: {'data-turbo-action': 'advance', 'data-controller': 'search-form'} do |f| %>"
       res << "<div class=\"#{@layout_strategy.row_classes} search--#{@plural}\">"
@@ -116,12 +116,13 @@ module  HotGlue
           end
         }.compact.join("\n")
 
-        "  <div class='#{column_classes} search-cell--#{singular}--#{column.join("-")}' >" +
+        size = layout_object[:columns][:bootstrap_column_width][columns.index(column)]
+        "  <div class='#{layout_strategy.column_classes_for_form_fields(size)} search-cell--#{singular}--#{column.join("-")}' >" +
           cols_result + "</div>"
 
       }.join("\n")
       res << "</div>"
-      res << "<div class='#{column_classes}'>"
+      res << "<div class='#{layout_strategy.column_classes_for_form_fields(nil)}'>"
       if @search_clear_button
         res << "<\%= f.button \"Clear\", name: nil, 'data-search-form-target': 'clearButton', class: 'btn btn-sm btn-secondary' %>"
       end
@@ -132,11 +133,12 @@ module  HotGlue
 
 
     def all_form_fields(layout_strategy:)
-      column_classes = layout_strategy.column_classes_for_form_fields
       columns = layout_object[:columns][:container]
 
       result = columns.map{ |column|
-        "  <div class='#{column_classes} cell--#{singular}--#{column.join("-")}' >" +
+        size  = layout_object[:columns][:bootstrap_column_width][columns.index(column)]
+
+        "  <div class='#{layout_strategy.column_classes_for_form_fields(size)} cell--#{singular}--#{column.join("-")}' >" +
           column.map { |col|
 
             field_error_name = columns_map[col].field_error_name
@@ -158,6 +160,8 @@ module  HotGlue
                  # show only on the update action overrides any pundit policy
               elsif @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
                 "<% if policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output  + "<% end %>"
+              elsif update_show_only.include?(col)
+                "<% if @action == 'edit' %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
               else
                 columns_map[col].form_field_output
               end
@@ -168,7 +172,7 @@ module  HotGlue
             add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
                                     add_spaces_each_line( (form_labels_position == 'before' ? (the_label || "") + "<br />\n"  : "") +
                                                         +  field_result +
-                                        (form_labels_position == 'after' ? "<br />\n" + (the_label || "") : "")  , 4) +
+                                        (form_labels_position == 'after' ? (  columns_map[col].newline_after_field? ? "<br />\n" : "") + (the_label || "") : "")  , 4) +
                                     "\n  </span>\n ", 2)
 
           }.join("") + "\n  </div>"
@@ -190,10 +194,8 @@ module  HotGlue
     ################################################################
 
     def all_line_fields(layout_strategy:,
-                        perc_width:,
-                        col_identifier: nil)
+                        perc_width:)
 
-      @col_identifier =  layout_strategy.column_classes_for_line_fields
 
       inline_list_labels = @inline_list_labels  || 'omit'
       columns = layout_object[:columns][:container]
@@ -203,9 +205,11 @@ module  HotGlue
 
       style_with_flex_basis = layout_strategy.style_with_flex_basis(perc_width)
 
-      result = columns.map{ |column|
+      result = columns.map.with_index{ |column,i|
+
+        size = layout_object[:columns][:bootstrap_column_width][i]
 
-        "<div class='hg-col #{col_identifier} #{singular}--#{column.join("-")}'#{style_with_flex_basis}> " +
+        "<div class='hg-col #{layout_strategy.column_classes_for_line_fields(size)} #{singular}--#{column.join("-")}'#{style_with_flex_basis}> " +
         column.map { |col|
           if eval("#{singular_class}.columns_hash['#{col}']").nil? && !attachments.keys.include?(col) && !related_sets.include?(col)
             raise "Can't find column '#{col}' on #{singular_class}, are you sure that is the column name?"
@@ -217,6 +221,8 @@ module  HotGlue
           "#{inline_list_labels == 'before' ? label + "<br/>" : ''}#{field_output}#{inline_list_labels == 'after' ? "<br/>" + label : ''}"
         }.join(  "<br />") + "</div>"
       }.join("\n")
+      return result
+
     end
   end
 end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -77,7 +77,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :no_list_heading, type: :boolean, default: false
 
   # determines if the labels show up BEFORE or AFTER on the NEW/EDIT (form)
-  class_option :form_labels_position, type: :string, default: 'after' #  choices are before, after, omit
+  class_option :form_labels_position, type: :string #  choices are before, after, omit
   class_option :form_placeholder_labels, type: :boolean, default: false # puts the field names into the placeholder labels
 
   # determines if labels appear within the rows of the VIEWABLE list (does NOT affect the list heading)
@@ -91,6 +91,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :modify, default: {}
   class_option :display_as, default: {}
   class_option :pundit, default: nil
+  class_option :pundit_policy_override, default: nil
   class_option :related_sets, default: ''
   class_option :code_before_create, default: nil
   class_option :code_after_create, default: nil
@@ -310,10 +311,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @inline_list_labels = options['inline_list_labels'] || get_default_from_config(key: :inline_list_labels) || 'omit' # 'before','after','omit'
 
     @form_labels_position = options['form_labels_position']
-    if !['before', 'after', 'omit'].include?(@form_labels_position)
-      raise HotGlue::Error, "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+    if @form_labels_position.nil?
+      @form_labels_position = get_default_from_config(key: :form_labels_position)
+      if @form_labels_position.nil?
+        @form_labels_position = 'after'
+      end
+    else
+      if !['before', 'after', 'omit'].include?(@form_labels_position)
+        raise HotGlue::Error, "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+      end
     end
 
+
     if !['before', 'after', 'omit'].include?(@inline_list_labels)
       raise HotGlue::Error, "You passed '#{@inline_list_labels}' as the setting for --inline-list-labels but the only allowed options are before, after, and omit (default)"
     end
@@ -349,6 +358,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
 
     @pundit = options['pundit']
+    @pundit_policy_override = options['pundit_policy_override']
 
     @no_nav_menu = options['no_nav_menu']
 
@@ -651,6 +661,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @menu_file_exists = true if @nested_set.none? && File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
 
     @turbo_streams = !!options['with_turbo_streams']
+
+    puts "show only #{@show_only}"
+    puts "update show only #{@update_show_only}"
+
   end
 
   def setup_hawk_keys
@@ -966,7 +980,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def list_column_headings
     @template_builder.list_column_headings(
-      col_identifier: @layout_strategy.column_classes_for_column_headings,
       column_width: @layout_strategy.column_width,
       singular: @singular
     )
@@ -1330,9 +1343,12 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       append_text = "  <li class='nav-item'>
     <%= link_to '#{@list_label_heading.humanize}', #{path_helper_plural(@nested_set.any? ? true: false)}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
   </li>"
+      alt_append_text = "  <li class='nav-item'>
+    <%= link_to '#{@list_label_heading.humanize.upcase}', #{path_helper_plural(@nested_set.any? ? true: false)}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
+  </li>"
 
       text = File.read(nav_file)
-      if text.include?(append_text)
+      if text.include?(append_text) || text.include?(alt_append_text)
         puts "SKIPPING: Nav link for #{singular_name} already exists in #{nav_file}"
       else
         puts "APPENDING: nav link for #{singular_name} #{nav_file}"
@@ -1427,7 +1443,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def all_line_fields
     @template_builder.all_line_fields(
-      col_identifier: @layout_strategy.column_classes_for_line_fields,
       perc_width: @layout_strategy.each_col, # undefined method `each_col'
       layout_strategy: @layout_strategy
     )
@@ -1531,9 +1546,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     if @nested_set.none?
       "\"\""
     else
-      @nested_set.collect { |arg|
-        "(((\"__#{arg[:singular]}-\#{" + "@" + arg[:singular] + ".id}\") if @" + arg[:singular] + ") || \"\")"
-      }.join(" + ")
+      "\"" + @nested_set.collect { |arg|
+        "__#{arg[:singular]}-\#{" + "@" + arg[:singular] + ".id}"
+      }.join("") + "\""
     end
   end
 

data/lib/generators/hot_glue/templates/controller.rb.erb

@@ -78,11 +78,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def index
-    load_all_<%= plural %>
-      <% if @search_fields %>
+    load_all_<%= plural %><% if @search_fields %>
 <%= @search_fields.collect{|field_name| @columns_map[field_name.to_sym].code_to_reset_match_if_search_is_blank}.compact.join("     \n") %><% end %>
-    load_all_<%= plural %><% if @pundit %><% if @pundit %>
-    authorize @<%= plural_name %><% end %>
+    <% if @pundit %><% if @pundit && !@pundit_policy_override %>
+    authorize @<%= plural_name %><% elsif @pundit && @pundit_policy_override %>
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.index?<% end %>
   rescue Pundit::NotAuthorizedError
     flash[:alert] = 'You are not authorized to perform this action.'
     render 'layouts/error'<% end %>
@@ -92,7 +93,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     @<%= singular_name %> = <%= class_name %>.new<% if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>(<%= @object_owner_sym %>: <%= @object_owner_eval %>)<% end %><% elsif @object_owner_optional && any_nested? %>
     @<%= singular_name %> = <%= class_name  %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}))<% else %>
     @<%= singular_name %> = <%= class_name  %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% end %>
-    <% if @pundit %>authorize @<%= singular_name %><% end %><% if @pundit %>
+    <% if @pundit && !@pundit_policy_override %>
+    authorize @<%= singular %><% elsif @pundit && @pundit_policy_override %>
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.new?<% end %><% if @pundit %>
     @action = 'new'
   rescue Pundit::NotAuthorizedError
     flash[:alert] = 'You are not authorized to perform this action.'
@@ -112,7 +116,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <%= creation_syntax %>
     <% if @pundit %><% @related_sets.each do |key, related_set| %>
     check_<%= related_set[:association_ids_method].to_s %>_permissions(modified_params, :create)<% end %><% end %>
-    <% if @pundit %>authorize @<%= singular %><% end %>
+      <% if @pundit && !@pundit_policy_override %>
+    authorize @<%= singular %><% elsif @pundit && @pundit_policy_override %>
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.create?<% end %>
     <%= @code_before_create ? "\n    " + @code_before_create.gsub(";", "\n") : "" %>
     if @<%= singular_name %>.save<%= @code_after_create ? ("\n      " + @code_after_create.gsub(";", "\n"))  : ""%>
       flash[:notice] = "Successfully created #{@<%= singular %>.<%= display_class %>}"
@@ -148,8 +155,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
 <% end %>
 <% unless @no_edit %>
-  def show<% if @pundit %>
-    authorize @<%= singular %><% end %>
+  def show<% if @pundit && !@pundit_policy_override %>
+    authorize @<%= singular %><% elsif @pundit && @pundit_policy_override %>
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.show?<% end %>
     redirect_to <%=  HotGlue.optionalized_ternary(namespace: @namespace,
                                  target:  @singular,
                                  top_level: false,
@@ -160,8 +169,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
                                  put_form: true).gsub("(#{singular}", "(@#{singular}") %>
   end
 
-  def edit<% if @pundit  %>
-    authorize @<%= singular_name %><% end %>
+  def edit<% if @pundit && !@pundit_policy_override %>
+    authorize @<%= singular %><% elsif @pundit && @pundit_policy_override %>
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.edit?<% end %>
     @action = 'edit'
     render :edit<% if @pundit %>
   rescue Pundit::NotAuthorizedError
@@ -187,15 +198,19 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
     <% if @hawk_keys.any? %>    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
     <%= controller_attachment_orig_filename_pickup_syntax %>
-    <% if @pundit %>
-    if @<%= singular_name %>.attributes = modified_params
+      <% if @pundit && !@pundit_policy_override %>
       authorize @<%= singular_name %>
       <%= @code_before_update ? "\n    " + @code_before_update.gsub(";", "\n") : "" %>
-      @<%= singular_name %>.save
-      <% else %>
-    <%= @code_before_update ? "\n    " + @code_before_update.gsub(";", "\n") : "" %>
+
     if @<%= singular_name %>.update(modified_params)
-    <% end %>
+
+    <% elsif @pundit && @pundit_policy_override %>
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.update?
+    if @<%= singular_name %>.update(modified_params)
+      <% else %>
+      <%= @code_before_update ? "\n    " + @code_before_update.gsub(";", "\n") : "" %>
+    if @<%= singular_name %>.update(modified_params)<% end %>
       <%= post_action_parental_updates.compact.join("\n      ") %>
       <%= @code_after_update ? "\n    " + @code_after_update.gsub(";", "\n") : "" %>
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
@@ -216,11 +231,14 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if destroy_action %>  def destroy
-    <% if @pundit %>authorize @<%= singular_name %><% end %>
+    <% if @pundit && !@pundit_policy_override %>
+    authorize @<%= singular %><% elsif @pundit && @pundit_policy_override %>
+    skip_authorization
+    raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.destroy?<% end %>
     begin
       @<%=singular_name%>.destroy
       flash[:notice] = '<%= singular_name.titlecase %> successfully deleted'
-    rescue StandardError => e
+    rescue ActiveRecordError => e
       flash[:alert] = '<%= singular_name.titlecase %> could not be deleted'
     end
     <%= post_action_parental_updates.join("\n    ") %>

data/lib/generators/hot_glue/templates/erb/create.turbo_stream.erb

@@ -1,7 +1,8 @@
 <\% if @<%= singular %>.errors.none? %>
   <\%= turbo_stream.replace "<%= @namespace %>__<%= plural %>-list" + <%= nested_for_turbo_nested_constructor %> do %>
-  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
-  <\% end %>
+  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %><% if @nested_set.any? %>, <%= @nested_set.collect{|arg| "#{arg[:singular]}: @#{arg[:singular]}"}.join(", ")  %>, nested_for: '<%= @nested_set.collect{|arg| "\"#{arg[:singular]}-\#{@#{arg[:singular]}.id}\""}.join("__") %>' <% end %> } %>
+
+<\% end %>
   <\% end %>
 <!-- parental updated -->
 <%= turbo_parental_updates %>
@@ -15,5 +16,4 @@
   <\% end %>
   <\%= turbo_stream.replace "flash_notices" do %>
   <\%= render partial: "layouts/flash_notices", locals: {resource: @<%= singular %>} %>
-
 <\% end %>

data/lib/generators/hot_glue/templates/erb/edit.erb

@@ -8,30 +8,40 @@
 <% if @big_edit %>
     </div>
   </div>
+</div>
+
 
 
 <% if @downnest_children.any? && @big_edit %>
-  <hr />
-  <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
-    <% @downnest_object.each do |downnest, size| %>
-      <div class="row">
-        <div class="col-md-<%= @big_edit  ? 12 : 6  %>">
+<div class="container" data-controller="bootstrap-tabbed-nav">
+    <ul class="nav nav-tabs" id="<%= singular + "_downnest_portals" %>" role="tablist">
+      <% @downnest_object.each_with_index do |data,index| %>
+        <% downnest = data[0] %>
+        <li class="nav-item" role="presentation">
+          <button class="nav-link <%= "active" if index==0 %>" id="<%= downnest %>-tab" data-bs-toggle="tab" data-bs-target="#<%= downnest %>-portal" type="button" role="tab" aria-controls="home" aria-selected="true">
+            <%= downnest.titlecase.pluralize %>
+          </button>
+        </li>
+      <% end %>
+    </ul>
+
+    <div class="tab-content" id="myTabContent">
+      <% @downnest_object.each_with_index do |data, index| %>
+        <% downnest = data[0] %>
+        <div class="tab-pane fade <%= "show active" if index==0 %>" id="<%= downnest %>-portal" role="tabpanel" aria-labelledby="<%= downnest %>-tab">
           <% downnest_object =  eval("#{singular_class}.reflect_on_association(:#{downnest})") %>
           <% if downnest_object.nil?; raise "no relationship for downnested portal `#{downnest}` found on `#{singular_class}`; please check relationship for has_many :#{downnest}"; end; %>
           <% downnest_class = downnest_object.class_name %>
           <% downnest_object_name = eval("#{downnest_class}.table_name") %>
           <% downnest_style = @layout_strategy.downnest_style %>
-          <% if @downnest_shows_headings %>
-            <h3>
-              <%= downnest_class.titlecase.pluralize %>
-            </h3>
-          <% end %>
-          <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {<%= @singular %>: @<%= @singular %>,  <%= downnest_object_name %>: @<%= @singular %>.<%= downnest %><% if @nested_set.any? %>, <%= @nested_set.collect{|x| "#{x[:singular]}: @#{x[:singular]}"}.join(", ") %>, nested_for: "<%= @nested_set.collect{|x| "#{x[:singular]}-" + "\#{" + "@#{x[:singular]}.id}"}.join("__") %>__<%= singular %>-#{@<%= @singular %>.id}" <% end %> } \%>
 
-          </div>
+          <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {<%= @singular %>: @<%= @singular %>,  <%= downnest_object_name %>: @<%= @singular %>.<%= downnest %><% if @nested_set.any? %>, <%= @nested_set.collect{|x| "#{x[:singular]}: @#{x[:singular]}"}.join(", ") %>, nested_for: "<%= @nested_set.collect{|x| "#{x[:singular]}-" + "\#{" + "@#{x[:singular]}.id}"}.join("__") %>__<%= singular %>-#{@<%= @singular %>.id}" <% end %> } \%>
         </div>
       <% end %>
-  <% end %>
+    </div>
+
 </div>
 <% end %>
 
+
+<% end %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.14'
+    CURRENT = '0.6.16'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.16
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails