hot-glue 0.7 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c823d274b52531414bbf843d1f44ccd364400ab9c736405a74b1cc5793774b48
-  data.tar.gz: 52d175d729d5b57c063da43bb7b7cb2940ea334be16e99637ade700ddaa2593a
+  metadata.gz: fede733fb9491fae14d59e1e00a446335a5bd613f600f4a12c141fd8cf497519
+  data.tar.gz: dab8840cd386193dfdf6b893edf02ccbeb5884f4b650c7abf6db8a06441b4e8d
 SHA512:
-  metadata.gz: a1c8b8309b61f0ddbb1f27ca3a73bde4e8349f13fb114c6f3f5dcc15343dcc597fa4fbdd11476c1456d38c772cfe29b61d7ca4bee7d79ad421592227cf305d49
-  data.tar.gz: 9b915be8972458f2fee1163e00c9f6c58a6ddf74ec829da2449989f3a5640597d16efb93c5ede4ea449bc786714997f511d3830a584029ff33222c6cef4d626e
+  metadata.gz: 10547fd449b51c3b1968f10a3f1ae12c8a20190924d9b4dc39e338193e7c0095030b5455aa34701a7a0fb16bf85cfde39b9978248ce0aba024d9374f2c66bf96
+  data.tar.gz: 9b088a35487336500561ce7510cf6b3df90e8542cf05b6176c882630bfac91b783ad4f6ab94a519d195bc0506af624843a1aabf26117eb23ca7222efe1d2a634

data/Gemfile.lock

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

data/README.md

