hot-glue 0.6.22 → 0.6.24

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

@@ -154,8 +154,12 @@ class AssociationField < Field
 
 
 
+      if  modify_as && modify_as[:include_blank]
+        include_blank = ", include_blank: true"
+      end
+
       (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
-        "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, { prompt: true, selected: #{singular}.#{name} }, class: 'form-control'#{data_attr}) %>\n" +
+        "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, { prompt: true, selected: #{singular}.#{name}#{include_blank} }, class: 'form-control'#{data_attr}) %>\n" +
         (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
         (is_owner ? "\n<% end %>" : "")
     end

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

@@ -1,6 +1,6 @@
 class RelatedSetField < Field
 
-  attr_accessor :assoc_name, :assoc_class, :assoc
+  attr_accessor :assoc_name, :assoc_class, :assoc, :label_field, :hawk
 
   def initialize( scaffold: , name: )
     super
@@ -17,15 +17,23 @@ class RelatedSetField < Field
 
     @assoc_class = eval(@related_set_model.try(:class_name))
 
-    name_list = [:name, :to_label, :full_name, :display_name, :email]
 
-    if assoc_class && name_list.collect{ |field|
-      assoc_class.respond_to?(field.to_s) || assoc_class.instance_methods.include?(field)
-    }.none?
-      exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{@assoc_name} association on the #{class_name} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
-      raise(HotGlue::Error, exit_message)
-    end
+    @deets = scaffold.related_sets[name.to_sym]
+
+    if @deets[:label_field].nil?
+      @label_field = "label"
 
+      # name_list = [:name, :to_label, :full_name, :display_name, :email]
+      #
+      # if assoc_class && name_list.collect{ |field|
+      #   assoc_class.respond_to?(field.to_s) || assoc_class.instance_methods.include?(field)
+      # }.none?
+      #   exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{@assoc_name} association on the #{class_name} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
+      #   raise(HotGlue::Error, exit_message)
+      # end
+    else
+      @label_field = @deets[:label_field]
+    end
   end
 
 
@@ -35,11 +43,23 @@ class RelatedSetField < Field
     if pundit
       disabled_syntax << ", {disabled: ! #{class_name}Policy.new(#{auth}, @#{singular}).role_ids_able?}"
     end
-    " <%= f.collection_check_boxes :#{association_ids_method}, #{association_class_name}.all, :id, :label, {}#{disabled_syntax} do |m| %>
+    " <%= f.collection_check_boxes :#{association_ids_method}, #{record_scope}, :id, :#{label_field}, {}#{disabled_syntax} do |m| %>
     <%= m.check_box %> <%= m.label %><br />
   <% end %>"
   end
 
+  def record_scope
+    if hawk.nil?
+      "#{association_class_name}.all"
+    else
+      hawk
+    end
+  end
+
+  def label_field
+    @label_field
+  end
+
   def association_ids_method
     eval("#{class_name}.reflect_on_association(:#{name})").class_name.underscore + "_ids"
   end
@@ -49,7 +69,7 @@ class RelatedSetField < Field
   end
 
   def viewable_output
-    "<%= #{singular}.#{name}.collect(&:label).join(\", \") %>"
+    "<%= #{singular}.#{name}.collect(&:#{label_field}).join(\", \") %>"
   end
 end
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -31,7 +31,7 @@ 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
+                :phantom_update_params, :lazy
   # important: using an attr_accessor called :namespace indirectly causes a conflict with Rails class_name method
   # so we use namespace_value instead
 
@@ -303,6 +303,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
           @modify_as[key.to_sym] =  {typeahead: 1, nested: nested}
         elsif $2 == "timezone"
           @modify_as[key.to_sym] =  {timezone: 1, badges: $3}
+        elsif $2 == "include_blank"
+          @modify_as[key.to_sym] =  {include_blank: true}
         elsif $2 == "none"
           @modify_as[key.to_sym] =  {none: 1, badges: $3}
         else
@@ -507,17 +509,38 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       puts "NESTING: #{@nested_set}"
     end
 
+    if @nested_set.any?
+      @lazy = true
+    end
+
     # related_sets
     related_set_input = options['related_sets'].split(",")
     @related_sets = {}
     related_set_input.each do |setting|
-      name = setting.to_sym
-      association_ids_method = eval("#{singular_class}.reflect_on_association(:#{setting.to_sym})").class_name.underscore + "_ids"
-      class_name = eval("#{singular_class}.reflect_on_association(:#{setting.to_sym})").class_name
 
-      @related_sets[setting.to_sym] =   { name: setting.to_sym,
+      if setting.include?("{") && setting.include?("[")
+        setting =~ /(.*){(.*)}\[(.*)\]/
+        key, label, hawk = $1, $2 , $3
+      elsif setting.include?("{") && !setting.include?("[")
+        setting =~ /(.*){(.*)}/
+        key, label = $1, $2 , $3
+      elsif setting.include?("[") && !setting.include?("{")
+        setting =~ /(.*)\[(.*)\]/
+        key, hawk = $1, $2
+      else
+
+        key = setting
+        label = "label"
+      end
+
+      association_ids_method = eval("#{singular_class}.reflect_on_association(:#{key.to_sym})").class_name.underscore + "_ids"
+      class_name = eval("#{singular_class}.reflect_on_association(:#{key.to_sym})").class_name
+
+      @related_sets[key.to_sym] =   { name: key.to_sym,
                           association_ids_method: association_ids_method,
-                          class_name: class_name }
+                          class_name: class_name,
+                          label_field: label,
+                          hawk: hawk }
     end
 
     if @related_sets.any?
@@ -587,6 +610,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       setting =~ /(.*){(.*)}/
       key, lookup_as = $1, $2
 
+
+
       if !eval("#{class_name}.reflect_on_association(:#{key.to_s.gsub("_id","")})")
         raise "couldn't find association for #{key} in the object #{class_name}"
       end
@@ -1534,6 +1559,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       res -= %w{_list _line index}
     end
 
+    if @lazy
+      res << '_lazy_list'
+    end
+
     res
   end
 

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

@@ -86,6 +86,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     authorize @<%= plural_name %><% elsif @pundit && @pundit_policy_override %>
     skip_authorization
     raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.index?<% end %>
+    <% if @lazy %>render layout: (params[:__lazy].present? ? false : true)<% end %>
   rescue Pundit::NotAuthorizedError
     flash[:alert] = 'You are not authorized to perform this action.'
     render 'layouts/error'<% end %>
@@ -164,7 +165,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.show?<% end %>
     redirect_to <%=  HotGlue.optionalized_ternary(namespace: @namespace,
                                  target:  @singular,
-                                 top_level: false,
+                                 top_level: true,
                                  nested_set: @nested_set,
                                  modifier: 'edit_',
                                  with_params: true,
@@ -280,20 +281,19 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     # <%= rs[:association_ids_method] %>: modified_params[:<%= rs[:association_ids_method] %>>]} syntax for Pundit
     modified_relations = { <%= rs[:association_ids_method] %>: modified_params[:<%= rs[:association_ids_method] %>] }
     return unless modified_params[:<%= rs[:association_ids_method] %>].present?
-    policy_check = <%= singular_class %>Policy.new(current_user, @<%= singular %>,
-                                                   modified_relations:).method("#{action}?".to_sym).call
+    policy_check = <%= singular_class %>Policy.new(current_user, @<%= singular %>).method("#{action}?".to_sym).call
     return if policy_check
     raise Pundit::NotAuthorizedError, message: @<%= singular %>.errors.collect{|k| "#{k.attribute} #{k.message}"}.join(" ")
   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) + @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)  + @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/_form.erb

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

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

@@ -0,0 +1,7 @@
+<\%= tag.turbo_frame id: "<%= @namespace %>__<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>,
+                    src: <%= path_helper_plural %> + "?__lazy",
+                    loading: "lazy" do %>
+
+  <div class="text-muted">Loading ...</div>
+
+<\% end %>

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

@@ -1,7 +1,5 @@
 <%= all_line_fields %>
 
-
-
 <% if @downnest_children.any? && ! @big_edit %>
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
   <% if @stacked_downnesting %><div class="<%= @layout_strategy.downnest_portal_stacked_column_width  %> scaffold-downnest" ><% end %>
@@ -44,6 +42,6 @@
   <% end %>
 
   <% unless @no_edit %>
-  <\%= link_to "Edit <% if @button_icons == 'font-awesome' %><i class='fa fa-1x fa-list-alt'></i><% end %>".html_safe, <%= edit_path_helper %>, <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary btn-sm" %>
+  <\%= link_to "Edit <% if @button_icons == 'font-awesome' %><i class='fa fa-1x fa-list-alt'></i><% end %>".html_safe, <%= edit_path_helper %> + (params[:page] ? "?page=#{params[:page]}" : ""), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary btn-sm" %>
   <% end %>
 </div>

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

@@ -1,6 +1,6 @@
 <\% 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 %>

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

@@ -36,7 +36,8 @@
           <% downnest_object_name = downnest[:name]  %>
           <% downnest_style = @layout_strategy.downnest_style %>
 
-          <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {<%= @singular %>: @<%= @singular %>,  <%= downnest[:polymorph_as] || downnest[:name] %>: @<%= @singular %>.<%= downnest[:polymorph_as] || downnest[:name] %><% if @nested_set.any? %>, <%= @nested_set.collect{|x| "#{x[:singular]}: @#{x[:singular]}"}.join(", ") %>, nested_for: "<%= @nested_set.collect{|x| "#{x[:singular]}-" + "\#{" + "@#{x[:singular]}.id}"}.join("__") %>__<%= singular %>-#{@<%= @singular %>.id}" <% end %> } \%>
+          <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/lazy_list", locals: {<%= @singular %>: @<%= @singular %>, <%= @nested_set.collect{|x| "#{x[:singular]}: @#{x[:singular]}"}.join(", ") %><%= @nested_set.any? ? "," : "" %> nested_for: "<%= (@nested_set).collect{|x| "#{x[:singular]}-" + "\#{" + "@#{x[:singular]}.id}"}.join("__") %><%= "__" if @nested_set.any? %><%= singular %>-#{@<%= @singular %>.id}"  } \%>
+
         </div>
       <% end %>
     </div>

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

@@ -6,6 +6,7 @@
 
   <%= @layout_strategy.page_begin %>
   <\%= render partial: '<%= list_path_partial %>',
-    locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
+    locals: {<%= plural %>: @<%= plural %>  <% if @nested_set.any?  %>, nested_for: "<%= @nested_set.collect{|n| "#{n[:singular]}-\#{@#{n[:singular]}.id}"}.join("__") %>", <%= @nested_set.collect{|n| "#{n[:singular]}: @#{n[:singular]}"}.join(", ") %><% end %>
+  } \%>
   <%= @layout_strategy.page_end %>
 </div>

data/lib/hot-glue.rb

@@ -25,7 +25,7 @@ module HotGlue
   def self.optionalized_ternary(namespace: nil,
                                 target:,
                                 nested_set:,
-                                prefix: nil, # is this used
+                                prefix: "", # is this used
                                 modifier: "",
                                 with_params: false,
                                 top_level: false,
@@ -35,33 +35,33 @@ module HotGlue
 
 
     if nested_set.nil? || nested_set.empty?
-      return modifier + "#{(namespace + '_') if namespace}#{target}_path" + (("(#{instance_sym}#{target})" if put_form) || "")
-    elsif nested_set[0][:optional] == false
+      return modifier + "#{(namespace + '_') if namespace}#{prefix}#{target}_path" + (("(#{instance_sym}#{target})" if put_form) || "")
 
+    else
       res = modifier + ((namespace + "_" if namespace) || "") + nested_set.collect{|x|
         x[:singular] + "_"
-      }.join() + target + "_path" + (("(#{nested_set.collect{
+      }.join() + prefix + target + "_path" + (("(#{nested_set.collect{
         |x| instance_sym + x[:singular] }.join(",")
       }#{ put_form ? ',' + (instance_last_item ? "@" : instance_sym) + target : '' })") || "")
 
       res
-
-    else
+    # else
+    #   raise "optional nested set is deprecated"
       # copy the first item, make a ternery in this cycle, and recursively move to both the
       # is present path and the is optional path
 
-      nonoptional = nested_set[0].dup
-      nonoptional[:optional] = false
-      rest_of_nest = nested_set[1..-1]
-
-      is_present_path = HotGlue.optionalized_ternary(
-        namespace: namespace,
-        target: target,
-        modifier: modifier,
-        top_level: top_level,
-        with_params: with_params,
-        put_form: put_form,
-        nested_set: [nonoptional, *rest_of_nest])
+      # nonoptional = nested_set[0].dup
+      # nonoptional[:optional] = false
+      # rest_of_nest = nested_set[1..-1]
+      #
+      # is_present_path = HotGlue.optionalized_ternary(
+      #   namespace: namespace,
+      #   target: target,
+      #   modifier: modifier,
+      #   top_level: top_level,
+      #   with_params: with_params,
+      #   put_form: put_form,
+      #   nested_set: [nonoptional, *rest_of_nest])
 
       # is_missing_path = HotGlue.optionalized_ternary(
       #   namespace: namespace,
@@ -72,7 +72,7 @@ module HotGlue
       #   put_form: put_form,
       #   nested_set: rest_of_nest  )
       #
-      return "#{is_present_path}"
+      # return "#{is_present_path}"
     end
   end
 

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.22'
+    CURRENT = '0.6.24'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.22
+  version: 0.6.24
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 2025-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,6 +115,7 @@ files:
 - lib/generators/hot_glue/templates/erb/_edit.erb
 - lib/generators/hot_glue/templates/erb/_flash_notices.erb
 - lib/generators/hot_glue/templates/erb/_form.erb
+- lib/generators/hot_glue/templates/erb/_lazy_list.erb
 - lib/generators/hot_glue/templates/erb/_line.erb
 - lib/generators/hot_glue/templates/erb/_list.erb
 - lib/generators/hot_glue/templates/erb/_nav.html.erb