hot-glue 0.6.31 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6bfe4a874a5e894d6b315e72c145f1a563ac3a851e2d4849e41eb127b4402f
-  data.tar.gz: d88aeb4540484a0335150c0d637a8781b1781ff33b227cd65b60d96fa13703ac
+  metadata.gz: 62c0a8b7999c39d4d93ece238d6447baa2ecdf34613d9fb11b5fe49842919424
+  data.tar.gz: c0a2d741d113fe2d3a366b5f33f110fc5aa8956a1b52af7ea2deb56085e76a4b
 SHA512:
-  metadata.gz: 16e4242488830bb7b4da394a9e6e919b32ef885ddf5ce506e05954ca5830b918a47b2662661289d0bf4adbb6b3e4bf5d89fdb2ddbb59f9333126622461fabb81
-  data.tar.gz: 9ac25352156d69caf694303602f968990441cded93504d6fc340df1b92091bb450f6372d409c10ba2be8a0599e1217e5d037e053b908c2b5136bad148f7719cb
+  metadata.gz: dd02b7553a585535eb7eb2ac195ce55eb0192151edccfb41cb9f3b4c8110ed125096200bbe3442cdc79dbb27db48cc0b8a10fdbc3366c9c0371f7ba46dc3684f
+  data.tar.gz: 235257f2f9150c0ac038fd7b11d4ac0551d4a224213e5cf244311ed43ca4cbdc02e25bf6427090213e30abde0de7289a0b01b887e265f0e2496a63c9fc9b12e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.30)
+    hot-glue (0.7)
       ffaker (~> 2.16)
       rails (> 5.1)
 

data/README.md

@@ -655,7 +655,16 @@ If you specify an include list, it will be treated as a whitelist: no fields wil
 
 You may not specify both include and exclude.
 
-Include setting is affected by both specified grouping mode and smart layouts, explained below.
+Many options allow you to specify fields in multiple modes:
+• Standard
+• Smart layout
+• Specified grouping
+
+see "Layout & Manipulation features" for details on how to build your `--include` statement, including how to use `:` and `,` 
+
+Also review Omitted Fields (`-` and `=`), Dynamic Blocks (`**`), Omitted Dynamic Blocks (`**-` and `**=`)
+
+Also see Set Column Widths ( `(` ... `)` ) to set the column widths explicitly in your `--include`
 
 
 ### `--exclude=`
@@ -665,7 +674,6 @@ By default, all fields are included unless they are on the default exclude list.
 
 If you specify any exclude list, those excluded **and** the default exclude list will be excluded. (If you need any of the fields on the default exclude list, you must use `--include` instead.)
 
-
 `./bin/rails generate hot_glue:scaffold Account --exclude=password`
 
 
