hot-glue 0.2.9E → 0.3.9

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -55,13 +55,16 @@ module HotGlue
     class_option :no_paginate, type: :boolean, default: false
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
-    class_option :markup, type: :string, default: "erb"
     class_option :stimulus_syntax, type: :boolean, default: nil
     class_option :downnest, type: :string, default: nil
     class_option :nestable, type: :boolean, default: false
     class_option :magic_buttons, type: :string, default: nil
     class_option :display_list_after_update, type: :boolean, default: false
 
+    class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
+    class_option :layout, type: :string, default: nil # deprecated -- use in app config instead
+
+
     def initialize(*meta_args)
       super
 
@@ -69,11 +72,18 @@ module HotGlue
         @the_object = eval(class_name)
       rescue StandardError => e
         message = "*** Oops: It looks like there is no object for #{class_name}. Please define the object + database table first."
-        raise(HotGlue::Error, message)
+        puts message
+        exit
+        # raise(HotGlue::Error, message)
       end
 
-      if @specs_only && @no_specs
-        raise(HotGlue::Error, "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. sorry.")
+      if !options['spec_only'].nil? && !options['no_spec'].nil?
+        puts "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. sorry."
+      end
+
+      if !options['exclude'].empty? && !options['include'].empty?
+        puts "*** Oops: You seem to have specified both --include and --exclude. Please use one or the other. Aborting."
+        exit
       end
 
       if @stimulus_syntax.nil?
@@ -84,17 +94,36 @@ module HotGlue
         end
       end
 
-      if options['markup'] == "erb"
+      if !options['markup'].nil?
+        puts "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        exit
+      end
+
+      if !options['markup'].nil?
+        puts "Using --layout flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        exit
+      end
+
+      yaml_from_config = YAML.load(File.read("config/hot_glue.yml"))
+      @markup =  yaml_from_config[:markup]
+
+      if  @markup == "erb"
         @template_builder = HotGlue::ErbTemplate.new
-      elsif options['markup'] == "slim"
+      elsif  @markup == "slim"
         puts "SLIM IS NOT IMPLEMENTED; please see https://github.com/jasonfb/hot-glue/issues/3"
         abort
         @template_builder = HotGlue::SlimTemplate.new
 
-      elsif options['markup'] == "haml"
+      elsif  @markup == "haml"
         @template_builder = HotGlue::HamlTemplate.new
       end
-      @markup =  options['markup']
+
+
+      @layout = yaml_from_config[:layout]
+
+      if !['hotglue', 'bootstrap'].include? @layout
+        raise "Invalid option #{@layout} in Hot glue config (config/hot_glue.yml). You must pass either hotglue (default) or bootstrap to config"
+      end
 
 
       args = meta_args[0]
@@ -138,7 +167,17 @@ module HotGlue
       @display_list_after_update = options['display_list_after_update'] || false
 
 
-      @downnest_relationship = options['downnest'] || false
+
+      @col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col"
+      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
+
+      @downnest = options['downnest'] || false
+
+      @downnest_children = []
+
+      if @downnest
+        @downnest_children = @downnest.split(",")
+      end
 
 
       if @god
@@ -158,6 +197,7 @@ module HotGlue
           @nested_args_plural[a] = a + "s"
         end
       end
+      @nestable = @nested_args.any?
 
 
       @magic_buttons = []
@@ -168,7 +208,7 @@ module HotGlue
       @build_update_action = !@no_edit || !@magic_buttons.empty?
       # if the magic buttons are present, build the update action anyway
 
-      @nestable = options['nestable'] || false
+      # @nestable = options['nestable'] || false
 
       if @auth && ! @self_auth && @nested_args.none?
         @object_owner_sym = @auth.gsub("current_", "").to_sym
@@ -206,21 +246,19 @@ module HotGlue
 
         else
           if @god
-
-            exit_message= "*** Oops:  god mode could not find the association(?). something is wrong."
+            exit_message= "*** Oops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
           else
             @auth_check = "current_user"
             @nested_args.each do |arg|
 
               if !@auth_check.method("#{arg}s")
-                exit_message= "*** Oops:  your nesting chain does not have a assocation for #{arg}s on #{@auth_check}  something is wrong."
+                exit_message = "*** Oops:  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
               end
-              byebug
-              puts ""
             end
           end
+          puts exit_message
+          exit
 
-          raise(HotGlue::Error, exit_message)
         end
       end
     end
@@ -262,14 +300,18 @@ module HotGlue
               eval(assoc.class_name)
             rescue NameError => e
               exit_message = "*** Oops: The model #{singular_class} is missing an association for #{assoc_name} or the model doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; your model #{singular_class.titlecase} should have_many :#{assoc_name}s.  To make a controller that can read all records, specify with --god."
-              raise(HotGlue::Error, exit_message)
+              puts exit_message
+              exit
+              # raise(HotGlue::Error, exit_message)
 
             end
 
 
             if assoc.nil?
-              exit_message= "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-              raise(HotGlue::Error,exit_message)
+              exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+              puts exit_message
+              exit
+              # raise(HotGlue::Error,exit_message)
             end
 
             assoc_class = eval(assoc.class_name)
@@ -282,7 +324,7 @@ module HotGlue
             }.any?
               # do nothing here
             else
-              exit_message= "*** Oops: Missing a label for #{assoc.class_name.upcase}. Can't find any column to use as the display label for the #{assoc.name.to_s} association on the #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, or 5) email directly on your #{assoc.class_name.upcase} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
+              exit_message = "*** Oops: Missing a label for #{assoc.class_name.upcase}. Can't find any column to use as the display label for the #{assoc.name.to_s} association on the #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, or 5) email directly on your #{assoc.class_name.upcase} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
               raise(HotGlue::Error,exit_message)
             end
           end
@@ -299,8 +341,6 @@ module HotGlue
       nil
     end
 
-
-
     def copy_controller_and_spec_files
       @default_colspan = @columns.size
       unless @specs_only
@@ -323,7 +363,18 @@ module HotGlue
     end
 
     def list_column_headings
-      @template_builder.list_column_headings(columns: @columns)
+      if @nested_args.any?
+        column_width = each_col * @columns.count
+
+        "<div class='#{@col_identifier}'  style='flex-basis: #{column_width}%'>"
+      else
+        @template_builder.list_column_headings(
+          column_width: each_col,
+          columns: @columns,
+          col_identifier: @col_identifier
+        )
+      end
+
 
     end
 
@@ -396,7 +447,7 @@ module HotGlue
     end
 
     def path_helper_args
-      if @nested_args.any? && @nestable
+      if @nested_args.any? && @nest
         [(@nested_args).collect{|a| "#{a}"} , singular].join(",")
       else
         singular
@@ -404,7 +455,7 @@ module HotGlue
     end
 
     def path_helper_singular
-      if @nestable
+      if @nest
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
       else
         "#{@namespace+"_" if @namespace}#{singular}_path"
@@ -412,7 +463,7 @@ module HotGlue
     end
 
     def path_helper_plural
-      if ! @nestable
+      if ! @nest
         "#{@namespace+"_" if @namespace}#{plural}_path"
       else
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
@@ -421,7 +472,7 @@ module HotGlue
 
     def path_arity
       res = ""
-      if @nested_args.any? && @nestable
+      if @nested_args.any? && @nest
         res << nested_objects_arity + ", "
       end
       res << "@" + singular
@@ -461,7 +512,7 @@ module HotGlue
 
     def nest_assignments_operator(top_level = false, leading_comma = false)
       if @nested_args.any?
-        "#{', ' if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
+        "#{', ' + "\n     " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
       else
         ""
       end
@@ -487,7 +538,12 @@ module HotGlue
           "@" + @nested_args.last + ".#{plural}"
         end
       else
-        @singular_class
+        if @nested_args.none?
+          @singular_class
+        else
+          "@" + @nested_args.last + ".#{plural}"
+        end
+
       end
     end
 
@@ -553,8 +609,10 @@ module HotGlue
         formats.each do |format|
           source_filename = cc_filename_with_extensions("#{@markup}/#{view}", "#{@markup}")
           dest_filename = cc_filename_with_extensions("#{view}", "#{@markup}")
+
+
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    controller_file_path, dest_filename)
+                                    plural, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -568,7 +626,7 @@ module HotGlue
           source_filename = cc_filename_with_extensions( "#{@markup}/#{view}.turbo_stream.#{@markup}")
           dest_filename = cc_filename_with_extensions("#{view}", "turbo_stream.#{@markup}")
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    controller_file_path, dest_filename)
+                                    plural, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -626,20 +684,48 @@ module HotGlue
     end
 
     def all_form_fields
+
       @template_builder.all_form_fields(
         columns: @columns,
         show_only: @show_only,
         singular_class: singular_class,
-        singular: singular
+        singular: singular,
+        col_identifier:  @col_identifier
       )
     end
 
+    def column_width
+      @each_col ||= each_col
+    end
+
+    def each_col
+      (col_width/@columns.count).to_i
+    end
+
+    def col_width
+      downnest_size = case (@downnest_children.count)
+
+                      when 0
+                        downnest_size = 0
+                      when 1
+                        downnest_size = 40
+
+                      else
+                        downnest_size = 60
+
+                      end
+      100 - downnest_size - 5
+    end
+
     def all_line_fields
+
       @template_builder.all_line_fields(
+        perc_width: column_width,
         columns: @columns,
         show_only: @show_only,
         singular_class: singular_class,
-        singular: singular
+        singular: singular,
+        layout: @layout
       )
     end
 
@@ -710,8 +796,16 @@ module HotGlue
 
     def controller_magic_button_update_actions
       @magic_buttons.collect{ |magic_button|
-        "    @#{singular}.#{magic_button}! if #{singular}_params[:#{magic_button}]"
-        }.join("\n")
+        "    begin
+      if #{singular}_params[:#{magic_button}]
+        res = @#{singular}.#{magic_button}!
+        res = \"#{magic_button.titleize}ed.\" if res === true
+        flash[:notice] = (flash[:notice] || \"\") <<  (res ? res + \" \" : \"\")
+      end
+    rescue ActiveRecord::RecordInvalid => e
+      @#{singular}.errors.add(:base, e.message)
+      flash[:alert] = (flash[:alert] || \"\") << 'There was ane error #{magic_button}ing your #{@singular}: '
+    end" }.join("\n") + "\n"
     end
 
     def controller_update_params_tap_away_magic_buttons
@@ -720,6 +814,36 @@ module HotGlue
       }.join("")
     end
 
+
+    def nested_for_turbo_id_list_constructor
+      if @nested_args.none?
+        ""
+      else
+        "+ ('__' + nested_for)"
+      end
+    end
+
+    def nested_for_turbo_nested_constructor(top_level = true)
+      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("__")
+      end
+    end
+
+    def nested_for_assignments_constructor(top_level = true)
+      instance_symbol = "@" if top_level
+      instance_symbol = "" if !top_level
+      if @nested_args.none?
+        ""
+      else
+        ", \n    nested_for: \"" + @nested_args.collect{|a| "#{a}-" + '#{' + instance_symbol + a + ".id}"}.join("__") + "\""
+      end
+    end
+
+
     private # thor does something fancy like sending the class all of its own methods during some strange run sequence
     # does not like public methods
     def cc_filename_with_extensions(name, file_format = format)

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

@@ -15,17 +15,37 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   # TODO: implement current_user or use Devise
 <% end %>
 
-  <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
-    if !@god
-      this_scope = nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
-    else
-      this_scope = eval(class_name + ".reflect_on_association(:#{arg})").class_name
-    end
+  <% if @nested_args.any? %>
+  def <%= @nested_args[0] %>
+    <% 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?"
+         end
+         next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x})").class_name
+     }
+     root_object = collect_objects.last
+     else
+       root_object = @auth + "." + @nested_args[0] + "s"
+     end
+
+     %>
+    <% if !@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 %>
+  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<% } %><% end %>
+  end<% } %>
+
+  <% end %>
+
 
 <% if !@self_auth %>
   def load_<%= singular_name %>
@@ -37,8 +57,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def load_all_<%= plural %>
-    <% if !@self_auth %>@<%= plural_name %> = <%= object_scope.gsub("@",'') %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
-    <% else %>@<%= plural_name %> = [<%= auth_object %>]<% end %>
+    @<%= plural_name %> = <%= object_scope.gsub("@",'') %>.page(params[:page])
   end
 
   def index
@@ -92,12 +111,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
-<%= controller_magic_button_update_actions %>
-
-    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>)
-      flash[:notice] = "Saved #{@<%= singular %>.<%= display_class %>}"
+<%= controller_magic_button_update_actions %>    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>)
+      flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
     else
-      flash[:alert] = "<%= singular_name.titlecase %> could not be saved."
+      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved."
+
     end
 <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
     respond_to do |format|
@@ -117,9 +135,9 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       format.turbo_stream
       format.html { redirect_to <%= path_helper_plural %> }
     end
-  end
+  end<% end %>
 
-<% end %>def <%=singular_name%>_params
+  def <%=singular_name%>_params
     params.require(:<%=singular_name%>).permit( <%= @columns + @magic_buttons.collect(&:to_sym) %> )
   end
 
@@ -130,10 +148,6 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   def namespace
     <% if @namespace %>"<%= @namespace %>/" <% else %>""<% end %>
   end
-
-  def common_scope
-    @nested_args
-  end
 end
 
 

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

@@ -1,7 +1,7 @@
 <div class="row">
   <%= all_form_fields %>
 
-  <div class="col">
+  <div class="<% @layout == "hotglue" ? 'scaffold-cell' : 'col' %>">
     <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>
   </div>

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

@@ -1,7 +1,8 @@
 
 <\%= turbo_frame_tag "<%= singular %>__#{ <%= singular %>.id }" do  %>
-  <div class='row' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
-    <\%= render partial: '<%=  show_path_partial %>', locals: { <%= singular %>: <%= singular %><%= nest_assignments_operator(false, true) if @nestable %> } %>
+  <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 %> } %>
+
   </div>
 <\% end %>
 

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

@@ -1,27 +1,42 @@
-<\%= turbo_frame_tag "<%= plural %>-list" do %>
-  <div class="container-fluid ">
-    <h4><%= plural.gsub("_", " ").upcase %></h4>
-    <div class="row">
-      <div class="col-md-12">
-        <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><% end %>
-      </div>
-    </div>
+<\%= turbo_frame_tag "<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
+  <div class="<%= @container_name %> scaffold-list">
+    <% unless @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
+
+    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><% end %>
 
 
-    <div class="row">
+    <div class="row scaffold-row">
       <%= list_column_headings %>
-      <div class='col buttons-col'></div>
+      <% if @downnest_children.any? %>
+        <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
+        <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width +  '%;' : "" %>
+
+        <% @downnest_children.each do |downnest| %>
+        <div class="<%= @col_identifer %> scaffold-col-heading<%= ' col-md-3' if @layout=="bootstrap" %>" <%= downnest_column_style %>>
+          <h4>
+            <%=  downnest.titleize  %>
+          </h4>
+        </div>
+      <% end %>
+      <% end %>
+
+      <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
+
+      <div class='<%= @col_identifer %> scaffold-col-heading scaffold-col-heading-buttons<%= ' col-md-2' if @layout=="bootstrap" %>' <%= button_column_style %>>
+
+      </div>
     </div>
 
       <\% if <%= plural %>.empty? %>
-        <div>
-            None
-        </div>
+    <div>
+        None
+    </div>
       <\% end %>
       <\% <%= plural %>.each do |<%= singular %>| %>
-        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if  @nestable %> } %>
+        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if  @nestable %><%= ", nested_for: nested_for" if @nestable %> } %>
       <\% end %>
 
     <%=  @no_paginate ? "" : paginate %>
+    </div>
   </div>
 <\% end %>

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

@@ -1,3 +1,5 @@
 <\%= turbo_frame_tag "<%= singular %>-new" do %>
-  <\%= link_to "New <%= singular.titlecase %>",  <%= new_path_name %>, disable_with: "Loading...", class: "new-<%= singular %>-button btn btn-primary pull-right" %>
+  <div>
+    <\%= link_to "New <%= singular.titlecase %>",  <%= new_path_name %>, disable_with: "Loading...", class: "new-<%= singular %>-button btn btn-primary pull-right <%= 'btn-sm' if @nested_args.any? %> " %>
+  </div>
 <\% end %>

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

@@ -1,17 +1,25 @@
 <%= all_line_fields %>
 
-<% if @downnest_relationship %>
-  <div class="col">
-  <\%= render partial: "dashboard/<%= @downnest_relationship %>/list", locals: {
-  <%= @singular %>: <%= @singular %>,
-  <%= @downnest_relationship %>: <%= @singular %>.<%= @downnest_relationship %>} %>
+<% if @downnest_children.any? %>
+  <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
+
+  <% @downnest_children.each do |downnest| %>
+
+    <% downnest_style =  @layout == "hotglue" ? 'style="flex-basis: ' +  each_downnest_width + '%"' : "" %>
+  <div class="<%= @col_identifier %><%= ' col-md-3' if @layout == "bootstrap" %> scaffold-downnest" <%= downnest_style  %> >
+  <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest %>/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 %>: <%= @singular %>.<%= downnest %>} %>
   </div>
+  <% end %>
 <% end %>
 
-<div class="col">
+<% button_style = @layout == "hotglue" ? 'style="flex-basis: ' +  (100 - (column_width * @columns.count)).floor.to_s +  '%;"' : "" %>
+<div class="<%= @col_identifier %> scaffold-line-buttons <%= ' col-md-2' if @layout == "bootstrap" %>" <%= button_style %>>
   <% if destroy_action %>
-    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), method: :delete do |f| %>
-      <\%= f.submit "Delete".html_safe, data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary " %>
+    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {style: "display: inline-block;"}, method: :delete do |f| %>
+      <\%= f.submit "Delete".html_safe,  data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
     <\% end %>
   <% end %>
 
@@ -19,6 +27,6 @@
   <%= magic_button_output %>
 
   <% 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 " %>
+  <\%= 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" %>
   <% end %>
 </div>

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

@@ -1,6 +1,6 @@
 <\% if @<%= singular %>.errors.none? %>
-  <\%= turbo_stream.replace "<%= plural %>-list" do %>
-  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %> <%= nest_assignments_operator(true, true) %>} %>
+  <\%= 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) %>} %>
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "<%= singular %>-new" do %>

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

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

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

@@ -5,7 +5,7 @@
   <div class="cell editable" style="position: relative;">
 
     <\% if @<%= singular %>.errors.any? %>
-      <\%= render(partial: "#{controller.namespace}errors", locals: {resource: @<%= singular %> }) %>
+      <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: @<%= singular %> }) %>
     <\% end %>
 
     <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>

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

@@ -1,9 +1,12 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="clearfix"></div>
-      <\%= render partial: '<%= list_path_partial %>',
-              locals: {<%= plural %>: @<%= plural %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
-    </div>
-  </div>
+<div class="<%= @container_name %>">
+  <% if @layout == "bootstrap" %><div class="row"> <div class="col-md-12">
+  <% else %>
+    <div class=' scaffold-index-<%= plural %>'>
+  <% end %>
+
+  <div class="clearfix"></div>
+  <\%= render partial: '<%= list_path_partial %>',
+    locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
+
+  <% if @layout == "bootstrap" %></div></div><% else  %></div><% end %>
 </div>