@@ -712,6 +712,49 @@ current_user's has_many association (so, for any other "my" family, would be `cu
 
 This is covered in [Example #4 in the Hot Glue Tutorial](https://school.jfbcodes.com/8188)
 
+
+##### Using the object inside of the hawk
+In the example above, we aren't using the name of the scaffold within the hawk.
+
+However, if you are using the object's name in the hawk (for example `thing` for a `ThingsController`), the view will need this as a local variable `thing` and
+the controller will need this as an instsance variable `@thing`
+
+In this special case, Hot Glue converts the local variable `thing` used within your hawk code into instance variable `@thing`
+
+For example, if we were building a Job scaffold, here we want restrict follow_up_target_id to a list 
+of eligible targets (in our case, with an email address that matches the company's website), we could use a view helper.
+
+Notice that `targets_by_company` is defined in the helper below, and we pass it a relation from the current object which is `job`
+
+`hot_glue:scaffold Job --hawk='follow_up_target_id{targets_by_company(job.company)}' --code-in-controller='include JobHelper;`
+(notice that it is `job` not `@job`)
+
+// app/helpers/job_helper.rb
+```
+module JobHelper
+  def targets_by_company(company)
+    domain = company.website
+    Target.where("email LIKE ?", "%#{domain}%" )
+  end
+end
+```
+
+The generated controller code looks like:
+```
+modified_params = hawk_params({follow_up_target_id: [targets_by_company(@job.company)]}, modified_params)
+```
+(`hawk_param` is defined in Hot Glue itself. Notice that the `@` was appended to the front of `job`)
+
+The edit form will look like this:
+```
+<%= f.collection_select(:follow_up_target_id, targets_by_company(job.company), :id, :name, { prompt: true, selected: job.follow_up_target_id }) %>
+```
+(In the _form view, the `job` is a local variable as we do not rely on the instance variables in subviews.)
+
+
+
+
+
 ### `--with-turbo-streams`
 
 If and only if you specify `--with-turbo-streams`, your views will contain `turbo_stream_from` directives. Whereas your views will always contain `turbo_frame_tags` (whether or not this flag is specified) and will use the Turbo stream replacement mechanism for non-idempotent actions (create & update). This flag just brings the magic of live-reload to the scaffold interfaces themselves.
@@ -1717,6 +1760,7 @@ This is a good place to set your created_by user id, like so
 
 
 
+
 ```
 def new
     @email_template = EmailTemplate.new(crusade: crusade)
@@ -1748,6 +1792,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
@@ -2409,6 +2463,24 @@ These automatic pickups for partials are detected at build time. This means that
 
 # VERSION HISTORY
 
+
+#### 2025-12-12
+- Using the object (of the scaffold being built) inside of the hawk now adds `@` to a variable named as the singular name of the scaffold;
+  see "Using the object inside of the hawk"
+- error catching for missing parent relationships
+- fixes path for magic button when the controller has a prefix
+- fix nav active target for a controller with a prefix (the nav template uses the snake_case of the full controller name including prefix)
+
+
+#### 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.

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

@@ -162,8 +162,13 @@ module HotGlue
 
             layout_object[:columns][:container][i] = column.split(",").collect{|x|
               x.gsub("-","").gsub("=","")
-            }.collect(&:to_sym)
+              if x.include?("(")
+                x =~ /(.*)\((.*)\)/
+                x = $1
 
+              end
+              x
+            }.collect(&:to_sym)
 
 
             layout_object[:columns][:bootstrap_column_width][i] = fixed_widths[i] || target_col_size

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

@@ -199,7 +199,10 @@ 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|
+
+            col = full_col.to_s.gsub("=", "").gsub("-", "").to_sym
+
             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]
@@ -310,7 +313,13 @@ module  HotGlue
       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|
+
+        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]

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
@@ -439,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
@@ -645,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)
 
@@ -687,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"
@@ -750,51 +754,56 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     if options['phantom_search']
       ps_input = options['phantom_search']
+      @phantom_search = {}
 
-      ps_input =~ /(.*)\[(.*)\]/
-      type_and_label, settings = $1, $2
 
+      ps_input.split(",").each do |input_setting|
+        input_setting =~ /(.*)\[(.*)\]/
+        type_and_label, settings = $1, $2
 
-      type = type_and_label.split("_")[0]
-      label = type_and_label.split("_")[1]
 
-      @phantom_search = {}
-      choices = settings.split("|")
+        type = type_and_label.split("_")[0]
+        label = type_and_label.split("_")[1]
 
+        choices = settings.split("|")
 
-      @phantom_search[label.to_sym] = {
-        type: type,
-        name: label.humanize,
-        choices: []
-      }
 
-      choices.each do |choice|
-        if type == "radio"
-          choice_label = choice.split(":")[0]
-          choice_scope = choice.split(":")[1]
-        elsif type == "checkboxes"
-          choice_label = choice.split(":")[0]
-          choice_scope_negative = choice.split(":")[1]
-          choice_scope  = choice.split(":")[2]
-        end
+        @phantom_search[label.to_sym] = {
+          type: type,
+          name: label.humanize,
+          choices: []
+        }
 
-        if choice_scope.nil? || choice_scope.strip.empty?
-          choice_scope = "all"
-        end
+        choices.each do |choice|
+          if type == "radio"
+            choice_label = choice.split(":")[0]
+            choice_scope = choice.split(":")[1]
+          elsif type == "checkboxes"
+            choice_label = choice.split(":")[0]
+            choice_scope_negative = choice.split(":")[1]
+            choice_scope  = choice.split(":")[2]
+          end
 
-        if choice_scope_negative.nil? || choice_scope_negative.strip.empty?
-          choice_scope_negative = "all"
-        end
+          if choice_scope.nil? || choice_scope.strip.empty?
+            choice_scope = "all"
+          end
 
-        choice_scope = ".#{choice_scope}" if !choice_scope.start_with?(".")
-        choice_scope_negative = ".#{choice_scope_negative}" if !choice_scope_negative.start_with?(".")
+          if choice_scope_negative.nil? || choice_scope_negative.strip.empty?
+            choice_scope_negative = "all"
+          end
 
-        @phantom_search[label.to_sym][:choices] << {
-          label: choice_label,
-          scope: choice_scope,
-          scope_negative: choice_scope_negative,
-        }
+          choice_scope = ".#{choice_scope}" if !choice_scope.start_with?(".")
+          choice_scope_negative = ".#{choice_scope_negative}" if !choice_scope_negative.start_with?(".")
+
+          @phantom_search[label.to_sym][:choices] << {
+            label: choice_label,
+            scope: choice_scope,
+            scope_negative: choice_scope_negative,
+          }
+        end
       end
+
+
       puts "phantom search #{@phantom_search}"
     else
       @phantom_search = {}
@@ -902,6 +911,11 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   end
 
+  def controller_prefix_snake
+    @controller_prefix&.underscore
+  end
+
+
   def setup_hawk_keys
     @hawk_keys = {}
 
@@ -1077,6 +1091,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?
@@ -1381,7 +1396,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   def form_path_edit_helper
     HotGlue.optionalized_ternary(namespace: @namespace,
                                  target:  @singular,
-                                 prefix: (@controller_prefix ? @controller_prefix.downcase + "_" : ""),
+                                 prefix: (@controller_prefix ? controller_prefix_snake + "_" : ""),
                                  nested_set: @nested_set,
                                  with_params: false,
                                  put_form: true,
@@ -1389,17 +1404,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def delete_path_helper
-    HotGlue.optionalized_ternary(namespace: @namespace,
-                                 prefix: (@controller_prefix ? @controller_prefix.downcase + "_" : ""),
+    res = HotGlue.optionalized_ternary(namespace: @namespace,
+                                 prefix: (@controller_prefix ? controller_prefix_snake + "_" : ""),
                                  target: @singular,
                                  nested_set: @nested_set,
                                  with_params: false,
                                  put_form: true)
+    res
   end
 
   def edit_path_helper
     HotGlue.optionalized_ternary(namespace: @namespace,
-                                 prefix: (@controller_prefix ? @controller_prefix.downcase + "_" : ""),
+                                 prefix: (@controller_prefix ? controller_prefix_snake + "_" : ""),
                                  target: @singular,
                                  nested_set: @nested_set,
                                  modifier: "edit_",
@@ -1410,7 +1426,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   def new_path_name
     HotGlue.optionalized_ternary(namespace: @namespace,
                                  target: singular,
-                                 prefix: (@controller_prefix ? @controller_prefix.downcase + "_" : ""),
+                                 prefix: (@controller_prefix ? controller_prefix_snake + "_" : ""),
                                  nested_set: @nested_set,
                                  modifier: "new_",
                                  with_params: false)
@@ -1471,14 +1487,23 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     if @nested_set.any? && @nested_set.last[:parent_name]
       last_parent = @nested_set.last[:parent_name]
       foreign_key =  eval("#{singular_class}.reflect_on_association(:#{last_parent})").foreign_key
-      association = eval(singular_class).reflect_on_association(@nested_set.last[:parent_name].to_sym)
+      possible_associations = eval(singular_class).reflect_on_association(@nested_set.last[:parent_name].to_sym)
                                         .klass.reflect_on_all_associations(:has_many)
-                                        .to_a.find{|x|
+                                        .to_a
 
+
+      association = possible_associations.find{|x|
           if x.source_reflection
             x.table_name == plural
           end
-      }.plural_name
+      }
+
+      if !association
+        klass = eval(singular_class).reflect_on_association(@nested_set.last[:parent_name].to_sym)
+                                    .klass.to_s
+        raise "Could not find relation #{plural} on #{klass}; maybe add `has_many :#{plural}` "
+      end
+      association = association.plural_name
 
     else
       association = plural
@@ -1547,16 +1572,19 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def magic_button_output
+
+
     @template_builder.magic_button_output(
       path: HotGlue.optionalized_ternary( namespace: @namespace,
+                                          prefix: (@controller_prefix ? controller_prefix_snake + "_" : ""),
                                           target: @singular,
                                           nested_set: @nested_set,
                                           with_params: false,
                                           put_form: true),
-                                          big_edit: @big_edit,
-                                          singular: singular,
-                                          magic_buttons: @magic_buttons,
-                                          small_buttons: @small_buttons
+      big_edit: @big_edit,
+      singular: singular,
+      magic_buttons: @magic_buttons,
+      small_buttons: @small_buttons
     )
   end
 
@@ -1644,12 +1672,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}"
@@ -1962,9 +1990,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     [name, file_format].compact.join(".")
   end
 
-  def hawk_to_ruby
+  def hawk_to_ruby(in_controller: false) # false for views; true for controller
+
+
     res = @hawk_keys.collect { |k, v|
-      "#{k.to_s}: [#{v[:bind_to].join(".")}]"
+      bind_to_array = v[:bind_to]
+
+      bind_to = bind_to_array.collect{|bt|
+        bt.gsub!(singular, "@#{singular}") if in_controller
+        bt
+      }
+
+      "#{k.to_s}: [#{bind_to.join(".")}]"
     }.join(", ")
     res
   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|
@@ -29,9 +30,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
        next_object = nil
        collect_objects = @nested_set.reverse.collect {|x|
            assoc_name = x[:parent_name] || x[:singular]
-           # if eval("#{next_object || class_name}.reflect_on_association(:#{assoc_name})").nil?
-           #   raise "***** Unable to find the association `#{assoc_name}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{assoc_name}` to the #{next_object || class_name} object?"
-           # end
+           if eval("#{next_object || class_name}.reflect_on_association(:#{assoc_name})").nil?
+             raise "***** Unable to find the association `#{assoc_name}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{assoc_name}` to the #{next_object || class_name} object?"
+           end
+
+
+
            next_object = eval("#{next_object || class_name}.reflect_on_association(:#{assoc_name})").class_name
        }
        root_object = collect_objects.last
@@ -118,7 +122,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
     <%= controller_attachment_orig_filename_pickup_syntax %>
     <%= creation_syntax %>
-    <%=  @code_after_new ?  @code_after_new.gsub(";","\n") + "\n" : "" %>
+    <%= @code_after_new ?  @code_after_new.gsub(";","\n") + "\n" : "" %>
+    <% if @hawk_keys.any? %> modified_params = hawk_params({<%= hawk_to_ruby(in_controller: true) %>}, modified_params)<% end %>
 
       <% if @pundit %><% @related_sets.each do |key, related_set| %>
     check_<%= related_set[:association_ids_method].to_s %>_permissions(modified_params, :create)<% end %><% end %>
@@ -218,7 +223,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       "#{field_name}: #{field_name}" unless @update_show_only.include?(lookup.to_sym)
     }.join(",") %>)
     <% end %>
