hot-glue 0.4.9.2 → 0.5.2

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -68,19 +68,18 @@ module HotGlue
   def self.derrive_reference_name(thing_as_string)
     assoc_class = eval(thing_as_string)
 
-    if assoc_class.respond_to?("name")
+    if assoc_class.new.respond_to?("name")
       display_column = "name"
-    elsif assoc_class.respond_to?("to_label")
+    elsif assoc_class.new.respond_to?("to_label")
       display_column = "to_label"
-    elsif assoc_class.respond_to?("full_name")
+    elsif assoc_class.new.respond_to?("full_name")
       display_column = "full_name"
-    elsif assoc_class.respond_to?("display_name")
+    elsif assoc_class.new.respond_to?("display_name")
       display_column = "display_name"
-    elsif assoc_class.respond_to?("email")
+    elsif assoc_class.new.respond_to?("email")
       display_column = "email"
-    else
-      raise("this should have been caught by the checker in the initializer")
-      # puts "*** Oops: 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} 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)"
+    # else # SHOULD BE UNREACHABLE
+    #   raise("this should have been caught by the checker in the initializer")
     end
     display_column
   end
@@ -97,7 +96,6 @@ module HotGlue
     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
@@ -105,6 +103,7 @@ module HotGlue
     class_option :include, type: :string, default: ""
     class_option :god, type: :boolean, default: false
     class_option :gd, type: :boolean, default: false # alias for god
+
     class_option :specs_only, type: :boolean, default: false
     class_option :no_specs, type: :boolean, default: false
     class_option :no_delete, type: :boolean, default: false
@@ -116,24 +115,32 @@ module HotGlue
     class_option :show_only, type: :string, default: ""
 
     class_option :ujs_syntax, type: :boolean, default: nil
-
     class_option :downnest, type: :string, default: nil
     class_option :magic_buttons, type: :string, default: nil
     class_option :small_buttons, type: :boolean, default: nil
-
     class_option :display_list_after_update, type: :boolean, default: false
     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 :hawk, type: :string, default: nil #
+
     class_option :no_list_label, type: :boolean, default: false
+
     class_option :no_list_heading, type: :boolean, default: false
 
-    class_option :before_list_labels, type: :boolean, default: false
+
+    # determines if the labels show up BEFORE or AFTER on the NEW/EDIT (form)
+    class_option :form_labels_position, default: 'after' #  choices are before, after, omit
+    class_option :form_placeholder_labels, 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
 
     def initialize(*meta_args)
       super
 
-
       begin
         @the_object = eval(class_name)
       rescue StandardError => e
@@ -142,8 +149,9 @@ module HotGlue
         raise(HotGlue::Error, message)
       end
 
-      if !options['spec_only'].nil? && !options['no_spec'].nil?
-        puts "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. sorry."
+
+      if options['specs_only'] && options['no_specs']
+        raise(HotGlue::Error,  "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. Aborting.")
       end
 
       if !options['exclude'].empty? && !options['include'].empty?
@@ -155,21 +163,16 @@ module HotGlue
 
 
       if @stimulus_syntax.nil?
-        if Rails.version.split(".")[0].to_i >= 7
-          @stimulus_syntax = true
-        else
-          @stimulus_syntax = false
-        end
-      end
-
-      if !options['markup'].nil?
-        message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
-        raise(HotGlue::Error, message)
+        @stimulus_syntax = true
 
+        # if Rails.version.split(".")[0].to_i >= 7
+        #   @stimulus_syntax = true
+        # else
+        # end
       end
 
       if !options['markup'].nil?
-        message = "Using --layout flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
         raise(HotGlue::Error, message)
       end
 
@@ -179,12 +182,10 @@ module HotGlue
       if  @markup == "erb"
         @template_builder = HotGlue::ErbTemplate.new
       elsif  @markup == "slim"
-        message =  "SLIM IS NOT IMPLEMENTED; please see https://github.com/jasonfb/hot-glue/issues/3"
-        raise(HotGlue::Error, message)
-        @template_builder = HotGlue::SlimTemplate.new
-
+        raise(HotGlue::Error,  "SLIM IS NOT IMPLEMENTED")
       elsif  @markup == "haml"
-        @template_builder = HotGlue::HamlTemplate.new
+        raise(HotGlue::Error,  "HAML IS NOT IMPLEMENTED")
+
       end
 
 
@@ -219,7 +220,7 @@ module HotGlue
       @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'"
+        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"
@@ -228,7 +229,7 @@ module HotGlue
 
 
       if options['nest']
-        raise "STOP: the flag --nest has been replaced with --nested; please re-run using the --nested flag"
+        raise HotGlue::Error, "STOP: the flag --nest has been replaced with --nested; please re-run using the --nested flag"
 
       end
 
@@ -267,11 +268,27 @@ module HotGlue
       @no_list_label = options['no_list_label'] || false
       @no_list_heading = options['no_list_heading'] || false
 
+      @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
+
+
+
       @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"
+        raise HotGlue::Error, "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
 
 
@@ -299,9 +316,24 @@ module HotGlue
         raise "This controller appears to be the same as the authentication object but in this context you cannot build a new/create action; please re-run with --no-create flag"
       end
 
-      # old syntax
-      @nested_args = []
+      @magic_buttons = []
+      if options['magic_buttons']
+        @magic_buttons = options['magic_buttons'].split(',')
+      end
+
+
+      @small_buttons = options['small_buttons'] || false
+
+      @build_update_action = !@no_edit || !@magic_buttons.empty?
+      # if the magic buttons are present, build the update action anyway
+
+      @ujs_syntax = options['ujs_syntax']
+      if !@ujs_syntax
+        @ujs_syntax = !defined?(Turbo::Engine)
+      end
+
 
+      # NEST CHAIN
       # new syntax
       # @nested_set = [
       # {
@@ -312,10 +344,6 @@ module HotGlue
       @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!("~","")
@@ -326,57 +354,51 @@ module HotGlue
           }
 
         }
-
-        puts "@nested_set is #{@nested_set}"
-        @nested_args_plural = {}
-
-
-        @nested_args.each do |a|
-          @nested_args_plural[a] = a + "s"
-        end
-      end
-
-      @magic_buttons = []
-      if options['magic_buttons']
-        @magic_buttons = options['magic_buttons'].split(',')
+        puts "NESTING: #{@nested_set}"
       end
 
-
-      @small_buttons = options['small_buttons'] || false
-
-      @build_update_action = !@no_edit || !@magic_buttons.empty?
-      # if the magic buttons are present, build the update action anyway
+      # OBJECT OWNERSHIP & NESTING
+      @reference_name = HotGlue.derrive_reference_name(singular_class)
+      if @auth && @self_auth
+        # byebug
+        @object_owner_sym = @auth.gsub("current_", "").to_sym
+        @object_owner_eval = @auth
+        @object_owner_optional = false
+        @object_owner_name = @auth.gsub("current_", "").to_s
 
 
-      if @auth && ! @self_auth && @nested_args.none?
+      elsif @auth && ! @self_auth && @nested_set.none? && !@auth.include?(".")
+        # byebug
         @object_owner_sym = @auth.gsub("current_", "").to_sym
         @object_owner_eval = @auth
         @object_owner_optional = false
-      else
+        @object_owner_name = @auth.gsub("current_", "").to_s
 
-        if @nested_args.any?
+      elsif @auth && @auth.include?(".")
+        # byebug
+        @object_owner_sym = nil
+        @object_owner_eval = @auth
+      else
+        # byebug
+        if @nested_set.any?
           @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_sym = nil
           @object_owner_eval = ""
         end
       end
 
+      identify_object_owner
+      setup_hawk_keys
 
-      @ujs_syntax = options['ujs_syntax']
 
-      if !@ujs_syntax
-        @ujs_syntax = !defined?(Turbo::Engine)
-      end
-      @reference_name = HotGlue.derrive_reference_name(singular_class)
 
-      identify_object_owner
+      # SETUP FIELDS & LAYOUT
       setup_fields
-
-      if  (@columns - @show_only - (@object_owner_sym.empty? ? [] : [@ownership_field.to_sym])).empty?
+      if  (@columns - @show_only - (@ownership_field ?  [@ownership_field.to_sym] : [])).empty?
         @no_field_form = true
       end
 
@@ -391,41 +413,61 @@ 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}")
+      @menu_file_exists = true if @nested_set.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
+
+
+    end
 
+    def setup_hawk_keys
+      @hawk_keys = {}
+
+      if options['hawk']
+        options['hawk'].split(",").each do |hawk_entry|
+          # format is: abc_id[thing]
+
+          if hawk_entry.include?("{")
+            hawk_entry =~ /(.*){(.*)}/
+            key, hawk_to = $1, $2
+          else
+            key = hawk_entry
+            hawk_to = @auth
+          end
+          hawk_scope = key.gsub("_id", "").pluralize
+          @hawk_keys[key.to_sym] = [hawk_to, hawk_scope]
+        end
+
+        puts "HAWKING: #{@hawk_keys}"
+      end
     end
 
     def identify_object_owner
       auth_assoc = @auth && @auth.gsub("current_","")
 
-      if !@object_owner_sym.empty?
+      if @object_owner_sym && ! @self_auth
         auth_assoc_field = auth_assoc + "_id" unless @god
-
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
-
+        # byebug
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
-        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."
+        elsif ! @nested_set.any?
+          exit_message = "*** Oops: It looks like is no association `#{@object_owner_sym}` from the object #{@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."
           raise(HotGlue::Error, exit_message)
 
         else
-
           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
-            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."
+          # else  # NOTE: not reachable
+          #   exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym}  maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n (If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.  Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag). To make a controller that can read all records, specify with --god."
           end
 
           raise(HotGlue::Error, exit_message)
         end
+      elsif  @object_owner_sym && ! @object_owner_eval.include?(".")
+        @ownership_field = @object_owner_name + "_id"
       end
     end
 
-
     def setup_fields
-      auth_assoc = @auth && @auth.gsub("current_","")
 
       if !@include_fields
         @exclude_fields.push :id, :created_at, :updated_at, :encrypted_password,
@@ -434,7 +476,6 @@ module HotGlue
                              :confirmation_token, :confirmed_at,
                              :confirmation_sent_at, :unconfirmed_email
 
-        @exclude_fields.push( (auth_assoc + "_id").to_sym) if ! auth_assoc.nil?
         @exclude_fields.push( @ownership_field.to_sym ) if ! @ownership_field.nil?
 
 
@@ -456,30 +497,34 @@ module HotGlue
             assoc_name = col.to_s.gsub("_id","")
 
 
-            begin
-              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."
+            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
 
-
-            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)
+            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
 
-            @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|
+            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 = "\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.)"
+              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
@@ -487,6 +532,11 @@ module HotGlue
       end
     end
 
+
+    def auth_root
+      "authenticate_" + @auth_identifier.split(".")[0] + "!"
+    end
+
     def formats
       [format]
     end
@@ -502,7 +552,7 @@ module HotGlue
         if @namespace
           begin
             eval(controller_descends_from)
-            puts "   skipping   base controller #{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")
           end
@@ -569,8 +619,8 @@ module HotGlue
     end
 
     def object_parent_mapping_as_argument_for_specs
-      if @nested_args.any?
-        ", " + @nested_args.last + ": " + @nested_args.last
+      if @nested_set.any?
+        ", " + @nested_set.last[:singular] + ": " + @nested_set.last[:singular]
       elsif @auth
         ", #{@auth_identifier}: #{@auth}"
       end
@@ -582,21 +632,19 @@ module HotGlue
         last_parent = ", #{@auth_identifier}: #{@auth}"
       end
 
-      @nested_args.each do |arg|
-        res << "  let(:#{arg}) {create(:#{arg} #{last_parent} )}\n"
-        last_parent = ", #{arg}: #{arg}"
+      @nested_set.each do |arg|
+        res << "  let(:#{arg[:singular]}) {create(:#{arg[:singular]} #{last_parent} )}\n"
+        last_parent = ", #{arg[:singular]}: #{arg[:singular]}"
       end
       res
     end
 
-
     def objest_nest_params_by_id_for_specs
-      @nested_args.map{|arg|
-        "#{arg}_id: #{arg}.id"
+      @nested_set.map{|arg|
+        "#{arg[:singular]}_id: #{arg[:singular]}.id"
       }.join(",\n          ")
     end
 
-
     def controller_class_name
       @controller_build_name
     end
@@ -618,8 +666,8 @@ module HotGlue
     end
 
     def path_helper_args
-      if @nested_args.any? && @nested
-        [(@nested_args).collect{|a| "#{a}"} , singular].join(",")
+      if @nested_set.any? && @nested
+        [(@nested_set).collect{|a| "#{a[:singular]}"} , singular].join(",")
       else
         singular
       end
@@ -627,7 +675,7 @@ module HotGlue
 
     def path_helper_singular
       if @nested
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{@controller_build_folder_singular}_path"
+        "#{@namespace+"_" if @namespace}#{(@nested_set.collect{|x| x[:singular]}.join("_") + "_" if @nested_set.any?)}#{@controller_build_folder_singular}_path"
       else
         "#{@namespace+"_" if @namespace}#{@controller_build_folder_singular}_path"
       end
@@ -676,7 +724,7 @@ module HotGlue
 
     def path_arity
       res = ""
-      if @nested_args.any? && @nested
+      if @nested_set.any? && @nested
         res << nested_objects_arity + ", "
       end
       res << "@" + singular
@@ -695,33 +743,24 @@ module HotGlue
     end
 
     def new_path_name
-
       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
-      return "" if @nested_args.none?
-      @nested_args.map{|a| "#{a}: #{a}"}.join(", ") #metaprgramming into Ruby hash
+      return "" if @nested_set.none?
+      @nested_set.map{|a| "#{a}: #{a}"}.join(", ") #metaprgramming into Ruby hash
     end
 
     def nested_assignments_top_level # this is by accessing the instance variable-- only use at top level
-      @nested_args.map{|a| "#{a}: @#{a}"}.join(", ") #metaprgramming into Ruby hash
+      @nested_set.map{|a| "#{a[:singular]}"}.join(", ") #metaprgramming into Ruby hash
     end
 
-
     def nest_assignments_operator(top_level = false, leading_comma = false)
-      if @nested_args.any?
+      if @nested_set.any?
         "#{", " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
       else
         ""
@@ -733,25 +772,25 @@ module HotGlue
     end
 
     def nested_objects_arity
-      @nested_args.map{|a| "@#{a}"}.join(", ")
+      @nested_set.map{|a| "@#{a[:singular]}"}.join(", ")
     end
 
     def nested_arity_for_path
-      [@nested_args[0..-1].collect{|a| "@#{a}"}].join(", ") #metaprgramming into arity for the Rails path helper
+      [@nested_set[0..-1].collect{|a| "@#{a[:singular]}"}].join(", ") #metaprgramming into arity for the Rails path helper
     end
 
     def object_scope
       if @auth
-        if @nested_args.none?
+        if @nested_set.none?
           @auth + ".#{plural}"
         else
-          "@" + @nested_args.last + ".#{plural}"
+          "@" + @nested_set.last[:singular] + ".#{plural}"
         end
       else
-        if @nested_args.none?
+        if @nested_set.none?
           @singular_class
         else
-          "@" + @nested_args.last + ".#{plural}"
+          "@" + @nested_set.last[:singular] + ".#{plural}"
         end
 
       end
@@ -762,10 +801,10 @@ module HotGlue
       if @auth
         if @self_auth
           @singular_class + ".where(id: #{@auth}.id)"
-        elsif @nested_args.none?
+        elsif @nested_set.none?
           @auth + ".#{plural}"
         else
-          "@" + @nested_args.last + ".#{plural}"
+          "@" + @nested_set.last[:singular] + ".#{plural}"
         end
       else
         @singular_class + ".all"
@@ -773,7 +812,7 @@ module HotGlue
     end
 
     def any_nested?
-      @nested_args.any?
+      @nested_set.any?
     end
 
     def all_objects_variable
@@ -838,7 +877,7 @@ module HotGlue
       #
       # 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
+      #   # not sure how i would achieve this without nokogiri
       #
       # end
 
@@ -914,8 +953,11 @@ module HotGlue
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
+        hawk_keys: @hawk_keys,
         col_identifier:  col_identifier,
-        ownership_field: @ownership_field
+        ownership_field: @ownership_field,
+        form_labels_position: @form_labels_position,
+        form_placeholder_labels: @form_placeholder_labels
       )
     end
 
@@ -969,7 +1011,9 @@ module HotGlue
         singular_class: singular_class,
         singular: singular,
         layout: @layout,
-        col_identifier: col_identifier
+        col_identifier: col_identifier,
+        inline_list_labels: @inline_list_labels
+
       )
     end
 
@@ -999,9 +1043,8 @@ module HotGlue
           "display_name"
         elsif me.column_names.include?("email") || me.instance_methods(false).include?(:email)
           "email"
-        elsif me.column_names.include?("number") || me.instance_methods(false).include?(:number)
-          "number"
         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
@@ -1081,7 +1124,7 @@ module HotGlue
     def nested_for_turbo_nested_constructor(top_level = true)
       instance_symbol = "@" if top_level
       instance_symbol = "" if !top_level
-      if @nested_args.none?
+      if @nested_set.none?
         "\"\""
       else
         @nested_set.collect{|arg|
@@ -1093,10 +1136,10 @@ module HotGlue
     def nested_for_assignments_constructor(top_level = true)
       instance_symbol = "@" if top_level
       instance_symbol = "" if !top_level
-      if @nested_args.none?
+      if @nested_set.none?
         ""
       else
-        ", \n    nested_for: \"" + @nested_args.collect{|a| "#{a}-" + '#{' + instance_symbol + a + ".id}"}.join("__") + "\""
+        ", \n    nested_for: \"" + @nested_set.collect{|a| "#{a[:singular]}-" + '#{' + instance_symbol + a[:singular] + ".id}"}.join("__") + "\""
       end
     end
 
@@ -1105,6 +1148,12 @@ module HotGlue
     def cc_filename_with_extensions(name, file_format = format)
       [name, file_format].compact.join(".")
     end
+
+    def hawk_to_ruby
+      @hawk_keys.collect{ |k,v|
+        "#{k}: [#{v[0]}, \"#{v[1]}\"] "
+      }.join(", ")
+    end
   end
 end