@@ -1059,10 +1067,72 @@ This is what would happen if 9 fields, specified in the order A,B,C,D,E,F,G,H,I,
 (If you had a number of fields that wasn't easily divisible by the number of columns, it would leave the final column one or a few fields short of the others.)
 
 
-### `--new-button-position` (above, below; default: above)
-Show the new button above or below the list.
 
+### Omitted fields
+
+Note that these additions all affect how you write your `--include` setting, but they operate in addition to all of the field visibility rules above. Notice that omitting a form means we by design omit it on both the new and edit actions. If you want to determine if it shows up on new vs. edit granularly, use a different approach.
+
+Generally, you will only omit a field in special cases. To omit a field, prefix either `-` (omit on list) or `=` to omit on form (new & edit), like so :
+
+`--include=-abd,=dfg`
+
+Here, the abc field will be omitted on the list and the dfg will be omitted on the form (new & edit)
+
+
+This works for any include setting type, whether the grouping mode is specified or not.
+
+`--include=-abd,=dfg`  
+`--include=-abd:=dfg` # same as above but builder will use specified grouping mode
+
+### Dynamic Blocks
+
+Next, you can now dynamically pull any partials from the view folder (of the name of your choosing) into your object's field display- before, between, or after any part of the column groupings using the `:` and `,` characters. (Review specified grouping mode in "Layout & Manipulation Features.")
+
+You simply make up any partial name, treat it as if it is one of the fields in the field list, and prefix it with `**`. (When specified, don't use `_` but remember to use the `_` in the file name.)
+
+It looks like this (let's assume I've made an arbitrary partial called `_jello.erb` in my build folder, which expects to be passed a `thing` local variable)
+
+`rails generate hot_glue:scaffold Thing --include='**jello:name:birthday:gender'`
+
+Here, you'll get four columns:
+
+The first column will pull a partial from the same folder being built. You build this partial, not Hot Glue.
 
+```
+<%= render partial: 'jello', locals: {thing: thing } %>
+```
+
+(Remember, the partial file name begins with `_` but is referenced without the underscore)
+
+Because you separated that first column using `:` from the other three, the partial will take up the whole column.
+The next 3 columns will contain name, birthday & gender, respectively.
+
+If you specify it this way:
+rails generate hot_glue:scaffold Thing --include='**jello,name:birthday:gender'
+
+Notice that between **jello and name is now a comma, putting the jello partial and name into the  same column. Now the partial will be displayed before the name in that column.
+
+You can mix & match any number of partials inserted anywhere into the field layout.
+
+
+### Omitted Dynamic Blocks
+
+Dynamic blocks respond to the new `-` and `=` settings for omitting fields the same way fields do. Prefixing a dynamic partial with `**-` will mean it will be omitted from the list, and `**=` will omit it from the form (new & edit)
+
+This way, the omitted syntax is parallel to the dynamic block structure. No other tye-in is made with the other field visibility settings.
+
+
+### Set Column Widths
+
+In other modes, Hot Glue decides how many bootstrap columns each column should span, defaulting to 2 unless using `--smart-layout`, in which case it ranges from 2 to 5 depending on how many fields you have. Generally, I start my scaffolds using either standard or smart, but soon, I'm often upgrading to specified grouping mode for fine-grained control.
+
+When using specified group mode (activated when a `:` character appears in the `--include` list), you can append to the end of EACH COLUMN (not each field) a parenthetical setting for the number of bootstrap columns.
+
+(When the setting includes this special character, you'll need  `'` to wrap the entire setting for `--include` on the command line.)
+
+
+### `--new-button-position` (above, below; default: above)
+Show the new button above or below the list.
 
 ### `--button-icons` (default is no icons)
 You can specify this either as builder flag or as a config setting (in `config/hot_glue.yml`)
@@ -1075,8 +1145,6 @@ Can also be specified globally in `config/hot_glue.yml`
 
 
 ### `--modify=field1{...},field2{...}`
-
-
 You can apply modification to the viewable (non-edit) display of field using the `--modify` switch.
 
 The syntax is `--modify=cost{$},price{$}`
@@ -1179,7 +1247,7 @@ In these contexts, the lookup must be exact match to the text entered (no partia
 
 Use `+` to map to the `find_or_create_by` method. (Without `+` it will use `find_by`.)
 
-This is accomlished using a little magic of a lookup field called `__lookup_X_Y` passed in the form parameters.
+This is accomplished using a little magic of a lookup field called `__lookup_X_Y` passed in the form parameters.
 
 The lookup field is used to look up the associated record, then deleted from the params.
 
@@ -1443,10 +1511,15 @@ As shown in the method `name_able?` of the example ThingPolicy above, if this fi
 ### `--hidden=` (affects both create + update actions)
 ### `--create-hidden=`
 ### `--update-hidden=`
-TODO: RENAME ME TO INVISIBLE 
 Separate list of fields. 
 
-These fields will exist on the create or update form exist as hidden_field, and so the update will still work._
+These fields will exist on the create or update form exist as `<input type='hidden'>` (html) field and so the *actual update or create action will continue to expect data from the front end.**
+
+(The data, being in a hidden field, is not visible to the user but it is in the browser's form, available to a hacker, and passed to the back-end for updating.)
+
+You do your own javascript here to insert/set the value programmatically. The example below uses a library called EditorView to create a HTML editor. 
+
+The dynamic interface's value from the edited html gets stuffed back into the form by Javascript before the form is updated
 
 
 EXAMPLE:
@@ -1539,10 +1612,9 @@ Like show only, these will check for `*_able?` methods on the object or Policy a
 
 It will also block the field from being updated on the backend, so don't use this if you want to create a hidden_field tag but still allow the controller to update it. (For that, see `--hidden=`.)
 
-
 Like show-only, note special behavior with pundit.
 
-A field can be marked invisible and show-only, in which case the invisible rule take prescedence when the access control is denied (field removed from form) but th show-only rule takes prescedance when the access control is granted,
+A field can be marked invisible and show-only, in which case the invisible rule take precedence when the access control is denied (field removed from form) but the show-only rule takes precedence when the access control is granted.
 
 Hidden can be used with invisible. In this case, the access control will be applied to the field. When editable, the hidden field output will be used.
 
@@ -1598,6 +1670,12 @@ If thing is not a Thing, then it is active relation (so this applies to the colu
 Remember, since the `_able?` methods are not otherwise called during Pundit's index cycle, this applies only to the list column headings and has no bearing on create, update, read, delete for which the access control can be anything you want that is available to the Poilcy. 
 
 
+###
+
+
+
+
+
 
 ## Code Insertion Features
 '
@@ -1639,6 +1717,7 @@ This is a good place to set your created_by user id, like so
 
 
 
+
 ```
 def new
     @email_template = EmailTemplate.new(crusade: crusade)
@@ -1670,6 +1749,16 @@ def create
 ```
 TODO: build a solution for inserting code only in the `new` action but NOT the create action
 
+#### `--code-in-controller=''` (escape newlines with `;` )
+
+This code will be inserted directly into your controller (as a class-level definition)
+
+
+```
+--code-in-controller="before_action -> { @thing = 'abc' }"
+```
+A one-liner hook works well for these. if you define an entire method, be sure to use `;` to separate line breaks
+
 
 
 ## Searching
@@ -2331,6 +2420,58 @@ These automatic pickups for partials are detected at build time. This means that
 
 # VERSION HISTORY
 
+#### 2025-11-12 - v0.7.1
+- in set searches, automatically sets the match field if the search text is input, removes match field (back to default) when search text is removed; 
+- 
+- also removes search text if you change the match selector back to empty 
+- 
+- removes vestiges of `.merge` from old implementation (#236)
+   
+- `--code-in-controller` option for inserting controller code directly into your controller
+
+
+#### 2025-11-05 - v0.7
+
+Hot Glue already has a robust set of tools to provide field-by-field access control, hiding or turning visible-only fields by multiple methods, described under Access Control & Field Visibility Features.
+
+Remember that Hot Glue's opinionated design has two ways a field is displayed: show (which appears on the list view and is always just viewable), and form (which is usees by both the new and edit actions to display a form). Within the `form` output, the form might be used for either new or edit, and further refinements can be applied to new or edit.
+
+Here's a quick review those methods now:
+
+--pundit 	
+• No distinction is made between the new and edit contexts
+• If policy says not able (_able? method returns false), the field is shown as viewable-only. That is, a user with access to the controller but not the field-level access granted by Pundit will see the field's value but cannot edit it. If you want instead the Policy to determine if the field is editable or completely invisible (not shown to the user), use invible below
+
+--show-only=
+• Turns fields on this list viewable only for both create & edit actions
+• overrides what's on the policy, but asks the policy if not on this list
+
+--update-show-only=
+• Turns fields on this list viewable only for the edit action
+• overrides what's on the policy, but asks the policy if not on this list
+
+
+--hidden=,  --create-hidden=,  --update-hidden=
+• Creates <input type='hidden'> fields on the form, not seen by the user but available to a hacker in the browser, and submitted to the back end.
+
+--invisible=,  --create-invisible=,  --update-invisible=
+• Must be used with Pundit.
+• If policy returns true, the field is viewable on list & editable as normal.
+• If the policy return false, the field is taken away (invisible) for that user
+
+
+
+Today, with v0.7 of this gem, I'm introducing three more features that are all available from within the `--include` setting.
+
+• Omitted fields:  using `-` is omit on list & show;  use  `=` to omit the field on the form (new & edit)
+• Dynamic blocks (which can also be omitted using
+• Set column widths when using specified grouping made (--include contains `:`)
+
+For details, see "Layout & Manipulation Features"
+
+
+
+
 #### 2025-10-28 - v0.6.31
 
 - new modification directive: `urlwrap`: use to wrap the field contents in a clickable link.

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

@@ -219,7 +219,7 @@ class AssociationField < Field
                      autofocus: true,
                      autocomplete: 'off',
                      value: @q['0']['#{name}'].present? ? #{assoc.class_name}.find(@q['0']['#{name}']).try(:name) : \"\"  %>
-      <%= f.hidden_field \'q[0][#{name}]\', value: @q['0']['#{name}_search'].try(:id), 'data-typeahead-target': 'hiddenFormValue' %>
+      <%= f.hidden_field \'q[0][#{name}]\', value: @q['0']['#{name}'], 'data-typeahead-target': 'hiddenFormValue' %>
       <div data-typeahead-target='results'></div>
       <div data-typeahead-target='classIdentifier' data-id=\"typeahead--q_0_#{name}_search\"></div>
       </div>"

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

@@ -49,8 +49,8 @@ class StringField < Field
   end
 
   def search_field_output
-    "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' } %>"+
-    "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' %>"
+    "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' , 'data-search-form-target': \"textMatch\"} %>"+
+    "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' , 'data-search-form-target': \"textSearch\"  %>"
   end
 
 

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

@@ -31,8 +31,8 @@ class TextField < Field
 
 
   def search_field_output
-    "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' } %>"+
-      "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' %>"
+    "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match', 'data-search-form-target': \"textMatch\" } %>"+
+      "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', 'data-search-form-target': \"textSearch\" %>"
   end
 
 
@@ -45,7 +45,7 @@ class TextField < Field
   end
 
   def code_to_reset_match_if_search_is_blank
-    "    @q['0'][:#{name}_match] = '' if @q['0'][:#{name}_search] == ''"
+    # "    @q['0'][:#{name}_match] = '' if @q['0'][:#{name}_search] == ''"
   end
 
 end

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

@@ -11,8 +11,8 @@ module HotGlue
                   :stacked_downnesting, :bootstrap_column_width
 
       def initialize(generator: ,
-                     include_setting: ,
-                     buttons_width:  )
+                     include_setting:,
+                     buttons_width: )
 
 
         @generator = generator
@@ -41,7 +41,11 @@ module HotGlue
           columns: {
             size_each: smart_layout ? bootstrap_column_width : (specified_grouping_mode ? nil : 1),
             container: [] , # array of arrays,
-            bootstrap_column_width: []
+            bootstrap_column_width: [],
+            column_custom_widths: [],
+            fields: {
+
+            }, # hash of fields
           },
           portals:  {
 
@@ -103,15 +107,21 @@ 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
+
           end
+
         elsif ! specified_grouping_mode
           # not smart and no specified grouping
           layout_object[:columns][:button_columns] = bootstrap_column_width
 
           layout_object[:columns][:container] = columns.collect{|col| [col]}
 
-        else # specified grouping mode -- the builder is given control
+          if include_setting.split(",").any?{|col| col.include?("(")}
+            raise "Your include list has a ( character; to specify a column width, use specified grouping mode only"
+          end
+
+
+        else # specified grouping mode -- the builder is given control unless a column width is explicitly set using (..)
           layout_object[:columns][:button_columns] = bootstrap_column_width
 
           (0..available_columns-1).each do |int|
@@ -121,16 +131,22 @@ module HotGlue
           # input control
 
           user_layout_columns = @include_setting.split(":")
+          fixed_widths = {}
+
+          user_layout_columns.each_with_index do |column_data,i |
+            if column_data.include?("(")
+              column_data =~ /(.*)\((.*)\)/
+              column_fields = $1
+              fixed_col_width = $2
+              fixed_widths[i] = fixed_col_width
+            else
+              column_fields = column_data
+            end
+            user_layout_columns[i] = column_fields
+          end
 
-          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
 
+          extra_columns = available_columns - user_layout_columns.size
 
           columns_to_work_with =  (12 - @buttons_width)
 
@@ -142,10 +158,22 @@ module HotGlue
           extra_columns = columns_to_work_with % user_layout_columns.size
 
 
-          user_layout_columns.each_with_index  do |column,i|
-            layout_object[:columns][:container][i] = column.split(",").collect(&:to_sym)
-            layout_object[:columns][:bootstrap_column_width][i] = target_col_size
-            if i < extra_columns
+          user_layout_columns.each_with_index  do |column, i|
+
+            layout_object[:columns][:container][i] = column.split(",").collect{|x|
+              x.gsub("-","").gsub("=","")
+              if x.include?("(")
+                x =~ /(.*)\((.*)\)/
+                x = $1
+
+              end
+              x
+            }.collect(&:to_sym)
+
+
+            layout_object[:columns][:bootstrap_column_width][i] = fixed_widths[i] || target_col_size
+
+            if i < extra_columns && ! fixed_widths[i]
               layout_object[:columns][:bootstrap_column_width][i] += 1
             end
           end
@@ -153,14 +181,46 @@ module HotGlue
           if user_layout_columns.size < layout_object[:columns][:container].size
             layout_object[:columns][:container].reject!{|x| x == []}
           end
+        end
 
+        # go through the columns and build the split visibility (show / form)
+
+        columns.each do |col|
+          layout_object[:columns][:fields][col] = {show: true, form: true}
         end
 
+        @include_setting.split(":").collect { |column_list|
+          column_list.split(",").collect do |field|
+            if field.include?("(")
+              field =~ /(.*)\((.*)\)/
+              field_short = $1
+            else
+              field_short = field
+            end
+
+            field_short =  field_short.gsub("-", "").gsub("=", "")
+
+            layout_object[:columns][:fields][field_short.to_sym] = {
+              show: true,
+              form: true
+            }
 
-        puts "*** constructed smart layout columns #{layout_object.inspect}"
+            if field.starts_with?("**")
+              nil
+            end
+
+            if field.include?("-")
+              layout_object[:columns][:fields][field_short.to_sym][:show] = false;
+            end
+            if field.include?("=")
+              layout_object[:columns][:fields][field_short.to_sym][:form] = false;
+            end
+
+          end
+        }
+        puts "*** SPECIFIED GROUPING SETTINGS: #{layout_object.inspect}"
         layout_object
       end
-
     end
   end
 end

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

@@ -98,11 +98,15 @@ module  HotGlue
         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|
-            the_output = "#{col_name.humanize}"
+            unless col_name.starts_with?("**")
+              the_output = "#{col_name.humanize}"
+            else
+              the_output = ""
+            end
             if invisible_update.include?(col_name.to_sym)
               if_statements = []
               if_statements << "false" if invisible_update.include?(col_name.to_sym)
-              # if_statements << "@action == 'new'" if invisible_create.include?(col_name.to_sym)
+
               the_output = "<% if ( " +  if_statements.join(" || ") + " || policy(#{@plural}).#{col_name}_able? ) %>" +
                 +  the_output + "<% end %>"
 
@@ -158,7 +162,7 @@ module  HotGlue
           dom_label = choice[:label].downcase.gsub(" ","_")
           if data[:type] == "radio"
             res << "\n<input type='radio'
-                            id='#{search_field}_search__#{dom_label}}'
+                            id='#{search_field}_search__#{dom_label}'
                             name='q[0][#{search_field}_search]' value='#{dom_label}'
            <%= 'checked' if  @q['0'][:#{search_field}_search] == \"#{dom_label}\" %> />"
           elsif data[:type] == "checkboxes"
@@ -195,66 +199,75 @@ module  HotGlue
         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|
+          column.map { |full_col|
 
-            field_error_name = columns_map[col].field_error_name
+            col = full_col.to_s.gsub("=", "").gsub("-", "").to_sym
 
-            label_class = columns_map[col].label_class
-            label_for = columns_map[col].label_for
+            if col.to_s.starts_with?("**") && layout_object[:columns][:fields][col][:form]
+              the_output = "<%= render partial: '#{col.to_s.gsub!("**","")}', locals: {#{singular}: #{singular} } %>"
+            elsif ! layout_object[:columns][:fields][col][:form]
+              # omit from show action
+            else
 
-            the_label = "\n<label class='#{label_class}' for='#{label_for}'>#{col.to_s.humanize}</label>"
-
-
-            field_result =
-              if show_only.include?(col)
-                columns_map[col].form_show_only_output
-              elsif update_show_only.include?(col) && !@pundit
-                "<% if @action == 'edit' %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
-              elsif update_show_only.include?(col) && @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
-                "<% if @action == 'new' && policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output + "<% end %>"
-                 # 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
+              field_error_name = columns_map[col].field_error_name
 
+              label_class = columns_map[col].label_class
+              label_for = columns_map[col].label_for
 
-            @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
+              the_label = "\n<label class='#{label_class}' for='#{label_for}'>#{col.to_s.humanize}</label>"
 
-            if @stimmify
-              col_target = HotGlue.to_camel_case(col.to_s.gsub("_", " "))
-              data_attr = " data-#{@stimmify}-target='#{col_target}Wrapper'"
-            end
 
+              field_result =
+                if show_only.include?(col)
+                  columns_map[col].form_show_only_output
+                elsif update_show_only.include?(col) && !@pundit
+                  "<% if @action == 'edit' %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
+                elsif update_show_only.include?(col) && @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
+                  "<% if @action == 'new' && policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output + "<% end %>"
+                   # 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
 
-            the_output =   add_spaces_each_line( "\n  <div #{@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  </div>\n ", 2)
 
+              @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
 
-            if hidden_create.include?(col.to_sym) || hidden_update.include?(col.to_sym)
-              if_statements = []
-              if_statements << "@action == 'edit'" if hidden_update.include?(col.to_sym)
-              if_statements << "@action == 'new'" if hidden_create.include?(col.to_sym)
+              if @stimmify
+                col_target = HotGlue.to_camel_case(col.to_s.gsub("_", " "))
+                data_attr = " data-#{@stimmify}-target='#{col_target}Wrapper'"
+              end
 
-              the_output = "<% if " + if_statements.join(" || ") + " %>" +
-                columns_map[col].hidden_output + "<% else %>" +  the_output + "<% end %>"
-            end
 
-            if invisible_create.include?(col) || invisible_update.include?(col)
-              if_statements = []
-              if_statements << "@action == 'edit'" if invisible_update.include?(col.to_sym)
-              if_statements << "@action == 'new'" if invisible_create.include?(col.to_sym)
+              the_output =   add_spaces_each_line( "\n  <div #{@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  </div>\n ", 2)
 
-              the_output = "<% if !(" + if_statements.join(" || ") + ") || policy(@#{singular}).#{col}_able? %>" +
-                +  the_output + "<% end %>"
-            end
 
+              if hidden_create.include?(col.to_sym) || hidden_update.include?(col.to_sym)
+                if_statements = []
+                if_statements << "@action == 'edit'" if hidden_update.include?(col.to_sym)
+                if_statements << "@action == 'new'" if hidden_create.include?(col.to_sym)
+
+                the_output = "<% if " + if_statements.join(" || ") + " %>" +
+                  columns_map[col].hidden_output + "<% else %>" +  the_output + "<% end %>"
+              end
+
+              if invisible_create.include?(col) || invisible_update.include?(col)
+                if_statements = []
+                if_statements << "@action == 'edit'" if invisible_update.include?(col.to_sym)
+                if_statements << "@action == 'new'" if invisible_create.include?(col.to_sym)
+
+                the_output = "<% if !(" + if_statements.join(" || ") + ") || policy(@#{singular}).#{col}_able? %>" +
+                  +  the_output + "<% end %>"
+              end
+
+            end # end of if col.to_s.starts_with?("**")
 
 
             the_output
@@ -298,35 +311,45 @@ module  HotGlue
       style_with_flex_basis = layout_strategy.style_with_flex_basis(perc_width)
 
       result = columns.map.with_index{ |column,i|
-
         size = layout_object[:columns][:bootstrap_column_width][i]
-
         "<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?"
+
+        column.map { |full_col|
+          col = full_col.to_s.gsub("=", "").gsub("-","").to_sym
+
+          if layout_object[:columns][:fields][col].nil?
+            raise "column #{col} not found on the layout data"
           end
+          if col.starts_with?("**") && layout_object[:columns][:fields][col][:show]
+            the_output = "<%= render partial: '#{col.to_s.gsub!("**","")}', locals: {#{singular}: #{singular} } %>"
+          elsif ! layout_object[:columns][:fields][col][:show]
+            the_output = ""
+          elsif 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?"
+            # omit from show action
+          else
 
-          field_output = columns_map[col].line_field_output
-          
-          label = "<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
+            field_output = columns_map[col].line_field_output
 
-          the_output = "#{inline_list_labels == 'before' ? label + "<br/>" : ''}#{field_output}#{inline_list_labels == 'after' ? "<br/>" + label : ''}"
-          if invisible_create.include?(col) || invisible_update.include?(col)
-            if_statements = []
-            if invisible_update.include?(col.to_sym) && invisible_create.include?(col.to_sym)
-            # elsif invisible_create.include?(col.to_sym)
-            #   if_statements << "!(@action == 'new')"
-            else
-              if_statements << "@action == 'edit'"
-            end
+            label = "<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
 
-            if_statements << " policy(#{singular}).#{col}_able?"
-            the_output = "<% if  " +  if_statements.join(" || ") + " %>" +
-              +  the_output + "<% end %>"
+            the_output = "#{inline_list_labels == 'before' ? label + "<br/>" : ''}#{field_output}#{inline_list_labels == 'after' ? "<br/>" + label : ''}"
+            the_output += "\n"
+            if invisible_create.include?(col) || invisible_update.include?(col)
+              if_statements = []
+              if invisible_update.include?(col.to_sym) && invisible_create.include?(col.to_sym)
+              else
+                if_statements << "@action == 'edit'"
+              end
+
+              if_statements << " policy(#{singular}).#{col}_able?"
+              the_output = "<% if  " +  if_statements.join(" || ") + " %>" +
+                +  the_output + "<% end %>"
+            end
           end
+
           the_output
-        }.join(  "<br />") + "</div>"
+        }.join(  "<br />\n") + "</div>"
       }.join("\n")
       return result
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -117,6 +117,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :phantom_create_params, type: :string, default: nil
   class_option :phantom_update_params, type: :string, default: nil
   class_option :controller_prefix, type: :string, default: nil
+  class_option :code_in_controller, type: :string, default: nil
 
   # SEARCH OPTIONS
   class_option :search, default: nil # set or predicate
@@ -256,11 +257,26 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @include_fields = []
 
       # semicolon to denote layout columns; commas separate fields
-      @include_fields += options['include'].split(":").collect { |x| x.split(",") }.flatten.collect(&:to_sym)
+      #
+      @include_fields += options['include'].split(":").collect { |column_list|
+        column_list.split(",").collect do |field|
+          if field.include?("(")
+            field =~ /(.*)\((.*)\)/
+            field_short = $1
+          else
+            field_short = field
+          end
+          if field_short.starts_with?("**")
+            nil
+          else
+            field_short.gsub("-", "").gsub("=", "")
+          end
+        end
+      }.flatten.compact.collect(&:to_sym)
+      puts "INCLUDED FIELDS: #{@include_fields}"
     end
 
 
-
     @show_only = options['show_only'].split(",").collect(&:to_sym)
     if @show_only.any?
       puts "show only field #{@show_only}}"
@@ -424,6 +440,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @phantom_create_params = options['phantom_create_params'] || ""
     @phantom_update_params = options['phantom_update_params'] || ""
 
+
     if get_default_from_config(key: :pundit_default)
       raise "please note the config setting `pundit_default` has been renamed `pundit`. please update your hot_glue.yml file"
     end
@@ -630,6 +647,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @code_before_update = options['code_before_update']
     @code_after_update = options['code_after_update']
     @code_after_new = options['code_after_new']
+    @code_in_controller = options['code_in_controller'] || ""
 
     buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + (@magic_buttons.any? ? 1 : 0)
 
@@ -672,6 +690,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     # build a new polymorphic object
     @associations = []
     @columns_map = {}
+
     @columns.each do |col|
       # if !(@the_object.columns_hash.keys.include?(col.to_s) || @attachments.keys.include?(col))
       #   raise "couldn't find #{col} in either field list or attachments list"
@@ -1062,6 +1081,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @columns = @the_object.columns.map(&:name).map(&:to_sym).reject { |field| !@include_fields.include?(field) }
     end
 
+
     @columns = @columns - @nested_set.collect { |set| (set[:singular] + "_id").to_sym  }
 
     if @attachments.any?
@@ -1084,6 +1104,19 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
   end
 
+  # def omit_fields_show
+  #
+  #   layout_object[:columns][:fields].each { |key, value|
+  #     value[:show] == false
+  #   }.reduce(:&)
+  # end
+
+  def omit_fields_form
+    layout_object[:columns][:fields].collect { |key, value| value[:form] == false ?  key : nil }.compact.reject!{|x| x.starts_with?("**")} || []
+  end
+
+
+
   def check_if_sample_file_is_present
     if sample_file_path.nil?
       puts "you have no sample file path set in config/hot_glue.yml"
@@ -1616,12 +1649,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>"
+      alt_append_text = "<%= link_to '#{@list_label_heading.humanize.upcase}', #{path_helper_plural(@nested_set.any? ? true: false)}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>"
+
+      check_for_existing_append = "<%= link_to '#{@list_label_heading.humanize}', #{path_helper_plural(@nested_set.any? ? true: false)}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>"
 
       text = File.read(nav_file)
-      if text.include?(append_text) || text.include?(alt_append_text)
+      if text.include?(check_for_existing_append) || 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}"
@@ -1892,7 +1925,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       if phantom_data[:type] == "radio"
         phantom_data[:choices].each do |choice|
           unless choice[:scope] == ".all"
-            res << "\n    @#{plural} = @#{plural}#{choice[:scope]} if @q['0'][:#{phantom_key}_search] == \"#{choice[:label]}\""
+            res << "\n    @#{plural} = @#{plural}#{choice[:scope]} if @q['0'][:#{phantom_key}_search] == \"#{choice[:label].downcase.gsub(" ","_")}\""
           end
         end
       elsif phantom_data[:type] == "checkboxes"
@@ -1903,7 +1936,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
             res << "\n    @#{plural} = @#{plural}#{choice[:scope]} if @q['0'][:#{phantom_key}_search__#{choice[:label].gsub(" ", "_").downcase}] == \"1\""
           end
           unless choice[:scope_negative] == ".all"
-            res << "\n    @#{plural} = @#{plural}#{choice[:scope_negative]} if @q['0'][:#{phantom_key}_search___#{choice[:label].gsub(" ", "_").downcase}] != \"1\""
+            res << "\n    @#{plural} = @#{plural}#{choice[:scope_negative]} if @q['0'][:#{phantom_key}_search__#{choice[:label].gsub(" ", "_").downcase}] != \"1\""
           end
         end
       end

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

@@ -8,6 +8,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
   helper :hot_glue
   include HotGlue::ControllerHelper
+  <%= @code_in_controller.gsub(";", "\n") %>
 
   <% unless @god %>before_action :<%= "authenticate_" + @auth_identifier.split(".")[0] + "!" %><% end %><% if any_nested? %>
     <% nest_chain = [] %> <% @nested_set.each { |arg|
@@ -288,13 +289,13 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %><% end %>
 
   def <%=singular_name%>_params
-    fields = <%= ((fields_filtered_for_strong_params - @show_only) + @magic_buttons.collect{|x| "__#{x}"}  + @phantom_create_params.split(",")).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "{#{rs[:association_ids_method]}: []}"}.join(", ") if @related_sets.any? %><%= ", " +  @alt_lookups.collect{|k,v|  ":__lookup_#{v[:assoc].downcase}_#{v[:lookup_as]}"  }.join(", ") if @alt_lookups.any? %>
+    fields = <%= ((fields_filtered_for_strong_params - @show_only - omit_fields_form) + @magic_buttons.collect{|x| "__#{x}"}  + @phantom_create_params.split(",")).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "{#{rs[:association_ids_method]}: []}"}.join(", ") if @related_sets.any? %><%= ", " +  @alt_lookups.collect{|k,v|  ":__lookup_#{v[:assoc].downcase}_#{v[:lookup_as]}"  }.join(", ") if @alt_lookups.any? %>
     params.require(:<%= testing_name %>).permit(fields)
   end<% if @update_show_only %>
 
   <% unless @no_edit %>
   def update_<%=singular_name%>_params
-    fields = <%= ((fields_filtered_for_strong_params - @update_show_only)  + @magic_buttons.collect{|x| "__#{x}"} +  @phantom_update_params.split(",")).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "{#{rs[:association_ids_method]}: []}"}.join(", ") if @related_sets.any? %><%=  ", " + @alt_lookups.collect{|k,v|  ":__lookup_#{v[:assoc].downcase}_#{v[:lookup_as]}"  }.join(", ") if @alt_lookups.any?  %>
+    fields = <%= ((fields_filtered_for_strong_params - @update_show_only - omit_fields_form)  + @magic_buttons.collect{|x| "__#{x}"} +  @phantom_update_params.split(",")).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "{#{rs[:association_ids_method]}: []}"}.join(", ") if @related_sets.any? %><%=  ", " + @alt_lookups.collect{|k,v|  ":__lookup_#{v[:assoc].downcase}_#{v[:lookup_as]}"  }.join(", ") if @alt_lookups.any?  %>
     <%= (fields_filtered_for_strong_params - @update_show_only).collect{|col|
     # TODO : fields not on show only also not invisible should be checked here
     # for _able? methods and added only when able

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

@@ -7,7 +7,11 @@
   <\%= 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 %> \%>
+    <\%=  render partial: "<%= namespace_with_trailing_dash + @controller_build_folder + "/" %>form", locals: {
+      <%=  singular  %>: <%= singular %>,
+      f: f,
+      <%= @nested_set.collect{|arg| "#{arg[:singular]}: #{arg[:singular]}" }.join(",\n    ") %>
+  } \%>
   <% 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 %>
   <% if @edit_after_form_partial %><\%= render partial: "edit_after_form", locals: {<%=  singular  %>: <%= singular %>}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> %><% end %>

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

@@ -1,7 +1,10 @@
 <% if @turbo_streams %><\%= turbo_stream_from <%= singular %>  %>
 <% end %><\%= turbo_frame_tag "<%= @namespace %>__#{ dom_id(<%= singular %>) }" do  %>
   <div class='<%= @layout_strategy.row_classes %>' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
-    <\%= render partial: '<%= show_path_partial %>', locals: { <%= singular %>: <%= singular %><% if @nested_set.any? %>, <%= @nested_set.collect{|nest_arg|  "#{nest_arg[:singular]}: #{ nest_arg[:singular]  }"}.join(", ") %>, nested_for: "<%= @nested_set.collect{|nest_arg| nest_arg[:singular] + "-\#{#{nest_arg[:singular]}.id}"}.join("__") %>"<% end %> } %>
+  <\%= render partial: '<%= show_path_partial %>', locals: {
+    <%= singular %>: <%= singular %><% if @nested_set.any? %>,
+    <%= @nested_set.collect{|nest_arg|  "#{nest_arg[:singular]}: #{ nest_arg[:singular]  }"}.join(",\n    ") %>,
+    nested_for: "<%= @nested_set.collect{|nest_arg| nest_arg[:singular] + "-\#{#{nest_arg[:singular]}.id}"}.join("__") %>"<% end %> } %>
   </div>
 <\% end %>
 

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

@@ -8,7 +8,14 @@
     <% end %>
 
     <% if @new_button_position == 'above' %>
-    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  @controller_build_folder + '/new_button", locals: {}' + @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {})"}.join()  + ' %\>'.gsub('\\',"")  %><br /><% end %>
+    <% unless @no_create %>
+      <%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +
+              @controller_build_folder +
+              "/new_button\", locals: {
+    #{@nested_set.collect{|arg| arg[:singular] + ": " + arg[:singular]}.join(",\n    ")} }" +
+              ' %\>'.gsub('\\',"")  %>
+        <br />
+    <% end %>
     <% end %>
 
     <% unless @no_list %>
@@ -58,10 +65,8 @@
     </div>
       <\% end %>
       <\% <%= plural %>.each do |<%= singular %>| %>
-        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %>}
-            .merge(defined?(nested_for) ? {nested_for: nested_for} : {})
-      <%= @nested_set.collect{|arg| "      .merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {})"}.join("\n") %>
-        %>
+        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %>,
+      <% if @nested_set.any? %>nested_for: nested_for, <%= @nested_set.collect{|arg| "#{arg[:singular]}: #{arg[:singular]}" }.join(", ") %><% end %> } \%>
       <\% end %>
       <% if @paginate_per_page_selector %>
         <\%= form_with url: '<%= path_helper_plural(top_level: false) %>', method: :get do |f| %>

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

@@ -5,8 +5,11 @@
   <\%= 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 %> \%>
+  <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form", locals: {
+    <%=  singular %>: <%= singular %>,
+    f: f,
+    <%= @nested_set.collect{|arg| "#{arg[:singular]}: #{arg[:singular]}" }.join(",\n    ") %>
+} \%>
 
 <% if @new_within_form_partial %><\%= render partial: "new_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/create.turbo_stream.erb

@@ -1,6 +1,9 @@
 <\% if @<%= singular %>.errors.none? %>
   <\%= turbo_stream.replace "<%= @namespace %>__<%= plural %>-list" + <%= nested_for_turbo_nested_constructor %> do %>
-  <\%= 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 %> } %>
+  <\%= 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 %>
@@ -9,9 +12,12 @@
 <!-- errors -->
   <\%= turbo_stream.replace "<%= @namespace %>__<%= singular %>-new" do %>
   <\% if @<%= singular %>.errors.none? %>
-  <\%= render partial: "new_button", locals: {}<%=  @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {" + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> %>
+  <\%= render partial: "new_button", locals: {
+<%=  @nested_set.collect{|arg| "#{arg[:singular]}: @#{arg[:singular] }"}.join(",   \n")  %>
+
+} %>
   <\% else %>
-  <\%= render partial: "new_form", locals: {<%= singular %>: @<%= singular %>}<%=  @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {" + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> %>
+  <\%= render partial: "new_form", locals: {<%= singular %>: @<%= singular %>, <%=  @nested_set.collect{|arg| arg[:singular] + ": @" + arg[:singular]}.join(",\n    ")  %> } %>
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "flash_notices" do %>

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

@@ -1,9 +1,12 @@
 <%= turbo_parental_updates %>
 
 <\%= turbo_stream.update "<%= @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()  %> \%>
+  <\%= render partial: "list", locals: {<%=plural%>: @<%=plural %> ,
+<% if @nested_set.any? %>nested_for: "<%= @nested_set.collect{|arg| arg[:singular] + "-\#{@#{arg[:singular]}.id}"  }.join("__") %>",
+<%= @nested_set.collect{|arg| arg[:singular] + ": @" + arg[:singular]  }.join(", ") %><% end %>
+} \%>
 <\% end %>
 
 <\%= turbo_stream.update "flash_notices" do %>
 <\%= render partial: "layouts/flash_notices", locals: {resource: @<%= singular %>} %>
-<\% end %>
+<\% end %>

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

@@ -1,5 +1,7 @@
 <% if @big_edit %>
-<div class="container">
+  <% if include_nav_template %><%= @layout_strategy.page_begin %><\%= render partial: "<%= nav_template %>", locals: {nav: "<%= @plural %>"} %><%= @layout_strategy.page_end %><% end %>
+
+  <div class="container">
   <div class="row">
     <div class="col-md-12">
       <\%= link_to "<% if @button_icons == 'font-awesome' %><i class='fa fa-arrow-circle-left  2x'></i><% end %> Back to list".html_safe, <%= path_helper_plural(true) %> %>
@@ -10,8 +12,6 @@
   </div>
 </div>
 
-
-
 <% if @downnest_children.any? && @big_edit %>
 <div class="container" data-controller="bootstrap-tabbed-nav">
     <ul class="nav nav-tabs" id="<%= singular + "_downnest_portals" %>" role="tablist">

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

@@ -1 +1 @@
-<\%= render partial: "new_form", locals: {<%= singular %>: @<%=singular%>}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> %>
+<\%= render partial: "new_form", locals: {<%= singular %>: @<%=singular%>, <%= @nested_set.collect{|arg| "#{arg[:singular]}: @#{arg[:singular]}" }.join(", ") %>} %>

data/lib/generators/hot_glue/templates/javascript/search_form_controller.js

@@ -1,16 +1,67 @@
 import { Controller } from "@hotwired/stimulus"
 
-// Connects to data-controller="search_form"
 export default class extends Controller {
-  static targets = ["clearButton"];
+  static targets = ["clearButton", "textSearch", "textMatch"]
 
   connect() {
-
     if (this.hasClearButtonTarget) {
       this.clearButtonTarget.addEventListener("click", (event) => {
         event.preventDefault()
         this.element.reset()
       })
     }
+
+    // watch match selects
+    this.textMatchTargets.forEach(target => {
+      target.addEventListener("change", this.handleMatchChange)
+    })
+  }
+
+  textSearchTargetConnected(target) {
+    target.addEventListener("input", this.handleSearchInput)
+  }
+
+  disconnect() {
+    this.textSearchTargets.forEach(target => {
+      target.removeEventListener("input", this.handleSearchInput)
+    })
+    this.textMatchTargets.forEach(target => {
+      target.removeEventListener("change", this.handleMatchChange)
+    })
+  }
+
+  handleSearchInput = (event) => {
+    const searchEl = event.target
+    const matchEl = this.findMatchFor(searchEl)
+    if (!matchEl) return
+
+    const val = searchEl.value.trim()
+    const resettable = ["contains", "starts_with", "ends_with"]
+
+    if (val.length > 0 && matchEl.value === "") {
+      matchEl.value = "contains"
+    } else if (val === "" && resettable.includes(matchEl.value)) {
+      matchEl.value = ""
+    }
+  }
+
+  handleMatchChange = (event) => {
+    const matchEl = event.target
+    if (matchEl.value !== "") return
+
+    const searchEl = this.findSearchFor(matchEl)
+    if (!searchEl) return
+
+    searchEl.value = ""
+  }
+
+  findMatchFor(searchEl) {
+    const matchName = searchEl.name.replace("search", "match")
+    return this.textMatchTargets.find(t => t.name === matchName)
+  }
+
+  findSearchFor(matchEl) {
+    const searchName = matchEl.name.replace("match", "search")
+    return this.textSearchTargets.find(t => t.name === searchName)
   }
 }

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.31'
+    CURRENT = '0.7.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.7.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-28 00:00:00.000000000 Z
+date: 2025-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails