hot-glue 0.6.9.2 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e1a2a4647618d6a657137799251c71e0f28dbc4023d2c870286fe9103971d88
-  data.tar.gz: 50bd3438275045b1c97a7f0834eb8e7e2a646381f5795134929cd79f35c78190
+  metadata.gz: a9b9cdb44bde02376148703d050944c0c7cc169b42349b021539098afd8532bf
+  data.tar.gz: e4baffd1a1d3d4cf01b811c850b02827c803f7d1188a5b5166f40b11730a0821
 SHA512:
-  metadata.gz: d115b6cee913161d39e9b345c994764fae30a4bda922396c5cac953d8918607844761082014d112c305d8e4ce1635d0c74a1481e5179cc6c07dcfbd954c6dcfa
-  data.tar.gz: 566eddd287147279e2defed46ac941c1674002c35e54535feabae2b81975a54415990d464a1725af7c51fd59a4375d98d2a9d2145a515e16daf86920346b593a
+  metadata.gz: f298a2685d19ebc5a27c16d72cb05806a74bdf3ffbe15b7f85e799164e0d4c56ae1605d950a0843749a3db840c957d1f8a30feb27d68b276656a277a3dd21d53
+  data.tar.gz: e5984cc18282e0b5b99f5992d764395dc9964c1a81b08c6848d9f498564e04e8623275fd40b4c67ca2759d400fe3d4e952ea4db61aada50a63f7fab3ef67a6d9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.9.1)
+    hot-glue (0.6.10)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -139,7 +139,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.5.1)
+    net-imap (0.5.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -235,7 +235,7 @@ GEM
     stimulus-rails (1.1.1)
       railties (>= 6.0.0)
     thor (1.2.1)
-    timeout (0.4.2)
+    timeout (0.4.3)
     turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)

data/README.md

@@ -413,34 +413,6 @@ 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 `--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. 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 `--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
-    resources :invoices
-  end
-  resources :invoices
-end
-```
-
-Even though we have two routes pointed to **invoices**, both will go to the same controller (`app/controllers/admin/invoices_controller.rb`)
-
-```
-./bin/rails generate hot_glue:scaffold User --namespace=admin --gd
-./bin/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 without the parent user.
-
-
-                                                         
 ### `--auth=`
 
 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.
@@ -1015,6 +987,13 @@ Omits controller.
 
 Omits list views. 
 
+`--new-button-position` (above, below; default: above)
+Show the new button above or below the list.
+
+`--downnest-shows-headings` (default: false)
+Show headings above downnested portals.
+
+
 ### `--big-edit`
 
 If you do not want inline editing of your list items but instead want to fallback to full-page style behavior for your edit views, use `--big-edit`. 
@@ -1134,7 +1113,16 @@ Use `before` to make the labels come before or `after` to make them come after.
 
 Omits the heading of column names that appears above the 1st row of data.
 
+### `--include-object-names`
+
+When you are "Editing X" we specify that X is a ___ (author, book, room, etc)
+
+e.g. "Editing author Edgar Allan Poe" vs "Editing Edgar Allan Poe"
+
+Can also be specified globally in `config/hot_glue.yml`
+
 
+### Code insertions
 
 `--code-before-create`
 `--code-after-create`
@@ -1454,7 +1442,7 @@ Always:
 
 Don't include this last line in your factory code. 
 
-## Nav Templates
+## Nav Templates and `--no-nav-menu`
 At the namespace level, you can have a file called `_nav.html.erb` to create tabbed bootstrap nav 
 
 To create the file for the first time (at each namespace), start by running
@@ -1478,6 +1466,10 @@ Once the file is present, any further builds in this namespace will:
 ```
 (In this example `owner/` is the namespace and `things` is the name of the scaffold being built)
 
+To suppress this behavior, add `--no-nav-menu` to the build command and the _nav template will not be touched.
+
+
+
 ## Automatic Base Controller
 
 Hot Glue will copy a file named `base_controller.rb` to the same folder where it tries to create any controller (so to the namespace), unless such a file exists there already.
@@ -1609,6 +1601,76 @@ puts the value into the search box and the id into a hidden field.
 
 You need to making a selection *and* click "Save" to update the record.
 
+The typeahead itself can be both namespaced and nested. (Remember, all controllers are generated at the namespace.)
+
+Pay close attention to a nested typeahead: When generating the typeahead scaffold use both `--namespace=aaa` and `--nested=bbb/ccc`
+
+In this example, the typeahead controller will operate at a namespace of `aaa` with two parents: `bbb` and `ccc`
+
+Combined with `--auth-identifier`, you can load only objects that are related from the `ccc` thing that gets loaded off the `bbb` thing that gets loaded off the current_user.
+
+This scopes the list returned by the typeahead. 
+
+You need to specify this twice: Once when specifying the typehead scaffold, and also any place in a regular scaffold that uses typeahead:
+
+For example, assuming we have a reciprocal has_many through for Accounts & Users
+
+user.rb
+```
+has_many :account_users
+has_many :accounts, through: :account_users
+```
+
+
+account.rb
+```
+has_many :account_users
+has_many :users, through: :account_users
+```
+
+
+`bin/rails generate hot_glue:scaffold Member --auth='current_user' --auth-identifier='user' --auth-identifier=user --modify='user_id{typeahead}[account]'`
+
+in our routes.rb file, we have
+```
+namespace :account_dashboard do
+  resources :accounts do
+    resources :users_typeahead
+    resources :rooms do
+      resources :members
+    end
+  end
+end 
+```
+
+Notice that the scaffold with the references to users is 2 levels deep: accounts -> rooms -> members (and is also in a namespace)
+
+Notice also that the *users typeahead* operates only one level deep in the same namespace.
+
+This means that to find users within the search, the essential piece of information is the account, because we want to scope the result set to the users belong to that account.
+
+• The account must belong to the current_user (notice the account uses nested account provided by the route)
+• Any users found by the typeahead must belong to the account
+
+```
+  def account
+    @account ||= current_user.accounts.find(params[:account_id]) 
+  end
+  
+  def index
+    authorize User, :typeahead? 
+    query = params[:query]
+    @typeahead_identifier = params[:typeahead_identifier]
+    @users = account.users.where("LOWER(email) LIKE ?  ", "%#{query.downcase}%").limit(10)
+    render layout: false
+  end
+```
+
+
+
+--
+
+
 ### TinyMCE
 1. `bundle add tinymce-rails` to add it to your Gemfile
 
@@ -1686,10 +1748,55 @@ These automatic pickups for partials are detected at buildtime. This means that
 
 
 # VERSION HISTORY
+
+
+#### 2025-01-28 v0.6.11
+
+• Typeahead now can use --auth, --auth-identifier, --namespace, and --nested
+• Works similar to how same flags work on scaffold generator. (Notice that the typeahead generator is a completely separate generator). 
+• When using nested, your results are scoped the parent objects in the nest chain (which is the last one)
+
+e.g.
+`bin/rails generate hot_glue:scaffold Member --auth='current_user' --auth-identifier='user' --auth-identifier=user --modify='user_id{typeahead}[account]'`
+
+here the user_id field on members will use a typeahead that is built in the namespace `account_dashboard` under 1 parent: `account`
+
+This would be used in conjunction with a typeahead built using the same namespace and nesting that matches:
+
+```
+bin/rails generate hot_glue:typeahead User --namespace='account_dashboard' --nested='account' --auth-identifier='user' --auth='current_user'
+```
+
+(See 'typeahead' section for details)
+
+`--include-object-names`
+
+When you are "Editing X" we specify that X is a ___ (author, book, room, etc)
+
+e.g. "Editing author Edgar Allan Poe" vs "Editing Edgar Allan Poe"
+
+Can also be specified globally in `config/hot_glue.yml`
+
+
+`--new-button-position` (above, below; default: above)
+Show the new button above or below the list.
+
+`--downnest-shows-headings` (default: false)
+Show headings above downnested portals.
+
+
+#### 2024-12-25 v0.6.10
+    • adds `--no-nav-menu` option to supress writing to the _nav template
+    • the _nav template itself can now end with either .html.erb or .erb
+    • Removing feature: optionalized nested params (this was a bad idea)
+    • enum partials now correctly render within a namespace
+    • fixes for detecting missing belongs_to relationships
+    • fixes to post-create and post-update parental reloads
+
+
 #### 2024-12-17 v0.6.9.2
 • adds alt_lookup to related_set_field.rb and fixes a variable passdown problem in edit.html.erb
 
-
 #### 2024-12-16 v0.6.9.1
 • Fixes hardcoding in #new action
 

data/lib/generators/hot_glue/field_factory.rb

@@ -65,6 +65,7 @@ class FieldFactory
                              attachment_data: generator.attachments[name.to_sym],
                              sample_file_path: generator.sample_file_path,
                              modify_as: generator.modify_as[name.to_sym] || nil,
+                             plural: generator.plural,
                              display_as: generator.display_as[name.to_sym] || nil,
                              default_boolean_display: generator.default_boolean_display,
                              namespace: generator.namespace_value,

data/lib/generators/hot_glue/fields/association_field.rb

@@ -5,12 +5,14 @@ class AssociationField < Field
 
   attr_accessor :assoc_name, :assoc_class, :assoc, :alt_lookup
 
-  def initialize( alt_lookup: , class_name: , default_boolean_display:, display_as: ,
-                 name: , singular: ,
-                 update_show_only: ,
-                 hawk_keys: , auth: , sample_file_path:,  ownership_field: ,
-                 attachment_data: nil , layout_strategy: , form_placeholder_labels: nil,
-                 form_labels_position:, modify_as: , self_auth: , namespace:, pundit:  )
+  def initialize( alt_lookup: ,
+                  class_name: ,
+                  default_boolean_display:, display_as: ,
+                  name: , singular: ,
+                  update_show_only: ,
+                  hawk_keys: , auth: , sample_file_path:,  ownership_field: ,
+                  attachment_data: nil , layout_strategy: , form_placeholder_labels: nil,
+                  form_labels_position:, modify_as: , self_auth: , namespace:, pundit: , plural:  )
     super
 
 
@@ -108,7 +110,15 @@ class AssociationField < Field
       # else
       # end
     elsif modify_as && modify_as[:typeahead]
-      search_url  = "#{namespace ? namespace + "_" : ""}#{assoc.class_name.downcase.pluralize}_typeahead_index_url"
+      search_url  = "#{namespace ? namespace + "_" : ""}" +
+        modify_as[:nested].join("_") +
+        + "_#{assoc.class_name.downcase.pluralize}_typeahead_index_url"
+
+
+      if @modify_as[:nested].any?
+        search_url  << "(" + modify_as[:nested].collect{|x| "#{x}"}.join(",") + ")"
+      end
+
       "<div class='typeahead typeahead--#{assoc.name}_id'
       data-controller='typeahead'
       data-typeahead-url-value='<%= #{search_url} %>'

data/lib/generators/hot_glue/fields/attachment_field.rb

@@ -2,6 +2,7 @@ class AttachmentField < Field
   attr_accessor :attachment_data
   def initialize(alt_lookup:,
                  attachment_data:,
+                 plural:,
                  auth:,
                  class_name:,
                  display_as:, singular:,

data/lib/generators/hot_glue/fields/enum_field.rb

@@ -72,7 +72,7 @@ class EnumField < Field
   end
 
   def partial_render
-    "<% if #{singular}.#{name} %><%=  render partial: #{singular}.#{name}, locals: { #{singular}: #{singular} } %><% end %>"
+    "<% if #{singular}.#{name} %><%=  render partial: \"#{namespace + "/" if namespace}#{plural}/\#{#{singular}.#{name}}\", locals: { #{singular}: #{singular} } %><% end %>"
   end
 
 

data/lib/generators/hot_glue/fields/field.rb

@@ -5,7 +5,7 @@ class Field
                 :hawk_keys,   :layout_strategy, :limit, :modify_as, :name, :object, :sample_file_path,
                 :self_auth,
                 :singular_class,  :singular, :sql_type, :ownership_field,
-                :update_show_only, :namespace, :pundit
+                :update_show_only, :namespace, :pundit, :plural
 
   def initialize(
     auth: ,
@@ -26,7 +26,8 @@ class Field
     update_show_only:,
     self_auth:,
     namespace:,
-    pundit:
+    pundit: ,
+    plural:
   )
     @name = name
     @layout_strategy = layout_strategy
@@ -43,6 +44,7 @@ class Field
     @modify_as = modify_as
     @display_as = display_as
     @pundit = pundit
+    @plural = plural
 
     @self_auth = self_auth
     @default_boolean_display = default_boolean_display

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -26,9 +26,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :singular_class, :smart_layout, :stacked_downnesting,
                 :update_show_only, :ownership_field,
                 :layout_strategy, :form_placeholder_labels,
-                :form_labels_position, :pundit,
+                :form_labels_position, :no_nav_menu, :pundit,
                 :self_auth, :namespace_value, :record_scope, :related_sets,
-                :search_clear_button, :search_autosearch
+                :search_clear_button, :search_autosearch, :include_object_names
   # important: using an attr_accessor called :namespace indirectly causes a conflict with Rails class_name method
   # so we use namespace_value instead
 
@@ -37,7 +37,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :singular_class, type: :string, default: nil
   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
@@ -45,7 +44,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   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
@@ -58,7 +56,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :big_edit, type: :boolean, default: false
   class_option :show_only, type: :string, default: ""
   class_option :update_show_only, type: :string, default: ""
-
   class_option :ujs_syntax, type: :boolean, default: nil
   class_option :downnest, type: :string, default: nil
   class_option :magic_buttons, type: :string, default: nil
@@ -71,7 +68,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :layout, type: :string, default: nil # if used here it will override what is in the config
   class_option :hawk, type: :string, default: nil
   class_option :with_turbo_streams, type: :boolean, default: false
-
   class_option :label, default: nil
   class_option :list_label_heading, default: nil
   class_option :new_button_label, default: nil
@@ -101,8 +97,13 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :code_before_update, default: nil
   class_option :code_after_update, default: nil
   class_option :record_scope, default: nil
+  class_option :no_nav_menu, type: :boolean, default: false # suppress writing to _nav template
+  class_option :include_object_names, type: :boolean, default: false
+  class_option :new_button_position, type: :string, default: 'above'
+  class_option :downnest_shows_headings, type: :boolean, default: nil
 
 
+  # SEARCH OPTIONS
   class_option :search, default: nil # set or predicate
 
   # FOR THE SET SEARCH
@@ -111,11 +112,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   # for the single-entry search box, they will be removed from the list specified above.
   class_option :search_query_fields, default: '' # comma separated list of fields to search by single-entry search term
   class_option :search_position, default: 'vertical' # choices are vertical or horizontal
-
-
   class_option :search_clear_button, default: false
-  class_option :saerch_autosearch, default: false
-
+  class_option :search_autosearch, default: false
 
   # FOR THE PREDICATE SEARCH
   # TDB
@@ -264,7 +262,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         elsif $2 == "tinymce"
           @modify_as[key.to_sym] =  {tinymce: 1, badges: $3}
         elsif $2 == "typeahead"
-          @modify_as[key.to_sym] =  {typeahead: 1, badges: $3}
+          nested = $3.split("/")
+          @modify_as[key.to_sym] =  {typeahead: 1, nested: nested}
         elsif $2 == "timezone"
           @modify_as[key.to_sym] =  {timezone: 1, badges: $3}
         elsif $2 == "none"
@@ -341,8 +340,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     @smart_layout = options['smart_layout']
     @record_scope = options['record_scope']
+    @downnest_shows_headings = options['downnest_shows_headings']
+    @new_button_position = options['new_button_position']
+
 
     @pundit = options['pundit']
+
+    @no_nav_menu = options['no_nav_menu']
+
     if @pundit.nil?
       @pundit = get_default_from_config(key: :pundit_default)
     end
@@ -362,6 +367,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @downnest_object = HotGlue.construct_downnest_object(@downnest)
     end
 
+    @include_object_names = options['include_object_names'] || get_default_from_config(key: :include_object_names)
+
+
+
     if @god
       # @auth = nil
     end
@@ -464,6 +473,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     identify_object_owner
     setup_fields
 
+
     if (@columns - @show_only - (@ownership_field ? [@ownership_field.to_sym] : [])).empty?
       @no_field_form = true
     end
@@ -788,12 +798,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         raise(HotGlue::Error, exit_message)
 
       else
-        if eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s})").nil? && !eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s.singularize})").nil?
-          exit_message = "*** Oops: you tried to nest #{singular_class} within a route for `#{@object_owner_sym}` but I can't find an association for this relationship. Did you mean `#{@object_owner_sym.to_s.singularize}` (singular) instead?"
-          # else  # NOTE: not reachable
-          #   exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym}  maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n (If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.  Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag). To make a controller that can read all records, specify with --god."
-        end
-
+        exit_message = "When trying to nest #{singular_class} within #{@nested_set.last[:plural]}, check the #{singular_class} model for the #{@object_owner_sym} association: \n belongs_to :#{@object_owner_sym}"
         raise(HotGlue::Error, exit_message)
       end
     elsif @object_owner_sym && !@object_owner_eval.include?(".")
@@ -1011,6 +1016,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     }.join(",\n          ")
   end
 
+  def nest_path
+    @nested_set.collect{| arg| arg[:singular]  }.join("/") + "/" if @nested_set.any?
+  end
+
   def controller_class_name
     @controller_build_name
   end
@@ -1071,7 +1080,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     HotGlue.optionalized_ternary(namespace: @namespace,
                                  target: @controller_build_folder,
                                  nested_set: @nested_set,
-                                 with_params: true,
+                                 with_params: false,
                                  top_level: false)
   end
 
@@ -1079,7 +1088,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     HotGlue.optionalized_ternary(namespace: @namespace,
                                  target: @singular,
                                  nested_set: @nested_set,
-                                 with_params: true,
+                                 with_params: false,
                                  put_form: true,
                                  top_level: false)
   end
@@ -1088,7 +1097,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     HotGlue.optionalized_ternary(namespace: @namespace,
                                  target: @singular,
                                  nested_set: @nested_set,
-                                 with_params: true,
+                                 with_params: false,
                                  put_form: true)
   end
 
@@ -1097,7 +1106,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                                  target: @singular,
                                  nested_set: @nested_set,
                                  modifier: "edit_",
-                                 with_params: true,
+                                 with_params: false,
                                  put_form: true)
   end
 
@@ -1126,7 +1135,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                                  target: singular,
                                  nested_set: @nested_set,
                                  modifier: "new_",
-                                 with_params: true)
+                                 with_params: false)
   end
 
   def nested_assignments
@@ -1224,7 +1233,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       path: HotGlue.optionalized_ternary( namespace: @namespace,
                                           target: @singular,
                                           nested_set: @nested_set,
-                                          with_params: true,
+                                          with_params: false,
                                           put_form: true),
                                           big_edit: @big_edit,
                                           singular: singular,
@@ -1238,7 +1247,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def include_nav_template
-    File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}")
+    File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}") ||
+      File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.#{@markup}")
   end
 
   def copy_view_files
@@ -1303,11 +1313,16 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
   end
 
-  def insert_into_nav_template
-    # how does this get called(?)
-    nav_file = "#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}"
-
+  def insert_into_nav_template # called from somewhere in the generator
+    return if @no_nav_menu
     if include_nav_template
+      if File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}")
+        nav_file = "#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}"
+      elsif File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.#{@markup}")
+        nav_file = "#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.#{@markup}"
+      end
+
+
       append_text = "  <li class='nav-item'>
     <%= link_to '#{@list_label_heading.humanize}', #{path_helper_plural(@nested_set.any? ? true: false)}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
   </li>"
@@ -1604,20 +1619,26 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def post_action_parental_updates
     if @nested_set.any?
-       @nested_set.collect { |data|
+       @nested_set.collect {  |data|
         parent = data[:singular]
-        "@#{singular}.#{parent}.reload"
-      }
+        "#{parent}.reload"
+       }
     else
       []
     end
   end
 
   def turbo_parental_updates
+    set_path = @nested_set.collect { |data| "#{data[:singular]}" }.join("/") + "/"
+    puts "constructing for #{set_path}"
     @nested_set.collect { |data|
-      "<%= turbo_stream.replace \"__#{@namespace if @namespace}\#{dom_id(@#{data[:singular]})}\" do %>
-    <%= render partial: \"#{@namespace}/#{data[:plural]}/line\", locals: {#{data[:singular]}: @#{singular}.#{data[:singular]}.reload} %>
+      res = "<%= turbo_stream.replace \"__#{@namespace if @namespace}\#{dom_id(@#{data[:singular]})}\" do %>
+    <%= render partial: \"#{@namespace}/#{data[:plural]}/line\", locals: {#{@nested_set.collect { |d|
+        (set_path.index(data[:singular] + "/") > set_path.index(d[:singular] + "/") || d[:singular] == data[:singular]  ) ? "#{d[:singular]}: @#{d[:singular]}" : nil
+      }.compact.join(", ")}} %>
   <% end %>"
+
+      res
     }.join("\n")
   end
 end

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

@@ -60,13 +60,13 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   <% if !@self_auth %>
   def load_<%= singular_name %>
     <% if @nested_set[0] && @nested_set[0][:optional] %>if params.include?(:<%= @nested_set.last[:singular] %>_id)
-      @<%= singular_name %> = <%= object_scope.gsub("@",'') %><%= @record_scope %>.find(params[:id])
-    else <% end %>@<%= singular_name %> = <%= object_scope %><%= @record_scope %>.find(params[:id])<% if @nested_set[0] && @nested_set[0][:optional]  %>
+      @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])
+    else <% end %>@<%= singular_name %> = <%= object_scope %>.find(params[:id])<% if @nested_set[0] && @nested_set[0][:optional]  %>
     end<% end %>
   end
   <% else %>
   def load_<%= singular_name %>
-    @<%= 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 %><%= @record_scope %>
+    @<%= 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 %>
   <% if @paginate_per_page_selector %>def per
     params[:per] || 10
@@ -115,7 +115,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <%= @code_before_create ? "\n    " + @code_before_create.gsub(";", "\n") : "" %>
     if @<%= singular_name %>.save<%= @code_after_create ? ("\n      " + @code_after_create.gsub(";", "\n"))  : ""%>
       flash[:notice] = "Successfully created #{@<%= singular %>.<%= display_class %>}"
-      <%= post_action_parental_updates.join("\n      ") %>
+      <%= post_action_parental_updates.compact.join("\n      ") %>
       load_all_<%= plural %>
       <% unless @display_edit_after_create %>render :create<% else %>redirect_to <%=   HotGlue.optionalized_ternary(namespace: @namespace,
                                  top_level: true,
@@ -154,7 +154,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     @action = 'edit'
     render :edit<% if @pundit %>
   rescue Pundit::NotAuthorizedError
-    flash[:notice] = "Editing #{@<%= singular %>.<%= display_class %>} not authorized."
+    flash[:notice] = "Editing <%= singular + ' ' if @include_object_names %>#{@<%= singular %>.<%= display_class %>} not authorized."
     render :index <% end %>
   end
 
@@ -181,10 +181,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       authorize @<%= singular_name %>
       <%= @code_before_update ? "\n    " + @code_before_update.gsub(";", "\n") : "" %>
       @<%= singular_name %>.save
-    <% else %>
+      <% else %>
     <%= @code_before_update ? "\n    " + @code_before_update.gsub(";", "\n") : "" %>
     if @<%= singular_name %>.update(modified_params)
     <% end %>
+      <%= post_action_parental_updates.compact.join("\n      ") %>
       <%= @code_after_update ? "\n    " + @code_after_update.gsub(";", "\n") : "" %>
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
       flash[:notice] << "Saved #{@<%= singular %>.<%= display_class %>}"

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

@@ -3,7 +3,7 @@
   <\% if <%= singular %>.errors.any? %>
   <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: <%= singular %> }) %>
   <\% end %>
-  <h2>Editing <\%= <%= singular %>.<%= display_class %> %></h2>
+  <h2>Editing <%= singular + " " if @include_object_names %><\%= <%= singular %>.<%= display_class %> %></h2>
   <\%= form_with model: <%= singular %>, url: <%= form_path_edit_helper %><%= ", html: {'data-turbo': false}" if @big_edit %> do |f| %>
     <\%=  render partial: "<%= namespace_with_trailing_dash + @controller_build_folder + "/" %>form", locals: {:<%=  singular  %> => <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> \%>
   <% if @edit_within_form_partial %><\%= render partial: "edit_within_form", locals: {f: f, <%=  singular  %>: <%= singular %>}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> %><% end %>

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

@@ -7,7 +7,9 @@
       </h4><% end %>
     <% end %>
 
+    <% if @new_button_position == 'above' %>
     <% 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 %>
+    <% end %>
 
     <% unless @no_list %>
       <% unless @no_list_heading %>
@@ -66,5 +68,10 @@
       <% end %>
     <%=  @no_paginate ? "" : paginate %>
   <% end  %>
+
+
+  <% if @new_button_position == 'below' %>
+    <% 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 %>
+  <% end %>
   </div>
 <\% end %>

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

@@ -12,7 +12,12 @@
     <% downnest_object_name = eval("#{downnest_class}.table_name") %>
     <% downnest_style = @layout_strategy.downnest_style %>
     <% if !@stacked_downnesting %><div class="<%= @layout_strategy.downnest_portal_column_width(downnest)  %> scaffold-downnest" <%= downnest_style  %> ><% end %>
-  <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
+    <% if @downnest_shows_headings %>
+      <h3>
+        <%= downnest_object_name.pluralize.humanize %>
+      </h3>
+    <% end %>
+    <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
         <%= @singular %>: <%= @singular %>,
         <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>
       }

data/lib/generators/hot_glue/templates/erb/create.turbo_stream.erb

@@ -3,7 +3,9 @@
   <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
   <\% end %>
   <\% end %>
+<!-- parental updated -->
 <%= turbo_parental_updates %>
+<!-- errors -->
   <\%= turbo_stream.replace "<%= @namespace %>__<%= singular %>-new" do %>
   <\% if @<%= singular %>.errors.none? %>
   <\%= render partial: "new_button", locals: {}<%=  @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {" + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> %>

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

@@ -14,13 +14,17 @@
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
     <% @downnest_object.each do |downnest, size| %>
       <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-<%= @big_edit  ? 12 : 6  %>">
           <% 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; %>
           <% downnest_class = downnest_object.class_name %>
           <% downnest_object_name = eval("#{downnest_class}.table_name") %>
           <% downnest_style = @layout_strategy.downnest_style %>
-
+          <% if @downnest_shows_headings %>
+            <h3>
+              <%= downnest_class.humanize %>
+            </h3>
+          <% end %>
           <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {<%= @singular %>: @<%= @singular %>,  <%= downnest_object_name %>: @<%= @singular %>.<%= downnest %><% if @nested_set.any? %>, <%= @nested_set.collect{|x| "#{x[:singular]}: @#{x[:singular]}"}.join(", ") %>, nested_for: "<%= @nested_set.collect{|x| "#{x[:singular]}-" + "\#{" + "@#{x[:singular]}.id}"}.join("__") %>__<%= singular %>-#{@<%= @singular %>.id}" <% end %> } \%>
 
           </div>

data/lib/generators/hot_glue/templates/erb/update.turbo_stream.erb

@@ -1,10 +1,13 @@
 <% if !@display_list_after_update %><\%= turbo_stream.replace "<%= @namespace %>__#{dom_id(@<%= singular %>)}" do %>
-  <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> }<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
+  <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %>, <%= @nested_set.collect{|arg| " #{arg[:singular]}: @#{arg[:singular]}"}.join(", ") %> }   \%>
 <\% end %><% else %><\%= turbo_stream.replace "<%= plural %>-list" do %>
-  <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
+  <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %><%= @nested_set.collect{|arg| " #{arg[:singular]}: @#{arg[:singular]}"}.join(", ") %>
+  \%>
 <\% end %>
 <% end %>
+<!-- parental updated -->
 <%= turbo_parental_updates %>
+<!-- flash notices -->
 <\%= turbo_stream.update "flash_notices" do %>
   <\%= render partial: "layouts/flash_notices", locals: {resource: @<%= singular %>} %>
 <\% end %>

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

@@ -4,12 +4,38 @@ class <%= ((@namespace.titleize.gsub(" ", "") + "::" if @namespace) || "") + @pl
   <% end %># <%= regenerate_me_code %><% if defined?(RuboCop) %>
   # rubocop:enable Layout/LineLength <% end %>
 
+
+  <% @nested_set.each do |nest| %>before_action :<%= nest[:singular] %>
+  def <%= nest[:singular] %>
+    @<%= nest[:singular] %> ||= current_user.accounts.find(params[:account_id])
+  end
+  <% end %>
+
+  <% nest_chain = [] %>
+  <% @nested_set.each { |arg|
+      if @auth_identifier == arg[:singular]
+        this_scope = auth_object
+      elsif nest_chain.empty?
+        this_scope = "#{@auth ? @auth : class_name}.#{arg[:plural]}"
+      else
+        this_scope = "#{nest_chain.last}.#{arg[:plural]}"
+      end
+       nest_chain << arg
+     }%>
+
   def index
     <% if @pundit %>authorize <%= @class_name %>, :typeahead? <% end %>
     query = params[:query]
     @typeahead_identifier = params[:typeahead_identifier]
-    @<%= @plural %> = <%= @singular.titleize.gsub(" ", "") %>.where("<%= @search_by.collect{|search| "LOWER(#{search}) LIKE ?" }.join(" OR ") %>", <%= @search_by.collect{|search|  "\"%\#{query.downcase}%\"" }.join(", ") %>).limit(10)
 
+
+    <% if @nested_set.none? %>
+    @<%= @plural %> = <%= @singular.titleize.gsub(" ", "") %>.where("<%= @search_by.collect{|search| "LOWER(#{search}) LIKE ?" }.join(" OR ") %>", <%= @search_by.collect{|search|  "\"%\#{query.downcase}%\"" }.join(", ") %>).limit(10)
+    <% else %>
+    <% @nested_set.each do |arg| %>
+    @<%= @plural %> = <%= @nested_set.last[:singular] %>.<%= @plural %>.where("<%= @search_by.collect{|search| "LOWER(#{search}) LIKE ?" }.join(" OR ") %>", <%= @search_by.collect{|search|  "\"%\#{query.downcase}%\"" }.join(", ") %>).limit(10)
+    <% end %>
+      <% end %>
     render layout: false
   end
 end

data/lib/generators/hot_glue/typeahead_generator.rb

@@ -5,6 +5,10 @@ module HotGlue
     source_root File.expand_path('templates', __dir__)
     class_option :namespace, type: :string, default: nil
     class_option :search_by, type: :string, default: nil
+    class_option :nested, type: :string, default: nil
+    class_option :auth, type: :string, default: nil
+    class_option :auth_identifier, type: :string, default: nil
+
 
     include DefaultConfigLoader
     def filepath_prefix
@@ -28,6 +32,25 @@ module HotGlue
       @class_name = args.first
       @plural = args.first.tableize.pluralize
       @namespace = options['namespace']
+      @nested = options['nested'] if options['nested']
+
+      if !@nested.nil?
+        @nested_set = @nested.split("/").collect { |arg|
+          is_optional = arg.start_with?("~")
+          arg.gsub!("~", "")
+          {
+            singular: arg,
+            plural: arg.pluralize,
+            optional: is_optional
+          }
+        }
+        puts "NESTING: #{@nested_set}"
+      else
+        @nested_set = []
+      end
+
+      @auth = options['auth'] || "current_user"
+      @auth_identifier = options['auth_identifier'] || "user"
 
       if options['search_by']
         @search_by = options['search_by'].split(",")

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.9.2'
+    CURRENT = '0.6.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.9.2
+  version: 0.6.11
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails