hot-glue 0.5.8 → 0.5.9.2

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -1,24 +1,19 @@
 require 'rails/generators/erb/scaffold/scaffold_generator'
 require 'ffaker'
-
+require_relative './fields/field'
+require_relative './field_factory'
 require_relative './markup_templates/base'
 require_relative './markup_templates/erb'
-# require_relative './markup_templates/haml'
-# require_relative './markup_templates/slim'
-
 require_relative './layout/builder'
 require_relative './layout_strategy/base'
 require_relative './layout_strategy/bootstrap'
 require_relative './layout_strategy/hot_glue'
 require_relative './layout_strategy/tailwind'
 
-
 module HotGlue
   class Error < StandardError
   end
 
-
-
   def self.construct_downnest_object(input)
     res = input.split(",").map { |child|
       child_name = child.gsub("+","")
@@ -70,7 +65,7 @@ module HotGlue
         with_params: with_params,
         put_form: put_form,
         nested_set: rest_of_nest  )
-      return "defined?(#{instance_sym + nested_set[0][:singular]}) ? #{is_present_path} : #{is_missing_path}"
+      return "defined?(#{instance_sym + nested_set[0][:singular]}2) ? #{is_present_path} : #{is_missing_path}"
     end
   end
 
@@ -95,8 +90,9 @@ module HotGlue
     hook_for :form_builder, :as => :scaffold
 
     source_root File.expand_path('templates', __dir__)
-    attr_accessor :path, :singular, :plural, :singular_class, :nest_with
-    attr_accessor :columns, :downnest_children, :layout_object
+    attr_accessor :path, :singular, :plural, :singular_class, :nest_with,
+                  :columns, :downnest_children, :layout_object, :alt_lookups,
+                  :update_show_only, :hawk_keys, :auth, :sample_file_path
 
     class_option :singular, type: :string, default: nil
     class_option :plural, type: :string, default: nil
@@ -150,8 +146,8 @@ module HotGlue
     class_option :inline_list_labels, default: 'omit' # choices are before, after, omit
     class_option :factory_creation, default: ''
     class_option :alt_foreign_key_lookup, default: '' #
-
-
+    class_option :attachments, default: ''
+    class_option :stacked_downnesting, default: false
 
     def initialize(*meta_args)
       super
@@ -180,11 +176,6 @@ module HotGlue
 
       if @stimulus_syntax.nil?
         @stimulus_syntax = true
-
-        # if Rails.version.split(".")[0].to_i >= 7
-        #   @stimulus_syntax = true
-        # else
-        # end
       end
 
       if !options['markup'].nil?
@@ -194,6 +185,7 @@ module HotGlue
 
       yaml_from_config = YAML.load(File.read("config/hot_glue.yml"))
       @markup =  yaml_from_config[:markup]
+      @sample_file_path = yaml_from_config[:sample_file_path]
 
       if options['layout']
         layout = options['layout']
@@ -215,15 +207,6 @@ module HotGlue
           LayoutStrategy::HotGlue.new(self)
         end
 
-
-      if  @markup == "erb"
-        @template_builder = HotGlue::ErbTemplate.new(layout_strategy: @layout_strategy)
-      elsif  @markup == "slim"
-        raise(HotGlue::Error,  "SLIM IS NOT IMPLEMENTED")
-      elsif  @markup == "haml"
-        raise(HotGlue::Error,  "HAML IS NOT IMPLEMENTED")
-      end
-
       args = meta_args[0]
       @singular = args.first.tableize.singularize # should be in form hello_world
 
@@ -233,32 +216,21 @@ module HotGlue
 
       @plural = options['plural'] || @singular.pluralize # respects what you set in inflections.rb, to override, use plural option
       @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 HotGlue::Error, "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
 
-
-
       if options['nest']
         raise HotGlue::Error, "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
 
+      setup_attachments
 
       @exclude_fields = []
       @exclude_fields += options['exclude'].split(",").collect(&:to_sym)
@@ -270,7 +242,6 @@ module HotGlue
         @include_fields += options['include'].split(":").collect{|x|x.split(",")}.flatten.collect(&:to_sym)
       end
 
-
       @show_only = []
       if !options['show_only'].empty?
         @show_only += options['show_only'].split(",").collect(&:to_sym)
@@ -282,6 +253,76 @@ module HotGlue
       end
 
 
+      # 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}"
+
+
+
+      setup_hawk_keys
+      @form_placeholder_labels = options['form_placeholder_labels'] # true or false
+      @inline_list_labels = options['inline_list_labels']  || 'omit' # 'before','after','omit'
+
+
+      @form_labels_position = options['form_labels_position']
+      if !['before','after','omit'].include?(@form_labels_position)
+        raise HotGlue::Error, "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+      end
+
+      if !['before','after','omit'].include?(@inline_list_labels)
+        raise HotGlue::Error, "You passed '#{@inline_list_labels}' as the setting for --inline-list-labels but the only allowed options are before, after, and omit (default)"
+      end
+
+
+
+      if  @markup == "erb"
+        @template_builder = HotGlue::ErbTemplate.new(
+          layout_strategy: @layout_strategy,
+          magic_buttons: @magic_buttons,
+          small_buttons: @small_buttons,
+          inline_list_labels: @inline_list_labels,
+          show_only: @show_only,
+          update_show_only: @update_show_only,
+          singular_class: singular_class,
+          singular: singular,
+          hawk_keys: @hawk_keys,
+          ownership_field: @ownership_field,
+          form_labels_position: @form_labels_position,
+          form_placeholder_labels: @form_placeholder_labels,
+          alt_lookups: @alt_lookups,
+          attachments: @attachments,
+        )
+      elsif  @markup == "slim"
+        raise(HotGlue::Error,  "SLIM IS NOT IMPLEMENTED")
+      elsif  @markup == "haml"
+        raise(HotGlue::Error,  "HAML IS NOT IMPLEMENTED")
+      end
 
       @god = options['god'] || options['gd'] || false
       @specs_only = options['specs_only'] || false
@@ -297,20 +338,8 @@ module HotGlue
       @no_list = options['no_list'] || false
       @no_list_label = options['no_list_label'] || false
       @no_list_heading = options['no_list_heading'] || false
+      @stacked_downnesting = options['stacked_downnesting']
 
-      @form_labels_position = options['form_labels_position']
-      if !['before','after','omit'].include?(@form_labels_position)
-
-        raise HotGlue::Error, "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
-      end
-
-      @form_placeholder_labels = options['form_placeholder_labels'] # true or false
-      @inline_list_labels = options['inline_list_labels']  || 'omit' # 'before','after','omit'
-
-
-      if !['before','after','omit'].include?(@inline_list_labels)
-        raise HotGlue::Error, "You passed '#{@inline_list_labels}' as the setting for --inline-list-labels but the only allowed options are before, after, and omit (default)"
-      end
 
 
 
@@ -415,15 +444,11 @@ module HotGlue
         end
       end
 
-      identify_object_owner
-      setup_hawk_keys
 
       @factory_creation = options['factory_creation'].gsub(";", "\n")
-
-
-
-      # SETUP FIELDS & LAYOUT
+      identify_object_owner
       setup_fields
+
       if  (@columns - @show_only - (@ownership_field ?  [@ownership_field.to_sym] : [])).empty?
         @no_field_form = true
       end
@@ -434,65 +459,19 @@ module HotGlue
                                               downnest_object: @downnest_object,
                                               buttons_width: buttons_width,
                                               columns: @columns,
-                                              smart_layout: @smart_layout )
+                                              smart_layout: @smart_layout,
+                                              stacked_downnesting: @stacked_downnesting)
       @layout_object = builder.construct
 
-      @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
 
+      @menu_file_exists = true if @nested_set.none? && File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
 
-    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}
+      @turbo_streams = !!options['with_turbo_streams']
     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 = {}
 
@@ -509,24 +488,115 @@ module HotGlue
           end
 
           hawk_scope = key.gsub("_id", "").pluralize
-          @hawk_keys[key.to_sym] = [hawk_to]
+          optional = eval(singular_class + ".reflect_on_association(:#{key.gsub('_id','')})").options[:optional]
+
+          @hawk_keys[key.to_sym] = {bind_to: [hawk_to], optional: optional}
           use_shorthand = !options["hawk"].include?("{")
 
           if use_shorthand # only include the hawk scope if using the shorthand
-            @hawk_keys[key.to_sym] << hawk_scope
+            @hawk_keys[key.to_sym][:bind_to] << hawk_scope
           end
+
         end
 
         puts "HAWKING: #{@hawk_keys}"
       end
     end
 
+
+    def setup_attachments
+      @attachments = {}
+
+      if options["attachments"]
+
+        options['attachments'].split(",").each do |attachment_entry|
+          # format is: avatar{thumbnail|field_for_original_filename}
+
+          if attachment_entry.include?("{")
+            num_params = attachment_entry.split("|").count
+            if num_params == 1
+              attachment_entry =~ /(.*){(.*)}/
+              key, thumbnail = $1, $2
+            elsif num_params == 2
+              attachment_entry =~ /(.*){(.*)\|(.*)}/
+              key, thumbnail, field_for_original_filename = $1, $2, $3
+            elsif num_params > 2
+              if num_params == 3
+                attachment_entry =~ /(.*){(.*)\|(.*)\|(.*)}/
+                key, thumbnail, field_for_original_filename, direct_upload = $1, $2, $3, $4
+              elsif num_params > 3
+                attachment_entry =~ /(.*){(.*)\|(.*)\|(.*)\|(.*)}/
+                key, thumbnail, field_for_original_filename, direct_upload, dropzone = $1, $2, $3, $4, $5
+              end
+
+              field_for_original_filename = nil if field_for_original_filename == ""
+
+              if thumbnail == ''
+                thumbnail = nil
+              end
+
+              if !direct_upload.nil? && direct_upload != "direct"
+                raise HotGlue::Error, "received 3rd parameter in attachment long form specification that was not 'direct'; for direct uploads, just use 'direct' or leave off to disable"
+              end
+
+              if !dropzone.nil? && dropzone != "dropzone"
+                raise HotGlue::Error, "received 4th parameter in attachme long form specification that was not 'dropzone'; for dropzone, just use 'dropzone' or leave off to disable"
+              end
+
+              if dropzone && !direct_upload
+                raise HotGlue::Error, "dropzone requires direct_upload"
+              end
+
+              if field_for_original_filename && direct_upload
+                raise HotGlue::Error, "Unfortunately orig filename extraction doesn't work with direct upload; please set 2nd parameter to empty string to disable"
+              end
+
+              direct_upload = !!direct_upload
+              dropzone = !!dropzone
+            end
+          else
+            key = attachment_entry
+
+            if !(eval("#{singular_class}.reflect_on_attachment(:#{attachment_entry})"))
+              raise HotGlue::Error, "Could not find #{attachment_entry} attachment on #{singular_class}"
+            end
+            if eval("#{singular_class}.reflect_on_attachment(:#{attachment_entry}).variants.include?(:thumb)")
+              thumbnail = "thumb"
+            else
+              thumbnail = nil
+            end
+
+            direct_upload = nil
+            field_for_original_filename = nil
+            dropzone  = nil
+          end
+
+          if thumbnail && !eval("#{singular_class}.reflect_on_attachment(:#{key}).variants.include?(:#{thumbnail})")
+            raise HotGlue::Error, "you specified to use #{thumbnail} as the thumbnail but could not find any such variant on the #{key} attachment; add to your #{singular}.rb file:
+  has_one_attached :#{key} do |attachable|
+    attachable.variant :#{thumbnail}, resize_to_limit: [100, 100]
+  end
+"
+          end
+
+
+          @attachments[key.to_sym] = {thumbnail: thumbnail,
+                                      field_for_original_filename: field_for_original_filename,
+                                      direct_upload: direct_upload,
+                                      dropzone: dropzone}
+        end
+
+        puts "ATTACHMENTS: #{@attachments}"
+      end
+    end
+
     def identify_object_owner
       auth_assoc = @auth && @auth.gsub("current_","")
 
       if @object_owner_sym && ! @self_auth
         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_set.any?
@@ -548,7 +618,6 @@ module HotGlue
     end
 
     def setup_fields
-
       if !@include_fields
         @exclude_fields.push :id, :created_at, :updated_at, :encrypted_password,
                              :reset_password_token,
@@ -561,58 +630,86 @@ module HotGlue
 
         @columns = @the_object.columns.map(&:name).map(&:to_sym).reject{|field| @exclude_fields.include?(field) }
 
+
       else
         @columns = @the_object.columns.map(&:name).map(&:to_sym).reject{|field| !@include_fields.include?(field) }
       end
 
+      if @attachments.any?
+        puts "adding attachments-as-columns: #{@attachments}"
+        @attachments.keys.each do |attachment|
+          @columns << attachment if !@columns.include?(attachment)
+        end
+
+        check_if_sample_file_is_present
+      end
+
 
+      # build a new polymorphic object
       @associations = []
+      @columns_map = {}
       @columns.each do |col|
+        if !(@the_object.columns_hash.keys.include?(col.to_s) ||  @attachments.keys.include?(col))
+          raise "couldn't find #{col} in either field list or attachments list"
+        end
+
         if col.to_s.starts_with?("_")
           @show_only << col
         end
 
-        if @the_object.columns_hash[col.to_s].type == :integer
-          if col.to_s.ends_with?("_id")
-            # guess the association name label
-            assoc_name = col.to_s.gsub("_id","")
+        if @the_object.columns_hash.keys.include?(col.to_s)
+          type =  @the_object.columns_hash[col.to_s].type
+        elsif @attachments.keys.include?(col)
+          type = :attachment
+        end
+        this_column_object = FieldFactory.new(name: col.to_s,
+                                              generator: self,
+                                              type: type)
+        field = this_column_object.field
+        if field.is_a?(AssociationField)
+          @associations << field.assoc_name.to_sym
+        end
+        @columns_map[col] = this_column_object.field
 
 
-            assoc_model = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
 
-            if assoc_model.nil?
-              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}; or add to #{singular_class} `belongs_to :#{assoc_name}`.  To make a controller that can read all records, specify with --god."
-              puts exit_message
-              raise(HotGlue::Error, exit_message)
-            end
+      end
+    end
 
-            begin
-              assoc_class = eval(assoc_model.try(:class_name))
-              @associations << assoc_name.to_sym
-              name_list = [:name, :to_label, :full_name, :display_name, :email]
-
-            rescue
-              # unreachable(?)
-              # if eval("#{singular_class}.reflect_on_association(:#{assoc_name.singularize})")
-              #   raise(HotGlue::Error,"*** Oops: #{singular_class} has no association for #{assoc_name.singularize}")
-              # else
-              #   raise(HotGlue::Error,"*** 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
-            end
 
-            if assoc_class && 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}`. 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: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
-              raise(HotGlue::Error,exit_message)
-            end
-          end
-        end
+    def check_if_sample_file_is_present
+      if sample_file_path.nil?
+        puts "you have no sample file path set in config/hot_glue.yml"
+        settings = File.read("config/hot_glue.yml")
+        @sample_file_path = "spec/files/computer_code.jpg"
+        added_setting = ":sample_file_path: #{sample_file_path}"
+        File.open("config/hot_glue.yml", "w") { |f| f.write settings + "\n" +   added_setting }
+
+        puts "adding `#{added_setting}` to config/hot_glue.yml"
+      elsif ! File.exist?(sample_file_path)
+        puts "NO SAMPLE FILE FOUND: adding sample file at #{sample_file_path}"
+        template "computer_code.jpg", File.join("#{filepath_prefix}spec/files/", "computer_code.jpg")
       end
+
+      puts ""
     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 } = #{ class_name }.create(modified_params)"
+      else
+        "#{@factory_creation}\n" +
+          "    @#{singular } = #{ class_name }.create(modified_params#{'.merge(' + merge_with + ')' if !merge_with.empty?})"
+      end
+    end
 
     def auth_root
       "authenticate_" + @auth_identifier.split(".")[0] + "!"
@@ -626,22 +723,25 @@ module HotGlue
       nil
     end
 
+    def filepath_prefix
+      'spec/dummy/' if Rails.env.test?
+    end
+
     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}", "#{@controller_build_folder}_controller.rb")
+        template "controller.rb.erb", File.join("#{filepath_prefix}app/controllers#{namespace_with_dash}", "#{@controller_build_folder}_controller.rb")
         if @namespace
           begin
             eval(controller_descends_from)
-            # puts "   skipping   base controller #{controller_descends_from}"
           rescue NameError => e
-            template "base_controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "base_controller.rb")
+            template "base_controller.rb.erb", File.join("#{filepath_prefix}app/controllers#{namespace_with_dash}", "base_controller.rb")
           end
         end
       end
 
       unless @no_specs
-        dest_file = File.join("#{'spec/dummy/' if Rails.env.test?}spec/features#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
+        dest_file = File.join("#{filepath_prefix}spec/features#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
 
         if  File.exist?(dest_file)
           existing_file = File.open(dest_file)
@@ -663,29 +763,26 @@ module HotGlue
         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}")
+      template "#{@markup}/_errors.#{@markup}", File.join("#{filepath_prefix}app/views#{namespace_with_dash}", "_errors.#{@markup}")
     end
 
     def spec_foreign_association_merge_hash
       ", #{testing_name}: #{testing_name}1"
     end
 
+    def testing_name
+      singular_class.gsub("::","_").underscore
+    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")
+      @columns_map.collect { |col, col_object|
+        col_object.spec_related_column_lets
+      }.join("\n")
     end
 
     def list_column_headings
       @template_builder.list_column_headings(
-        columns: @layout_object[:columns][:container],
+        layout_object: @layout_object,
         col_identifier: @layout_strategy.column_classes_for_column_headings,
         column_width: @layout_strategy.column_width,
         singular: @singular
@@ -693,45 +790,37 @@ module HotGlue
     end
 
     def columns_spec_with_sample_data
-      @columns.map { |c|
-        type = eval("#{singular_class}.columns_hash['#{c}']").type
-        random_data = case type
-                      when :integer
-                        rand(1...1000)
-                      when :string
-                        FFaker::AnimalUS.common_name
-                      when :text
-                        FFaker::AnimalUS.common_name
-                      when :datetime
-                        Time.now + rand(1..5).days
-                      end
-        c.to_s + ": '" + random_data.to_s + "'"
+      @columns_map.map  { |col, col_object|
+        unless col_object.is_a?(AssociationField)
+          random_data = col_object.spec_random_data
+          col.to_s + ": '" + random_data.to_s + "'"
+        end
       }.join(", ")
     end
 
-
     def regenerate_me_code
       "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 @self_auth
         ""
-      elsif @nested_set.any?
+      elsif @nested_set.any? && ! @nested_set.last[:optional]
         ", " + @nested_set.last[:singular] + ": " + @nested_set.last[:singular]
-      elsif @auth
+      elsif @auth && !@god
         ", #{@auth_identifier}: #{@auth}"
       end
     end
 
     def objest_nest_factory_setup
-      res = "  "
+      res = ""
       if @auth
         last_parent = ", #{@auth_identifier}: #{@auth}"
       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
@@ -747,18 +836,6 @@ module HotGlue
       @controller_build_name
     end
 
-    def singular_name
-      @singular
-    end
-
-    def testing_name
-      singular_class_name.gsub("::","_").underscore
-    end
-
-    def singular_class_name
-      @singular_class
-    end
-
     def plural_name
       plural
     end
@@ -767,78 +844,18 @@ module HotGlue
       @auth_identifier
     end
 
-    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
-          "      " + "new_#{col} = Date.current + (rand(100).days) \n" +
-            '      ' + "find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
-        when :time
-          # "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
-          # '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
-
-        when :datetime
-          "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
-            '      ' + "find(\"[name='#{testing_name}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
-
-        when :integer
-          if col.to_s.ends_with?("_id")
-            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})"
-          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" +
-            "      " + "new_#{col.to_s} = list_of_#{col.to_s}[rand(list_of_#{col.to_s}.length)].to_s \n" +
-            '      find("select[name=\'' + singular + '[' + col.to_s + ']\']  option[value=\'#{new_' + col.to_s + '}\']").select_option'
-
-        when :boolean
-          "      new_#{col} = 1 \n" +
-            "      find(\"[name='#{testing_name}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
-        when :string
-          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})"
-        end
+    def capybara_make_updates(which_partial = :create)
+      @columns_map.map { | col, col_obj|
+        show_only_list = which_partial == :create ? @show_only : (@update_show_only+@show_only)
 
+        if show_only_list.include?(col)
+          "      page.should have_no_selector(:css, \"[name='#{testing_name}[#{ col.to_s }]'\")"
+        else
+          col_obj.spec_setup_and_change_act(which_partial)
+        end
       }.join("\n")
     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(",")
@@ -966,11 +983,9 @@ module HotGlue
         else
           "@" + @nested_set.last[:singular] + ".#{plural}"
         end
-
       end
     end
 
-
     def all_objects_root
       if @auth
         if @self_auth
@@ -1001,7 +1016,6 @@ module HotGlue
       !Gem::Specification.sort_by{ |g| [g.name.downcase, g.version] }.group_by{ |g| g.name }['devise']
     end
 
-
     def magic_button_output
       @template_builder.magic_button_output(
         path: HotGlue.optionalized_ternary(namespace: @namespace,
@@ -1019,7 +1033,6 @@ module HotGlue
       "#{namespace_with_trailing_dash}nav"
     end
 
-
     def include_nav_template
       File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}")
     end
@@ -1032,7 +1045,7 @@ module HotGlue
           dest_filename = cc_filename_with_extensions("#{view}", "#{@markup}")
 
 
-          dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
+          dest_filepath = File.join("#{filepath_prefix}app/views#{namespace_with_dash}",
                                     @controller_build_folder, dest_filename)
 
 
@@ -1046,7 +1059,7 @@ module HotGlue
         formats.each do |format|
           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}",
+          dest_filepath = File.join("#{filepath_prefix}app/views#{namespace_with_dash}",
                                     @controller_build_folder, dest_filename)
 
 
@@ -1055,15 +1068,6 @@ module HotGlue
 
         end
       end
-
-      # menu_file = "app/views#{namespace_with_dash}/menu.erb"
-      #
-      # 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
-      #
-      # end
-
     end
 
     def append_model_callbacks
@@ -1071,7 +1075,7 @@ module HotGlue
 
       if options['with_turbo_streams'] == true
         dest_filename = cc_filename_with_extensions("#{singular_class.underscore}", "rb")
-        dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/models", dest_filename)
+        dest_filepath = File.join("#{filepath_prefix}app/models", dest_filename)
 
 
         puts "appending turbo callbacks to #{dest_filepath}"
@@ -1098,11 +1102,7 @@ module HotGlue
     end
 
     def namespace_with_trailing_dash
-      if @namespace
-        "#{@namespace}/"
-      else
-        ""
-      end
+      @namespace ? "#{@namespace}/" : ""
     end
 
     def all_views
@@ -1148,25 +1148,13 @@ module HotGlue
       false
     end
 
-
     def model_search_fields # an array of fields we can search on
       []
     end
 
     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,
-        alt_lookups: @alt_lookups
-      )
+      @template_builder.all_form_fields(layout_strategy: @layout_strategy,
+                                        layout_object: @layout_object)
     end
 
     def list_label
@@ -1179,13 +1167,10 @@ module HotGlue
 
     def all_line_fields
       @template_builder.all_line_fields(
-        perc_width: @layout_strategy.each_col,     #undefined method `each_col'
-        columns:  @layout_object[:columns][:container],
-        show_only: @show_only,
-        singular_class: singular_class,
-        singular: singular,
         col_identifier: @layout_strategy.column_classes_for_line_fields,
-        inline_list_labels: @inline_list_labels
+        perc_width: @layout_strategy.each_col,     #undefined method `each_col'
+        layout_strategy: @layout_strategy,
+        layout_object: @layout_object
       )
     end
 
@@ -1197,8 +1182,6 @@ module HotGlue
       end
     end
 
-
-
     def display_class
       me = eval(singular_class)
 
@@ -1216,7 +1199,6 @@ module HotGlue
         elsif me.column_names.include?("email") || me.instance_methods(false).include?(:email)
           "email"
         else
-          # NOT UNREACHABLE BUT UNTESTED
           exit_message = "*** Oops: Can't find any column to use as the display label on #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, 5) email, or 6) number directly on your #{singular_class} 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
@@ -1253,7 +1235,7 @@ module HotGlue
         flash[:notice] = (flash[:notice] || \"\") <<  (res ? res + \" \" : \"\")
       rescue ActiveRecord::RecordInvalid => e
         @#{singular}.errors.add(:base, e.message)
-        flash[:alert] = (flash[:alert] || \"\") << 'There was ane error #{magic_button}ing your #{@singular}: '
+        flash[:alert] = (flash[:alert] || \"\") << 'There was an error #{magic_button}ing your #{@singular}: '
       end
     end"
 
@@ -1282,8 +1264,8 @@ module HotGlue
     end
 
     def n_plus_one_includes
-      if @associations.any?
-        ".includes(" + @associations.map{|x| ":#{x.to_s}"}.join(", ") + ")"
+      if @associations.any? || @attachments.any?
+        ".includes(" + (@associations.map{|x| x} + @attachments.collect{|k,v| "#{k}_attachment"}).map{|x| ":#{x.to_s}"}.join(", ") + ")"
       else
         ""
       end
@@ -1319,9 +1301,17 @@ module HotGlue
 
     def hawk_to_ruby
       res = @hawk_keys.collect{ |k,v|
-        "#{k}: [#{v[0]}, \"#{v[1]}\"]"
+        "#{k.to_s}: [#{v[:bind_to].join(".")}]"
       }.join(", ")
       res
     end
+
+    def controller_attachment_orig_filename_pickup_syntax
+      @attachments.collect{ |key, attachment|  "\n" + "    modified_params[:#{ attachment[:field_for_original_filename] }] = #{singular}_params['#{ key }'].original_filename" if attachment[:field_for_original_filename] }.compact.join("\n")
+    end
+
+    def any_datetime_fields?
+      (@columns - @attachments.keys.collect(&:to_sym)).collect{|col| eval("#{singular_class}.columns_hash['#{col}']").type}.include?(:datetime)
+    end
   end
 end