hot-glue 0.4.8.1 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afd7653fa703e1bf60d018a359d175c3f99db44446e727c8e6efcea7076ed856
-  data.tar.gz: 1796ccdc104e936c5416ef8068b1b148d4038f071822f1d62c24d7c0be97f658
+  metadata.gz: a742ee0c02993ed08614aafae1af82e86528f002b69a7213c8cd731518b14df3
+  data.tar.gz: 6bd0941019c42f2ce0eee5d94447098b748a0475726efd53554c1f62f3051f2f
 SHA512:
-  metadata.gz: 5899771864cb198681bec532523d375319885cc65a48ffdc3b783af471fd37cc80c94a3e894cd8374829eef066e2a42fe9d9e6af323561de2198ea562ea8d5fe
-  data.tar.gz: c86ad53fce047f3ce3e029dcf880cbed981d94f79ff1838a6a87288e141b2a33ac72dca01dbc7760937c7cf463da57d2fb56a0aeba3eb009b1781296019aba33
+  metadata.gz: 4bdfa2cdfbf27a138d53be2455df509345ec20f0f37d047a67e77d7365fff543a76e41504f3a1699a6eb24056ad939e55254ec6b4195c8647734d4b7f6eb288a
+  data.tar.gz: d123bf48ca0e1beb4eacdceeee934aaca4b6e6c6284a2c0c3f09e39caab94e9561bea7ccd8fcb92d6c8942df5ae855958270d2a8726a06dc3875fbfa6ec7b7d8

data/.github/FUNDING.yml

@@ -1,2 +1,2 @@
-custom: ["https://heliosdev.shop/hot-glue-license?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link",
-         "https://jfb.teachable.com/p/hot-glue-in-depth-tutorial?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link"]
+custom: ["https://heliosdev.shop/p/hot-glue?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link",
+         "https://jfbcodes.com/p/hot-glue-in-depth-tutorial?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.4.8)
+    hot-glue (0.4.8.1)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)

data/README.md

@@ -27,8 +27,10 @@ Hot Glue generates functionality that's quick and dirty. It lets you be crafty.
 * Nest your routes model-by-model for built-in poor man's authentication.
 * Throw the scaffolding away when your app is ready to graduate to its next phase.
 
-# Hot Glue Tutorial 
-## [GET THE COURSE TODAY (includes Hot Glue License)](https://jfbcodes.com/courses/hot-glue-in-depth-tutorial/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page) **only $60 USD!**
+
+# Get Hot Glue
+## [Licence Only Option Now Available](https://heliosdev.shop/p/hot-glue/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page) **only $50 USD!**
+## [GET THE COURSE TODAY (includes Licence)](https://jfbcodes.com/courses/hot-glue-in-depth-tutorial/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page) **only $60 USD!**
 
 |   |  |  
 | ------------- | ------------- |
@@ -62,8 +64,11 @@ There are two ways to create new apps on Rails 7: With or without ImportMap. The
 
 `rails new --css=bootstrap --javascript=webpack --database=postgresql`
 
-Confirm that both Stimulus and Turbo are working. For the quick step-by-step to help you confirm 
-that both Stimulus and Turbo are working for your new JSBundling-Rails/CSSBunlding-Rails setup [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-new-app-with-js-bundling-css-bundling/).
+Confirm that both Stimulus and Turbo are working.
+
+**If using JSBundling, make sure to use the new `bin/dev rails` instead of the old `rails server` or else your Webpack will not compile.** 
+
+For the quick step-by-step to help you confirm that both Stimulus and Turbo are working for your new JSBundling-Rails/CSSBunlding-Rails setup [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-new-app-with-js-bundling-css-bundling/).
 
 (Note that Bootstrap is optional for Hot Glue. Here, I am just showing you the default isntallation for simplicity.)
 
@@ -92,21 +97,13 @@ Purchase a license at https://heliosdev.shop/hot-glue-license
 During in installation, you MUST supply a `--layout` flag.
 
 ### `--layout` flag (NOTE: haml and slim are no longer supported at this time)
-Here you will set up and install Hot Glue for the first time. It will install a config file that will save two preferences: layout (hotglue or bootstrap) and markup (erb or haml or slim).
+Here you will set up and install Hot Glue for the first time. 
 
