hot-glue 0.5.6 → 0.5.7

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -44,8 +44,10 @@ module  HotGlue
     # THE FORM
 
     def all_form_fields(*args)
+
       @columns = args[0][:columns]
       @show_only = args[0][:show_only]
+
       @singular_class = args[0][:singular_class]
       @ownership_field  = args[0][:ownership_field]
       @form_labels_position = args[0][:form_labels_position]
@@ -53,25 +55,28 @@ module  HotGlue
       @hawk_keys = args[0][:hawk_keys]
       @singular = args[0][:singular]
 
-      column_classes = args[0][:col_identifier]
+      @alt_lookups = args[0][:alt_lookups]
 
+      column_classes = args[0][:col_identifier]
+      update_show_only = args[0][:update_show_only] || []
       singular = @singular
+
       result = columns.map{ |column|
         "  <div class='#{column_classes}' >" +
           column.map { |col|
+            type = eval("#{singular_class}.columns_hash['#{col}']").type
+            limit = eval("#{singular_class}.columns_hash['#{col}']").limit
+            sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
+
             field_result =
               if show_only.include?(col.to_sym)
-                "<%= #{singular}.#{col} %>"
+                show_only_result(type: type, col: col, singular: singular)
               else
-                type = eval("#{singular_class}.columns_hash['#{col}']").type
-                limit = eval("#{singular_class}.columns_hash['#{col}']").limit
-                sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
-
                 case type
                 when :integer
                   integer_result(col)
                 when :uuid
-                  uuid_result(col)
+                  association_result(col)
                 when :string
                   string_result(col, sql_type, limit)
                 when :text
@@ -96,11 +101,18 @@ module  HotGlue
             else
               field_error_name = col
             end
-
+            show_only_open = ""
+            show_only_close = ""
+            if update_show_only.include?(col)
+              show_only_open = "<% if action_name == 'edit' %>" +
+                show_only_result(type: type, col: col, singular: singular) + "<% else %>"
+              show_only_close = "<% end %>"
+            end
             the_label = "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
             add_spaces_each_line( "\n  <span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
                                     add_spaces_each_line( (@form_labels_position == 'before' ? the_label : "") +
-                                      field_result + (@form_labels_position == 'after' ? the_label : "")   , 4) +
+                                    show_only_open +  field_result + show_only_close +
+                                    (@form_labels_position == 'after' ? the_label : "")   , 4) +
                                     "\n  </span>\n  <br />", 2)
 
 
@@ -110,6 +122,14 @@ module  HotGlue
     end
 
 
+    def show_only_result(type:, col: , singular: )
+      if type == :uuid || (type == :integer && col.ends_with?("_id"))
+        association_read_only_result(col)
+      else
+        "<%= #{singular}.#{col} %>"
+      end
+    end
+
     def integer_result(col)
       # look for a belongs_to on this object
       if col.to_s.ends_with?("_id")
@@ -119,13 +139,7 @@ module  HotGlue
       end
     end
 
-
-    def uuid_result(col)
-      association_result(col)
-    end
-
-
-    def association_result(col)
+    def association_read_only_result(col)
       assoc_name = col.to_s.gsub("_id","")
       assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
       if assoc.nil?
@@ -134,7 +148,7 @@ module  HotGlue
       end
 
       is_owner = col == ownership_field
-      assoc_class_name = assoc.active_record.name
+      assoc_class_name = assoc.class_name.to_s
       display_column = HotGlue.derrive_reference_name(assoc_class_name)
 
       if @hawk_keys[assoc.foreign_key.to_sym]
@@ -143,12 +157,39 @@ module  HotGlue
       else
         hawked_association = "#{assoc.class_name}.all"
       end
+      "<%= #{@singular}.#{assoc_name}.#{display_column} %>"
+    end
+
+    def association_result(col)
+      assoc_name = col.to_s.gsub("_id","")
+      assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
 
-      (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
-        "  <%= f.collection_select(:#{col}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
-        (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
-        (is_owner ? "\n<% end %>" : "")
 
+      if @alt_lookups.keys.include?(col.to_s)
+        alt = @alt_lookups[col.to_s][:lookup_as]
+        "<%= f.text_field :__lookup_#{alt}, value: @#{singular}.#{assoc_name}.try(:#{alt}), placeholder: \"search by #{alt}\" %>"
+      else
+        if assoc.nil?
+          exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+          exit
+        end
+
+        is_owner = col == ownership_field
+        assoc_class_name = assoc.class_name.to_s
+        display_column = HotGlue.derrive_reference_name(assoc_class_name)
+
+        if @hawk_keys[assoc.foreign_key.to_sym]
+          hawk_definition = @hawk_keys[assoc.foreign_key.to_sym]
+          hawked_association = hawk_definition.join(".")
+        else
+          hawked_association = "#{assoc.class_name}.all"
+        end
+
+        (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
+          "  <%= f.collection_select(:#{col}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
+          (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
+          (is_owner ? "\n<% end %>" : "")
+      end
     end
 
     def string_result(col, sql_type, limit)
@@ -192,7 +233,14 @@ module  HotGlue
 
     def enum_result(col)
       enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
-      "<%= f.collection_select(:#{col},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col} }, class: 'form-control') %>"
+
+      if eval("defined? #{singular_class}.#{enum_type}_labels") == "method"
+        enum_definer = "#{singular_class}.#{enum_type}_labels"
+      else
+        enum_definer = "#{singular_class}.defined_enums['#{enum_type}']"
+      end
+
+      "<%= f.collection_select(:#{col},  enum_to_collection_select(#{enum_definer}), :key, :value, {selected: @#{singular}.#{col} }, class: 'form-control') %>"
     end
 
     ################################################################
@@ -247,7 +295,8 @@ module  HotGlue
                     exit
                     # raise(HotGlue::Error,exit_message)
                   end
-                  assoc_class_name = assoc.active_record.name
+                  assoc_class_name = assoc.class_name
+
                   display_column =  HotGlue.derrive_reference_name(assoc_class_name)
                   "<%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>"
 
@@ -265,8 +314,8 @@ module  HotGlue
                 exit
                 # raise(HotGlue::Error,exit_message)
               end
-              assoc_class_name = assoc.active_record.name
-              display_column =  HotGlue.derrive_reference_name(assoc_class_name)
+
+              display_column =  HotGlue.derrive_reference_name(assoc.class_name.to_s)
               "<%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>"
 
             when :float
@@ -309,11 +358,16 @@ module  HotGlue
             when :enum
               enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
 
+              if eval("defined? #{singular_class}.#{enum_type}_labels") == "method"
+                enum_definer = "#{singular_class}.#{enum_type}_labels"
+              else
+                enum_definer = "#{singular_class}.defined_enums['#{enum_type}']"
+              end
                        "
     <% if #{singular}.#{col}.nil? %>
         <span class='alert-danger'>MISSING</span>
     <% else %>
-      <%=  #{singular_class}.defined_enums['#{enum_type}'][#{singular}.#{col}] %>
+      <%=  #{enum_definer}[#{singular}.#{col}.to_sym] %>
     <% end %>
 
 "

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,63 @@ 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
+      if @factory_creation == ''
+        "@#{singular_name } = #{ class_name }.create(modified_params)"
+      else
+        "#{@factory_creation}\n" +
+        "    @#{singular_name } = #{ class_name }.create(modified_params)"
+      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 +507,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 = !hawk_scope.include?("{")
+
+          if use_shorthand # only include the hawk scope if using the shorthand
             @hawk_keys[key.to_sym] << hawk_scope
           end
         end
@@ -496,6 +562,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?("_")
@@ -573,7 +640,7 @@ module HotGlue
       unless @no_specs
         dest_file = File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{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,12 +656,30 @@ 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],
@@ -622,11 +707,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 +727,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 +748,7 @@ module HotGlue
     end
 
     def testing_name
-      singular_class_name.gsub("::","_").downcase
+      singular_class_name.gsub("::","_").underscore
     end
 
     def singular_class_name
@@ -676,8 +763,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 +779,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 +797,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 +821,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 +1017,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 +1054,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 +1110,11 @@ module HotGlue
 
       unless @no_edit
         res << 'edit'
-        res << '_form'
       end
 
+      if !( @no_edit && @no_create)
+          res << '_form'
+      end
       res
     end
 
@@ -1041,35 +1149,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 +1256,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}') }"
       }.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 +1314,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