hot-glue 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac74e056098b9847487adc764e7bb03b0024c94bdbdf151eb24eb688cc53309
-  data.tar.gz: a23e9e6c569539b30542b97446bea589317cd1118bd87bf7c4330fff3a08603d
+  metadata.gz: 19812e0ed05939741ec5f22550345a5d94a07ad32f3925540bd6bb2ec76e0f6f
+  data.tar.gz: d2fba980427bd8c8961a6fb475b063305956d8a99ac428ffc28317291b961209
 SHA512:
-  metadata.gz: eae357a387a886f4f24156f78f666a56f81a829d1aab3dd3e128698cbf59ede7136bf9d6c0c8e286b9840205860133ea6d17085ff7e340aea4a3b9be8bcacae1
-  data.tar.gz: d5d23aaac0178a602cbc0f1893819aba6b12d57270f218389742a54bdfdea5a59c6bd800b1a5e7b05cedb75d452bd6a8da170a6cc3a57fd6c2caf9edcca4c2e1
+  metadata.gz: 2a6c67fe502cce091097b4e72f1806a23b9126eea7c1498a8ba5f38aec5a581ddb59fd54543e4ba00257f70bfaa987aaf9ae07c9f80de093cccd0a3584dd9133
+  data.tar.gz: 3143a9b97b4338421c2bc4b910afd2f18cddb96178e8e27e6beaf4189d705d54222aa6335c425b7beb2ea2910557979135d84919c410ad63d3c357d3c5e06885

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.7.5)
+    hot-glue (0.7.6.2)
       ffaker (~> 2.16)
       rails (> 5.1)
 
@@ -129,7 +129,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.6.2)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -225,7 +225,7 @@ GEM
     stimulus-rails (1.1.1)
       railties (>= 6.0.0)
     thor (1.2.1)
-    timeout (0.6.0)
+    timeout (0.6.1)
     turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)

data/README.md

@@ -712,6 +712,17 @@ 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)
 
+##### Polymoprhism with the Hawk
+
+If the field (foreign key) being hawked is a polymorphic foreign key, you need to list multiple objects which define the allowed scopes (one for each kind of parent type).
+
+In this case, you will use **spaces** to separate scopes (NOT commas)
+
+for example, if we have a `thing` that can belong (via parent_id and parent_type) to either people or places, we could restrict this thing to only people and places associated from the `account` object (which would be in-scope based on, for example, the nesting arrangement or a logged in-user, or the account currently being managed)
+
+`--hawk=parent_id{account.people account.places}`
+
+Hot glue wil convert the spaces to commas when writing the controller code. 
 
 ##### Using the object inside of the hawk
 In the example above, we aren't using the name of the scaffold within the hawk.
@@ -882,7 +893,7 @@ You may use semi-colons to separate multiple lines of code.
 
 For example, a user Factory might be called like so:
 
-`./bin/rails generate hot_glue:scaffold User --factory-creation={factory = UserFactory.new(params: user_params)} --gd`
+`./bin/rails generate hot_glue:scaffold User --factory-creation='factory = UserFactory.new(params: user_params)' --gd`
 
 (Note we are relying on the `user_params` method provided by the controller.)
 
@@ -2478,6 +2489,47 @@ These automatic pickups for partials are detected at build time. This means that
 
 # VERSION HISTORY
 