-Once you run the installer, the installer will save what you set it to in `config/hot_glue.yml`. Newly generated scaffolds will use these two settings, but you can modify them just by modifying the config file (you don't need to re-run the installer)
+It will install a config file that will save two preferences: layout (`hotglue` or `bootstrap`)
 
-If you do NOT specify `--layout=bootstrap`, then `hotglue` will be assumed. When constructing scaffold with bootstrap layout (at this time Hot Glue peeks into config/hot_glue.yml to see what you've set there), your views come out with divs that have classes like .container-fluid, .row, and .col. You'll need to install Bootstrap separately, any way you like, but jQuery is not required as Hot Glue does not rely on jQuery-dependant Bootstrap features.
+The installer will create `config/hot_glue.yml`. 
 
-
-If instead you install Hot Glue (or switch the setting) using the default layout mode (`--layout=hotglue`),
-your scaffolding will be built using no-Bootstrap syntax: It has its own syntax with classes like
-`.scaffold-container`,
-`.scaffold-list`,
-`.scaffold-row`, and
-`.scaffold-cell`
-
-During the installation, if your `--layout` flag is left unspecified or set to `hotglue` you must also pass `--theme` flag.
+During the installation, if your `--layout` flag is set to `hotglue` you must also pass `--theme` flag.
 
 the themes are:
 • like_mountain_view (Google)
@@ -114,21 +111,12 @@ the themes are:
 • like_bootstrap (bootstrap 4 copy)
 • dark_knight (_The Dark Night_ (2008) inspired)
 • like_cupertino (modern Apple-UX inspired)
-• gradeschool (spiral bound/lined notebook inspired)
-
-Please note that the scaffold is ** built with different market up for boostrap**, so you cannot switch between the Bootstrap and Hotglue layouts without rebuilding the scaffold.
-
-(On the other hand, if you build within the Hotglue layout, all of the Hotglue theme files CAN be swapped out without rebuilding the scaffold.)
-
-The themes are just SCSS files installed into app/assets/stylesheets. You can tweak or modify or remove them after they get installed.
-
 
 ### `--markup` flag
 
-default is `erb`. IMPORTANT: As of right now, I am only supporting & building against ERB. HAML and SLIM are not currently supported.
+default is `erb`. IMPORTANT: As of right now, HAML and SLIM are not currently supported.
 
 
-## 3. RUN HOT-GLUE INSTALL:
 ### example installing ERB using Bootstrap layout:
 `rails generate hot_glue:install --markup=erb --layout=bootstrap`
 
@@ -373,6 +361,34 @@ Then, finally the @charge will be loaded
 
 This is "starfish access control" or "poor man's access control."  It works when the current user has several things they can manage, and by extension can manage children of those things.  
 
+
+#### Optionalized Nested Parents
+
+Add `~` in front of any nested parameter (any parent in the `--nest` list) you want to make optional. This creates a two-headed controller: It can operate with or without that optionalized parameter.
+
+This is an advanced feature is to use **two duplicative routes to the same controller**. You can only use this feature with Gd controller.  
+
+Specify your controller *twice* in your routes.rb. Then, in your `--nest` setting, add `~` to any nested parent you want to **make optional**. "Make optional" means the controller will behave as-if it exists in two places: once, at the normal nest level.  Then the same controller will 'exist' again one-level up in your routes. **If the route has sub-routes, you'll need to re-specify the entire subtree also**.
+```
+namespace :admin
+  resources :users do
+    resources :invoices
+  end
+  resources :invoices
+end
+```
+
+Even though we have two routes pointed to invoices, both will go to the same controller (`invoices_controller.rb`)
+
+```
+rails generate hot_glue:scaffold User --namespace=admin --gd --downnest=invoices
+rails generate hot_glue:scaffold Invoice --namespace=admin --gd --nest=~users
+```
+Notice for the Invoice build, the parent user is *optionalized* (not 'optional'-- optionalized: to be made so it can be made optional).  
+
+The Invoices controller, which is a Gd controller, will load the User if a user is specified in the route (`/admin/users/:user_id/invoices/`). It will ALSO work at `/admin/invoices` and will switch back into loading directly from the base class when routed this way.
+
+
                                                          
 ### `--auth=`
 
@@ -396,28 +412,6 @@ It is also presumed that when viewing their own dashboard of things, the user wi
 
 If you supply nesting (see below), your nest chain will automatically begin with your auth root object (see nesting)
 
-#### Optionalized Nested Parents
-
-Add `~` in front of any nested parameter (any parent in the `--nest` list) you want to make optional. This creates a two-headed controller: It can operate with or without that optionalized parameter. 
-
-This is an advanced feature is to use two duplicitous routes to the same controller.  You can only use this feature with Gd controller.  To use, specify your controller *twice* in your routes.rb. Then, in your `--nest` setting, add `~` to any nested parent you want to **make optional**. "Make optional" means the controller will behave as-if it exists in two places: once, at the normal nest level.  Then the same controller will 'exist' again one-level up in your routes. **If the route has sub-routes, you'll need to re-specify the entire subtree also**.
-```
-namespace :admin
-  resources :users do
-    resources :invoices
-  end
-  resources :invoices
-end
-```
-Hot Glue will build the scaffolding once for users and once again for invoice. Even though we have two routes pointed to invoices, 
-```
-rails generate hot_glue:scaffold User --namespace=admin --gd --downnest=invoices
-rails generate hot_glue:scaffold Invoice --namespace=admin --gd --nest=~users
-```
-Notice for the Invoice build, the parent user is *optionalized* (not 'optional'-- optionalized: to be made so it can be made optional).  The Invoices controller, which is a Gd controller, will load the User if a user is specified in the route (`/admin/users/:user_id/invoices/`). It will ALSO work at `/admin/invoices` and will switch back into loading directly from the base class when routed this way.
-
-
-
 
 ### `--auth_identifier=`
 
@@ -525,7 +519,7 @@ With Bootstrap in specified grouping or smart layout mode, it automatically atte
 
 Using Bootstrap with neither specified grouping nor smart layouts may make 12 columns, which will produce strange result. (Bootstrap is not designed to work with, for example, a 13-column layout.)
 
-You should typically either specify your grouping or use smart layouts when building with Bootstrap, but if your use case does not fit the stacking feature you can specify neither and then you may have deal with the over-stuffed layouts as explained above. 
+You should typically either specify your grouping or use smart layouts when building with Bootstrap, but if your use case does not fit the stacking feature you can specify neither flag and then you may then have to deal with the over-stuffed layouts as explained. 
 
 
 
@@ -533,7 +527,7 @@ You should typically either specify your grouping or use smart layouts when buil
 
 Smart layouts are like specified grouping but Hot Glue does the work of figuring out how many fields you want in each column. 
 
-It will concatinate your fields into groups that will fit into the Bootstraps 12-column grid.
+It will concatinate your fields into groups that will fit into the Bootstrap's 12-column grid.
 
 The effect will be that the fields will be stacked together into nicely fit columns.
 
@@ -553,7 +547,7 @@ If you're keeping track, that means we may have used 6 to 8 out of our Bootstrap
 
 If we have 2 downnested portals and only the default buttons, that uses 10 out of 12 Bootstrap columns, leaving only 2 bootstrap columns for the fields.
 
-THe layout builder takes the number of columns left and then distributes the feilds 'evenly' among them. However, note that order specified translates to up-to-down within the column, and then left-to-right across the columns, like so:
+The layout builder takes the number of columns left and then distributes the feilds 'evenly' among them. However, note that order specified translates to up-to-down within the column, and then left-to-right across the columns, like so:
 
 A D G
 
@@ -622,7 +616,11 @@ Automatically create subviews down your object tree. This should be the name of
 You will need to build scaffolding with the same name for the related object as well. On the list view, the object you are currently building will be built with a sub-view list of the objects related from the given line.
 
 The downnested child table (not to be confused with this object's `--nested` setting, where you are specifying this object's _parents_) is called a **child portal**. When you create a record in the child portal, the related record is automatically set to be owned by its parent (as specified by `--nested`). For an example, see the [v0.4.7 release notes](https://github.com/jasonfb/hot-glue/releases/tag/v0.4.7).
- 
+
+Can now be created with more space (wider) by adding a `+` to the end of the downnest name
+- e.g. `--downnest=abc+,xyz`
+
+The 'Abcs' portal will display as 5 bootstrap columns instead of the typical 4. (You may use multiple ++ to keep making it wider but the inverse with minus is not supported
 
 
 
@@ -665,7 +663,14 @@ Omits list action. Only makes sense to use this if you are create a view where y
 
 ### `--no-list-labels`
 
-Omits list labels. (note that in the form the labels are rendered again anyway)
+Omits list labels at the top of the list.
+
+### `--no-list-heading`
+
+Omits the list heading. 
+
+(Note that on a per model basis, you can also globally omit the heading or set a unique value using 
+`@@table_label_singular` and `@@table_label_plural` on your model objects.)
 
 ### `--no-create`
 
@@ -697,10 +702,23 @@ HotGlue will copy a file named base_controller.rb to the same folder where it tr
 
 Obviously, the created controller will always have this base controller as its subclass. In this way, you are encouraged to implement functionality common to the *namespace* (shared between the controllers in the namespace), using this technique.
 
+## Special Table Labels
+
+If your object is very wordy (like MyGreatHook) and you want it to display in the UI as something shorter,
+add `@@table_label_plural = "The Things"` and `@@table_label_singular = "The Things"`. 
+
+Hot Glue will use this as the listing heading label and New record label. This affects only the UI only.
+
+You can also set these to `nil` to omit the labels completely. 
+
+Child portals have the headings omitted automatically (there is a heading identifying them already on the parent view where they get included), or you can use the `--no-list-heading` on any specific build. 
+
+
 ## Field Types Supported
 
 - Integers that don't end with `_id`: displayed as input fields with type="number"
-- Integers that do end with `_id` will be treated automatically as associations. You should have a Rails association defined. (Hot Glue will warn you if it can't find one.)
+- Foreign keys: Integers that do end with `_id` will be treated automatically as associations. You should have a Rails association defined. (Hot Glue will warn you if it can't find one.)
+  - Note:  if your foreign key has a nonusual class name, it should be using the `class_name:` in the model definition
 - String: displayed as small input box 
 - Text: displayed as large textarea
 - Float: displayed as input box
@@ -713,28 +731,52 @@ Obviously, the created controller will always have this base controller as its s
 
 # VERSION HISTORY
 
+#### 2022-02-14 - v0.4.9
+• Fixed issue building models with namespaced class names (e.g. `Fruits::Apple` and `Fruits::Bannana`). 
+  You can now build against these kinds of models natively (be sure to pass the full model name, with double-colon syntax). 
+
+• Also fixes issues when associations themselves were namespaced models.
+
+• The N+1 Killer (!!!) 
+    - N+1 queries for _any association_ built by the list are now automagically killed by the list controllers.
+    - Thanks to the work done back in Rails 5.2, Rails smartly uses either two queries to glob up the data OR one query with a LEFT OUTER JOIN if that's faster. You don't have to think about it. **Thanks Rails 5.2!**
+    - Hot Glue now adds `.includes(...)` if it is including an association when it loads the list view to eliminate the N+1s
+    - Bullet is still the best way to identify, find, & fix your N+1 queries is still highly recommended. https://github.com/flyerhzm/bullet 
+
+• Downnest children (portals) can now be created with more space (made wider) by adding one or more `+` to the end of the downnest name, denoting add 1 bootstrap column.
+    - e.g. `--downnest=abc+,xyz`
 
+    The "Abc" portal will take up 5 bootstrap columns and the Xyz portal will take up 4 columns. (++ to indicate 6, `+++` for 7, etc)
+
+• Now that you can expand the downnest child portal width, you can easily give them too much width taking up more than 12 bootstrap columns. 
+  The builder stops you from building if you have taken up too many bootstrap columns, are in _either_ **Smart Layout mode** or **Specified Grouping mode**.
+  However, this check is not in place if you are in neither mode, in which case you should watch out for building more than 12 bootstrap columns.
+
+• To give a special label to a model, add `@@table_label_plural = "The Things"` and `@@table_label_singular = "The Thing"`. 
+  This model will now have a list heading of "The Things" instead of its usual name. 
+  For 'create buttons' and the 'New' screen, the builder will use the singular setting. 
+  This affects all builds against that model and affects the UI (display) only. 
+  All route names, table names, and variables are unaffected by this.
+
+• You can also use `@@table_label_plural = nil` to set these tables to **omit** the label headings, or use the new flag...
+
+• `--no-list-heading` (defaults to false but note several conditions when list headings are now hidden)
+
+Omits the list heading. Note that the listing heading is omitted: 
+1) if there is no list, 
+2) if you set the `--no-list-heading` flag, 
+3) if the model has `@@table_label_plural = nil`, or 
+4) if you are constructing a nested child portal with only non-optionalized parents. 
+
+
+
+#### 2022-02-09 - v0.4.8.1 - Issue with Installer for v0.4.8
+    - There was an issue for the installer for v0.4.8. This new version v0.4.8.1 correts it.
 
 
 #### 2022-02-07 - v0.4.8 Optionalized Nested Parents
     - optionalized nested parents. to use add `~` in front of any nested parameter you want to make optional
     
-    - This is an advanced feature is to use two duplicitous routes to the same controller.  You can only use this feature with Gd controller.  To use, specify your controller *twice* in your routes.rb. Then, in your `--nest` setting, add `~` to any nested parent you want to **make optional**. "Make optional" means the controller will behave as-if it exists in two places: once, at the normal nest level.  Then the same controller will 'exist' again one-level up in your routes. **If the route has sub-routes, you'll need to re-specify the entire subtree also**.
-```
-namespace :admin
-  resources :users do
-    resources :invoices
-  end
-  resoures :invoices
-end
-```
-We will  build the scaffolding once for users and once again for invoice. Even though we have two routes pointed to invoices,
-```
-rails generate hot_glue:scaffold User --namespace=admin --gd --downnest=invoices
-rails generate hot_glue:scaffold Invoice --namespace=admin --gd --nest=~users
-```
-    - Notice for the Invoice build, the parent user is *optionalized* (not 'optional'-- optionalized: to be made so it can be made optional).  The Invoices controller, which is a Gd controller, will load the User if a user is specified in the route (`/admin/users/:user_id/invoices/`). It will ALSO work at `/admin/invoices` and will switch back into loading directly from the base class when routed this way.
-    - fixes to specified grouping mode-- the columns you specify now grab up the remaining bootstrap columns to fill space
 
 #### 2022-01-26 - v0.4.7 `--nest` has been renamed to `--nested`; please use `--nested` moving forward
   - `--alt-controller-name` feature from the last release has been removed, I have something better coming soon
@@ -851,8 +893,8 @@ COVERGE=on rake spec
 --
 --
  
-Test coverage as of 2022-02-06
- 
-![Screen Shot 2022-02-06 at 10 26 36 PM](https://user-images.githubusercontent.com/59002/152719855-fdd3da6d-8348-44b9-8753-b0e73eee8065.png)
+Test coverage as of 2022-02-14 (v0.4.9)
+
+![Screen Shot 2022-02-14 at 8 33 29 PM](https://user-images.githubusercontent.com/59002/153975911-30fa9c84-c8d8-49e7-bd5c-e2b958d6f10e.png)
 
 

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

@@ -4,13 +4,13 @@ module HotGlue
   module Layout
     class Builder
       attr_reader :include_setting,
-                  :downnest_children,
+                  :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]
 
@@ -32,23 +32,28 @@ 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}
+        downnest_children_width = []
+
+        downnest_object.each do |child, size|
+          layout_object[:portals][child] = {size:  size}
+        end
 
 
         if smart_layout
@@ -56,6 +61,10 @@ module HotGlue
           #
 
           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|

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

@@ -94,9 +94,9 @@ module  HotGlue
                     end
 
                     is_owner = col == ownership_field
-                    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)
 
-                    # TODO: add is_owner && check if this nested arg is optional
                     (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} %>" : "") +
@@ -209,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

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -12,6 +12,15 @@ module HotGlue
   class Error < StandardError
   end
 
+  def self.construct_downnest_object(input)
+    res = input.split(",").map { |child|
+      child_name = child.gsub("+","")
+      extra_size = child.count("+")
+      {child_name => 4+extra_size}
+    }
+    Hash[*res.collect{|hash| hash.collect{|key,value| [key,value].flatten}.flatten}.flatten]
+  end
+
   def self.optionalized_ternary(params)
     namespace = params[:namespace] || nil
     target = params[:target]
@@ -117,6 +126,8 @@ module HotGlue
     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 :no_list_labels, type: :boolean, default: false
+    class_option :no_list_heading, type: :boolean, default: false
+
     class_option :before_list_labels, type: :boolean, default: false
 
     def initialize(*meta_args)
@@ -191,6 +202,12 @@ module HotGlue
 
 
       @singular = args.first.tableize.singularize # should be in form hello_world
+
+
+      if @singular.include?("/")
+        @singular = @singular.split("/").last
+      end
+
       @plural = options['plural'] || @singular + "s" # supply to override; leave blank to use default
       @namespace = options['namespace'] || nil
 
@@ -217,9 +234,10 @@ module HotGlue
 
       @nested = (!options['nested'].empty? && options['nested']) || nil
 
-      @singular_class = @singular.titleize.gsub(" ", "")
-      @exclude_fields = []
+      @singular_class = args.first # note this is the full class name with a model namespace
 
+
+      @exclude_fields = []
       @exclude_fields += options['exclude'].split(",").collect(&:to_sym)
 
       if !options['include'].empty?
@@ -247,6 +265,8 @@ module HotGlue
       @no_edit = options['no_edit'] || false
       @no_list = options['no_list'] || false
       @no_list_labels = options['no_list_labels'] || false
+      @no_list_heading = options['no_list_heading'] || false
+
       @display_list_after_update = options['display_list_after_update'] || false
       @smart_layout = options['smart_layout']
 
@@ -258,13 +278,13 @@ module HotGlue
       @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
       @downnest = options['downnest'] || false
 
-      @downnest_children = []
-
+      @downnest_children = [] # TODO: defactor @downnest_children in favor of downnest_object
+      @downnest_object = {}
       if @downnest
-        @downnest_children = @downnest.split(",")
+        @downnest_children = @downnest.split(",").map{|child| child.gsub("+","")}
+        @downnest_object = HotGlue.construct_downnest_object(@downnest)
       end
 
-
       if @god
         @auth = nil
       end
@@ -364,7 +384,7 @@ module HotGlue
 
       builder = HotGlue::Layout::Builder.new({
                                               include_setting: options['include'],
-                                              downnest_children: @downnest_children,
+                                              downnest_object: @downnest_object,
                                               buttons_width: buttons_width,
                                               columns: @columns,
                                               smart_layout: @smart_layout
@@ -372,6 +392,7 @@ 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}")
+
     end
 
     def identify_object_owner
@@ -379,6 +400,7 @@ module HotGlue
 
       if !@object_owner_sym.empty?
         auth_assoc_field = auth_assoc + "_id" unless @god
+
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
 
         if assoc
@@ -422,6 +444,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?("_")
           @show_only << col
@@ -431,11 +454,10 @@ module HotGlue
           if col.to_s.ends_with?("_id")
             # guess the association name label
             assoc_name = col.to_s.gsub("_id","")
-            assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
 
 
             begin
-              eval(assoc.class_name)
+              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."
               puts exit_message
@@ -443,20 +465,21 @@ module HotGlue
             end
 
 
-            if assoc.nil?
+            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)
             end
 
-            assoc_class = eval(assoc.class_name)
+            @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|
               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_name.upcase}. 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.upcase} 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)"
+              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.)"
               raise(HotGlue::Error,exit_message)
             end
           end
@@ -512,16 +535,12 @@ module HotGlue
     end
 
     def list_column_headings
-      if @nested_args.any?
+      if @layout == "bootstrap"
+        column_width = @layout_object[:columns][:size_each]
+        col_identifier = "col-md-#{column_width}"
+      elsif @layout == "hotglue"
         column_width = each_col * @columns.count
-      else
-        column_width = 0
-      end
-
-      if !@smart_layout
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-1"
-      else
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-2"
+        col_identifier = "scaffold-cell"
       end
 
       @template_builder.list_column_headings(
@@ -586,6 +605,10 @@ module HotGlue
       @singular
     end
 
+    def singular_class_name
+      @singular_class
+    end
+
     def plural_name
       plural
     end
@@ -900,6 +923,22 @@ module HotGlue
       @each_col ||= each_col
     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
+    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
+    end
+
     def each_col
       return col_width if @columns.count == 0
       (col_width/(@columns.count)).to_i
@@ -1030,6 +1069,15 @@ module HotGlue
       end
     end
 
+
+    def n_plus_one_includes
+      if @associations.any?
+        ".includes(" + @associations.map{|x| ":#{x.to_s}"}.join(", ") + ")"
+      else
+        ""
+      end
+    end
+
     def nested_for_turbo_nested_constructor(top_level = true)
       instance_symbol = "@" if top_level
       instance_symbol = "" if !top_level
@@ -1052,7 +1100,6 @@ module HotGlue
       end
     end
 
-
     private # thor does something fancy like sending the class all of its own methods during some strange run sequence
     # does not like public methods
     def cc_filename_with_extensions(name, file_format = format)

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

@@ -56,8 +56,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def load_all_<%= plural %> <% if !@self_auth %>
-    @<%= plural_name %> = ( <%= object_scope.gsub("@",'') %>.page(params[:page])<%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set[0] &&  @nested_set[0][:optional] %>) <% if @nested_set[0] &&  @nested_set[0][:optional] %> || <%= class_name %>.all<% end %> <% else %>
-    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id) # returns iterable even though this <%= singular_name %> is anly allowed access to themselves<% end %>
+    @<%= plural_name %> = ( <%= object_scope.gsub("@",'') %>.page(params[:page])<%= n_plus_one_includes %><%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set[0] &&  @nested_set[0][:optional] %>) <% if @nested_set[0] &&  @nested_set[0][:optional] %> || <%= class_name %>.all<% end %> <% else %>
+    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %> # returns iterable even though this <%= singular_name %> is anly allowed access to themselves<% end %>
   end
 
   def index

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

@@ -1,6 +1,10 @@
 <\%= turbo_frame_tag "<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
   <div class="<%= @container_name %> scaffold-list">
-    <% unless @no_list || @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
+    <% unless @no_list || @no_list_heading || (@nested_set.any? && !@nested_set.collect{|x| x[:optional]}.any?)  %>
+      <% unless list_label.nil? %><h4>
+        <%= list_label %>
+      </h4><% end %>
+    <% end %>
 
     <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  @controller_build_folder + '/new_button", locals: {}' + @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {})"}.join()  + ' %\>'.gsub('\\',"")  %><br /><% end %>
 
@@ -8,17 +12,17 @@
       <% unless @no_list_labels %>
         <div class="row scaffold-heading-row">
           <%= list_column_headings %>
-          <% if @downnest_children.any? %>
-            <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
+          <% if @downnest_object.any? %>
+            <%# each_downnest_width = @downnest_object.count == 1 ? 40 : (60/@downnest_object.count).floor %>
             <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width.to_s +  '%;' : "" %>
 
-            <% @downnest_children.each_with_index do |downnest,i| %>
-            <div class=" scaffold-col-heading<%= " col-sm-#{ @layout_object[:portals][downnest][:size] }" if @layout=="bootstrap" %>" <%= downnest_column_style %>>
-              <strong>
-                <%=  downnest.titleize  %>
-              </strong>
-            </div>
-          <% end %>
+            <% @downnest_object.each do |downnest,i| %>
+              <div class=" scaffold-col-heading<%= " col-sm-#{ @layout_object[:portals][downnest][:size] }" if @layout=="bootstrap" %>" <%= downnest_column_style %>>
+                <strong>
+                  <%=  downnest.titleize  %>
+                </strong>
+              </div>
+            <% end %>
           <% end %>
 
           <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>

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

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

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

@@ -1,6 +1,6 @@
 <\%= turbo_frame_tag "<%=  singular %>-new" do %>
 <h3>
-  New <%= singular.titlecase %>
+  New <%= thing_label %>
   </h3>
   <\%= form_with model:  <%= singular %>, url: <%= form_path_new_helper %>, method: :post do  |f| \%>
     <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form",

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

@@ -3,7 +3,7 @@
 <% if @downnest_children.any? %>
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
 
-  <% @downnest_children.each_with_index do |downnest,i| %>
+  <% @downnest_object.each do |downnest, size| %>
 
     <% downnest_object =  eval("#{singular_class}.reflect_on_association(:#{downnest})") %>
     <% if downnest_object.nil?; raise "no relationship for downnested portal `#{downnest}` found on `#{singular_class}`; please check relationship for has_many :#{downnest}"; end; %>

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

@@ -9,7 +9,7 @@
     <\% end %>
 
     <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>
-    <\%= form_with model: <%= "@" + singular%>, url: <%= form_path_edit_helper %> do |f| %>
+    <\%= form_with model: <%= "@" + singular %>, url: <%= form_path_edit_helper %> do |f| %>
     <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
     <\% end %>
 

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.4.8.1'
+    CURRENT = '0.4.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.8.1
+  version: 0.4.9
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ files:
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
 - lib/hotglue/version.rb
-homepage: https://jfbcodes.com/p/hot-glue-in-depth-tutorial?utm_source=rubygems.org&utm_campaign=rubygems_link
+homepage: https://heliosdev.shop/p/hot-glue?utm_source=rubygems.org&utm_campaign=rubygems_link
 licenses:
 - Commercial with free option
 metadata:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A gem to build Tubro Rails scaffolding.