hot-glue 0.6.10 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e97635a9b4a9f05502eaec8834622f0eca2bcf6a984b32819aa92b1f94afebce
-  data.tar.gz: 05c5ca3e88a7d2fe2e0dce9f22824ae817a3d909f03f8c4a8053bd6d12b72632
+  metadata.gz: 1eacfaf1cc09c6a40597a8a0f3f2bda37e156f5ed63be68ff842de01a707dc5d
+  data.tar.gz: 20b3c4134a1443c2c5d134a5f5bcdecfb2e13c749c856a1620ecb43209245e68
 SHA512:
-  metadata.gz: 47afa457097e68f69f7aaa85d07f8ebe70d47f052875eb52863796122846e9b8993d13e678e8eb927ce44a0331b2a56972a189d8af0e1c4272bd2b2661837548
-  data.tar.gz: 525847e13f04fec313576a235d864fa2a59781d448bd4a94ed2425d0c2bbb508efd83f0b97d37a9f9f5ab5af7f49b5d9e6dc3797648e5ab39bf7b67823794ef8
+  metadata.gz: 3c38593db0539b7259b05b3d3e86062f550d54f969c9a30ad9e2ffa035513c035e154a02ed3f9427def36a025929d0679b66ff0423fc7fdf4ae01623ffb2f540
+  data.tar.gz: 6c661dff1800dc911b23681622992fe4e7ac5d554c107e32aa5577f94250022bfbd07be78d33b9c6acab4149aacc2e2ce1047b8f5fd3f728c49139f1db07a4c2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.10)
+    hot-glue (0.6.12)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -76,6 +76,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
     bcrypt (3.1.18)
     builder (3.2.4)
     byebug (11.1.3)
@@ -139,7 +140,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.5.4)
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -245,7 +246,8 @@ GEM
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket (1.2.9)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)

data/README.md

@@ -987,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`. 
@@ -1106,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`
@@ -1585,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
 
@@ -1658,11 +1744,52 @@ If you have a partial in your view folder called `_list_after_each_row_heading`,
 
 The `within` partials should do operations within the form (like hidden fields), and the `after` partials should do entirely unrelated operations, like a different form entirely.
 
-These automatic pickups for partials are detected at buildtime. This means that if you add these partials later, you must rebuild your scaffold.
+These automatic pickups for partials are detected at build time. This means that if you add these partials later, you must rebuild your scaffold.
 
 
 # VERSION HISTORY
 
+#### 2025-02-19 - v0.6.12
+• adds decimal field type (displays as float-- there is no special handling for decimal on the UI)
+• guard against polymorphic belongs_to -- not a full implementation for polymorphic fields, just hides the fields on the form; on the list uses to_label always
+• fixes heading with multiword names on downnested portals to display nicely capitalized
+• removes open struct
+
+#### 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

data/app/helpers/hot_glue_helper.rb

@@ -1,10 +1,13 @@
 module HotGlueHelper
-
-
+  class KVObject
+    attr_accessor :key, :value
+    def initialize(key: , value: )
+      @key = key
+      @value = value
+    end
+  end
 
   def enum_to_collection_select(hash)
-    hash.collect{|k,v| OpenStruct.new({key: k, value: v})}
-
+    hash.collect{|k,v| KVObject.new(key: k, value: v)}
   end
-
 end

data/lib/generators/hot_glue/field_factory.rb

@@ -32,6 +32,8 @@ class FieldFactory
               TextField
             when :float
               FloatField
+            when :decimal
+              FloatField
             when :datetime
               DateTimeField
             when :date

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

@@ -24,17 +24,18 @@ class AssociationField < Field
       raise(HotGlue::Error, exit_message)
     end
 
-    @assoc_class = eval(assoc_model.try(:class_name))
+    if ! eval("#{class_name}.reflect_on_association(:#{assoc}).polymorphic?")
+      @assoc_class = eval(assoc_model.try(:class_name))
 
-    name_list = [:name, :to_label, :full_name, :display_name, :email]
+      name_list = [:name, :to_label, :full_name, :display_name, :email]
 
-    if assoc_class && name_list.collect{ |field|
-      assoc_class.respond_to?(field.to_s) || assoc_class.instance_methods.include?(field)
-    }.none?
-      exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{@assoc_name} association on the #{class_name} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
-      raise(HotGlue::Error, exit_message)
+      if assoc_class && name_list.collect{ |field|
+        assoc_class.respond_to?(field.to_s) || assoc_class.instance_methods.include?(field)
+      }.none?
+        exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{@assoc_name} association on the #{class_name} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
+        raise(HotGlue::Error, exit_message)
+      end
     end
