hot-glue 0.4.5 → 0.4.9

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,59 @@ module HotGlue
   class Error < StandardError
   end
 
+  def self.construct_downnest_object(input)
+    res = input.split(",").map { |child|
+      child_name = child.gsub("+","")
+      extra_size = child.count("+")
+      {child_name => 4+extra_size}
+    }
+    Hash[*res.collect{|hash| hash.collect{|key,value| [key,value].flatten}.flatten}.flatten]
+  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)
 
@@ -41,7 +94,10 @@ module HotGlue
     class_option :singular, type: :string, default: nil
     class_option :plural, type: :string, default: nil
     class_option :singular_class, type: :string, default: nil
-    class_option :nest, type: :string, default: ""
+    class_option :nest, type: :string, default: nil # DEPRECATED —— DO NOT USE
+    class_option :nested, type: :string, default: ""
+
+
     class_option :namespace, type: :string, default: nil
     class_option :auth, type: :string, default: nil
     class_option :auth_identifier, type: :string, default: nil
@@ -69,7 +125,10 @@ module HotGlue
     class_option :smart_layout, type: :boolean, default: false
     class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
     class_option :layout, type: :string, default: nil # if used here it will override what is in the config
+    class_option :no_list_labels, type: :boolean, default: false
+    class_option :no_list_heading, type: :boolean, default: false
 
+    class_option :before_list_labels, type: :boolean, default: false
 
     def initialize(*meta_args)
       super
@@ -140,18 +199,45 @@ module HotGlue
       end
 
       args = meta_args[0]
+
+
       @singular = args.first.tableize.singularize # should be in form hello_world
+
+
+      if @singular.include?("/")
+        @singular = @singular.split("/").last
+      end
+
       @plural = options['plural'] || @singular + "s" # supply to override; leave blank to use default
+      @namespace = options['namespace'] || nil
+
+
+      use_controller_name =  plural.titleize.gsub(" ", "")
+
+      @controller_build_name = (( @namespace.titleize.gsub(" ","") + "::" if @namespace) || "") + use_controller_name + "Controller"
+      @controller_build_folder = use_controller_name.underscore
+      @controller_build_folder_singular = singular
+
+      if ! @controller_build_folder.ends_with?("s")
+        raise "can't build with controller name #{@controller_build_folder} because it doesn't end with an 's'"
+      end
+
       @auth = options['auth'] || "current_user"
       @auth_identifier = options['auth_identifier'] || (! @god && @auth.gsub("current_", "")) || nil
 
 
-      @nest = (!options['nest'].empty? && options['nest']) || nil
-      @namespace = options['namespace'] || nil
 
-      @singular_class = @singular.titleize.gsub(" ", "")
-      @exclude_fields = []
+      if options['nest']
+        raise "STOP: the flag --nest has been replaced with --nested; please re-run using the --nested flag"
+
+      end
+
+      @nested = (!options['nested'].empty? && options['nested']) || nil
 
+      @singular_class = args.first # note this is the full class name with a model namespace
+
+
+      @exclude_fields = []
       @exclude_fields += options['exclude'].split(",").collect(&:to_sym)
 
       if !options['include'].empty?
@@ -166,7 +252,6 @@ module HotGlue
         @show_only += options['show_only'].split(",").collect(&:to_sym)
       end
 
-
       @god = options['god'] || options['gd'] || false
       @specs_only = options['specs_only'] || false
 
@@ -179,41 +264,77 @@ module HotGlue
 
       @no_edit = options['no_edit'] || false
       @no_list = options['no_list'] || false
+      @no_list_labels = options['no_list_labels'] || false
+      @no_list_heading = options['no_list_heading'] || false
 
       @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"
 
+      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
       @downnest = options['downnest'] || false
 
-      @downnest_children = []
-
+      @downnest_children = [] # TODO: defactor @downnest_children in favor of downnest_object
+      @downnest_object = {}
       if @downnest
-        @downnest_children = @downnest.split(",")
+        @downnest_children = @downnest.split(",").map{|child| child.gsub("+","")}
+        @downnest_object = HotGlue.construct_downnest_object(@downnest)
       end
 
-
       if @god
         @auth = nil
       end
 
       # when in self auth, the object is the same as the authenticated object
+
       if @auth && auth_identifier == @singular
         @self_auth = true
       end
 
+      if @self_auth && !@no_create
+        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 = []
-      if !@nest.nil?
-        @nested_args = @nest.split("/")
+
+      # new syntax
+      # @nested_set = [
+      # {
+      #    singular: ...,
+      #    plural: ...,
+      #    optional: false
+      # }]
+      @nested_set = []
+
+      if ! @nested.nil?
+
+
+        @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']
@@ -230,11 +351,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 = ""
@@ -243,20 +367,24 @@ module HotGlue
 
 
       @ujs_syntax = options['ujs_syntax']
+
       if !@ujs_syntax
         @ujs_syntax = !defined?(Turbo::Engine)
-        puts "You did not specify ujs_syntax and so I default it to #{@ujs_syntax}"
       end
       @reference_name = HotGlue.derrive_reference_name(singular_class)
 
       identify_object_owner
       setup_fields
 
+      if  (@columns - @show_only - (@object_owner_sym.empty? ? [] : [@ownership_field.to_sym])).empty?
+        @no_field_form = true
+      end
+
       buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + @magic_buttons.count
 
       builder = HotGlue::Layout::Builder.new({
                                               include_setting: options['include'],
-                                              downnest_children: @downnest_children,
+                                              downnest_object: @downnest_object,
                                               buttons_width: buttons_width,
                                               columns: @columns,
                                               smart_layout: @smart_layout
@@ -264,6 +392,7 @@ module HotGlue
       @layout_object = builder.construct
 
       @menu_file_exists = true if @nested_args.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
+
     end
 
     def identify_object_owner
@@ -271,25 +400,24 @@ module HotGlue
 
       if !@object_owner_sym.empty?
         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 !@nest
-          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."
+        elsif ! @nested_args.any?
+
+          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
-          if @god
-            exit_message= "*** Oops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
+
+          if eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s})").nil? && !eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s.singularize})").nil?
+            exit_message = "*** Oops: you tried to nest #{singular_class} within a route for `#{@object_owner_sym}` but I can't find an association for this relationship. Did you mean `#{@object_owner_sym.to_s.singularize}` (singular) instead?"
           else
-            @auth_check = eval(@auth_identifier.titleize)
-            @nested_args.each do |arg|
-              if ! @auth_check.reflect_on_association("#{arg}s".to_sym)
-                exit_message = "*** Oops:  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
-              end
-            end
+            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
-          puts exit_message
+
           raise(HotGlue::Error, exit_message)
         end
       end
@@ -316,6 +444,7 @@ module HotGlue
         @columns = @the_object.columns.map(&:name).map(&:to_sym).reject{|field| !@include_fields.include?(field) }
       end
 
+      @associations = []
       @columns.each do |col|
         if col.to_s.starts_with?("_")
           @show_only << col
@@ -325,11 +454,10 @@ module HotGlue
           if col.to_s.ends_with?("_id")
             # guess the association name label
             assoc_name = col.to_s.gsub("_id","")
-            assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
 
 
             begin
-              eval(assoc.class_name)
+              assoc_model = eval("#{singular_class}.reflect_on_association(:#{assoc_name}).active_record")
             rescue NameError => e
               exit_message = "*** Oops: The model #{singular_class} is missing an association for :#{assoc_name} or the model #{assoc_name.titlecase} doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; your model #{singular_class.titlecase} should belong_to :#{assoc_name}.  To make a controller that can read all records, specify with --god."
               puts exit_message
@@ -337,20 +465,21 @@ module HotGlue
             end
 
 
-            if assoc.nil?
+            if assoc_model.nil?
               exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
               puts exit_message
               raise(HotGlue::Error,exit_message)
             end
 
-            assoc_class = eval(assoc.class_name)
+            @associations << assoc_name.to_sym
+            assoc_class = eval(assoc_model.name)
             name_list = [:name, :to_label, :full_name, :display_name, :email]
             if name_list.collect{ |field|
               assoc_class.column_names.include?(field.to_s) ||  assoc_class.instance_methods.include?(field)
             }.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 = "\n*** 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 #{singular_class} model. TODO: Please implement just one of: \n1) name, \n2) to_label, \n3) full_name, \n4) display_name \n5) email \nYou 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
           end
@@ -369,7 +498,7 @@ module HotGlue
     def copy_controller_and_spec_files
       @default_colspan = @columns.size
       unless @specs_only
-        template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
+        template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{@controller_build_folder}_controller.rb")
         if @namespace
           begin
             eval(controller_descends_from)
@@ -406,16 +535,12 @@ module HotGlue
     end
 
     def list_column_headings
-      if @nested_args.any?
+      if @layout == "bootstrap"
+        column_width = @layout_object[:columns][:size_each]
+        col_identifier = "col-md-#{column_width}"
+      elsif @layout == "hotglue"
         column_width = each_col * @columns.count
-      else
-        column_width = 0
-      end
-
-      if !@smart_layout
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-1"
-      else
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-2"
+        col_identifier = "scaffold-cell"
       end
 
       @template_builder.list_column_headings(
@@ -473,16 +598,17 @@ module HotGlue
 
 
     def controller_class_name
-      res = ""
-      res << @namespace.titleize + "::" if @namespace
-      res << plural.titleize.gsub(" ", "") + "Controller"
-      res
+      @controller_build_name
     end
 
     def singular_name
       @singular
     end
 
+    def singular_class_name
+      @singular_class
+    end
+
     def plural_name
       plural
     end
@@ -492,7 +618,7 @@ module HotGlue
     end
 
     def path_helper_args
-      if @nested_args.any? && @nest
+      if @nested_args.any? && @nested
         [(@nested_args).collect{|a| "#{a}"} , singular].join(",")
       else
         singular
@@ -500,49 +626,88 @@ module HotGlue
     end
 
     def path_helper_singular
-      if @nest
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
+      if @nested
+        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{@controller_build_folder_singular}_path"
       else
-        "#{@namespace+"_" if @namespace}#{singular}_path"
+        "#{@namespace+"_" if @namespace}#{@controller_build_folder_singular}_path"
       end
     end
 
     def path_helper_plural
-      if ! @nest
-        "#{@namespace+"_" if @namespace}#{plural}_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
       res = ""
-      if @nested_args.any? && @nest
+      if @nested_args.any? && @nested
         res << nested_objects_arity + ", "
       end
       res << "@" + singular
     end
 
     def line_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/line"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/line"
     end
 
     def show_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/show"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/show"
     end
 
     def list_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/list"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/list"
     end
 
     def new_path_name
-      base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{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
@@ -557,7 +722,7 @@ module HotGlue
 
     def nest_assignments_operator(top_level = false, leading_comma = false)
       if @nested_args.any?
-        "#{', ' + "\n     " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
+        "#{", " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
       else
         ""
       end
@@ -626,8 +791,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
@@ -643,7 +811,7 @@ module HotGlue
 
 
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    plural, dest_filename)
+                                    @controller_build_folder, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -657,7 +825,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}",
-                                    plural, dest_filename)
+                                    @controller_build_folder, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -665,6 +833,15 @@ module HotGlue
 
         end
       end
+
+      # menu_file = "app/views#{namespace_with_dash}/menu.erb"
+      #
+      # if File.exists?(menu_file)
+      #   # TODO: can I insert the new menu item into the menu programatically here?
+      #   # not sure how i would acheive this without nokogiri
+      #
+      # end
+
     end
 
     def namespace_with_dash
@@ -730,19 +907,15 @@ 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],
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        col_identifier:  col_identifier
+        col_identifier:  col_identifier,
+        ownership_field: @ownership_field
       )
     end
 
@@ -750,6 +923,22 @@ module HotGlue
       @each_col ||= each_col
     end
 
+    def list_label
+      if(eval("#{class_name}.class_variable_defined?(:@@table_label_plural)"))
+        eval("#{class_name}.class_variable_get(:@@table_label_plural)")
+      else
+        plural.gsub("_", " ").upcase
+      end
+    end
+
+    def thing_label
+      if(eval("#{class_name}.class_variable_defined?(:@@table_label_singular)"))
+        eval("#{class_name}.class_variable_get(:@@table_label_singular)")
+      else
+        singular.gsub("_", " ").upcase
+      end
+    end
+
     def each_col
       return col_width if @columns.count == 0
       (col_width/(@columns.count)).to_i
@@ -771,6 +960,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,
@@ -778,13 +968,14 @@ module HotGlue
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        layout: @layout
+        layout: @layout,
+        col_identifier: col_identifier
       )
     end
 
     def controller_descends_from
-      if defined?(@namespace.titlecase + "::BaseController")
-        @namespace.titlecase + "::BaseController"
+      if defined?(@namespace.titlecase.gsub(" ", "") + "::BaseController")
+        @namespace.titlecase.gsub(" ", "") + "::BaseController"
       else
         "ApplicationController"
       end
@@ -871,10 +1062,19 @@ module HotGlue
 
 
     def nested_for_turbo_id_list_constructor
-      if @nested_args.none?
+      if @nested_set.any?
+        '+ (((\'__\' + nested_for) if defined?(nested_for)) || "")'
+      else
         ""
+      end
+    end
+
+
+    def n_plus_one_includes
+      if @associations.any?
+        ".includes(" + @associations.map{|x| ":#{x.to_s}"}.join(", ") + ")"
       else
-        "+ ('__' + nested_for)"
+        ""
       end
     end
 
@@ -882,9 +1082,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
 
@@ -898,7 +1100,6 @@ module HotGlue
       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)