hot-glue 0.6.15 → 0.6.17

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

@@ -2,13 +2,7 @@ class RelatedSetField < Field
 
   attr_accessor :assoc_name, :assoc_class, :assoc
 
-  def initialize( class_name: , default_boolean_display:, display_as: ,
-                  name: , singular: , plural:,
-                  alt_lookup: ,
-                  update_show_only: ,
-                  hawk_keys: , auth: , sample_file_path:,  ownership_field: ,
-                  attachment_data: nil , layout_strategy: , form_placeholder_labels: nil,
-                  form_labels_position:, modify_as: , self_auth: , namespace:, pundit:)
+  def initialize( scaffold: , name: )
     super
 
     @related_set_model = eval("#{class_name}.reflect_on_association(:#{name})")
@@ -37,12 +31,13 @@ class RelatedSetField < Field
 
   def form_field_output
     disabled_syntax = +""
+
     if pundit
       disabled_syntax << ", {disabled: ! #{class_name}Policy.new(#{auth}, @#{singular}).role_ids_able?}"
     end
     " <%= f.collection_check_boxes :#{association_ids_method}, #{association_class_name}.all, :id, :label, {}#{disabled_syntax} do |m| %>
-      <%= m.check_box %> <%= m.label %><br />
-    <% end %>"
+    <%= m.check_box %> <%= m.label %><br />
+  <% end %>"
   end
 
   def association_ids_method

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

@@ -10,7 +10,8 @@ module  HotGlue
                   :form_placeholder_labels, :hawk_keys, :update_show_only,
                   :attachments, :show_only, :columns_map, :pundit, :related_sets,
                   :search, :search_fields, :search_query_fields, :search_position,
-                  :form_path, :layout_object, :search_clear_button, :search_autosearch
+                  :form_path, :layout_object, :search_clear_button, :search_autosearch,
+                  :stimmify, :stimmify_camel, :hidden
 
 
     def initialize(singular:, singular_class: ,
@@ -22,7 +23,7 @@ module  HotGlue
                  update_show_only:, attachments: , columns_map:, pundit:, related_sets:,
                  search:, search_fields:, search_query_fields: , search_position:,
                  search_clear_button:, search_autosearch:, layout_object:,
-                 form_path: )
+                 form_path: , stimmify: , stimmify_camel:, hidden: )
 
 
       @form_path = form_path
@@ -31,6 +32,9 @@ module  HotGlue
       @search_by_query = search_query_fields
       @search_position = search_position
       @layout_object = layout_object
+      @stimmify = stimmify
+      @stimmify_camel = stimmify_camel
+      @hidden = hidden
 
       @singular = singular
       @singular_class = singular_class
@@ -76,13 +80,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 +100,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 +120,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 +137,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
@@ -167,11 +173,21 @@ module  HotGlue
 
             @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
 
-            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' ? (  columns_map[col].newline_after_field? ? "<br />\n" : "") + (the_label || "") : "")  , 4) +
-                                    "\n  </span>\n ", 2)
+            if @stimmify
+              col_target = HotGlue.to_camel_case(col.to_s.gsub("_", " "))
+              data_attr = " data-#{@stimmify}-target='#{col_target}Wrapper'"
+            end
+
+            unless hidden.include?(col.to_sym)
+              add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>' #{data_attr} >\n" +
+                                      add_spaces_each_line( (form_labels_position == 'before' ? (the_label || "") + "<br />\n"  : "") +
+                                                              +  field_result +
+                                                              (form_labels_position == 'after' ? (  columns_map[col].newline_after_field? ? "<br />\n" : "") + (the_label || "") : "")  , 4) +
+                                      "\n  </span>\n ", 2)
+            else
+              columns_map[col].hidden_output
+            end
+
 
           }.join("") + "\n  </div>"
       }.join("\n")
@@ -192,10 +208,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]
@@ -205,13 +219,16 @@ 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?"
           end
+
           field_output = columns_map[col].line_field_output
           
           label = "<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
@@ -219,6 +236,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

@@ -28,7 +28,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :layout_strategy, :form_placeholder_labels,
                 :form_labels_position, :no_nav_menu, :pundit,
                 :self_auth, :namespace_value, :record_scope, :related_sets,
-                :search_clear_button, :search_autosearch, :include_object_names
+                :search_clear_button, :search_autosearch, :include_object_names,
+                :stimmify, :stimmify_camel, :hidden
   # important: using an attr_accessor called :namespace indirectly causes a conflict with Rails class_name method
   # so we use namespace_value instead
 
@@ -56,6 +57,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :big_edit, type: :boolean, default: false
   class_option :show_only, type: :string, default: ""
   class_option :update_show_only, type: :string, default: ""
+  class_option :hidden, type: :string, default: ""
   class_option :ujs_syntax, type: :boolean, default: nil
   class_option :downnest, type: :string, default: nil
   class_option :magic_buttons, type: :string, default: nil
@@ -91,6 +93,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
@@ -101,6 +104,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :include_object_names, type: :boolean, default: false
   class_option :new_button_position, type: :string, default: 'above'
   class_option :downnest_shows_headings, type: :boolean, default: nil
+  class_option :stimmify, type: :string, default: nil
 
 
   # SEARCH OPTIONS