+#### 2026-04-08 - v0.7.6.2
+- Syntax fix in code, no functional changes
+
+#### 2026-04-06 - v0.7.6.1
+- Syntax fix in code, no functional changes
+
+#### 2026-03-08 - v0.7.6
+- Makes hawk polymorphic aware. As well, a child controller with a polymorphic parent is also aware (the last item in the nest list should be specified using `(`...`)`)
+
+Using the hawk with a polymorphic foreign key:
+
+If the field (foreign key) being hawked is a polymorphic foreign key, you need to list multiple objects which define the allowed scopes (one for each kind of parent type).
+
+In this case, you will use **spaces** to separate scopes (NOT commas)
+
+for example, if we have a `thing` that can belong (via parent_id and parent_type) to either people or places, we could restrict this thing to only people and places associated from the `account` object (which would be in-scope based on, for example, the nesting arrangement or a logged in-user, or the account currently being managed)
+
+`--hawk=parent_id{account.people account.places}`
+
+Hot glue wil convert the spaces to commas when writing the controller code. 
+
+A child controller to with a polymorphic parent:
+- This special case assume that that the parent being build is not actually a polymoprh, it is a real object, but its children have foreign keys to it which are polymorphic. 
+
+`--nested=abc(parent) `
+
+Example: In my data model, targets have a polymorphic parent (parent_id and parent_type) and can belong to either Companies or Schools. Here, we are building the Companies view with a child to Targets, but notice for these targets we are using polymorphism and also using a controller prefix, so tha this child controller will be built as CompanyTargets. In the companies build, we downnest `company_targets(targets)` (`company_targets` is the name of the child controller, but it is acting on an object called `targets`, as seen in the downnest specification.)
+
+```
+bin/rails generate hot_glue:scaffold Company --namespace='account_dashboard' --nested='account'  --downnest='company_targets(targets)'
+```
+
+When building Targets, notice that the nested chain ends with `company(parent)`. This means our routes behave like normal routes (account/company), but this tells Hot Glue that the relationship from Target to Company is via the polymorphic parent_id & parent_type key. 
+
+```
+bin/rails generate hot_glue:scaffold Target --namespace='account_dashboard' --nested='account/company(parent)'  --controller-prefix='Company'
+```
+
+- Pagy support for Pagy 42 + 43. Breaking changes bewteen Pagy version 9 and version 42 force you to rebuild everything (every view) when upgrading Pagy. Hot Glue now detects which version of Pagy is installed and outputs the syntax for that version. (You will still need to rebuild all controllers when upgrading past Pagy 9)
+
+
 #### 2026-01-11 - v0.7.5
 This is mostly a maintenance release to address these two issues related to the hawk:
 - removes the hawk in the create action because we are alrady doing it in the creation_syntax

data/app/helpers/hot_glue/controller_helper.rb

@@ -120,68 +120,6 @@ module HotGlue
       "#{sign}#{hour_abs}#{minute_str}"
     end
 
-    # def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = {})
-    #
-    #   use_timezone = if current_user_object.try(:timezone)
-    #                    (ActiveSupport::TimeZone[current_user_object.timezone])
-    #                  else
-    #                    Time.zone
-    #                  end
-    #
-    #
-    #   uses_dst = (current_user_object.try(:locale_uses_dst)) || false
-    #
-    #   modified_params = modified_params.tap do |params|
-    #     params.keys.each{|k|
-    #       if field_list.is_a?(Hash)
-    #         include_me = field_list[k.to_sym].present?
-    #       elsif field_list.is_a?(Array)
-    #         field_list.include?(k.to_sym)
-    #       end
-    #
-    #       parsables =  {
-    #         datetime: "%Y-%m-%d %H:%M %z",
-    #         time: "%H:%M %z"
-    #       }
-    #
-    #
-    #       if include_me && params[k].present?
-    #         input_value = params[k].gsub("T", " ") # e.g. "2025-09-24 14:00" or "14:00"
-    #
-    #         if field_list.is_a?(Array)
-    #           # Datetime inputs (e.g. datetime-local)
-    #           parsed_time = Time.strptime(input_value, "%Y-%m-%d %H:%M")
-    #           parsed_time = parsed_time.utc.change(sec: 0)
-    #         else
-    #           case field_list[k.to_sym]
-    #           when :datetime
-    #             parsed_time = Time.strptime(input_value, "%Y-%m-%d %H:%M")
-    #             parsed_time = parsed_time.utc.change(sec: 0)
-    #           when :time
-    #
-    #             Rails.logger.info("input_value: #{input_value}")
-    #             # Parse as hour/minute only, no zone
-    #             t = Time.strptime(input_value, "%H:%M")
-    #
-    #             # Build a UTC time with today's date
-    #             parsed_time = Time.utc(Time.now.year, Time.now.month, Time.now.day, t.hour, t.min, 0)
-    #             # Convert back to a plain "time of day" (for DB `time` column)
-    #             parsed_time = parsed_time.to_time.change(sec: 0)
-    #             Rails.logger.info("parsed_time: #{parsed_time}")
-    #
-    #           else
-    #             raise "Unsupported field type: #{field_list[k.to_sym]}"
-    #           end
-    #         end
-    #
-    #         Rails.logger.info "parsed_time #{parsed_time}"
-    #         params[k] = parsed_time
-    #       end
-    #     }
-    #   end
-    #   modified_params
-    # end
-
     def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = {})
       use_timezone =
         if current_user_object.try(:timezone)
@@ -229,17 +167,33 @@ module HotGlue
     end
 
     def hawk_params(hawk_schema, modified_params)
-      @hawk_alarm = ""
-      hawk_schema.each do |hawk_key,hawk_definition|
-        hawk_root = hawk_definition[0]
-        # hawk_scope = hawk_definition[1]
-
-        unless modified_params[hawk_key.to_s].blank?
-          begin
-            eval("hawk_root").find(modified_params[hawk_key.to_s])
-          rescue ActiveRecord::RecordNotFound => e
-            @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
-            modified_params.tap { |hs| hs.delete(hawk_key.to_s) }
+      @hawk_alarm = +""
+      hawk_schema.each do |hawk_key, hawk_definition|
+        if hawk_definition[0].to_s.start_with?("[") # the hawk is polymorphic
+          # hawk_definition[0] is like "[account.companies,account.vc_firms]"
+          scopes = hawk_definition[0].to_s.gsub(/^\[|\]$/, "").split(",").map(&:strip)
+
+          unless modified_params[hawk_key.to_s].blank?
+            passed = scopes.any? do |scope_str|
+              relation = scope_str.split(".").inject(self) { |obj, method_name| obj.send(method_name) }
+              relation.where(id: modified_params[hawk_key.to_s]).exists?
+            end
+
+            unless passed
+              @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
+              modified_params.tap { |hs| hs.delete(hawk_key.to_s) }
+            end
+          end
+        else
+          hawk_root = hawk_definition[0]
+          unless modified_params[hawk_key.to_s].blank?
+            begin
+
+              hawk_definition.where(modified_params[hawk_key.to_s])
+            rescue ActiveRecord::RecordNotFound => e
+              @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
+              modified_params.tap { |hs| hs.delete(hawk_key.to_s) }
+            end
           end
         end
       end

data/lib/generators/hot_glue/field_factory.rb

@@ -54,24 +54,6 @@ class FieldFactory
     end
 
     @field = field_class.new(scaffold: generator,  name: name)
-      #                        layout_strategy: generator.layout_strategy,
-      #                        form_placeholder_labels: generator.form_placeholder_labels,
-      #                        form_labels_position: generator.form_labels_position,
-      #                        ownership_field: generator.ownership_field,
-      #                        hawk_keys: generator.hawk_keys,
-      #                        auth: generator.auth,
-      #                        class_name: generator.singular_class,
-      #                        alt_lookup: generator.alt_lookups[name] || nil,
-      #                        singular: generator.singular,
-      #                        self_auth: generator.self_auth,
-      #                        update_show_only: generator.update_show_only,
-      #                        attachment_data: generator.attachments[name.to_sym],
-      #                        sample_file_path: generator.sample_file_path,
-      #                        modify_as: generator.modify_as[name.to_sym] || nil,
-      #                        plural: generator.plural,
-      #                        display_as: generator.display_as[name.to_sym] || nil,
-      #                        default_boolean_display: generator.default_boolean_display,
-      #                        namespace: generator.namespace_value,
-      #                        pundit: generator.pundit )
+     
   end
 end

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

@@ -3,7 +3,7 @@ require_relative './field.rb'
 
 class AssociationField < Field
 
-  attr_accessor :assoc_name, :assoc_class, :assoc, :alt_lookup
+  attr_accessor :assoc_name, :assoc_class, :assoc, :alt_lookup, :polymorphic_parents
 
   def initialize(scaffold: , name: )
     super
@@ -108,7 +108,7 @@ class AssociationField < Field
       if @modify_as[:nested].any?
         search_url  << "(" + modify_as[:nested].collect{|x| "#{x}"}.join(",") + ")"
       end
-
+@polymorphic_parents  = []
       "<div class='typeahead typeahead--#{assoc.name}_id'
       data-controller='typeahead'
       data-typeahead-url-value='<%= #{search_url} %>'
@@ -118,8 +118,11 @@ class AssociationField < Field
                      autofocus: true,
                      autocomplete: 'off',
                      value: #{singular}.try(:#{assoc.name}).try(:name) %>
-      <%= f.hidden_field :#{assoc.name}_id, value: #{singular}.try(:#{assoc.name}).try(:id), 'data-typeahead-target': 'hiddenFormValue' %>
-      <div data-typeahead-target='results'></div>
+      <%= f.hidden_field :#{assoc.name}_id, value: #{singular}.try(:#{assoc.name}).try(:id), 'data-typeahead-target': 'hiddenFormValue' %>" + 
+      ( @polymorphic_parents.include?( (assoc.name.to_s + "_id")) ? 
+"\n     <%= f.hidden_field :#{assoc.name}_type, value: #{singular}.try(:#{assoc.name}_type), 'data-typeahead-target': 'hiddenFormType' %>"
+      : "") + 
+      "\n      <div data-typeahead-target='results'></div>
       <div data-typeahead-target='classIdentifier' data-id=\"typeahead--#{assoc_name}_id\"></div>
       </div>"
     else

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

@@ -6,7 +6,8 @@ class Field
                 :self_auth,
                 :singular_class,  :singular, :sql_type, :ownership_field,
                 :update_show_only, :namespace, :pundit, :plural,
-                :stimmify, :hidden_create, :hidden_update, :attachment_data, :god
+                :stimmify, :hidden_create, :hidden_update, :attachment_data, :god,
+                :polymorphic_parents
 
 
   def initialize(
@@ -37,7 +38,7 @@ class Field
     @hidden_update = scaffold.hidden_update
     @attachment_data = scaffold.attachments[name.to_sym]
     @god = scaffold.god
-
+    @polymorphic_parents = scaffold.polymorphic_parents
 
 
     # TODO: remove knowledge of subclasses from Field

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

@@ -12,7 +12,8 @@ module  HotGlue
                   :search, :search_fields, :search_query_fields, :search_position,
                   :form_path, :layout_object, :search_clear_button, :search_autosearch,
                   :stimmify, :stimmify_camel, :hidden_create, :hidden_update, :invisible_create,
-                  :invisible_update, :plural, :phantom_search, :pagination_style
+                  :invisible_update, :plural, :phantom_search, :pagination_style,
+                  :namespace, :controller_build_folder
 
 
     def initialize(singular:, singular_class: ,
@@ -26,7 +27,7 @@ module  HotGlue
                  search_clear_button:, search_autosearch:, layout_object:,
                  form_path: , stimmify: , stimmify_camel:, hidden_create:, hidden_update: ,
                  invisible_create:, invisible_update: , plural: , phantom_search:,
-                   pagination_style: )
+                   pagination_style:, namespace: nil, controller_build_folder: nil )
 
 
       @form_path = form_path
@@ -68,6 +69,12 @@ module  HotGlue
       @related_sets = related_sets
       @phantom_search = phantom_search
       @pagination_style = pagination_style
+      @namespace = namespace
+      @controller_build_folder = controller_build_folder
+    end
+
+    def pickup_partial_path(partial_name)
+      "#{@namespace + "/" if @namespace}#{@controller_build_folder}/#{partial_name}"
     end
 
     def add_spaces_each_line(text, num_spaces)
@@ -204,7 +211,7 @@ module  HotGlue
             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} } %>"
+              the_output = "<%= render partial: '#{pickup_partial_path(col.to_s.gsub!("**",""))}', locals: {#{singular}: #{singular} } %>"
             elsif ! layout_object[:columns][:fields][col][:form]
               # omit from show action
             else
@@ -285,12 +292,18 @@ module  HotGlue
         "<% if #{plural}.respond_to?(:total_pages) %><%= paginate(#{plural}) %> <% end %>"
       elsif @pagination_style == "will_paginate"
         "<% if #{plural}.respond_to?(:total_pages) %><%= will_paginate(#{plural}) %> <% end %>"
-      elsif @pagination_style == "pagy"
+      elsif @pagination_style == "pagy9"
         if !@layout_strategy == "bootstrap"
           "<%== pagy_nav(@pagy, anchor_string: 'data-turbo-action=\"advance\"') %>"
         else
           "<%== pagy_bootstrap_nav(@pagy, anchor_string: 'data-turbo-action=\"advance\"') %>"
         end
+      elsif @pagination_style == "pagy43"
+        if @layout_strategy.is_a?(LayoutStrategy::Bootstrap)
+          "<%== @pagy.series_nav(:bootstrap) if @pagy && @pagy.pages > 1 %>"
+        else
+          "<%== @pagy.series_nav if @pagy && @pagy.pages > 1 %>"
+        end
       end
     end
 
@@ -321,7 +334,7 @@ module  HotGlue
             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} } %>"
+            the_output = "<%= render partial: '#{pickup_partial_path(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)

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -34,7 +34,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :search_clear_button, :search_autosearch, :include_object_names,
                 :stimmify, :stimmify_camel, :hidden_create, :hidden_update,
                 :invisible_create, :invisible_update, :phantom_create_params,
-                :phantom_update_params, :lazy, :back_link_to_parent
+                :phantom_update_params, :lazy, :back_link_to_parent, :polymorphic_parents
+
   # important: using an attr_accessor called :namespace indirectly causes a conflict with Rails class_name method
   # so we use namespace_value instead
 
@@ -121,6 +122,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   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
+  class_option :polymorphic_parent, type: :string, default: nil
 
   # SEARCH OPTIONS
   class_option :search, default: nil # set or predicate
@@ -177,7 +179,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       if Gem::Specification.find_all_by_name('pagy').first.version.to_s.split(".").first.to_i <= 9
         @pagination_style = 'pagy9'
       else
-        raise "Pagy version 43 not yet compatible"
+        # warn "Pagy version 43 not yet compatible"
         @pagination_style = 'pagy43'
       end
     elsif Gem::Specification.find_all_by_name('will_paginate').any?
@@ -260,6 +262,23 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     setup_attachments
 
+    # polymorphic parents
+    # input = options["polymorphic_parent"]
+    # "parent_id[company|vc_firm|press_outlet],thing_id[apple|banana]"
+
+    if @nested && @nested.split("/").last.include?("(")
+      @polymorphic_parents = [@nested.split("/").last[/\(([^)]+)\)/, 1] + "_id"]
+    
+    else
+      @polymorphic_parents = []
+      # do we need to be able to set these via a config?
+      # the use case I've implemented only supports a polymorphic parent in
+      # how you build the nest structure (last nested parent)
+      # what if there are two or more fields which are polymorphic on the object 
+    end
+
+    puts "polymhic_parents: #{@polymorphic_parents}"
+
     @exclude_fields = []
     @exclude_fields += options['exclude'].split(",").collect(&:to_sym)
 
@@ -283,6 +302,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
           end
         end
       }.flatten.compact.collect(&:to_sym)
+      @include_fields += @polymorphic_parents.collect{ |x|
+        [x.to_sym, x.to_s.gsub("_id","_type").to_sym]
+    }.flatten
       puts "INCLUDED FIELDS: #{@include_fields}"
     end
 
@@ -904,7 +926,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         invisible_create: @invisible_create,
         invisible_update: @invisible_update,
         phantom_search: @phantom_search,
-        pagination_style: @pagination_style
+        pagination_style: @pagination_style,
+        namespace: @namespace,
+        controller_build_folder: @controller_build_folder
       )
     elsif @markup == "slim"
       raise(HotGlue::Error, "SLIM IS NOT IMPLEMENTED")
@@ -932,6 +956,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     if options["hawk"]
       options['hawk'].split(",").each do |hawk_entry|
+
         # format is: abc_id[thing]
         if hawk_entry.include?("{")
           hawk_entry =~ /(.*){(.*)}/
@@ -941,20 +966,43 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
           hawk_to = @auth
         end
 
-        hawk_scope = key.gsub("_id", "").pluralize
 
-        if eval(singular_class + ".reflect_on_association(:#{key.gsub('_id', '')})").nil?
-          raise "Could not find `#{key.gsub('_id', '')}` association; add this to the #{singular_class} class: \nbelongs_to :#{key.gsub('_id', '')} "
+        hawk_scope = key.gsub("_id", "").pluralize
+        reflection = eval(singular_class + ".reflect_on_association(:#{key.gsub('_id', '')})")
+        raise "Could not find `#{key.gsub('_id', '')}` association; add this to the #{singular_class} class: \nbelongs_to :#{key.gsub('_id', '')} " if reflection.nil?
+
+        optional = reflection.options[:optional]
+
+        # if hawk_to.include?(" ")
+        #   @hawk_keys[key.to_sym] = { bind_to: [hawk_to.gsub(" ", ",")], 
+        #   polymorphic: true,
+        #   optional: optional }
+
+        #   # hawk_to.start_with?("[")
+        #   # # Polymorphic hawk: space-separated scopes inside brackets
+        #   # # e.g. [account.companies account.vc_firms]
+        #   # raise "#{key} is not a polymorphic association; add `polymorphic: true` to belongs_to :#{key.gsub('_id', '')} in #{singular_class}" unless reflection.options[:polymorphic]
+        #   # scopes = hawk_to.gsub(/^\[|\]$/, "").split(" ")
+        #   # @hawk_keys[key.to_sym] = { bind_to: scopes, polymorphic: true, optional: optional }
+        # else
+        # 
+        if hawk_to.include?(" ")
+          hawk_to.gsub!(" ", ",")
+          polymorphic = true
+        else
+          polymorphic = false
         end
 
-        optional = eval(singular_class + ".reflect_on_association(:#{key.gsub('_id', '')})").options[:optional]
-
-        @hawk_keys[key.to_sym] = { bind_to: [hawk_to], optional: optional }
+        @hawk_keys[key.to_sym] = { bind_to: [hawk_to],
+          optional: optional , 
+          polymorphic: polymorphic}
+        
+        
         use_shorthand = !options["hawk"].include?("{")
-
         if use_shorthand # only include the hawk scope if using the shorthand
           @hawk_keys[key.to_sym][:bind_to] << hawk_scope
         end
+        # end
 
       end
 
@@ -1162,7 +1210,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def creation_syntax
     if @factory_creation.nil? && ! @alt_lookups.any?
-      (@hawk_keys.any? ?   "modified_params = hawk_params({#{ hawk_to_ruby(in_controller: true) }}, modified_params)\n    " : "")  + "@#{singular } = #{ class_name }.new(modified_params)"
+
+      res = (@hawk_keys.any? ?   "modified_params = hawk_params({#{ hawk_to_ruby(in_controller: true) }}, modified_params)\n    " : "")  + "@#{singular } = #{ class_name }.new(modified_params)"
     elsif @factory_creation.nil? && @alt_lookups.any?
 
       prelookup_syntax = @alt_lookups.collect{|lookup, data|
@@ -1181,13 +1230,13 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       #{@factory_creation}
       "
       res << "\n      " + "@#{singular} = factory.#{singular}" unless res.include?("@#{singular} = factory.#{singular}")
-      res << "\n    rescue ActiveRecord::RecordInvalid
-      @#{singular} = factory.#{singular}
-      @action = 'new'
-    end"
-      res
+      res << "\n    rescue ActiveRecord::RecordInvalid"
+      res << "\n    @#{singular} = factory.#{singular}"
+      res << "\n     @action = 'new'"
     end
+    res
   end
+    
 
   def formats
     [format]
@@ -1498,13 +1547,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def object_scope
-    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
-      possible_associations = eval(singular_class).reflect_on_association(@nested_set.last[:parent_name].to_sym)
-                                        .klass.reflect_on_all_associations(:has_many)
-                                        .to_a
-
+    if @nested_set.any? && @nested_set.last[:parent_name] && !@nested_set.last[:polymorph_as]
+      if @nested_set.last[:polymorph_as]
+        possible_associations = [@nested_set.last[:parent_name].pluralize]
+      else
+        possible_associations = eval(singular_class).reflect_on_association(( @nested_set.last[:parent_name]).to_sym)
+                                                    .klass.reflect_on_all_associations(:has_many)
+                                                    .to_a
+      end
 
       association = possible_associations.find{|x|
           if x.source_reflection
@@ -1986,7 +2036,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       res << "    @#{plural} = @#{plural}.page(params[:page])#{ ".per(per)" if @paginate_per_page_selector }"
     elsif @pagination_style == "will_paginate"
       res << "    @#{plural} = @#{plural}.paginate(page: params[:page], #{ ", per_page: per" if @paginate_per_page_selector })"
-    elsif @pagination_style == "pagy"
+    elsif @pagination_style == "pagy9" || @pagination_style == "pagy43"
       res << "    @pagy, @#{plural} = pagy(@#{plural})"
     end
     res
@@ -2006,19 +2056,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def hawk_to_ruby(in_controller: false)
     # false for views; true for controller
-
     res = @hawk_keys.collect { |k, v|
-      bind_to_array = v[:bind_to].dup
-      bind_to = bind_to_array.collect{|bt|
-        if in_controller
-          bt.gsub(singular, "@#{singular}")
-        else
-          bt
-        end
-      }
-
-      "#{k.to_s}: [#{bind_to.join(".")}]"
+      "#{k}: #{v[:bind_to]}"
     }.compact.join(", ")
+
     res
   end
 

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

@@ -29,14 +29,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   def <%= @nested_set[0][:singular] %><% if @god
        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
+         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
 
-
-
-           next_object = eval("#{next_object || class_name}.reflect_on_association(:#{assoc_name})").class_name
+         next_object = eval("#{next_object || class_name}.reflect_on_association(:#{assoc_name})").class_name
        }
        root_object = collect_objects.last
      else
@@ -204,9 +202,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     end
     <% end %>
 
-    modified_params = modify_date_inputs_on_params(<% if @update_show_only %>update_<% end %><%= singular_name %>_params.dup<%= controller_update_params_tap_away_magic_buttons  %>, <%= current_user_object %>, <%= datetime_fields_list %>)<% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
-    modified_params = modified_params.merge(<%= @object_owner_sym %>: <%= @object_owner_eval %>) <% elsif @object_owner_optional && any_nested? %>
-    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% end %>
+    modified_params = modify_date_inputs_on_params(<% if @update_show_only %>update_<% end %><%= singular_name %>_params.dup<%= controller_update_params_tap_away_magic_buttons  %>, <%= current_user_object %>, <%= datetime_fields_list %>)
+  
     <% if @pundit %><% @related_sets.each do |key, related_set| %>
     check_<%= related_set[:association_ids_method].to_s %>_permissions(modified_params, :update)<% end %><% end %>
       <% if (@alt_lookups.any?) %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.7.5'
+    CURRENT = '0.7.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-11 00:00:00.000000000 Z
+date: 2026-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails