hot-glue 0.4.7 → 0.4.8.1

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -3,8 +3,8 @@ require 'ffaker'
 
 require_relative './markup_templates/base'
 require_relative './markup_templates/erb'
-require_relative './markup_templates/haml'
-require_relative './markup_templates/slim'
+# require_relative './markup_templates/haml'
+# require_relative './markup_templates/slim'
 
 require_relative './layout/builder'
 
@@ -12,6 +12,50 @@ module HotGlue
   class Error < StandardError
   end
 
+  def self.optionalized_ternary(params)
+    namespace = params[:namespace] || nil
+    target = params[:target]
+    nested_set = params[:nested_set]
+    modifier = params[:modifier] || ""
+    with_params = params[:with_params] || false
+    top_level = params[:top_level] || false
+
+    instance_sym = top_level ? "@" : ""
+
+    put_form =  params[:put_form] || false
+
+    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) || "") + nested_set.collect{|x|
+        x[:singular] + "_"
+      }.join() + target + "_path" + (("(#{nested_set.collect{
+        |x| instance_sym + x[:singular] }.join(",")
+      }#{ put_form ? ',' + instance_sym + target : '' })" if with_params) || "")
+
+    else
+      # 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]
+
+      all_params = {namespace: namespace,
+                    target: target,
+                    modifier: modifier,
+                    top_level: top_level,
+                    with_params: with_params,
+                    put_form: put_form}
+      is_present_path = HotGlue.optionalized_ternary(all_params.merge({  nested_set: [nonoptional, *rest_of_nest]})       )
+
+      is_missing_path = HotGlue.optionalized_ternary(all_params.merge({  nested_set: rest_of_nest})       )
+
+
+      return "defined?(#{instance_sym + nested_set[0][:singular]}) ? #{is_present_path} : #{is_missing_path}"
+    end
+  end
+
   def self.derrive_reference_name(thing_as_string)
     assoc_class = eval(thing_as_string)
 
@@ -206,6 +250,10 @@ module HotGlue
       @display_list_after_update = options['display_list_after_update'] || false
       @smart_layout = options['smart_layout']
 
+      if options['include'].include?(":") && @smart_layout
+        raise "You specified both --smart-layout and also specified grouping mode (there is a : character in your field include list); you must remove the colon(s) from your --include tag or remove the --smart-layout option"
+      end
+
 
       @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
       @downnest = options['downnest'] || false
@@ -231,16 +279,42 @@ module HotGlue
         raise "This controller appears to be the same as the authentication object but in this context you cannot build a new/create action; please re-run with --no-create flag"
       end
 
+      # old syntax
       @nested_args = []
+
+      # new syntax
+      # @nested_set = [
+      # {
+      #    singular: ...,
+      #    plural: ...,
+      #    optional: false
+      # }]
+      @nested_set = []
+
       if ! @nested.nil?
-        @nested_args = @nested.split("/")
+
+
+        @nested_args = @nested.split("/").collect{|x| x.gsub("~","")}
+
+        @nested_set = @nested.split("/").collect { |arg|
+          is_optional = arg.start_with?("~")
+          arg.gsub!("~","")
+          {
+            singular: arg,
+            plural: arg.pluralize,
+            optional: is_optional
+          }
+
+        }
+
+        puts "@nested_set is #{@nested_set}"
         @nested_args_plural = {}
+
+
         @nested_args.each do |a|
           @nested_args_plural[a] = a + "s"
         end
       end
-      @nestable = @nested_args.any?
-
 
       @magic_buttons = []
       if options['magic_buttons']
@@ -257,11 +331,14 @@ module HotGlue
       if @auth && ! @self_auth && @nested_args.none?
         @object_owner_sym = @auth.gsub("current_", "").to_sym
         @object_owner_eval = @auth
+        @object_owner_optional = false
       else
 
         if @nested_args.any?
-          @object_owner_sym = @nested_args.last.to_sym
-          @object_owner_eval = "@#{@nested_args.last}"
+          @object_owner_sym = @nested_set.last[:singular].to_sym
+          @object_owner_eval = "@#{@nested_set.last[:singular]}"
+          @object_owner_name = @nested_set.last[:singular]
+          @object_owner_optional = @nested_set.last[:optional]
         else
           @object_owner_sym = ""
           @object_owner_eval = ""
@@ -304,11 +381,12 @@ module HotGlue
         auth_assoc_field = auth_assoc + "_id" unless @god
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
 
-
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
         elsif ! @nested_args.any?
-          exit_message = "*** Oops: It looks like is no association from current_#{@object_owner_sym} to a class called #{@singular_class}. If your user is called something else, pass with flag auth=current_X where X is the model for your users as lowercase. Also, be sure to implement current_X as a method on your controller. (If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for auth_identifier.) To make a controller that can read all records, specify with --god."
+
+          exit_message = "*** Oops: It looks like is no association from class called #{@singular_class} to the current_#{@object_owner_sym}. If your user is called something else, pass with flag auth=current_X where X is the model for your users as lowercase. Also, be sure to implement current_X as a method on your controller. (If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for auth_identifier.) To make a controller that can read all records, specify with --god."
+          raise(HotGlue::Error, exit_message)
 
         else
 
@@ -317,6 +395,7 @@ module HotGlue
           else
             exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym}  maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n (If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.  Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag). To make a controller that can read all records, specify with --god."
           end
+
           raise(HotGlue::Error, exit_message)
         end
       end
@@ -532,11 +611,44 @@ module HotGlue
     end
 
     def path_helper_plural
-      if ! @nested
-        "#{@namespace+"_" if @namespace}#{@controller_build_folder}_path"
-      else
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
-      end
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @controller_build_folder,
+                                   nested_set: @nested_set)
+    end
+
+    def form_path_new_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @controller_build_folder,
+                                   nested_set: @nested_set,
+                                   with_params: true,
+                                   top_level: false)
+    end
+
+    def form_path_edit_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @singular,
+                                   nested_set: @nested_set,
+                                   with_params: true,
+                                   put_form: true,
+                                   top_level: true)
+    end
+
+
+    def delete_path_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @singular,
+                                   nested_set: @nested_set,
+                                   with_params: true,
+                                   put_form: true)
+    end
+
+    def edit_path_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @singular,
+                                   nested_set: @nested_set,
+                                   modifier: "edit_",
+                                   with_params: true,
+                                   put_form: true)
     end
 
     def path_arity
@@ -560,13 +672,19 @@ module HotGlue
     end
 
     def new_path_name
-      base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{@controller_build_folder_singular}_path"
-      if @nested_args.any?
-        base += "(" + @nested_args.collect { |arg|
-          "#{arg}.id"
-        }.join(", ") + ")"
-      end
-      base
+
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: singular,
+                                   nested_set: @nested_set,
+                                   modifier: "new_",
+                                   with_params: true)
+      # base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{@controller_build_folder_singular}_path"
+      # if @nested_args.any?
+      #   base += "(" + @nested_args.collect { |arg|
+      #     "#{arg}.id"
+      #   }.join(", ") + ")"
+      # end
+      # base
     end
 
     def nested_assignments
@@ -650,8 +768,11 @@ module HotGlue
 
     def magic_button_output
       @template_builder.magic_button_output(
-        path_helper_singular: path_helper_singular,
-        path_helper_args: path_helper_args,
+        path: HotGlue.optionalized_ternary(namespace: @namespace,
+                                           target: @singular,
+                                           nested_set: @nested_set,
+                                           with_params: true,
+                                           put_form: true),
         singular: singular,
         magic_buttons: @magic_buttons,
         small_buttons: @small_buttons
@@ -763,12 +884,7 @@ module HotGlue
     end
 
     def all_form_fields
-      # TODO: DRY THIS
-      if !@smart_layout
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-1"
-      else
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-2"
-      end
+      col_identifier = (@layout == "hotglue") ? "scaffold-cell" : "col-md-#{@layout_object[:columns][:size_each]}"
 
       @template_builder.all_form_fields(
         columns: @layout_object[:columns][:container],
@@ -805,6 +921,7 @@ module HotGlue
     end
 
     def all_line_fields
+      col_identifier = (@layout == "hotglue") ? "scaffold-cell" : "col-md-#{@layout_object[:columns][:size_each]}"
 
       @template_builder.all_line_fields(
         perc_width: column_width,
@@ -812,7 +929,8 @@ module HotGlue
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        layout: @layout
+        layout: @layout,
+        col_identifier: col_identifier
       )
     end
 
@@ -905,10 +1023,10 @@ module HotGlue
 
 
     def nested_for_turbo_id_list_constructor
-      if @nested_args.none?
-        ""
+      if @nested_set.any?
+        '+ (((\'__\' + nested_for) if defined?(nested_for)) || "")'
       else
-        "+ ('__' + nested_for)"
+        ""
       end
     end
 
@@ -916,9 +1034,11 @@ module HotGlue
       instance_symbol = "@" if top_level
       instance_symbol = "" if !top_level
       if @nested_args.none?
-        ""
+        "\"\""
       else
-        "__" + @nested_args.collect{|a| "#{a}-" + '#{' + instance_symbol + a + '.id}'}.join("__")
+        @nested_set.collect{|arg|
+          "(((\"__#{arg[:singular]}-\#{" + "@" + arg[:singular] + ".id}\") if @" + arg[:singular] + ") || \"\")"
+        }.join(" + ")
       end
     end
 

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

@@ -3,66 +3,61 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   include HotGlue::ControllerHelper
 
   <% unless @auth_identifier == '' || @god %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
-  <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
+  <% if any_nested? %><% nest_chain = [] %> <% @nested_set.each { |arg|
 
-    if auth_identifier == arg
+    if auth_identifier == arg[:singular]
       this_scope = auth_object
     elsif nest_chain.empty?
-      this_scope =  "#{@auth ? auth_object : class_name}.#{arg}s"
+      this_scope = "#{@auth ? auth_object : class_name}.#{arg}s"
     else
-      this_scope = "#{nest_chain.last}.#{arg}s"
+      this_scope = "#{nest_chain.last}.#{arg[:plural]}"
     end
 
      nest_chain << arg %>
-  before_action :<%= arg %>
+  before_action :<%= arg[:singular] %><%= ", if: -> { params.include?(:#{arg[:singular]}_id) }" if arg[:optional] %>
+
     <% } %><% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   after_action -> { flash.discard }, if: -> { request.format.symbol ==  :turbo_stream }
 <% if @nested_args.any? %>
-  def <%= @nested_args[0] %><% if @god
+  def <%= @nested_set[0][:singular] %><% if @god
        next_object = nil
-       collect_objects = @nested_args.reverse.collect {|x|
-           if eval("#{next_object || class_name}.reflect_on_association(:#{x})").nil?
-             raise "***** Unable to find the association `#{x}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
+       collect_objects = @nested_set.reverse.collect {|x|
+           if eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})").nil?
+             raise "***** Unable to find the association `#{x[:singular]}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
            end
-           next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x})").class_name
+           next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})").class_name
        }
        root_object = collect_objects.last
      else
-       if @nested_args[0] == @auth_identifier
+       if @nested_set[0][:singular] == @auth_identifier
          root_object = @auth
        else
-         root_object = @auth + "." + @nested_args[0] + "s"
+         root_object = @auth + "." + @nested_set[0][:plural]
        end
      end
- %><% if !@god &&  @nested_args[0] == @auth_identifier %>
-    @<%= @nested_args[0] %> ||= <%= root_object %> <% elsif !@god %>
-    @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% else %>
-    @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% end %>
+ %><% if !@god && @nested_set[0][:singular] == @auth_identifier %>
+    @<%= @nested_set[0][:singular] %> ||= <%= root_object %> <% else %>
+    @<%= @nested_set[0][:singular] %> ||= <%= root_object %>.find(params[:<%=  @nested_set[0][:singular]  %>_id])<%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %> <% end %>
   end
-  <% end %>
-  <% if any_nested? %><% nest_chain = [@nested_args[0]]; this_scope = @nested_args[0] + 's'; %> <%   @nested_args[1..-1].each { |arg|
-    this_scope =  "#{nest_chain.last}.#{arg}s"
-    nest_chain << arg
-    %>
-  def <%= arg %>
-    @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
+  <% end %><% if any_nested? %><% nest_chain = [@nested_set[0][:singular]]; this_scope = @nested_set[0][:plural]; %> <%   @nested_set[1..-1].each_with_index { |arg,index|
+    this_scope =  "#{nest_chain.last}.#{arg[:plural]}"
+    nest_chain << arg %>
+  def <%= arg[:singular] %>
+    @<%= arg[:singular] %> ||= (<%= this_scope %>.find(params[:<%= arg[:singular] %>_id])<%= " if params.include?(:#{@nested_set[index][:singular]}_id)" if @god && arg[:optional] %>)<% if @god &&  arg[:optional] %> || (<%= collect_objects[index] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
   end<% } %> <% end %> <% if !@self_auth %>
 
   def load_<%= singular_name %>
-    @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])
+    @<%= singular_name %> = (<%= object_scope.gsub("@",'') %>.find(params[:id])<%= " if params.include?(:#{@nested_set.last[:singular]}_id)" if @nested_set[0] && @nested_set[0][:optional]  %>)<% if @nested_set[0] && @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
   end
   <% else %>
   def load_<%= singular_name %>
-    @<%= singular_name %> = <%= auth_object.gsub("@",'') %>
+    @<%= singular_name %> = (<%= auth_object.gsub("@",'') %><%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %>)<% if @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
   end<% end %>
 
-  def load_all_<%= plural %>
-    <% if !@self_auth %>
-    @<%= plural_name %> = <%= object_scope.gsub("@",'') %>.page(params[:page])
-    <% else %>
-    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id) # returns iterable even though this <%= singular_name %> is anly allowed access to themselves
-    <% end %>
+  def load_all_<%= plural %> <% if !@self_auth %>
+    @<%= plural_name %> = ( <%= object_scope.gsub("@",'') %>.page(params[:page])<%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set[0] &&  @nested_set[0][:optional] %>) <% if @nested_set[0] &&  @nested_set[0][:optional] %> || <%= class_name %>.all<% end %> <% else %>
+    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id) # returns iterable even though this <%= singular_name %> is anly allowed access to themselves<% end %>
   end
 
   def index
@@ -75,7 +70,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 <% if create_action %>  def new
     <% if ! @god %>
     @<%= singular_name %> = <%= class_name  %>.new(<%= @object_owner_sym %>: <%= @object_owner_eval %>)
-   <% else %>
+   <% elsif @object_owner_optional && any_nested? %>
+    @<%= singular_name %> = <%= class_name  %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {})) <% else %>
     @<%= singular_name %> = <%= class_name  %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)
    <% end %>
     respond_to do |format|
@@ -84,7 +80,9 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if ! @object_owner_sym.empty? %>.merge!(<%= @object_owner_sym %>: <%= @object_owner_eval %> )<% end %> <%= @auth ? ', ' + @auth : '' %>)
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if ! @object_owner_sym.empty? %>.merge!(<% if @object_owner_optional && any_nested? %><%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {} <% else  %> <%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>) <% end %>)
+
+
     @<%=singular_name %> = <%= class_name %>.create(modified_params)
 
     if @<%= singular_name %>.save

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

@@ -1,7 +1,7 @@
 
 <\%= turbo_frame_tag "<%= singular %>__#{ <%= singular %>.id }" do  %>
   <div class='row scaffold-row' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
-    <\%= render partial: '<%=  show_path_partial %>', locals: { <%= singular %>: <%= singular %><%= nest_assignments_operator(false, true) if @nestable %><%= (", nested_for: \"" + @nested_args.collect{|a| a + "-" + '#{'+ a + '.id}' }.join("__") + "\"") if @nestable %> } %>
+    <\%= render partial: '<%=  show_path_partial %>', locals: { <%= singular %>: <%= singular %> }<% @nested_set.each do |nest_arg| %>.merge(defined?(<%= nest_arg[:singular] %>) ? {<%= nest_arg[:singular] %>: <%= nest_arg[:singular] %>, nested_for: "<%= nest_arg[:singular] %>-#{<%= nest_arg[:singular] %>.id}"} : {})<% end %> %>
 
   </div>
 <\% end %>

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

@@ -2,7 +2,7 @@
   <div class="<%= @container_name %> scaffold-list">
     <% unless @no_list || @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
 
-    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  @controller_build_folder + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><br /><% end %>
+    <% 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_list %>
       <% unless @no_list_labels %>
@@ -35,7 +35,10 @@
     </div>
       <\% end %>
       <\% <%= plural %>.each do |<%= singular %>| %>
-        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if  @nestable %><%= ", nested_for: nested_for" if @nestable %> } %>
+        <\%= 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") %>
+        %>
       <\% end %>
     <%=  @no_paginate ? "" : paginate %>
   <% end  %>

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

@@ -2,8 +2,8 @@
 <h3>
   New <%= singular.titlecase %>
   </h3>
-  <\%= form_with model:  <%= singular %>, url: <%= path_helper_plural %>(<%= nested_objects_arity %>), method: "post" do  |f| %>
+  <\%= form_with model:  <%= singular %>, url: <%= form_path_new_helper %>, method: :post do  |f| \%>
     <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form",
-      locals: { <%=  singular %>: <%= singular %> <%= nest_assignments_operator(false,  true)  %>, f: f} %>
+      locals: { <%=  singular %>: <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}}: {})" }.join %> \%>
   <\% end %>
 <\% end %>

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

@@ -6,14 +6,18 @@
   <% @downnest_children.each_with_index do |downnest,i| %>
 
     <% downnest_object =  eval("#{singular_class}.reflect_on_association(:#{downnest})") %>
+    <% if downnest_object.nil?; raise "no relationship for downnested portal `#{downnest}` found on `#{singular_class}`; please check relationship for has_many :#{downnest}"; end; %>
     <% downnest_class = downnest_object.class_name %>
     <% downnest_object_name = eval("#{downnest_class}.table_name") %>
     <% downnest_style =  @layout == "hotglue" ? 'style="flex-basis: ' +  each_downnest_width.to_s + '%"' : "" %>
     <div class="<%= " col-md-#{@layout_object[:portals][downnest][:size]}" if @layout == "bootstrap" %> scaffold-downnest" <%= downnest_style  %> >
   <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
-    nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if nested_for}<% end %><%= @singular %>-#{<%= @singular %>.id}",
-    <%= @singular %>: <%= @singular %><%= nest_assignments_operator(false, true) %>,
-    <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>} %>
+        <%= @singular %>: <%= @singular %>,
+        <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>
+      }
+      .merge({nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if defined?(nested_for)}<% end %><%= @singular %>-#{<%= @singular %>.id}"})
+      <%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {} )"}.join("\n") %>
+    \%>
   </div>
   <% end %>
 <% end %>
@@ -23,12 +27,12 @@
   <%= magic_button_output %>
 
   <% if destroy_action %>
-    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {data: {'<%= @ujs_syntax ? 'confirm' : 'turbo-confirm' %>': "Are you sure you want to delete #{ <%= @singular + "." + display_class %> }?"}, style: "display: inline-block;"}, method: :delete do |f| %>
+    <\%= form_with url: <%= delete_path_helper %>, html: {data: {'<%= @ujs_syntax ? 'confirm' : 'turbo-confirm' %>': "Are you sure you want to delete #{ <%= @singular + "." + display_class %> }?"}, style: "display: inline-block;"}, method: :delete do |f| %>
       <\%= f.submit "Delete".html_safe,  class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
     <\% end %>
   <% end %>
 
   <% unless @no_edit %>
-  <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary btn-sm" %>
+  <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, <%= edit_path_helper %>, <% 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,13 +1,13 @@
 <\% if @<%= singular %>.errors.none? %>
-  <\%= turbo_stream.replace "<%= plural %>-list<%= nested_for_turbo_nested_constructor %>" do %>
-  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) %>} %>
+  <\%= turbo_stream.replace "<%= 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()  %> \%>
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "<%= singular %>-new" do %>
   <\% if @<%= singular %>.errors.none? %>
-  <\%= render partial: "new_button", locals: {<%= nest_assignments_operator(true, false) %>} %>
+  <\%= render partial: "new_button", locals: {}<%=  @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {" + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> %>
   <\% else %>
-  <\%= render partial: "new_form", locals: {<%= singular %>: @<%= singular %> <%= nest_assignments_operator(true, true) %> } %>
+  <\%= render partial: "new_form", locals: {<%= singular %>: @<%= singular %>}<%=  @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {" + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> %>
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "flash_notices" do %>

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

@@ -1,3 +1,3 @@
-<\%= turbo_stream.replace "<%= plural %>-list<%= nested_for_turbo_nested_constructor %>" do %>
-  <\%= render partial: "list", locals: {<%=plural%>: @<%=plural%> <%= nested_for_assignments_constructor %> <%= nest_assignments_operator(true, true) %>}  %>
+<\%= turbo_stream.replace "<%= 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()  %> \%>
 <\% end %>

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

@@ -9,8 +9,8 @@
     <\% end %>
 
     <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>
-    <\%= form_with model: <%= "@" + singular%>, url: <%= path_helper_singular %>(<%= path_arity %>) do |f| %>
-    <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f} %>
+    <\%= form_with model: <%= "@" + singular%>, url: <%= form_path_edit_helper %> do |f| %>
+    <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
     <\% end %>
 
   </div>

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

@@ -8,7 +8,7 @@
 
   <div class="clearfix"></div>
   <\%= render partial: '<%= list_path_partial %>',
-    locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
+    locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
 
   <% if @layout == "bootstrap" %></div></div><% else  %></div><% end %>
 </div>

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

@@ -1 +1 @@
-<\%= render partial: "new_form", locals: {<%= singular %>: @<%=singular%><%= nest_assignments_operator(true,  true)  %>} %>
+<\%= render partial: "new_form", locals: {<%= singular %>: @<%=singular%>}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> %>

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

@@ -1,7 +1,7 @@
 <% if !@display_list_after_update %><\%= turbo_stream.replace "<%= singular%>__#{@<%= singular %>.id}" do %>
-  <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> <%= nest_assignments_operator(true,true) %> } %>
+  <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> }<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
 <\% end %><% else %><\%= turbo_stream.replace "<%= plural %>-list" do %>
-  <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %><%= nest_assignments_operator(true, true) if @nestable %><%= nested_for_assignments_constructor %> } \%>
+  <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
 <\% end %>
 <% end %>
 

data/lib/hotglue/version.rb

@@ -1,3 +1,5 @@
 module HotGlue
-  VERSION = '0.4.7'
+  class Version
+    CURRENT = '0.4.8.1'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,6 +67,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- README2.md
 - Rakefile
 - app/assets/config/manifest.js
 - app/helpers/hot_glue/controller_helper.rb
@@ -81,8 +82,6 @@ files:
 - lib/generators/hot_glue/layout/builder.rb
 - lib/generators/hot_glue/markup_templates/base.rb
 - lib/generators/hot_glue/markup_templates/erb.rb
-- lib/generators/hot_glue/markup_templates/haml.rb
-- lib/generators/hot_glue/markup_templates/slim.rb
 - lib/generators/hot_glue/scaffold_generator.rb
 - lib/generators/hot_glue/templates/base_controller.rb.erb
 - lib/generators/hot_glue/templates/capybara_login.rb