-
   end
 
   def assoc_label
@@ -110,7 +111,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("_") + ("_" if modify_as[:nested].any?) +
+        + "#{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} %>'
@@ -132,7 +141,12 @@ class AssociationField < Field
 
       is_owner = name == ownership_field
       assoc_class_name = assoc.class_name.to_s
-      display_column = HotGlue.derrive_reference_name(assoc_class_name)
+      if assoc_class
+        display_column = HotGlue.derrive_reference_name(assoc_class_name)
+      else
+        # polymorphic
+        display_column = "name"
+      end
 
       if hawk_keys[assoc.foreign_key.to_sym]
         hawk_definition = hawk_keys[assoc.foreign_key.to_sym]
@@ -170,9 +184,16 @@ class AssociationField < Field
 
   def line_field_output
 
-    display_column =  HotGlue.derrive_reference_name(assoc_class.to_s)
 
-    "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
+    if assoc_class
+      display_column =  HotGlue.derrive_reference_name(assoc_class.to_s)
+
+      "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
+    else
+      "<%= #{singular}.#{assoc}.try(:to_label) || '<span class=\"content \">MISSING</span>'.html_safe %>"
+
+    end
+
   end
 
 

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

@@ -40,19 +40,18 @@ class BooleanField < Field
     if display_boolean_as.nil?
 
     end
-    "<div class='#{@layout_strategy.form_checkbox_wrapper_class} #{'form-switch' if display_boolean_as == 'switch'}'>\n" +
+    "<span class='#{@layout_strategy.form_checkbox_wrapper_class} #{'form-switch' if display_boolean_as == 'switch'}'>\n" +
       (if display_boolean_as == 'radio'
       radio_button_display
     elsif display_boolean_as == 'checkbox'
       checkbox_display
     elsif display_boolean_as == 'switch'
       switch_display
-   end) + "</div> \n"
+   end) + "</span> \n"
   end
 
   def form_field_output
-    (form_labels_position == 'before' ?  " <br />"  : "") +
-      form_field_display + (form_labels_position == 'after' ?  " <br />"  : "")
+    form_field_display
   end
 
   def line_field_output

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

@@ -40,7 +40,7 @@ class DateTimeField < Field
   end
 
   def form_field_output
-    "<%= f.datetime_field( :#{name}, value: #{singular}.#{name} && #{singular}.#{name}.change(sec: 0), class: '#{@layout_strategy.form_input_class}'  ) %>"
+    "<%= f.datetime_field( :#{name}, value: #{singular}.#{name} && #{singular}.#{name}.in_time_zone(current_timezone), class: '#{@layout_strategy.form_input_class}'  ) %><%= current_timezone %>"
   end
 
   def viewable_output

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

@@ -3,7 +3,7 @@ class RelatedSetField < Field
   attr_accessor :assoc_name, :assoc_class, :assoc
 
   def initialize( class_name: , default_boolean_display:, display_as: ,
-                  name: , singular: ,
+                  name: , singular: , plural:,
                   alt_lookup: ,
                   update_show_only: ,
                   hawk_keys: , auth: , sample_file_path:,  ownership_field: ,

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

@@ -156,18 +156,20 @@ module  HotGlue
                 "<% if @action == 'new' && policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output + "<% end %>"
 
                  # show only on the update action overrides any pundit policy
-            elsif @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
-              "<% if policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output  + "<% end %>"
-            else
-              columns_map[col].form_field_output
-            end
+              elsif @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
+                "<% if policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output  + "<% end %>"
+              else
+                columns_map[col].form_field_output
+              end
+
 
             @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
+
             add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert 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 || "" : "") +
-                                                        +  " <br />\n" + field_result +
-                                        (form_labels_position == 'after' ? the_label : "")   , 4) +
-                                    "\n  </span>\n  <br />", 2)
+                                    add_spaces_each_line( (form_labels_position == 'before' ? (the_label || "") + "<br />\n"  : "") +
+                                                        +  field_result +
+                                        (form_labels_position == 'after' ? "<br />\n" + (the_label || "") : "")  , 4) +
+                                    "\n  </span>\n ", 2)
 
           }.join("") + "\n  </div>"
       }.join("\n")

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -28,7 +28,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :layout_strategy, :form_placeholder_labels,
                 :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
 
@@ -81,7 +81,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :form_placeholder_labels, type: :boolean, default: false # puts the field names into the placeholder labels
 
   # determines if labels appear within the rows of the VIEWABLE list (does NOT affect the list heading)
-  class_option :inline_list_labels, default: 'omit' # choices are before, after, omit
+  class_option :inline_list_labels, default: nil # default is set below
   class_option :factory_creation, default: ''
   class_option :alt_foreign_key_lookup, default: '' #
   class_option :attachments, default: ''
@@ -98,7 +98,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   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
@@ -260,7 +262,12 @@ 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}
+          if !$3.nil?
+            nested = $3.split("/")
+          else
+            nested = []
+          end
+          @modify_as[key.to_sym] =  {typeahead: 1, nested: nested}
         elsif $2 == "timezone"
           @modify_as[key.to_sym] =  {timezone: 1, badges: $3}
         elsif $2 == "none"
@@ -300,7 +307,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     setup_hawk_keys
     @form_placeholder_labels = options['form_placeholder_labels'] # true or false
-    @inline_list_labels = options['inline_list_labels'] || 'omit' # 'before','after','omit'
+    @inline_list_labels = options['inline_list_labels'] || get_default_from_config(key: :inline_list_labels) || 'omit' # 'before','after','omit'
 
     @form_labels_position = options['form_labels_position']
     if !['before', 'after', 'omit'].include?(@form_labels_position)
@@ -337,6 +344,9 @@ 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']
 
@@ -361,6 +371,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
@@ -463,6 +477,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
@@ -1069,7 +1084,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
 
@@ -1077,7 +1092,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
@@ -1086,7 +1101,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
 
@@ -1095,7 +1110,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
 
@@ -1124,7 +1139,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
@@ -1222,7 +1237,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,

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

@@ -72,13 +72,14 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     params[:per] || 10
   end<% end %>
   <% unless @no_list %>
-  def load_all_<%= plural %>
+  def load_all_<%= plural %><% if @search == "set" %>
+    @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo| {"#{foo}_match".to_sym => ((@columns_map[foo.to_sym].modify_as && @columns_map[foo.to_sym].modify_as[:binary]) ? "-1" : ""), "#{foo}_search".to_sym => ""}}.reduce({}, :merge)  } %> <% end %>
   <%= load_all_code %>
   end
 
-  def index<% if @search == "set" %>
-    @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo|
-    {"#{foo}_match".to_sym => ((@columns_map[foo.to_sym].modify_as && @columns_map[foo.to_sym].modify_as[:binary]) ? "-1" : ""), "#{foo}_search".to_sym => ""}}.reduce({}, :merge)  } %> <% end %><% if @search_fields %>
+  def index
+    load_all_<%= plural %>
+      <% if @search_fields %>
 <%= @search_fields.collect{|field_name| @columns_map[field_name.to_sym].code_to_reset_match_if_search_is_blank}.compact.join("     \n") %><% end %>
     load_all_<%= plural %><% if @pundit %><% if @pundit %>
     authorize @<%= plural_name %><% end %>
@@ -131,8 +132,18 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       <% unless @display_edit_after_create %>render :create, status: :unprocessable_entity<% else %>render :new , status: :unprocessable_entity<% end %>
     end<% if @pundit %>
   rescue Pundit::NotAuthorizedError => e
+    flash[:alert] = "Not authorized."
     @<%= singular %>.errors.add(:base, e.message)
-    render :create, status: :unprocessable_entity<% end %>
+    <% unless @display_edit_after_create %>render :create, status: :unprocessable_entity<% else %>redirect_to <%=   HotGlue.optionalized_ternary(namespace: @namespace,
+                                 top_level: true,
+                                 target:  @singular,
+                                 nested_set: @nested_set,
+                                 modifier: 'edit_',
+                                 with_params: true,
+                                 instance_last_item: true,
+                                 put_form: true).gsub("(#{singular}", "(@#{singular}") %><% end %>
+
+    <% end %>
   end
 
 <% end %>
@@ -154,7 +165,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
 

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/edit.erb

@@ -11,6 +11,7 @@
 
 
 <% if @downnest_children.any? && @big_edit %>
+  <hr />
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
     <% @downnest_object.each do |downnest, size| %>
       <div class="row">
@@ -20,7 +21,11 @@
           <% 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.titlecase.pluralize %>
+            </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/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.10'
+    CURRENT = '0.6.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.12
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails