hot-glue 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a742ee0c02993ed08614aafae1af82e86528f002b69a7213c8cd731518b14df3
-  data.tar.gz: 6bd0941019c42f2ce0eee5d94447098b748a0475726efd53554c1f62f3051f2f
+  metadata.gz: ce580959416e9968343b55064541fe777cef3c213f6124add34aba96f13a194b
+  data.tar.gz: 902147016f8d3ef1b20a1ce713b84d68b9ff2b5700d2643369d1037d0658bbc2
 SHA512:
-  metadata.gz: 4bdfa2cdfbf27a138d53be2455df509345ec20f0f37d047a67e77d7365fff543a76e41504f3a1699a6eb24056ad939e55254ec6b4195c8647734d4b7f6eb288a
-  data.tar.gz: d123bf48ca0e1beb4eacdceeee934aaca4b6e6c6284a2c0c3f09e39caab94e9561bea7ccd8fcb92d6c8942df5ae855958270d2a8726a06dc3875fbfa6ec7b7d8
+  metadata.gz: d4625645ea4bd58ee8614965ff26083ef86ca6d07398408bcf01cb72e3aceda62d60480a86fbe4a999e12f726bc74c427f35a3d889cba9e6d0ef7e54c42f1f79
+  data.tar.gz: 7dd4e7fc8d7a605c54818c60bfdaa38148727f65a13e8e1135002bcc23c6f63649be909787b76b207fd81b3f6a139e0598a526b59c872dc71e512f2983432fe4

data/.github/FUNDING.yml

@@ -1,2 +1 @@
-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"]
+custom: ["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.1)
+    hot-glue (0.5.0)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)

data/README.md

@@ -3,24 +3,24 @@
 
 Hot Glue is a Rails scaffold builder for the Turbo era. It is an evolution of the admin-interface style scaffolding systems of the 2010s ([activeadmin](https://github.com/activeadmin/activeadmin), [rails_admin](https://github.com/sferik/rails_admin), and [active_scaffold](https://github.com/activescaffold/active_scaffold)).
 
-Using Turbo-Rails and Hotwire (default in Rails 7) you get a lightning-fast out-of-the-box CRUD building experience.
+Using Turbo-Rails and Hotwire (default in Rails 7) you get a lightning-fast out-of-the-box CRUD-building experience.
 
-Every page displays only a list view: new and edit operations happen as 'edit-in-place', so the user never leaves the page.
+Every page displays only a list view: new and edit operations happen as 'edit-in-place,' so the user never leaves the page.
 
-Because all page navigation is Turbo's responsibilty, everything plugs & plays nicely into a Turbo-backed Rails app.
+Because all page navigation is Turbo's responsibility, everything plugs & plays nicely into a Turbo-backed Rails app.
 
-Alternatively, you can use this tool to create a Turbo-backed *section* of your Rails app-- like an admin interface -- while still treating the rest of the Rails app as an API or building out other features by hand.
+Alternatively, you can use this tool to create a Turbo-backed *section* of your Rails app -- such as an admin interface -- while still treating the rest of the Rails app as an API or building out other features by hand.
 
-It will read your relationships and field types to generate your code for you, leaving you with a 'sourdough starter' to work from. If you modify the generated code, you're on your own if you want to preserve your changes and also re-generate scaffold after adding fields.
+It will read your relationships and field types to generate your code for you, leaving you with a 'sourdough starter' to work from. If you modify the generated code, you're on your own if you want to preserve your changes and also re-generate scaffolding after adding fields.
 
 By default, it generates code that gives users full control over objects they 'own' and by default it spits out functionality giving access to all fields.
 
-Hot Glue generates functionality that's quick and dirty. It lets you be crafty. As with a real hot glue gun, use with caution.
+Hot Glue generates functionality that is quick and dirty. It lets you be crafty. As with a real glue gun, use it with caution.
 
 * Build plug-and-play scaffolding mixing generated ERB with the power of Hotwire and Turbo-Rails
-* Everything edits-in-place (unless you use `--big-edit`, then it won't)
-* Automatically Reads Your Models (make them AND migrate your DB before building your scaffolding!)
-* Excellent for CREATE-READ-UPDATE-DELETE (CRUD), lists with pagination (coming soon: searching & sorting)
+* Everything edits-in-place (unless you use `--big-edit`)
+* Automatically reads your models (make them AND migrate your database before building your scaffolding!)
+* Excellent for CREATE-READ-UPDATE-DELETE (CRUD), lists with pagination
 * Great for prototyping, but you should learn Rails fundamentals first.
 * 'Packaged' with Devise, Kaminari, Rspec, FontAwesome
 * Create system specs automatically along with the generated code.
@@ -68,9 +68,9 @@ 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/).
+For the quick step-by-step guide 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.)
+(Note that Bootstrap is optional for Hot Glue. Here, I am just showing you the default installation for simplicity.)
 
 For the old method of installing Bootstrap [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-bootstrap/)
 
@@ -92,18 +92,20 @@ gem 'ffaker'
 ## 3. HOTGLUE INSTALLER
 Add `gem 'hot-glue'` to your Gemfile & `bundle install`
 
-Purchase a license at https://heliosdev.shop/hot-glue-license
+Purchase a license at https://heliosdev.shop/p/hot-glue
 
 During in installation, you MUST supply a `--layout` flag.
 
-### `--layout` flag (NOTE: haml and slim are no longer supported at this time)
+### `--layout` flag (only two options: `hotglue` or `bootstrap`; default is `bootstrap`) 
 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`)
 
 The installer will create `config/hot_glue.yml`. 
 
-During the installation, if your `--layout` flag is set to `hotglue` you must also pass `--theme` flag.
+
+### `--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)
@@ -112,15 +114,16 @@ the themes are:
 • dark_knight (_The Dark Night_ (2008) inspired)
 • like_cupertino (modern Apple-UX inspired)
 