@@ -220,25 +224,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @include_fields += options['include'].split(":").collect { |x| x.split(",") }.flatten.collect(&:to_sym)
     end
 
-    # @show_only_data = {}
-    # if !options['show_only'].empty?
-    #   show_only_input = options['show_only'].split(",")
-    #   show_only_input.each do |setting|
-    #     if setting.include?("[")
-    #       setting =~ /(.*)\[(.*)\]/
-    #       key, lookup_as = $1, $2
-    #       @show_only_data[key.to_sym] = {cast: $2 }
-    #     else
-    #       @show_only_data[setting.to_sym] = {cast: nil}
-    #     end
-    #   end
-    # end
+
 
     @show_only = options['show_only'].split(",").collect(&:to_sym)
     if @show_only.any?
       puts "show only field #{@show_only}}"
     end
 
+    @hidden = options['hidden'].split(",").collect(&:to_sym)
+    if @hidden.any?
+      puts "hidden fields #{@hidden}}"
+    end
+
     @modify_as = {}
     if !options['modify'].empty?
       modify_input = options['modify'].split(",")
@@ -357,6 +354,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
 
     @pundit = options['pundit']
+    @pundit_policy_override = options['pundit_policy_override']
 
     @no_nav_menu = options['no_nav_menu']
 
@@ -439,6 +437,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @related_sets = {}
     related_set_input.each do |setting|
       name = setting.to_sym
+      byebug
       association_ids_method = eval("#{singular_class}.reflect_on_association(:#{setting.to_sym})").class_name.underscore + "_ids"
       class_name = eval("#{singular_class}.reflect_on_association(:#{setting.to_sym})").class_name
 
@@ -522,7 +521,11 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     #     {  key: value }
     #     : nil}.compact
 
-
+    @stimmify = options['stimmify']
+    if @stimmify === "stimmify"
+      @stimmify = @singular.gsub("_", "-") + "-form"
+      @stimify_camel = @stimmify.camelize
+    end
 
     # build a new polymorphic object
     @associations = []
@@ -647,7 +650,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         search_position: @search_position,
         search_clear_button: @search_clear_button,
         search_autosearch: @search_autosearch,
-        form_path: form_path_new_helper
+        form_path: form_path_new_helper,
+        stimmify: @stimmify,
+        stimmify_camel: @stimmify_camel,
+        hidden: @hidden
       )
     elsif @markup == "slim"
       raise(HotGlue::Error, "SLIM IS NOT IMPLEMENTED")
@@ -978,7 +984,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
     )
@@ -1084,6 +1089,17 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                                  top_level: top_level)
   end
 
+  def edit_parent_path_helper
+    # the path to the edit route of the PARENT
+    if @nested_set.any? && @nested
+      "edit_#{@namespace + "_" if @namespace}#{(@nested_set.collect { |x| x[:singular] }.join("_") + "_" if @nested_set.any?)}path(" +
+      "#{@nested_set.collect { |x| x[:singular] }.join(", ")}" + ")"
+
+    else
+      "edit_#{@namespace + "_" if @namespace}path"
+    end
+  end
+
   def datetime_fields_list
     @columns.select do |col|
       if @the_object.columns_hash[col.to_s]
@@ -1442,7 +1458,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
     )

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/_edit.erb

@@ -4,7 +4,9 @@
   <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: <%= singular %> }) %>
   <\% end %>
   <h2>Editing <%= singular + " " if @include_object_names %><\%= <%= singular %>.<%= display_class %> %></h2>
-  <\%= form_with model: <%= singular %>, url: <%= form_path_edit_helper %><%= ", html: {'data-turbo': false}" if @big_edit %> do |f| %>
+  <\%= form_with model: <%= singular %>,
+   <% if @stimmify %> data: {controller: '<%= @stimmify %>' },
+   <% end %>url: <%= form_path_edit_helper %><%= ", html: {'data-turbo': false}" if @big_edit %> do |f| %>
     <\%=  render partial: "<%= namespace_with_trailing_dash + @controller_build_folder + "/" %>form", locals: {:<%=  singular  %> => <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> \%>
   <% if @edit_within_form_partial %><\%= render partial: "edit_within_form", locals: {f: f, <%=  singular  %>: <%= singular %>}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> %><% end %>
   <\% end %>

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

@@ -2,7 +2,8 @@
 <%= form_fields_html %>
 
   <div class="<%= @layout_strategy.column_classes_for_button_column %>">
-    <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
+    <\%= link_to "Cancel", <%=
+    @nested_set.none? ? path_helper_plural : edit_parent_path_helper %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
     <\%= f.hidden_field "_________" %><% end %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>
   </div>

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

@@ -2,7 +2,9 @@
   <h3>
     <%= @new_form_heading %>
   </h3>
-  <\%= form_with model:  <%= singular %>, url: <%= form_path_new_helper %>, method: :post<%= @display_edit_after_create ? ", html: {'data-turbo': false}" : "" %> do  |f| \%>
+  <\%= form_with model:  <%= singular %>,
+         <% if @stimmify %>data: {controller: '<%= @stimmify %>' },
+<% end %>url: <%= form_path_new_helper %>, method: :post<%= @display_edit_after_create ? ", html: {'data-turbo': false}" : "" %> do  |f| \%>
     <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form",
 locals: { <%=  singular %>: <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}}: {})" }.join %> \%>
 

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 %>