hot-glue 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c0a8b7999c39d4d93ece238d6447baa2ecdf34613d9fb11b5fe49842919424
-  data.tar.gz: c0a2d741d113fe2d3a366b5f33f110fc5aa8956a1b52af7ea2deb56085e76a4b
+  metadata.gz: fede733fb9491fae14d59e1e00a446335a5bd613f600f4a12c141fd8cf497519
+  data.tar.gz: dab8840cd386193dfdf6b893edf02ccbeb5884f4b650c7abf6db8a06441b4e8d
 SHA512:
-  metadata.gz: dd02b7553a585535eb7eb2ac195ce55eb0192151edccfb41cb9f3b4c8110ed125096200bbe3442cdc79dbb27db48cc0b8a10fdbc3366c9c0371f7ba46dc3684f
-  data.tar.gz: 235257f2f9150c0ac038fd7b11d4ac0551d4a224213e5cf244311ed43ca4cbdc02e25bf6427090213e30abde0de7289a0b01b887e265f0e2496a63c9fc9b12e0
+  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.
@@ -2420,6 +2463,15 @@ 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; 
 - 
@@ -2429,7 +2481,6 @@ These automatic pickups for partials are detected at build time. This means that
    
 - `--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/scaffold_generator.rb

@@ -754,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
+
+          if choice_scope_negative.nil? || choice_scope_negative.strip.empty?
+            choice_scope_negative = "all"
+          end
 
-        choice_scope = ".#{choice_scope}" if !choice_scope.start_with?(".")
-        choice_scope_negative = ".#{choice_scope_negative}" if !choice_scope_negative.start_with?(".")
+          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,
-        }
+          @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 = {}
@@ -906,6 +911,11 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   end
 
+  def controller_prefix_snake
+    @controller_prefix&.underscore
+  end
+
+
   def setup_hawk_keys
     @hawk_keys = {}
 
@@ -1386,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,
@@ -1394,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_",
@@ -1415,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)
@@ -1476,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
@@ -1552,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
 
@@ -1967,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

@@ -30,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
@@ -119,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 %>
@@ -219,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,7 +1,7 @@
 <\%= 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 %>,

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

@@ -1,5 +1,6 @@
 <% if @big_edit %>
-  <% 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 %>
 
   <div class="container">
   <div class="row">

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/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.7.1'
+    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.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-12 00:00:00.000000000 Z
+date: 2025-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails