hot-glue 0.5.6 → 0.5.8

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -121,6 +121,7 @@ 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 :update_show_only, type: :string, default: ""
 
     class_option :ujs_syntax, type: :boolean, default: nil
     class_option :downnest, type: :string, default: nil
@@ -133,19 +134,24 @@ module HotGlue
     class_option :hawk, type: :string, default: nil
     class_option :with_turbo_streams, type: :boolean, default: false
 
-    class_option :no_list_label, type: :boolean, default: false
+    class_option :label, default: nil
+    class_option :list_label_heading, default: nil
+    class_option :new_button_label, default: nil
+    class_option :new_form_heading, default: nil
 
+    class_option :no_list_label, type: :boolean, default: false
     class_option :no_list_heading, type: :boolean, default: false
 
-
     # determines if the labels show up BEFORE or AFTER on the NEW/EDIT (form)
     class_option :form_labels_position, type: :string, default: 'after' #  choices are before, after, omit
     class_option :form_placeholder_labels, type: :boolean,  default: false # puts the field names into the placeholder labels
 
-
-    # NOT YET IMPLEMENTED
     # determines if labels appear within the rows of the VIEWABLE list (does NOT affect the list heading)
     class_option :inline_list_labels, default: 'omit' # choices are before, after, omit
+    class_option :factory_creation, default: ''
+    class_option :alt_foreign_key_lookup, default: '' #
+
+
 
     def initialize(*meta_args)
       super
@@ -259,8 +265,9 @@ module HotGlue
 
       if !options['include'].empty?
         @include_fields = []
+
         # semicolon to denote layout columns; commas separate fields
-        @include_fields += options['include'].gsub(":","").split(",").collect(&:to_sym)
+        @include_fields += options['include'].split(":").collect{|x|x.split(",")}.flatten.collect(&:to_sym)
       end
 
 
@@ -269,6 +276,13 @@ module HotGlue
         @show_only += options['show_only'].split(",").collect(&:to_sym)
       end
 
+      @update_show_only = []
+      if !options['update_show_only'].empty?
+        @update_show_only += options['update_show_only'].split(",").collect(&:to_sym)
+      end
+
+
+
       @god = options['god'] || options['gd'] || false
       @specs_only = options['specs_only'] || false
 
@@ -404,6 +418,8 @@ module HotGlue
       identify_object_owner
       setup_hawk_keys
 
+      @factory_creation = options['factory_creation'].gsub(";", "\n")
+
 
 
       # SETUP FIELDS & LAYOUT
@@ -421,15 +437,66 @@ module HotGlue
                                               smart_layout: @smart_layout )
       @layout_object = builder.construct
 
-      @menu_file_exists = true if @nested_set.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
+      @menu_file_exists = true if @nested_set.none? && File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
 
       @turbo_streams = !!options['with_turbo_streams']
+
+
+      # syntax should be xyz_id{xyz_email},abc_id{abc_email}
+      # instead of a drop-down for the foreign entity, a text field will be presented
+      # You must ALSO use a factory that contains a parameter of the same name as the 'value' (for example, `xyz_email`)
+
+      alt_lookups_entry = options['alt_foreign_key_lookup'].split(",")
+      @alt_lookups = {}
+      @alt_foreign_key_lookup = alt_lookups_entry.each do |setting|
+        setting =~ /(.*){(.*)}/
+        key, lookup_as = $1, $2
+        assoc = eval("#{class_name}.reflect_on_association(:#{key.to_s.gsub("_id","")}).class_name")
+
+        data = {lookup_as: lookup_as.gsub("+",""),
+                assoc: assoc,
+                with_create: lookup_as.include?("+")}
+        @alt_lookups[key] = data
+      end
+
+      puts "------ ALT LOOKUPS for #{@alt_lookups}"
+
+      @update_alt_lookups = @alt_lookups.collect{|key, value|
+                                              @update_show_only.include?(key) ?
+                                                    {  key: value }
+                                                      : nil}.compact
+
+      @label = options['label'] || ( eval("#{class_name}.class_variable_defined?(:@@table_label_singular)") ? eval("#{class_name}.class_variable_get(:@@table_label_singular)") :  singular.gsub("_", " ").titleize )
+      @list_label_heading =  options['list_label_heading'] || ( eval("#{class_name}.class_variable_defined?(:@@table_label_plural)") ? eval("#{class_name}.class_variable_get(:@@table_label_plural)") : plural.gsub("_", " ").upcase )
+
+      @new_button_label = options['new_button_label'] || ( eval("#{class_name}.class_variable_defined?(:@@table_label_singular)") ? "New " + eval("#{class_name}.class_variable_get(:@@table_label_singular)") : "New " + singular.gsub("_", " ").titleize )
+      @new_form_heading = options['new_form_heading'] || "New #{@label}"
     end
 
+
+    def fields_filtered_for_email_lookups
+      @columns.reject{|c| @alt_lookups.keys.include?(c) } + @alt_lookups.values.map{|v| ("__lookup_#{v[:lookup_as]}").to_sym}
+    end
+
+
+    def creation_syntax
+
+      merge_with = @alt_lookups.collect{ |key, data|
+        "#{data[:assoc].downcase}: #{data[:assoc].downcase}_factory.#{data[:assoc].downcase}"
+      }.join(", ")
+
+      if @factory_creation == ''
+        "@#{singular_name } = #{ class_name }.create(modified_params)"
+      else
+        "#{@factory_creation}\n" +
+        "    @#{singular_name } = #{ class_name }.create(modified_params#{'.merge(' + merge_with + ')' if !merge_with.empty?})"
+      end
+    end
+    
     def setup_hawk_keys
       @hawk_keys = {}
 
-      if options['hawk']
+      if options["hawk"]
         options['hawk'].split(",").each do |hawk_entry|
           # format is: abc_id[thing]
 
@@ -443,7 +510,9 @@ module HotGlue
 
           hawk_scope = key.gsub("_id", "").pluralize
           @hawk_keys[key.to_sym] = [hawk_to]
-          if @use_shorthand # only include the hawk scope if using the shorthand
+          use_shorthand = !options["hawk"].include?("{")
+
+          if use_shorthand # only include the hawk scope if using the shorthand
             @hawk_keys[key.to_sym] << hawk_scope
           end
         end
@@ -496,6 +565,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?("_")
@@ -571,9 +641,9 @@ module HotGlue
       end
 
       unless @no_specs
-        dest_file = File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
+        dest_file = File.join("#{'spec/dummy/' if Rails.env.test?}spec/features#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
 
-        if  File.exists?(dest_file)
+        if  File.exist?(dest_file)
           existing_file = File.open(dest_file)
           existing_content = existing_file.read
           if existing_content =~ /\#HOTGLUE-SAVESTART/
@@ -589,17 +659,36 @@ module HotGlue
           @existing_content = "  #HOTGLUE-SAVESTART\n  #HOTGLUE-END"
         end
 
+
         template "system_spec.rb.erb", dest_file
       end
 
       template "#{@markup}/_errors.#{@markup}", File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}", "_errors.#{@markup}")
     end
 
+    def spec_foreign_association_merge_hash
+      ", #{testing_name}: #{testing_name}1"
+    end
+
+    def spec_related_column_lets
+      (@columns - @show_only).map { |col|
+        type = eval("#{singular_class}.columns_hash['#{col}']").type
+        if (type == :integer && col.to_s.ends_with?("_id") || type == :uuid)
+          assoc = "#{col.to_s.gsub('_id','')}"
+          the_foreign_class = eval(@singular_class + ".reflect_on_association(:" + assoc + ")").class_name.split("::").last.underscore
+          hawk_keys_on_lets = (@hawk_keys["#{assoc}_id".to_sym] ? ", #{@auth.gsub('current_', '')}: #{@auth}": "")
+
+          "  let!(:#{assoc}1) {create(:#{the_foreign_class}" +  hawk_keys_on_lets + ")}"
+        end
+      }.compact.join("\n")
+    end
+
     def list_column_headings
       @template_builder.list_column_headings(
         columns: @layout_object[:columns][:container],
         col_identifier: @layout_strategy.column_classes_for_column_headings,
-        column_width: @layout_strategy.column_width
+        column_width: @layout_strategy.column_width,
+        singular: @singular
       )
     end
 
@@ -622,11 +711,13 @@ module HotGlue
 
 
     def regenerate_me_code
-      "rails generate hot_glue:scaffold #{ @meta_args[0][0] } #{@meta_args[1].join(" ")}"
+      "rails generate hot_glue:scaffold #{ @meta_args[0][0] } #{@meta_args[1].collect{|x| x.gsub(/\s*=\s*([\S\s]+)/, '=\'\1\'')}.join(" ")}"
     end
 
     def object_parent_mapping_as_argument_for_specs
-      if @nested_set.any?
+      if @self_auth
+        ""
+      elsif @nested_set.any?
         ", " + @nested_set.last[:singular] + ": " + @nested_set.last[:singular]
       elsif @auth
         ", #{@auth_identifier}: #{@auth}"
@@ -640,7 +731,7 @@ module HotGlue
       end
 
       @nested_set.each do |arg|
-        res << "  let(:#{arg[:singular]}) {create(:#{arg[:singular]} #{last_parent} )}\n"
+        res << "let(:#{arg[:singular]}) {create(:#{arg[:singular]} #{last_parent} )}\n"
         last_parent = ", #{arg[:singular]}: #{arg[:singular]}"
       end
       res
@@ -661,7 +752,7 @@ module HotGlue
     end
 
     def testing_name
-      singular_class_name.gsub("::","_").downcase
+      singular_class_name.gsub("::","_").underscore
     end
 
     def singular_class_name
@@ -676,8 +767,8 @@ module HotGlue
       @auth_identifier
     end
 
-    def test_capybara_block
-      (@columns - @show_only).map { |col|
+    def test_capybara_block(which_partial = :create)
+      (@columns - (which_partial == :create ? @show_only : (@update_show_only+@show_only))).map { |col|
         type = eval("#{singular_class}.columns_hash['#{col}']").type
         case type
         when :date
@@ -692,16 +783,17 @@ module HotGlue
             '      ' + "find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
 
         when :integer
-
           if col.to_s.ends_with?("_id")
-            assoc = col.to_s.gsub('_id','')
-            "      #{col}_selector = find(\"[name='#{singular}[#{col}]']\").click \n" +
-              "      #{col}_selector.first('option', text: #{assoc}1.name).select_option"
+            capybara_block_for_association(col_name: col, which_partial: which_partial)
           else
             "      new_#{col} = rand(10) \n" +
-              "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
-
+            "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
           end
+        when :float
+          "      " + "new_#{col} = rand(10) \n" +
+            "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+        when :uuid
+          capybara_block_for_association(col_name: col, which_partial: which_partial)
 
         when :enum
           "      list_of_#{col.to_s} = #{singular_class}.defined_enums['#{col.to_s}'].keys \n" +
@@ -709,17 +801,21 @@ module HotGlue
             '      find("select[name=\'' + singular + '[' + col.to_s + ']\']  option[value=\'#{new_' + col.to_s + '}\']").select_option'
 
         when :boolean
-          "     new_#{col} = rand(2).floor \n" +
-            "     find(\"[name='#{testing_name}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
+          "      new_#{col} = 1 \n" +
+            "      find(\"[name='#{testing_name}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
         when :string
-          if col.to_s.include?("email")
-            "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
-              "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
-
-          else
-            "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
-              "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
-          end
+          faker_string =
+            if col.to_s.include?('email')
+              "FFaker::Internet.email"
+            elsif  col.to_s.include?('domain')
+              "FFaker::Internet.domain_name"
+            elsif col.to_s.include?('ip_address') || col.to_s.ends_with?('_ip')
+              "FFaker::Internet.ip_v4_address"
+            else
+              "FFaker::Movie.title"
+            end
+            "      " + "new_#{col} = #{faker_string} \n" +
+            "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
         when :text
           "      " + "new_#{col} = FFaker::Lorem.paragraphs(1).join("") \n" +
             "      find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
@@ -729,6 +825,20 @@ module HotGlue
     end
 
 
+    def capybara_block_for_association(col_name: nil , which_partial: nil )
+      assoc = col_name.to_s.gsub('_id','')
+      if which_partial == :update && @update_show_only.include?(col_name)
+        # do not update tests
+      elsif @alt_lookups.keys.include?(col_name.to_s)
+        lookup = @alt_lookups[col_name.to_s][:lookup_as]
+        "      find(\"[name='#{singular}[__lookup_#{lookup}]']\").fill_in( with: #{assoc}1.#{lookup} )"
+      else
+        "      #{col_name}_selector = find(\"[name='#{singular}[#{col_name}]']\").click \n" +
+          "      #{col_name}_selector.first('option', text: #{assoc}1.name).select_option"
+      end
+    end
+
+
     def path_helper_args
       if @nested_set.any? && @nested
         [(@nested_set).collect{|a| "#{a[:singular]}"} , singular].join(",")
@@ -911,7 +1021,7 @@ module HotGlue
 
 
     def include_nav_template
-      File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}")
+      File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}")
     end
 
     def copy_view_files