-### `--markup` flag
 
-default is `erb`. IMPORTANT: As of right now, HAML and SLIM are not currently supported.
+### `--markup` flag (NOTE: haml and slim are no longer supported at this time)
+
+default is `erb`. IMPORTANT: As of right now, HAML and SLIM are not currently supported so the only option is also the default `erb`.
 
 
 ### example installing ERB using Bootstrap layout:
 `rails generate hot_glue:install --markup=erb --layout=bootstrap`
 
-### Example installing HAML using Hot Glue layout and the 'like_mountain_view' (Gmail-inspired) theme:
+### Example installing using Hot Glue layout and the 'like_mountain_view' (Gmail-inspired) theme:
 `rails generate hot_glue:install --markup=erb --layout=hotglue --theme=like_mountain_view`
 
 The Hot Glue installer did several things for you in this step. Examine the git diffs or see 'Hot Glue Installer Notes' below.
@@ -140,11 +143,11 @@ https://github.com/FortAwesome/font-awesome-sass
 
 Add to your Gemfile
 
-As of 2022-01-26 Devise for Rails 7 is still not released so you must use **main branch**, like so:
+As of now, Devise for Rails 7 is still not released so you must use **main branch**, like so:
 
 `gem 'devise', branch: 'main', git: 'https://github.com/heartcombo/devise.git'`
 
-(If you are on Rails 6, you must do ALL of the steps in the Legacy Setup steps. Be sure not to skip **Legacy Step #5** (below))
+(If you are on Rails 6, you must do ALL of the steps in the Legacy Setup steps. Be sure not to skip **Legacy Step #5** below)
 
 For Rails 7, be sure you are on the main branch of devise above and your logins should work. (The previously necessary step of disabling turbo shown in Legacy Step #5 is no longer needed. )
 
@@ -205,7 +208,7 @@ this may not have been automatically applied by the installer.
 #### Hot Glue switched Capybara from RACK-TEST to HEADLESS CHROME
 
 - By default Capybara is installed with :rack_test as its driver.
-- This does not support Javascript, and the code from Hot Glue IS NOT fallback compatible-- it will not work on non-Javascript browsers.
+- This does not support Javascript. Hot Glue is not targeted for fallback browsers.
 - From the [Capybara docs](https://github.com/teamcapybara/capybara#drivers):
 ```
 By default, Capybara uses the :rack_test driver, which is fast but limited: it does not support JavaScript
@@ -300,7 +303,7 @@ end
 
 ### `--nested=`
 
-This object is nested within another tree of objects, and there is a nested route in your `routes.rb` file. When specifying the parent(s), be sure to use **singular case**.
+This object is nested within another tree of objects, and there is a nested route in your `routes.rb` file with the specified parent controllers above this controller. When specifying the parent(s), be sure to use **singular case**.
 
 #### Example #1: One-level Nesting
 Invoice `has_many :lines` and a Line `belongs_to :invoice`
@@ -364,11 +367,11 @@ This is "starfish access control" or "poor man's access control."  It works when
 
 #### 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.
+Add `~` in front of any nested parameter (any parent in the `--nested` 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.  
+This is an advanced feature. To use, **make 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**.
+Specify your controller *twice* in your routes.rb. Then, in your `--nested` 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
@@ -378,15 +381,15 @@ namespace :admin
 end
 ```
 
-Even though we have two routes pointed to invoices, both will go to the same controller (`invoices_controller.rb`)
+Even though we have two routes pointed to **invoices**, both will go to the same controller (`app/controllers/admin/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
+rails generate hot_glue:scaffold User --namespace=admin --gd
+rails generate hot_glue:scaffold Invoice --namespace=admin --gd --nested=~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.
+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 without the parent user.
 
 
                                                          
@@ -394,11 +397,11 @@ The Invoices controller, which is a Gd controller, will load the User if a user
 
 By default, it will be assumed you have a `current_user` for your user authentication. This will be treated as the "authentication root" for the "poor man's auth" explained above.
 
-The poor man's auth presumes that object graphs have only one natural way to traverse them (that is, one primary way to traverse them), and that all relationships infer that a set of things or their descendants are granted access to me for reading, writing, updating, and deleting.
+The poor man's auth presumes that object graphs have only one natural way to traverse them (that is, one primary way to traverse them), and that all relationships infer that a set of things or their descendants are granted access to "me" for reading, writing, updating, and deleting.
 
 Of course this is a sloppy way to do access control, and can easily leave open endpoints your real users shouldn't have access to.
 
-When you display anything built with the scaffolding, we assume the `current_user` will have `has_many` association that matches the pluralized name of the scaffold. In the case of nesting, we will automatically find the nested objects first, then continue down the nest chain to find the target object. In this way, we know that all object are 'anchored' to the logged-in user.
+When you display anything built with the scaffolding, Hot Glue assumes the `current_user` will have `has_many` association that matches the pluralized name of the scaffold. In the case of nesting, we will automatically find the nested objects first, then continue down the nest chain to find the target object. This is how Hot Glue assumes all object are 'anchored' to the logged-in user. (As explained in the `--nested` section.)
 
 If you use Devise, you probably already have a `current_user` method available in your controllers. If you don't use Devise, you can implement it in your ApplicationController.
 
@@ -444,6 +447,8 @@ The default (do not pass `auth_identifier=`) will match the `auth` (So if you us
 
 
 `rails generate hot_glue:scaffold Thing --auth=current_account --auth_identifier=login`
+
+ 
 In this example, the controller produced with:
 ```
    before_action :authenticate_login!
@@ -454,11 +459,12 @@ However, the object graph anchors would continue to start from current_account.
 ```
 
 Use empty string to **turn this method off**:
+ 
 `rails generate hot_glue:scaffold Thing --auth=current_account --auth_identifier=''`
 
 In this case a controller would be generated that would have NO before_action to authenticate the account, but it would still treat the current_account as the auth root for the purpose of loading the objects.
 
-Please note that this example would product non-functional code, so you would need to manually fix your controllers to make sure `current_account` is available to the controller.
+Please note that this example would produce non-functional code, so you would need to manually fix your controllers to make sure `current_account` is available to the controller.
 
 
 ### `--plural=`
@@ -466,17 +472,24 @@ Please note that this example would product non-functional code, so you would ne
 You don't need this if the pluralized version is just + "s" of the singular version. Only use for non-standard plurlizations, and be sure to pass it as TitleCase (as if you pluralized the model name which is non-standard for Rails)
 
 
+### `--form-labels-position` (default: `after`; options are **before**, **after**, and **omit**)
+By default form labels appear after the form inputs. To make them appear before or omit them, use this flag.
+
+See also `--form-placeholder-labels` to use placeolder labels. 
+
+
+
 ### `--exclude=`
 (separate field names by COMMA)
 
-By default, all fields are included unless they are on the exclude list. (The default for the exclude list is `id`, `created_at`, and `updated_at`  so you don't need to exclude those-- they are added.)
+By default, all fields are included unless they are on the default exclude list. (The default exclude list is `id`, `created_at`, `updated_at`, `encrypted_password`, `reset_password_token`, `reset_password_sent_at`, `remember_created_at`, `confirmation_token`, `confirmed_at`, `confirmation_sent_at`, `unconfirmed_email`.)
 
-If you specify an exclude list, those and the default excluded list will be excluded.
+If you specify any exclude list, those excluded **and** the default exclude list will be excluded. (If you need any of the fields on the default exclude list, you must use `--include` instead.)
 
 
 `rails generate hot_glue:scaffold Account --exclude=password`
 
-(The default excluded list is: :id, :created_at, :updated_at, :encrypted_password, :reset_password_token, :reset_password_sent_at, :remember_created_at, :confirmation_token, :confirmed_at, :confirmation_sent_at, :unconfirmed_email. If you want to edit any fields with the same name, you must use the include flag instead.)
+(The default excluded list is:  If you want to edit any fields with the same name, you must use the include flag instead.)
 
 
 ### `--include=`
@@ -488,42 +501,46 @@ If you specify an include list, it will be treated as a whitelist: no fields wil
 
 You may not specify both include and exclude.
 
-Include setting is affected by both specified grouping and smarty layouts, explained below.
+Include setting is affected by both specified grouping mode and smart layouts, explained below.
 
 
 #### Specified Grouping Mode
 
 To specify grouped columns, separate COLUMNS by a COLON, then separate fields with commas. Specified groupings work like smart layouts (see below), except you drive which groupings make up the columns. 
 
-(Smarty layouts, below, achieves the same effect but automatically groups your fields into a smart number of columns. ) 
+(Smart layouts, below, achieves the same effect but automatically group your fields into a smart number of columns.) 
 
 If you want to group up fields together into columns, use a COLON (`:`) character to specify columns.
 
 Your input **may** have a COLON at the end of it, but otherwise your columns will made **flush left**.
 
-Without specified grouping (and not using smart layout), no group will happen, so these two fields would display in two columns:
-`--include=api_id,api_key`
-
-With a trailing colon you would be specifying the grouping. You're telling Hot Glue to make the two fields into column #1. (There is no other column.)
-`--include=api_id,api_key:`
+Without specified grouping (and not using smart layout), no grouping will happen. So these two fields would display in two (small, 1-column Bootstrap) columns:
+ 
+`--include=first,last`
 
+With a **trailing colon** you switch Hot Glue into specified grouping mode. You're telling Hot Glue to make the two fields into column #1. (There is no other column.)
+`--include=first,last:`
 
-If, for example, you wanted to put the `name` field into column #1 and then the api_id and api_key into column #2, you would use:
-`--include=name:api_id,api_key`
+Hot Glue also happens to know that, for example, when you say "one column" you really want _one visual_ column made up of the available Bootstrap columns. For example, with 1 child portal (4) + the default edit/create buttons (2), you would have 6 remaining bootstrap columns (2+4+6=12). With 6 remaining Bootstrap columns Hot Glue will make 1 _visual colum_ into a 6-column Bootstrap column.
 
+If, for example, you wanted to put the `email` field into column #1 and then the `first` and `last` into column #2, you would use:
+`--include=email:first,last`
 
+Assuming we have the same number of columns as the above example (6), Hot Glue knows that you now have 2 _visual columns_. It then gives each visual column 3-colum bootstrap columns, which makes your layout into a 3+3+4+2=12 Bootstrap layout. 
 
-Specifying any colon in your include syntax switches the builder into specified grouping mode. The effect will be that the fields will be stacked together into nicely fit columns. (This will look confusing if your user expect an Excel-like interface.)
+**Specifying any colon in your include syntax switches the builder into specified grouping mode.** 
+ 
+The effect will be that the fields will be stacked together into nicely fit columns. (This will look confusing if your end-user is expecting an Excel-like interface.)
 
-With Bootstrap in specified grouping or smart layout mode, it automatically attempts to fit everything into 12-columns. 
+With Hot Glue in specified grouping or smart layout mode, it automatically attempts to fit everything into Bootstrap 12-columns. 
 
-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.)
+Using Bootstrap with neither specified grouping nor smart layouts may make more than 12 columns, which will produce strange results. (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 flag and then you may then have to deal with the over-stuffed layouts as explained. 
 
 
 
-### `--smart-layout` mode (automatic grouping) (default: false)
+### `--smart-layout` (also known as automatic grouping)
 
 Smart layouts are like specified grouping but Hot Glue does the work of figuring out how many fields you want in each column. 
 
@@ -535,7 +552,7 @@ The effect will be that the fields will be stacked together into nicely fit colu
 
 **If your customer is used to Excel, this feature will confuse them.**
 
-Also, this feature will **probably not** be supported by the SORTING (not yet implemented; TBD). I'm not really sure it makes sense to build a non-columnar layout with sorting, so I think I **probably won't support smart layouts** if you want sorting. (You will be forced to choose between the two which I think makes sense.)
+Also, this feature will **probably not** be supported by the SORTING (not yet implemented). (You will be forced to choose between the two which I think makes sense.)
 
 The layout builder works from right-to-left and starts with 12, the number of Bootstrap's columns.
 
@@ -547,7 +564,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 remaining 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
 
@@ -557,7 +574,7 @@ C F I
 
 This is what would happen if 9 fields, specified in the order A,B,C,D,E,F,G,H,I, were distributed across 3 columns. 
 
-(If you had a number of fields that wasn't easily divisible by the number of columns, it would leave the final column a few fields short of the others.)
+(If you had a number of fields that wasn't easily divisible by the number of columns, it would leave the final column one or a few fields short of the others.)
 
 
 
@@ -658,39 +675,48 @@ Omits pagination. (All list views have pagination by default.)
 
 ### `--no-list`
 
-Omits list action. Only makes sense to use this if you are create a view where you only want the create button you want to navigate to the update screen alternative ways.
+Omits list action. Only makes sense to use this if want to create a view where you only want the create button or to navigate to the update screen alternative ways. (The new/create still appears, as well the edit, update & destroy actions are still created even though there is no natural way to navigate to them.)
 
 
-### `--no-list-labels`
+### `--no-list-label`
 
-Omits list labels at the top of the list.
+Omits list LABEL itself above the list. (Do not confuse with the field labels.)
 
-### `--no-list-heading`
+(Note that on a per model basis, you can also globally omit the label or set a unique label value using
+`@@table_label_singular` and `@@table_label_plural` on your model objects.)
 
-Omits the list heading. 
+Note that list labels may  be automatically omitted on downnested scaffolds.
 
-(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.)
+### `--form-placeholder-labels` (default: false)
+
+When set to true, fields, numbers, and text areas will have placeholder labels.
+Will not apply to dates, times, datetimes, dropdowns (enums + foreign keys), or booleans.
+
+See also setting `--form-labels-position` to control position or omit normal labels.
+
+### `--no-list-heading`
+
+Omits the heading of column names that appears above the 1st row of data.
 
 ### `--no-create`
 
-Omits create action.
+Omits new & create actions.
 
 ### `--no-delete`
 
-Omits delete action.
+Omits delete button & destroy action.
 
 ### `--big-edit`
 
-If you do not want inline editing of your list items but instead to fall back to full page style behavior for your edit views, use `--big-edit`. Turbo still handles the page interactions, but the user is taken to a full-screen edit page instead of an edit-in-place interaction.
+If you do not want inline editing of your list items but instead want to fall back to full page style behavior for your edit views, use `--big-edit`. Turbo still handles the page interactions, but the user is taken to a full-screen edit page instead of an edit-in-place interaction.
 
-### `--display-list-after-update` (default: false)
+### `--display-list-after-update` 
 
 After an update-in-place normally only the edit view is swapped out for the show view of the record you just edited.
 
 Sometimes you might want to redisplay the entire list after you make an update (for example, if your action removes that record from the result set).
 
-To do this, use flag `--display_list_after_update`. The update will behave like delete and re-fetch all the records in the result and tell Turbo to swap out the entire list.
+To do this, use flag `--display-list-after-update`. The update will behave like delete and re-fetch all the records in the result and tell Turbo to swap out the entire list.
 
 
 
@@ -700,14 +726,14 @@ To do this, use flag `--display_list_after_update`. The update will behave like
 
 HotGlue will copy a file named base_controller.rb to the same folder where it tries to create any controller, unless such a file exists there already.
 
-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.
+The created controller will always have this base controller as its subclass. 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"`. 
+add `@@table_label_plural = "Hooks"` and `@@table_label_singular = "Hook"`. 
 
-Hot Glue will use this as the listing heading label and New record label. This affects only the UI only.
+Hot Glue will use this as the **list heading** and **New record label**, respectively. This affects only the UI only.
 
 You can also set these to `nil` to omit the labels completely. 
 
@@ -727,6 +753,7 @@ Child portals have the headings omitted automatically (there is a heading identi
 - Time: displayed as HTML5 time picker
 - Boolean: displayed radio buttons yes/ no
 - Enum - displayed as a drop-down list (defined the enum values on your model). For Rails 6 see https://jasonfleetwoodboldt.com/courses/stepping-up-rails/enumerated-types-in-rails-and-postgres/
+  - AFAIK, you must specify the enum definition both in your model and also in your database migration for both Rails 6 + Rails 7
 
 
 # VERSION HISTORY

data/app/helpers/hot_glue/controller_helper.rb

@@ -8,43 +8,25 @@ module HotGlue
 
 
     def datetime_field_localized(form_object, field_name, value, label, timezone = nil )
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+        form_object.text_field(field_name, class: 'form-control',
                                     type: 'datetime-local',
                                     value: date_to_current_timezone(value, timezone))
-
-      res << timezonize(timezone)
-      res
+        + timezonize(timezone)
     end
 
 
     def date_field_localized(form_object, field_name, value, label, timezone = nil )
-
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'date',
                                     value: value )
-
-      res
     end
 
     def time_field_localized(form_object, field_name, value, label, timezone = nil )
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'time',
                                     value: date_to_current_timezone(value, timezone))
+      + timezonize(timezone)
 
-      res << timezonize(timezone)
-      res
     end
 
     def current_timezone

data/lib/generators/hot_glue/install_generator.rb

@@ -38,7 +38,7 @@ module HotGlue
         require 'open-uri'
 
         # ask HeliosDev.shop if this email is good
-        stream = URI.open("https://heliosdev.shop/check_licenses/hot-glue-license?email=#{license_email}")
+        stream = URI.open("https://heliosdev.shop/check_licenses/hot-glue?email=#{license_email}")
         resp = JSON.parse(stream.read)
 
         if resp['status'] == 'success'
@@ -87,11 +87,6 @@ module HotGlue
 
       end
 
-      if Rails.version.split(".")[0].to_i >= 7
-        copy_file "confirmable.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/controllers/confirmable.js"
-      end
-
-
       begin
         if Rails.version.split(".")[0].to_i == 6
           app_js_contents = File.read("app/javascript/packs/application.js")

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

@@ -1,23 +1,19 @@
 module  HotGlue
   class ErbTemplate < TemplateBase
 
-
+    attr_accessor :path, :singular, :singular_class,
+                  :magic_buttons, :small_buttons,
+                  :show_only, :column_width, :layout, :perc_width,
+                  :ownership_field, :form_labels_position,
+                  :inline_list_labels,
+                  :columns, :column_width, :col_identifier, :singular,
+                  :form_placeholder_labels
 
     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}, value: @#{@singular}.#{col}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
-      "\n"
-    end
-
-
     def magic_button_output(*args)
       path = args[0][:path]
       # path_helper_singular = args[0][:path_helper_singular]
@@ -34,20 +30,13 @@ module  HotGlue
       }.join("\n")
     end
 
-    def text_area_output(col, field_length, col_identifier )
-      lines = field_length % 40
-      if lines > 5
-        lines = 5
-      end
 
-      "<%= f.text_area :#{col}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>"
-    end
 
     def list_column_headings(*args)
-      layout_columns = args[0][:columns]
-      column_width = args[0][:column_width]
-      col_identifier = args[0][:col_identifier]
-      layout = args[0][:layout]
+      @columns = args[0][:columns]
+      @column_width = args[0][:column_width]
+      @col_identifier = args[0][:col_identifier]
+      @layout = args[0][:layout]
 
       if layout == "hotglue"
         col_style = " style='flex-basis: #{column_width}%'"
@@ -55,23 +44,29 @@ module  HotGlue
         col_style = ""
       end
 
-      result = layout_columns.map{ |column|
+      result = columns.map{ |column|
         "<div class='#{col_identifier}'" + col_style + ">" +  column.map(&:to_s).map{|col_name| "#{col_name.humanize}"}.join("<br />")  + "</div>"
       }.join("\n")
       return result
     end
 
 
+    ################################################################
+
+    # THE FORM
+
     def all_form_fields(*args)
-      layout_columns = args[0][:columns]
-      show_only = args[0][:show_only]
-      singular_class = args[0][:singular_class]
-      col_identifier = args[0][:col_identifier]
-      ownership_field  = args[0][:ownership_field]
+      @columns = args[0][:columns]
+      @show_only = args[0][:show_only]
+      @singular_class = args[0][:singular_class]
+      @col_identifier = args[0][:col_identifier]
+      @ownership_field  = args[0][:ownership_field]
+      @form_labels_position = args[0][:form_labels_position]
+      @form_placeholder_labels = args[0][:form_placeholder_labels]
 
       @singular = args[0][:singular]
       singular = @singular
-      result = layout_columns.map{ |column|
+      result = columns.map{ |column|
         "  <div class='#{col_identifier}' >" +
           column.map { |col|
             field_result =
@@ -84,41 +79,11 @@ module  HotGlue
 
                 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' %>"
-
-                  end
+                  integer_result(col)
                 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
-
+                  string_result(col, sql_type, limit)
                 when :text
-                  if sql_type == "varchar"
-                    field_output(col, nil, limit, col_identifier)
-                  else
-                    text_area_output(col, 65536, col_identifier)
-                  end
+                  text_result(col, sql_type, limit)
                 when :float
                   field_output(col, nil, 5, col_identifier)
                 when :datetime
@@ -128,18 +93,10 @@ module  HotGlue
                 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" +
-                    ""
+                  boolean_result(col)
                 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') %>"
+                  enum_result(col)
                 end
-
               end
 
             if (type == :integer) && col.to_s.ends_with?("_id")
@@ -148,16 +105,93 @@ module  HotGlue
               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) +
+            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) +
                                     "\n  </span>\n  <br />", 2)
 
+
           }.join("") + "\n  </div>"
       }.join("\n")
       return result
     end
 
 
+    def integer_result(col)
+      # 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}, autocomplete: 'off', size: 4, class: 'form-control', type: 'number'"  + (@form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+
+        # field_output(col, nil, 4, col_identifier)
+        #
+        # # "<%= f.text_field :#{col}, value: #{singular}.#{col}, class: 'form-control', size: 4, type: 'number' %>"
+
+      end
+    end
+
+    def string_result(col, sql_type, limit)
+      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
+
+
+    def text_result(col, sql_type, limit)
+      if sql_type == "varchar"
+        field_output(col, nil, limit, col_identifier)
+      else
+        text_area_output(col, 65536, col_identifier)
+      end
+    end
+
+    def field_output(col, type = nil, width, col_identifier )
+      "  <%= f.text_field :#{col}, value: #{@singular}.#{col}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (@form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+    end
+
+    def text_area_output(col, field_length, col_identifier )
+      lines = field_length % 40
+      if lines > 5
+        lines = 5
+      end
+
+      "<%= f.text_area :#{col}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( @form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "") + " %>"
+    end
+
+    def boolean_result(col)
+      " <br />"  +
+        "  <%= 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" +
+        ""
+    end
+
+    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') %>"
+    end
+
+    ################################################################
 
     def paginate(*args)
       plural = args[0][:plural]
@@ -165,18 +199,24 @@ module  HotGlue
       "<% if #{plural}.respond_to?(:total_pages) %><%= paginate(#{plural}) %> <% end %>"
     end
 
+
+
+
+    ################################################################
+
+
     def all_line_fields(*args)
-      layout_columns = args[0][:columns]
-      show_only = args[0][:show_only]
-      singular_class = args[0][:singular_class]
-      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 = args[0][:columns]
+      @show_only = args[0][:show_only]
+      @singular_class = args[0][:singular_class]
+      @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
+      columns_count = columns.count + 1
+      perc_width = (@perc_width).floor
 
       if layout == "bootstrap"
         style_with_flex_basis = ""
@@ -184,7 +224,7 @@ module  HotGlue
         style_with_flex_basis = " style='flex-basis: #{perc_width}%'"
       end
 
-      result = layout_columns.map{ |column|
+      result = columns.map{ |column|
         "<div class='#{col_identifier}'#{style_with_flex_basis}>" +
 
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -97,7 +97,6 @@ module HotGlue
     class_option :nest, type: :string, default: nil # DEPRECATED —— DO NOT USE
     class_option :nested, type: :string, default: ""
 
-
     class_option :namespace, type: :string, default: nil
     class_option :auth, type: :string, default: nil
     class_option :auth_identifier, type: :string, default: nil
@@ -105,6 +104,7 @@ module HotGlue
     class_option :include, type: :string, default: ""
     class_option :god, type: :boolean, default: false
     class_option :gd, type: :boolean, default: false # alias for god
+
     class_option :specs_only, type: :boolean, default: false
     class_option :no_specs, type: :boolean, default: false
     class_option :no_delete, type: :boolean, default: false
@@ -116,24 +116,31 @@ module HotGlue
     class_option :show_only, type: :string, default: ""
 
     class_option :ujs_syntax, type: :boolean, default: nil
-
     class_option :downnest, type: :string, default: nil
     class_option :magic_buttons, type: :string, default: nil
     class_option :small_buttons, type: :boolean, default: nil
-
     class_option :display_list_after_update, type: :boolean, default: false
     class_option :smart_layout, type: :boolean, default: false
     class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
     class_option :layout, type: :string, default: nil # if used here it will override what is in the config
-    class_option :no_list_labels, type: :boolean, default: false
+
+    class_option :no_list_label, type: :boolean, default: false
+
     class_option :no_list_heading, type: :boolean, default: false
 
-    class_option :before_list_labels, type: :boolean, default: false
+
+    # determines if the labels show up BEFORE or AFTER on the NEW/EDIT (form)
+    class_option :form_labels_position, default: 'after' #  choices are before, after, omit
+    class_option :form_placeholder_labels, default: false # puts the field names into the placeholder labels
+
+
+    # NOT YET IMPLEMENTED
+    # determines if labels appear within the rows of the VIEWABLE list (does NOT affect the list heading)
+    # class_option :inline_list_labels, default: 'omit' # choices are before, after, omit
 
     def initialize(*meta_args)
       super
 
-
       begin
         @the_object = eval(class_name)
       rescue StandardError => e
@@ -165,7 +172,6 @@ module HotGlue
       if !options['markup'].nil?
         message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
         raise(HotGlue::Error, message)
-
       end
 
       if !options['markup'].nil?
@@ -264,9 +270,21 @@ module HotGlue
 
       @no_edit = options['no_edit'] || false
       @no_list = options['no_list'] || false
-      @no_list_labels = options['no_list_labels'] || false
+      @no_list_label = options['no_list_label'] || false
       @no_list_heading = options['no_list_heading'] || false
 
+      @form_labels_position = options['form_labels_position']
+      if !['before','after','omit'].include?(@form_labels_position)
+        raise "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+      end
+
+      @form_placeholder_labels = options['form_placeholder_labels'] # true or false
+
+
+      # if !['before','after','omit'].include?(@form_placeholder_labels)
+      #   raise "You passed '#{@form_placeholder_labels}' as the setting for --form-placeholder-labels but the only allowed options are before, after, and omit (default)"
+      # end
+
       @display_list_after_update = options['display_list_after_update'] || false
       @smart_layout = options['smart_layout']
 
@@ -915,7 +933,9 @@ module HotGlue
         singular_class: singular_class,
         singular: singular,
         col_identifier:  col_identifier,
-        ownership_field: @ownership_field
+        ownership_field: @ownership_field,
+        form_labels_position: @form_labels_position,
+        form_placeholder_labels: @form_placeholder_labels
       )
     end
 

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

@@ -40,24 +40,29 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     @<%= @nested_set[0][:singular] %> ||= <%= root_object %> <% else %>
     @<%= @nested_set[0][:singular] %> ||= <%= root_object %>.find(params[:<%=  @nested_set[0][:singular]  %>_id])<%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %> <% end %>
   end
-  <% end %><% if any_nested? %><% nest_chain = [@nested_set[0][:singular]]; this_scope = @nested_set[0][:plural]; %> <%   @nested_set[1..-1].each_with_index { |arg,index|
-    this_scope =  "#{nest_chain.last}.#{arg[:plural]}"
-    nest_chain << arg %>
+  <% end %><% if any_nested? %><% nest_chain = [@nested_set[0][:singular]]; this_scope = @nested_set[0][:plural]; %>
+    <%   for index in 0..(@nested_set.count - 1) do
+      arg = @nested_set[index]
+      last_arg = (index == 0 ? nil : @nested_set[index-1])
+
+      this_scope =  "#{nest_chain.last}.#{arg[:plural]}"
+      nest_chain << arg %>
   def <%= arg[:singular] %>
-    @<%= arg[:singular] %> ||= (<%= this_scope %>.find(params[:<%= arg[:singular] %>_id])<%= " if params.include?(:#{@nested_set[index][:singular]}_id)" if @god && arg[:optional] %>)<% if @god &&  arg[:optional] %> || (<%= collect_objects[index] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
-  end<% } %> <% end %> <% if !@self_auth %>
+    @<%= arg[:singular] %> ||= (<%= this_scope %>.find(params[:<%= arg[:singular] %>_id])<%= " if params.include?(:#{last_arg[:singular]}_id)" if last_arg && @god && last_arg[:optional] %>)
+    <% if @god &&  (last_arg[:optional] ) %>@<%= arg[:singular] %> ||=  (<%=  collect_objects[index-1] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
+  end<% end %> <% end %> <% if !@self_auth %>
 
   def load_<%= singular_name %>
     @<%= singular_name %> = (<%= object_scope.gsub("@",'') %>.find(params[:id])<%= " 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 %>.find(params[:id])<% end %>
   end
   <% else %>
   def load_<%= singular_name %>
-    @<%= singular_name %> = (<%= auth_object.gsub("@",'') %><%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %>)<% if @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
+    @<%= singular_name %> = (<%= auth_object.gsub("@",'') %><%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set.any? && @nested_set[0][:optional] %>)<% if @nested_set.any? && @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
   end<% end %>
 
   def load_all_<%= plural %> <% if !@self_auth %>
-    @<%= 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 %>
+    @<%= plural_name %> = ( <%= object_scope.gsub("@",'') %>.page(params[:page])<%= n_plus_one_includes %><%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set.any? && @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 only allowed access to themselves<% end %>
   end
 
   def index

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

@@ -1,6 +1,6 @@
 <\%= turbo_frame_tag "<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
   <div class="<%= @container_name %> scaffold-list">
-    <% unless @no_list || @no_list_heading || (@nested_set.any? && !@nested_set.collect{|x| x[:optional]}.any?)  %>
+    <% unless @no_list  || @no_list_label || (@nested_set.any? && !@nested_set.collect{|x| x[:optional]}.any?)  %>
       <% unless list_label.nil? %><h4>
         <%= list_label %>
       </h4><% end %>
@@ -9,7 +9,7 @@
     <% 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 %>
 
     <% unless @no_list %>
-      <% unless @no_list_labels %>
+      <% unless @no_list_heading %>
         <div class="row scaffold-heading-row">
           <%= list_column_headings %>
           <% if @downnest_object.any? %>

data/lib/hotglue/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,7 +85,6 @@ files:
 - lib/generators/hot_glue/scaffold_generator.rb
 - lib/generators/hot_glue/templates/base_controller.rb.erb
 - lib/generators/hot_glue/templates/capybara_login.rb
-- lib/generators/hot_glue/templates/confirmable.js
 - lib/generators/hot_glue/templates/controller.rb.erb
 - lib/generators/hot_glue/templates/erb/_errors.erb
 - lib/generators/hot_glue/templates/erb/_flash_notices.erb

data/lib/generators/hot_glue/templates/confirmable.js

@@ -1,14 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-console.log("defining Confirmable....")
-export default class extends Controller {
-  static values = { message: String }
-
-  confirm(event) {
-
-    if(!window.confirm(this.message)) {
-      event.preventDefault();
-      event.stopPropagation()
-    }
-  }
-}