-   <% if @hawk_keys.any? %> modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
+   <% if @hawk_keys.any? %> modified_params = hawk_params({<%= hawk_to_ruby(in_controller: true) %>}, modified_params)<% end %>
     <%= controller_attachment_orig_filename_pickup_syntax %>
     @<%= singular_name %>.assign_attributes(modified_params)
       <% if @pundit && !@pundit_policy_override %>

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

@@ -1,13 +1,17 @@
 <\%= turbo_frame_tag "<%= @namespace %>__#{dom_id(<%= singular %>)}" do  %>
 <div class="cell editable" style="position: relative;">
   <\% if <%= singular %>.errors.any? %>
-  <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: <%= singular %> }) %>
+  <\%= 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 %>,
    <% 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,8 @@
 <% if @big_edit %>
-<div class="container">
+  <% if include_nav_template %><%= @layout_strategy.page_begin %>
+    <\%= render partial: "<%= nav_template %>", locals: {nav: "<%= "#{@controller_prefix ? controller_prefix_snake + "_": ""}#{@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 +13,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/index.erb

@@ -1,7 +1,8 @@
 <% if @menu_file_exists %><\%= render partial: "<%= namespace_with_trailing_dash %>menu", locals: {active: '<%= plural %>'} %><% end %>
 
 <div class="<%= @container_name %>">
-  <% if include_nav_template %><%= @layout_strategy.page_begin %><\%= render partial: "<%= nav_template %>", locals: {nav: "<%= @plural %>"} %><%= @layout_strategy.page_end %><% end %>
+  <% if include_nav_template %><%= @layout_strategy.page_begin %>
+  <\%= render partial: "<%= nav_template %>", locals: {nav: "<%= "#{@controller_prefix ? controller_prefix_snake + "_": ""}#{@plural}" %>"} %><%= @layout_strategy.page_end %><% end %>
   <% if @index_before_list_partial %><\%= render partial: "index_before_list" %><% end %>
 
   <%= @layout_strategy.page_begin %>

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.7'
+    CURRENT = '0.7.2'
   end
 end

metadata

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