@@ -948,7 +1058,7 @@ module HotGlue
 
       # menu_file = "app/views#{namespace_with_dash}/menu.erb"
       #
-      # if File.exists?(menu_file)
+      # if File.exist?(menu_file)
       #   # TODO: can I insert the new menu item into the menu programatically here?
       #   # not sure how i would achieve this without nokogiri
       #
@@ -1004,9 +1114,11 @@ module HotGlue
 
       unless @no_edit
         res << 'edit'
-        res << '_form'
       end
 
+      if !( @no_edit && @no_create)
+          res << '_form'
+      end
       res
     end
 
@@ -1041,35 +1153,28 @@ module HotGlue
       []
     end
 
-    def all_form_fields
+    def form_fields_html
       @template_builder.all_form_fields(
         columns: @layout_object[:columns][:container],
         show_only: @show_only,
+        update_show_only: @update_show_only,
         singular_class: singular_class,
         singular: singular,
         hawk_keys: @hawk_keys,
         col_identifier:  @layout_strategy.column_classes_for_form_fields,
         ownership_field: @ownership_field,
         form_labels_position: @form_labels_position,
-        form_placeholder_labels: @form_placeholder_labels
+        form_placeholder_labels: @form_placeholder_labels,
+        alt_lookups: @alt_lookups
       )
     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
+      @list_label_heading
     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
+    def new_thing_label
+      @new_thing_label
     end
 
     def all_line_fields
@@ -1155,12 +1260,18 @@ module HotGlue
      }.join("\n") + "\n"
     end
 
+
     def controller_update_params_tap_away_magic_buttons
       @magic_buttons.collect{ |magic_button|
-        ".tap{ |ary| ary.delete('#{magic_button}') }"
+        ".tap{ |ary| ary.delete('__#{magic_button}') }"
       }.join("")
     end
 
+    def controller_update_params_tap_away_alt_lookups
+      @alt_lookups.collect{ |key, data|
+        ".tap{ |ary| ary.delete('__lookup_#{data[:lookup_as]}') }"
+      }.join("")
+    end
 
     def nested_for_turbo_id_list_constructor
       if @nested_set.any?
@@ -1207,9 +1318,10 @@ module HotGlue
     end
 
     def hawk_to_ruby
-      @hawk_keys.collect{ |k,v|
-        "#{k}: [#{v[0]}, \"#{v[1]}\"] "
+      res = @hawk_keys.collect{ |k,v|
+        "#{k}: [#{v[0]}, \"#{v[1]}\"]"
       }.join(", ")
+      res
     end
   end
 end

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

@@ -5,8 +5,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   helper :hot_glue
   include HotGlue::ControllerHelper
 
-  <% unless @auth_identifier == '' || @god %>before_action :<%= auth_root %><% end %>
-  <% if any_nested? %><% nest_chain = [] %> <% @nested_set.each { |arg|
+  <% unless @auth_identifier == '' || @god %>before_action :<%= auth_root %><% end %><% if any_nested? %>
+    <% nest_chain = [] %> <% @nested_set.each { |arg|
 
     if auth_identifier == arg[:singular]
       this_scope = auth_object
@@ -17,13 +17,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     end
 
      nest_chain << arg %>
-  before_action :<%= arg[:singular] %><%= ", if: -> { params.include?(:#{arg[:singular]}_id) }" if arg[:optional] %>
-
-    <% } %><% end %>
+  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_set.any? %>
-  def <%= @nested_set[0][:singular] %><% if @god
+  after_action -> { flash.discard }, if: -> { request.format.symbol == :turbo_stream }
+  <% if @nested_set.any? %>def <%= @nested_set[0][:singular] %><% if @god
        next_object = nil
        collect_objects = @nested_set.reverse.collect {|x|
            if eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})").nil?
@@ -39,9 +36,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
          root_object = @auth + "." + @nested_set[0][:plural]
        end
      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 %>
+ %><% 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_set[0][:singular]]; this_scope = @nested_set[0][:plural]; %>
     <%   for index in 0..(@nested_set.count - 1) do
@@ -54,18 +52,18 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   def <%= arg[:singular] %>
     @<%= arg[:singular] %> ||= (<%= this_scope %>.find(params[:<%= arg[:singular] %>_id])<%= " if params.include?(:#{last_arg[:singular]}_id)" if last_arg && @god && last_arg[:optional] %>)
       <% if @god && last_arg && (last_arg[:optional] ) %>@<%= arg[:singular] %> ||=  (<%=  collect_objects[index-1] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
-  end<% end %>
-    <% end %><% end %> <% if !@self_auth %>
+  end<% end %><% end %><% end %> <% if !@self_auth %>
   def load_<%= singular_name %>
-    @<%= 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 %>
+    @<%= 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("@",'') %><%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set.any? && @nested_set[0][:optional] %>)<% if @nested_set.any? && @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])<%= n_plus_one_includes %><%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set.any? && @nested_set[0] &&  @nested_set[0][:optional] %>) <% if @nested_set[0] &&  @nested_set[0][:optional] %> || <%= class_name %>.all<% end %> <% else %>
+  def load_all_<%= plural %><% if !@self_auth %>
+    @<%= plural_name %> = <%= object_scope.gsub("@",'') %>.page(params[:page])<%= n_plus_one_includes %><%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set.any? && @nested_set[0] &&  @nested_set[0][:optional] %><% if @nested_set[0] &&  @nested_set[0][:optional] %>
+    @<%= plural_name %> = <%= class_name %>.all<% end %><% else %>
     @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %> # returns iterable even though this <%= singular_name %> is only allowed access to themselves<% end %>
   end
 
@@ -73,19 +71,20 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     load_all_<%= plural %>
   end
 
-<% if create_action %>  def new <% if @object_owner_sym %>
-    @<%= singular_name %> = <%= class_name  %>.new(<%  if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>) <% elsif @object_owner_optional && any_nested? %>
-    @<%= singular_name %> = <%= class_name  %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {})) <% else %>
+<% if create_action %>  def new<% if @object_owner_sym %>
+    @<%= singular_name %> = <%= class_name  %>.new(<%  if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% 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 %>
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.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 %>)
-<% if @hawk_keys.any? %>    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
-
-    @<%=singular_name %> = <%= class_name %>.create(modified_params)
-
+<% if @alt_lookups.any? %><%= @alt_lookups.collect{|key, data|
+    "    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"
+       }.join("/n") %><% end %> <% merge_lookups = @alt_lookups.collect{|key, data| "#{key.gsub("_id", "")}: #{key.gsub("_id", "")}" }.join(",") %>
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %><% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.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 %>)<%= ".merge(#{merge_lookups})" if !merge_lookups.empty? %><% if @hawk_keys.any? %>
+    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
+    <%= creation_syntax %>
     if @<%= singular_name %>.save
       flash[:notice] = "Successfully created #{@<%= singular %>.<%= display_class %>}"
       load_all_<%= plural %>
@@ -102,9 +101,22 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
-    modified_params = modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %><% if @hawk_keys.any? %>
-    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
-      <%= controller_magic_button_update_actions %>
+<% if @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.any? %><%= @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.collect{|key, data|
+    "    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"
+       }.join("\n") %><% end %> <% merge_lookups = @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.collect{|key, data| "#{key.gsub("_id", "")}: #{key.gsub("_id", "")}" }.join(",") %>
+    <% @magic_buttons.each { |button| %>@<%= singular_name %>.<%= button %>! if <%= singular_name %>_params[:__<%= button %>]
+    <% } %>
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.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 %>)<%= controller_update_params_tap_away_alt_lookups  %><%= controller_update_params_tap_away_magic_buttons %><%= ".merge(#{merge_lookups})" if !merge_lookups.empty? %>
+
+    <% if @hawk_keys.any? %>    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
+<% if @alt_lookups.any? %><%= @alt_lookups.collect{|key, data|
+    unless @factory_creation.include?("#{data[:assoc].downcase} = ")
+"    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"
+    end
+   }.join("/n") %><% end %><% if (@update_alt_lookups).any? %>
+      <%= @update_alt_lookups.collect{|key, data|
+   "    @#{ singular_name }.#{key.gsub("_id", "")} = #{key.gsub("_id", "")}"
+   }.join("/n") %><% end %>
     if @<%= singular_name %>.update(modified_params)
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
       flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
@@ -120,17 +132,17 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     begin
       @<%=singular_name%>.destroy
     rescue StandardError => e
-      flash[:alert] = "<%= singular_name.titlecase %> could not be deleted."
+      flash[:alert] = '<%= singular_name.titlecase %> could not be deleted.'
     end
     load_all_<%= plural %>
   end<% end %>
 
   def <%=singular_name%>_params
-    params.require(:<%= testing_name %>).permit( <%= (@columns - @show_only) + @magic_buttons.collect(&:to_sym) %> )
+    params.require(:<%= testing_name %>).permit(<%= (fields_filtered_for_email_lookups - @show_only) + @magic_buttons.collect{|x| "__#{x}".to_sym }%>)
   end
 
   def namespace
-    <% if @namespace %>"<%= @namespace %>/" <% else %>""<% end %>
+    <% if @namespace %>'<%= @namespace %>/'<% else %><% end %>
   end
 end
 

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

@@ -1,7 +1,7 @@
 <div class="row">
-<%= all_form_fields %>
+<%= form_fields_html %>
 
-  <div class="<%= @layout_strategy.column_classes_for_form_fields %>">
+  <div class="<%= @layout_strategy.column_classes_for_button_column %>">
     <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
     <\%= f.hidden_field "_________" %><% end %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>

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

@@ -1,7 +1,7 @@
 <% if @turbo_streams %><\%= turbo_stream_from <%= singular %>  %>
 <% end %><\%= turbo_frame_tag "<%= @namespace %>__#{ dom_id(<%= singular %>) }" do  %>
   <div class='<%= @layout_strategy.row_classes %>' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
-    <\%= 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 %> %>
+    <\%= 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/_new_button.erb

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

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

@@ -1,9 +1,9 @@
 <\%= turbo_frame_tag "<%= @namespace %>__<%= singular %>-new" do %>
-<h3>
-  New <%= thing_label %>
+  <h3>
+    <%= @new_form_heading %>
   </h3>
   <\%= 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 %>, f: f}<%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}}: {})" }.join %> \%>
-  <\% end %>
+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

@@ -10,7 +10,7 @@
     <% downnest_class = downnest_object.class_name %>
     <% downnest_object_name = eval("#{downnest_class}.table_name") %>
     <% downnest_style = @layout_strategy.downnest_style %>
-    <div class="<%= " col-md-#{@layout_object[:portals][downnest][:size]}" if @layout == "bootstrap" %> scaffold-downnest" <%= downnest_style  %> >
+    <div class="<%= @layout_strategy.downnest_portal_column_width(downnest)  %> scaffold-downnest" <%= downnest_style  %> >
   <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
         <%= @singular %>: <%= @singular %>,
         <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>
@@ -23,7 +23,7 @@
 <% end %>
 
 <%= @layout_strategy.button_style %>
-<div class="<%= @col_identifier %> scaffold-line-buttons <%= @layout_strategy.button_classes %>" <%= @layout_strategy.button_style %>>
+<div class=" scaffold-line-buttons <%= @layout_strategy.column_classes_for_button_column %>" <%= @layout_strategy.button_style %>>
   <%= magic_button_output %>
 
   <% if destroy_action %>

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

@@ -1,4 +1,4 @@
-<% if !@display_list_after_update %><\%= turbo_stream.replace "<%= namespace %>__#{dom_id(@<%= singular %>)}" do %>
+<% if !@display_list_after_update %><\%= turbo_stream.replace "<%= @namespace %>__#{dom_id(@<%= singular %>)}" do %>
   <\%= 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 %>}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>