hot-glue 0.6.23 → 0.6.24

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

@@ -517,13 +517,30 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     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?

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

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

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