hot-glue 0.4.6 → 0.4.9.1

data/README2.md

@@ -0,0 +1,79 @@
+
+## LEGACY SETUP FOR RAILS 6
+
+## Legacy Step #1. ADD HOTWIRE
+(RAILS 6 ONLY— SKIP THIS STEP FOR RAILS 7)
+```
+yarn add @hotwired/turbo-rails
+```
+or `npm install @hotwired/turbo-rails`
+
+
+## Legacy Step #2. SWITCH FROM TurblLinks to Turbo-Rails
+(RAILS 6 ONLY — SKIP FOR RAILS 7)
+(THIS WAS AUTOMATICALLY DONE BY THE HOT GLUE INSTALLATION -- CONFIRM CHANGES ONLY)
+- Add `gem 'turbo-rails'` to your Gemfile & `bundle install`
+- Then install it with `rails turbo:install`
+- The Turbo install has switched your action cable settings from 'async' to Redis, so be sure to start a redis server
+- in `app/javascript/packs/application.js` remove this line
+```
+import Turbolinks from "turbolinks"
+```
+and replace it with
+```
+import { Turbo } from "@hotwired/turbo-rails"
+```
+
+
+Also replace
+``` 
+Turbolinks.start()
+```
+with:
+```
+Turbo.start()
+```
+
+
+## Legacy Step #3. INSTALL WEBPACKER
+(_SKIP FOR RAILS 7_ unless you want to use Webpacker with Rails 7)
+
+** For webpacker, you must be using Node version ^12.13.0 || ^14.15.0 || >=16 **
+
+I recommend Node Version Manager (NVM) to switch between nodes. You will not be able to get through the following command with a Node version that does not match above.
+
+Check your node version with `node -v`
+
+```
+`yarn add @rails/webpacker`
+```
+
+
+rails webpacker:install
+
+## Legacy Step #4: Postgresql Enum Support for Rail 6
+For Enum support, I recommend activerecord-pg_enum
+Instructions for Rails 6 are here:
+https://jasonfleetwoodboldt.com/courses/stepping-up-rails/enumerated-types-in-rails-and-postgres/
+
+_This functionality is now built-in to Rails 7._
+
+
+## Legacy Step #5: Fix Devise if adding Turbo To Your Project
+## IMPORTANT: Devise currently has serious compatibility issues with Turbo Rails. In particular, your log-in screens do not work out of the box. Follow the next step to fix them.
+
+Manually port the Devise views into your app with
+
+`rails generate devise:views`
+
+Edit `devise/registrations/new`, `devise/sessions/new`, `devise/passwords/new` and `devise/confirmations/new` modifying all four templates like so:
+
+form_for(resource, as: resource_name, url: session_path(resource_name) ) do |f|
+
+add the data-turbo false option in the html key:
+```bigquery
+
+```
+form_for(resource, as: resource_name, **html: {'data-turbo' => "false"},** url: session_path(resource_name) ) do |f|
+
+This tells Devise to fall back to non-Turbo interaction for the log-in and registration. For the rest of the app, we will use Turbo Rails interactions.

data/config/database.yml

@@ -1,86 +1,11 @@
-# PostgreSQL. Versions 9.3 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On macOS with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # https://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
 development:
-  <<: *default
-  database: Dummy_development
-
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user running Rails.
-  #username: Dummy
-
-  # The password associated with the postgres role (username).
-  #password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
+  adapter: sqlite3
+  database: ../spec/dummy/db/development.sqlite3
+  pool: 5
+  timeout: 5000
 
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  <<: *default
-  database: Dummy_test
-
-# As with config/credentials.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password or a full connection URL as an environment
-# variable when you boot the app. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# If the connection URL is provided in the special DATABASE_URL environment
-# variable, Rails will automatically merge its configuration values on top of
-# the values provided in this file. Alternatively, you can specify a connection
-# URL environment variable explicitly:
-#
-#   production:
-#     url: <%= ENV['MY_APP_DATABASE_URL'] %>
-#
-# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full overview on how database connection configuration can be specified.
-#
-production:
-  <<: *default
-  database: Dummy_production
-  username: Dummy
-  password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>
+  adapter: sqlite3
+  database: ../spec/dummy/db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/db/schema.rb

@@ -0,0 +1 @@
+db/spec/dummy/db/schema.rb

data/lib/generators/hot_glue/install_generator.rb

@@ -17,7 +17,6 @@ module HotGlue
       super
       @layout = options['layout'] || "hotglue"
       @theme =  options['theme']
-
       if @layout == "hotglue" && options['theme'].nil?
         puts "You have selected to install Hot Glue without a theme. You can either use the --layout=bootstrap to install NO HOT GLUE THEME, or to use a Hot Glue theme please choose: like_boostrap, like_menlo_park, like_cupertino, like_mountain_view, dark_knight"
         return

data/lib/generators/hot_glue/layout/builder.rb

@@ -3,23 +3,27 @@
 module HotGlue
   module Layout
     class Builder
-      attr_reader :include_setting, :downnest_children, :buttons_width, :columns, :smart_layout
+      attr_reader :include_setting,
+                  :downnest_object,
+                  :buttons_width, :columns,
+                  :smart_layout, :specified_grouping_mode
 
       def initialize(params)
         @include_setting = params[:include_setting]
-        @downnest_children = params[:downnest_children]
+        @downnest_object = params[:downnest_object]
 
         @buttons_width = params[:buttons_width]
 
         @no_buttons = @buttons_width == 0
         @columns = params[:columns]
         @smart_layout = params[:smart_layout]
+        @specified_grouping_mode = include_setting.include?(":")
       end
 
       def construct
         layout_object = {
           columns: {
-            size_each: nil,
+            size_each: smart_layout ? 2 : (specified_grouping_mode ? nil : 1),
             container: [] # array of arrays
           },
           portals:  {
@@ -28,33 +32,39 @@ module HotGlue
           buttons: { size: @buttons_width}
         }
 
-        downnest_children.each do |child|
-          layout_object[:portals][child] = {size: 4}
-        end
+        # downnest_object.each do |child, size|
+        #   layout_object[:portals][child] = {size: size}
+        # end
 
         # smart layout: 2 columns per field; 4 column for EACH downnested portals, 2 column for buttons
-        how_many_downnest = downnest_children.size
+        how_many_downnest = downnest_object.size
+
+        bootstrap_columns = (12 - @buttons_width )
+
+        bootstrap_columns = bootstrap_columns - (downnest_object.collect{|k,v| v}.sum)
 
-        bootstrap_columns = (12-@buttons_width )
-        bootstrap_columns = bootstrap_columns - (how_many_downnest*4)
         available_columns = (bootstrap_columns / 2).floor # bascially turns the 12-column grid into a 6-column grid
 
         if available_columns < 0
           raise "Cannot build layout with #{how_many_downnest} downnested portals"
         end
 
-        @downnest_children_width = []
-        @downnest_children.each_with_index{ |child, i| @downnest_children_width[i] = 4}
-
-        if include_setting.nil?
+        downnest_children_width = []
 
+        downnest_object.each do |child, size|
+          layout_object[:portals][child] = {size:  size}
         end
 
+
         if smart_layout
           # automatic control
           #
 
           if columns.size > available_columns
+            if available_columns == 0
+              raise "Oopps... No available columns in SMART LAYOUT"
+            end
+
             each_col_can_have = (columns.size.to_f / available_columns.to_f).round
 
             layout_object[:columns][:container] = (0..available_columns-1).collect { |x|
@@ -68,23 +78,29 @@ module HotGlue
             }
             layout_object[:columns][:container].reject!{|x| x == [nil]}
           end
-        elsif !include_setting.include?(":")
+        elsif ! specified_grouping_mode
+          # not smart and no specified grouping
+          #
           layout_object[:columns][:container] = columns.collect{|col| [col]}
 
-        else
+        else # specified grouping mode -- the builder is given control
 
           (0..available_columns-1).each do |int|
             layout_object[:columns][:container][int] = []
           end
 
           # input control
-          user_layout_columns = @include_setting .split(":")
+
+          user_layout_columns = @include_setting.split(":")
+          size_each = (bootstrap_columns / user_layout_columns.count).floor # this is the bootstrap size
+
+          layout_object[:columns][:size_each] = size_each
 
           if user_layout_columns.size > available_columns
-            raise "Your include statement #{@include_setting }  has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
+            raise "Your include statement #{@include_setting } has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
           end
           user_layout_columns.each_with_index  do |column,i|
-            layout_object[:columns][:container][i] = column.split(",")
+            layout_object[:columns][:container][i] = column.split(",").collect(&:to_sym)
           end
 
           if user_layout_columns.size < layout_object[:columns][:container].size
@@ -92,21 +108,23 @@ module HotGlue
           end
         end
 
-        if layout_object[:columns][:container].size < available_columns
-          available = available_columns - layout_object[:columns][:container].size
-          downnest_child_count = 0
-
-          while(available > 0)
-            if (downnest_child_count <= downnest_children.size-1)
-              layout_object[:portals][downnest_children[downnest_child_count]][:size] = layout_object[:portals][downnest_children[downnest_child_count]][:size]  + 2
-            else
-              # leave as-is
-            end
-            downnest_child_count = downnest_child_count + 1
-            available = available - 1
-          end
-          # give some space back to the downnest
-        end
+        # TODO: do I want this code that expands the downnest portal
+        # maybe refactor into a setting on the --downnest flag itself somehow
+        # if layout_object[:columns][:container].size < available_columns
+        #   available = available_columns - layout_object[:columns][:container].size
+        #   downnest_child_count = 0
+        #
+        #   while(available > 0)
+        #     if (downnest_child_count <= downnest_children.size-1)
+        #       layout_object[:portals][downnest_children[downnest_child_count]][:size] = layout_object[:portals][downnest_children[downnest_child_count]][:size]  + 2
+        #     else
+        #       # leave as-is
+        #     end
+        #     downnest_child_count = downnest_child_count + 1
+        #     available = available - 1
+        #   end
+        #   # give some space back to the downnest
+        # end
 
         puts "*** constructed layout columns #{layout_object.inspect}"
         layout_object

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

@@ -1,24 +1,33 @@
 module  HotGlue
   class ErbTemplate < TemplateBase
 
+
+
+    def add_spaces_each_line(text, num_spaces)
+      add_spaces = " " * num_spaces
+      text.lines.collect{|line| add_spaces + line}.join("")
+    end
+
+
     # include GeneratorHelper
     attr_accessor :singular
 
     def field_output(col, type = nil, width, col_identifier )
-      "  <%= f.text_field :#{col.to_s}, value: @#{@singular}.#{col.to_s}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
-      "  <label class='form-text' >#{col.to_s.humanize}</label>\n"
+      "  <%= f.text_field :#{col}, value: @#{@singular}.#{col}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
+      "\n"
     end
 
 
     def magic_button_output(*args)
-      path_helper_singular = args[0][:path_helper_singular]
-      path_helper_args = args[0][:path_helper_args]
+      path = args[0][:path]
+      # path_helper_singular = args[0][:path_helper_singular]
+      # path_helper_args = args[0][:path_helper_args]
       singular = args[0][:singular]
       magic_buttons = args[0][:magic_buttons]
       small_buttons = args[0][:small_buttons]
 
       magic_buttons.collect{ |button_name|
-        "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}), html: {style: 'display: inline', data: {\"turbo-confirm\": 'Are you sure you want to #{button_name} this #{singular}?'}} do |f| %>
+        "<%= form_with model: #{singular}, url: #{path}, html: {style: 'display: inline', data: {\"turbo-confirm\": 'Are you sure you want to #{button_name} this #{singular}?'}} do |f| %>
       <%= f.hidden_field :#{button_name}, value: \"#{button_name}\" %>
     <%= f.submit '#{button_name.titleize}'.html_safe, disabled: (#{singular}.respond_to?(:#{button_name}able?) && ! #{singular}.#{button_name}able? ), class: '#{singular}-button btn btn-primary #{"btn-sm" if small_buttons}' %>
     <% end %>"
@@ -31,8 +40,7 @@ module  HotGlue
         lines = 5
       end
 
-      "<%= f.text_area :#{col.to_s}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>" +
-        "<label class='form-text'>#{col.to_s.humanize}</label>"
+      "<%= f.text_area :#{col}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>"
     end
 
     def list_column_headings(*args)
@@ -59,90 +67,92 @@ module  HotGlue
       show_only = args[0][:show_only]
       singular_class = args[0][:singular_class]
       col_identifier = args[0][:col_identifier]
+      ownership_field  = args[0][:ownership_field]
 
-
-      # TODO: CLEAN ME
       @singular = args[0][:singular]
       singular = @singular
-
-      col_spaces_prepend = "    "
-
-
       result = layout_columns.map{ |column|
-        "<div class='#{col_identifier}' >" +
-
+        "  <div class='#{col_identifier}' >" +
           column.map { |col|
+            field_result =
+              if show_only.include?(col.to_sym)
+                "<%= @#{singular}.#{col} %>"
+              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
+                  # look for a belongs_to on this object
+                  if col.to_s.ends_with?("_id")
+                    assoc_name = col.to_s.gsub("_id","")
+                    assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+                    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.active_record.name
+                    display_column = HotGlue.derrive_reference_name(assoc_class_name)
+
+                    (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
+                      "  <%= f.collection_select(:#{col}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
+                      (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
+                      (is_owner ? "\n<% end %>" : "")
+
+                  else
+                    "<%= f.text_field :#{col}, value: #{singular}.#{col}, class: 'form-control', size: 4, type: 'number' %>"
 
-          field_result = if show_only.include?(col)
-            "<%= @#{singular}.#{col.to_s} %>" +
-            "<label class='form-text'>#{col.to_s.humanize}</label>"
-          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
-                # look for a belongs_to on this object
-                if col.to_s.ends_with?("_id")
-                  assoc_name = col.to_s.gsub("_id","")
-                  assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
-                  if assoc.nil?
-                    exit_message= "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-                    exit
                   end
-                  display_column = HotGlue.derrive_reference_name(assoc.class_name)
-                  "<%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
-  <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
-
-                else
-                  "<%= f.text_field :#{col.to_s}, value: #{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number' %>
-  <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
+                when :string
+                  if sql_type == "varchar" || sql_type == "character varying"
+                    field_output(col, nil, limit || 40, col_identifier)
+                  else
+                    text_area_output(col, 65536, col_identifier)
+                  end
 
-                end
-              when :string
-                if sql_type == "varchar" || sql_type == "character varying"
-                  field_output(col, nil, limit || 40, col_identifier)
-                else
-                  text_area_output(col, 65536, col_identifier)
+                when :text
+                  if sql_type == "varchar"
+                    field_output(col, nil, limit, col_identifier)
+                  else
+                    text_area_output(col, 65536, col_identifier)
+                  end
+                when :float
+                  field_output(col, nil, 5, col_identifier)
+                when :datetime
+                  "<%= datetime_field_localized(f, :#{col}, #{singular}.#{col}, '#{ col.to_s.humanize }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
+                when :date
+                  "<%= date_field_localized(f, :#{col}, #{singular}.#{col}, '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
+                when :time
+                  "<%= time_field_localized(f, :#{col}, #{singular}.#{col},  '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
+                when :boolean
+                  " " +
+                    "  <span>#{col.to_s.humanize}</span>" +
+                    "  <%= f.radio_button(:#{col},  '0', checked: #{singular}.#{col}  ? '' : 'checked') %>\n" +
+                    "  <%= f.label(:#{col}, value: 'No', for: '#{singular}_#{col}_0') %>\n" +
+                    "  <%= f.radio_button(:#{col}, '1',  checked: #{singular}.#{col}  ? 'checked' : '') %>\n" +
+                    "  <%= f.label(:#{col}, value: 'Yes', for: '#{singular}_#{col}_1') %>\n" +
+                    ""
+                when :enum
+                  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') %>"
                 end
 
-              when :text
-                if sql_type == "varchar"
-                  field_output(col, nil, limit, col_identifier)
-                else
-                  text_area_output(col, 65536, col_identifier)
-                end
-              when :float
-                field_output(col, nil, 5, col_identifier)
-              when :datetime
-                  "<%= datetime_field_localized(f, :#{col.to_s}, #{singular}.#{col.to_s}, '#{ col.to_s.humanize }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
-              when :date
-                  "<%= date_field_localized(f, :#{col.to_s}, #{singular}.#{col.to_s}, '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
-              when :time
-               "<%= time_field_localized(f, :#{col.to_s}, #{singular}.#{col.to_s},  '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
-              when :boolean
-                " " +
-                  "  <span>#{col.to_s.humanize}</span>" +
-                  "  <%= f.radio_button(:#{col.to_s},  '0', checked: #{singular}.#{col.to_s}  ? '' : 'checked') %>\n" +
-                  "  <%= f.label(:#{col.to_s}, value: 'No', for: '#{singular}_#{col.to_s}_0') %>\n" +
-                  "  <%= f.radio_button(:#{col.to_s}, '1',  checked: #{singular}.#{col.to_s}  ? 'checked' : '') %>\n" +
-                  "  <%= f.label(:#{col.to_s}, value: 'Yes', for: '#{singular}_#{col.to_s}_1') %>\n" +
-                  ""
-              when :enum
-                enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col.to_s}'}[0].sql_type")
-                "<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
-  <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
               end
-           end
-
-          if (type == :integer) && col.to_s.ends_with?("_id")
-            field_error_name = col.to_s.gsub("_id","")
-          else
-            field_error_name = col.to_s
-          end
-           "<span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{ 'style="display: inherit;"'}  >" + field_result + "</span>"
-          }.join("<br />\n") + "</div>"
+
+            if (type == :integer) && col.to_s.ends_with?("_id")
+              field_error_name = col.to_s.gsub("_id","")
+            else
+              field_error_name = col
+            end
+
+            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(field_result + "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>", 4) +
+                                    "\n  </span>\n  <br />", 2)
+
+          }.join("") + "\n  </div>"
       }.join("\n")
       return result
     end
@@ -162,20 +172,20 @@ module  HotGlue
       singular = args[0][:singular]
       perc_width = args[0][:perc_width]
       layout = args[0][:layout]
+      col_identifier =   args[0][:col_identifier]  || (layout == "bootstrap" ? "col-md-2" :  "scaffold-cell")
+
 
       columns_count = layout_columns.count + 1
       perc_width = (perc_width).floor
 
       if layout == "bootstrap"
-        col_identifer = "col-md-2"
         style_with_flex_basis = ""
       else
         style_with_flex_basis = " style='flex-basis: #{perc_width}%'"
-        col_identifer = "scaffold-cell"
       end
 
       result = layout_columns.map{ |column|
-        "<div class='#{col_identifer}'#{style_with_flex_basis}>" +
+        "<div class='#{col_identifier}'#{style_with_flex_basis}>" +
 
 
         column.map { |col|
@@ -186,7 +196,7 @@ module  HotGlue
           case type
           when :integer
             # look for a belongs_to on this object
-            if col.to_s.ends_with?("_id")
+            if col.ends_with?("_id")
 
               assoc_name = col.to_s.gsub("_id","")
 
@@ -199,9 +209,8 @@ module  HotGlue
                 exit
                 # raise(HotGlue::Error,exit_message)
               end
-
-              display_column =  HotGlue.derrive_reference_name(assoc.class_name)
-
+              assoc_class_name = assoc.active_record.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 %>"
 
             else
@@ -244,7 +253,7 @@ module  HotGlue
     <% end %>
 
   "        when :enum
-             enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col.to_s}'}[0].sql_type")
+             enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
 
                        "
     <% if #{singular}.#{col}.nil? %>