hot-glue 0.5.23.1 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdb39b06854037640b63ad674ce2785fcdbb5ea7947b9bf62483b8bc81f24aed
-  data.tar.gz: d64d081e67e29d893849950568ba70bbdaccb057da5d2ade725ea26e74040664
+  metadata.gz: 9c2b46bf01f0742356ab56ad4cd139534becbe919b8e38ac8d166f8ca1c1c47c
+  data.tar.gz: b697f19f9928249d693632ff040f7ebb97ddf396fd8fb8d74b60f3abfe3a6bca
 SHA512:
-  metadata.gz: f09eb212dc5f40325cccb88273088e3fd8ab096fbccf42f4c99d4bb9fb8964efde375be68e9b927fadd5b077d846d8b208b149030b93cabe4348d76a0ad4758d
-  data.tar.gz: 2dc1598871b44d6199011e2b36e6ed8c88c4a2564c249e363130cda931dfb5cef5c4900dade36182ec68216da12ca52f51b941db02056c2ee6d9abb8e68bacf8
+  metadata.gz: 9ad16ec01f21d5ac9013cbbc0ee2e364cce4deec8ff52544d34438c641a4009d763ff953e70813d2f4b5e5b35904959ca49b5fea50dc8187c254c0bc0a19850c
+  data.tar.gz: f7cbb297d36077486c6983b0dfebee09b32871b316f28fe215f3578df5054445f337d372e13b55d84f44f30a6e4e0de776df14cb3137a4ec12c8e481ed38abba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.5.23.1)
+    hot-glue (0.5.25)
       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.3.7)
+    net-imap (0.4.1)
       date
       net-protocol
     net-pop (0.1.2)

data/README.md

@@ -664,13 +664,16 @@ For booleans shown as checkboxes or switches, it affects only the view output as
 
 You will need to separately specify them as show-only if you want them to be non-editable.
 
-The available modifiers are:
+Notice that each modifiers can be used with specific field types. 
 
-| modifier                  | what it does                                                                                                                                                         | can be used on                |   |   |
-|---------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|---|---|
-| $                         | wraps output in `number_to_currency()`                                                                                                                               | float, integer                |   |   |
-| truthy label\|falsy label | specify a binary switch with a pipe (\|) character if the value is truthy, it will display as "truthy label" if the value is falsy, it will display as "falsy label" | boolean, datetime, date, time |   |   |
-|                           |                                                                                                                                                                      |                               |   |   |
+| user modifier                 | what it does                                                                                                                                                     | Field types                       |   |   |
+|-------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------|---|---|
+| $                             | wraps output in `number_to_currency()`                                                                                                                           | floats and integers               |   |   |
+| (truthy label)\|(falsy label) | specify a binary switch with a pipe (\|) character if the value is truthy, it will display as "truthy label" if the value is falsy, it will display as "falsy label" | booleans, datetimes, dates, times |   |    |
+| partials                      | applies to enums only, you must have a partial whose name matches each enum type                                                                                 | enums only                        |   |   |
+| tinymce                       | applies to text fields only, be sure to setup TineMCE globally                                                                                                   | text fields only                  |    |   |
+
+Except for "(truthy label)" and "(falsy label)" which represent the labels you should specify separated by the pipe character (|), use the modifier exactly as shown.
 
 ### `--pundit`
 If you enable Pundit, your controllers will look for a Policy that matches the name of the thing being built.
@@ -891,10 +894,15 @@ Produces ONLY the controller spec file, nothing else.
 Produces all the files except the spec file.
 
 
-### `--no-paginate`
+### `--no-paginate` (default: false)
 
 Omits pagination. (All list views have pagination by default.)
 
+### `--paginate-per-page-selector` (default: false)
+
+Show a small drop-down below the list to let the user choose 10, 25, or 100 results per page.
+
+
 ### `--no-list`
 
 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.)
@@ -1402,8 +1410,99 @@ end
 
 ```
 
+
+### TinyMCE
+1. `bundle add tinymce-rails` to add it to your Gemfile
+
+2. Add this inside of your `<head>` tag (at the bottom is fine)
+```
+    <%= tinymce_assets %>
+```
+3. Then, also inside of your `<head>` tag, add this:
+```
+<script>
+      TinyMCERails.configuration.default = {
+        selector: "textarea.tinymce",
+        cache_suffix: "?v=6.7.0",
+        menubar: "insert view format table tools",
+        toolbar: ["bold italic | link | undo redo | forecolor backcolor | bullist numlist outdent indent | table | uploadimage | code"],
+        plugins: "table,fullscreen,image,code,searchreplace,wordcount,visualblocks,visualchars,link,charmap,directionality,nonbreaking,media,advlist,autolink,lists",
+        images_upload_url: "/uploader/image"
+      };
+
+    </script>
+```
+
+Then to `application.js` add
+
+```
+import "./tinymce_init"
+
+```
+
+create a file `tinymce_init.js` with this content
+
+```
+const reinitTiny = () => {
+  tinymce.init({
+    selector: 'textarea.tinymce', // Add the appropriate selector for your textareas
+    // Other TinyMCE configuration options
+  });
+}
+
+window.addEventListener('turbo:before-fetch-response', () => {
+  tinymce.remove();
+  tinymce.init({selector:'textarea.tinymce'});
+})
+
+window.addEventListener('turbo:frame-render', reinitTiny)
+window.addEventListener('turbo:render', reinitTiny)
+```
+
+Once you have completed this setup, you can now use `--modify` with the modifier `tinymce`. 
+
+For example, to display the field `my_story` on the object `Thing`, you'd generate with:
+
+```
+bin/rails generate Thing --include=my_story --modify='my_story{tinymce}'
+```
+
 # VERSION HISTORY
 
+#### 2023-10-16 - v0.5.25
+
+- Fixes scoping on Pundit-built controllers; even when using pundit we should still wrap to the current build's own ownership scope (#132
+- don't write to the nav file if we're building a nested controller (#134)
+- adds system specs for self-auth feature
+- Pagination Fixes:
+
+A new flag `--paginate-per-page-selector` (default false) will allow you to show a small drop-down to let the user choose 10, 25, or 100 results per page.
+
+To get pagination to work, choose either #1 OR #2 below. #1 will replace the templates in app/views/kaminari so don't do that if you have modified them since first generating them out of Kaminari.
+
+1. Replace the kaminari gem with my fork and regenerate your templates
+bundle remove kaminari
+bundle add kaminari --git="https://github.com/jasonfb/kaminari.git" --branch="master"
+bundle install
+rm -rf app/views/kaminari
+rails g kaminari:config
+
+
+2. Go into app/views/kaminari/ and modify each template in this folder by adding ` 'data-turbo-action': 'advance'` to all of the links (which mostly appear in this code as the `link_to_unless` helper-- add the parameter onto the end of the calls to those helpers.) 
+
+
+
+#### 2023-10-07 - v0.5.24
+
+- TinyMCE implementation. See 'TinyMCE' above.
+Note: I also plan to implement ActionText as an alternative.  However, because TinyMCE is implemented with a `text` field type an ActionText is implemented with a Rails-specific `rich_text` field type, the two mechanisms will be incompatible with one another. TinyMCE has an annoying drawback in how it works with Turbo refreshes (not very consistently), and style of loading Javascript is discordant with Rails moving forward. So I am leaving this implementation as experimental.
+- Spec Savestart code: In the behavior specs, there is a code marker (start & end) where you can insert custom code that gets saved between 
+build. The start code maker has changed from `#HOTGLUE-SAVESTART` to `# HOTGLUE-SAVESTART`
+and the end code marker has changed from `#HOTGLUE-END` to `# HOTGLUE-END`. This now conforms to Rubocop. 
+Be sure to do find & replace in your existing projects to keep your custom code.
+- Fix for specs for attachment fields. If you have attachments fields, you must have a sample file at `spec/fixtures/glass_button.png`
+- Pundit now correctly protects the `index` action (authorize was missing before)
+
 #### 2023-10-01 - v0.5.23
 
 - You can now use the modify flag on enum type fields to display a partial with the same name of that enum type.
@@ -1897,7 +1996,5 @@ To run only the internal specs, use
 
 `rspec spec`
 
-Internal Test coverage as of 2023-02-10 (v0.5.7)
-
-<img width="1202" alt="Screen Shot 2023-02-10 at 4 43 59 PM" src="https://user-images.githubusercontent.com/59002/218204736-5740505b-1ec8-456f-b0fb-9c359f6f7037.png">
-
+Internal Test coverage as of 2023-10-15 (v0.5.24)
+All Files ( 86.29% covered at 75.64 hits/line )

data/lib/generators/hot_glue/field_factory.rb

@@ -55,10 +55,11 @@ class FieldFactory
                              class_name: generator.singular_class,
                              alt_lookups: generator.alt_lookups,
                              singular: generator.singular,
+                             self_auth: generator.self_auth,
                              update_show_only: generator.update_show_only,
                              attachment_data: generator.attachments[name.to_sym],
                              sample_file_path: generator.sample_file_path,
-                             modify: generator.modify[name.to_sym] || nil,
+                             modify_as: generator.modify_as[name.to_sym] || nil,
                              display_as: generator.display_as[name.to_sym] || nil,
                              default_boolean_display: generator.default_boolean_display)
   end

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

@@ -10,7 +10,7 @@ class AssociationField < Field
                  update_show_only: ,
                  hawk_keys: , auth: , sample_file_path:,  ownership_field: ,
                  attachment_data: nil , layout_strategy: , form_placeholder_labels: nil,
-                 form_labels_position:, modify:  )
+                 form_labels_position:, modify_as: , self_auth: )
     super
 
     @assoc_model = eval("#{class_name}.reflect_on_association(:#{assoc})")

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

@@ -4,7 +4,7 @@ class AttachmentField < Field
                  display_as:,
                  singular:, update_show_only:, hawk_keys:, auth:,
                  sample_file_path: nil, attachment_data:, ownership_field:, layout_strategy: ,
-                 form_placeholder_labels: , form_labels_position:, modify: )
+                 form_placeholder_labels: , form_labels_position:, modify_as:, self_auth: )
     super
 
     @attachment_data = attachment_data
@@ -14,7 +14,17 @@ class AttachmentField < Field
     nil
   end
 
-  def spec_setup_and_change_act(which_partial = nil)
+  def spec_list_view_natural_assertion
+    "within('div.#{singular}--#{name}') do
+        img = page.find('img')
+        expect(img['src']).to end_with('glass_button.png')
+      end"
+
+    # "expect(page).to have_content(#{singular}#{1}.#{name})"
+  end
+
+
+def spec_setup_and_change_act(which_partial = nil)
     "      attach_file(\"#{singular}[#{name.to_s}]\", \"#{sample_file_path}\")"
   end
 

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

@@ -23,9 +23,9 @@ class BooleanField < Field
 
   def radio_button_display
     "  <%= f.radio_button(:#{name}, '0', checked: #{singular}.#{name}  ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
-      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:falsy] || 'No'}', for: '#{singular}_#{name}_0') %>\n" +
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify_as[:binary][:falsy] || 'No'}', for: '#{singular}_#{name}_0') %>\n" +
       " <br /> <%= f.radio_button(:#{name}, '1',  checked: #{singular}.#{name}  ? 'checked' : '' , class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
-      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:truthy] || 'Yes'}', for: '#{singular}_#{name}_1') %>\n"
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify_as[:binary][:truthy] || 'Yes'}', for: '#{singular}_#{name}_1') %>\n"
   end
 
   def checkbox_display
@@ -60,9 +60,9 @@ class BooleanField < Field
       "<% if #{singular}.#{name}.nil? %>
         <span class='alert-danger'>MISSING</span>
     <% elsif #{singular}.#{name} %>
-      #{modify[:binary][:truthy]}
+      #{modify_as[:binary][:truthy]}
     <% else %>
-      #{modify[:binary][:falsy]}
+      #{modify_as[:binary][:falsy]}
     <% end %>"
     else
       "<% if #{singular}.#{name}.nil? %>

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

@@ -41,7 +41,7 @@ class EnumField < Field
     res = "<%= f.collection_select(:#{name},  enum_to_collection_select(#{enum_definer}), :key, :value, {selected: #{singular}.#{name} }, class: 'form-control') %>"
 
 
-    if modify && modify[:enum] == :partials
+    if modify_as && modify_as[:enum] == :partials
       res << partial_render
     end
     res
@@ -61,7 +61,7 @@ class EnumField < Field
         <span class='alert-danger'>Missing #{name}</span>
     <% else %>"
 
-    if modify && modify[:enum] == :partials
+    if modify_as && modify_as[:enum] == :partials
       res << partial_render
     else
       res << "<%=  #{enum_definer}[#{singular}.#{name}.to_sym] %>"

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

@@ -1,7 +1,9 @@
 class Field
   attr_accessor :assoc_model, :assoc_name, :assoc_class, :associations, :alt_lookups, :auth,
-                :assoc_label,  :class_name, :default_boolean_display, :display_as, :form_placeholder_labels, :form_labels_position,
-                :hawk_keys,   :layout_strategy, :limit, :modify, :name, :object, :sample_file_path,
+                :assoc_label,  :class_name, :default_boolean_display, :display_as, :form_placeholder_labels,
+                :form_labels_position,
+                :hawk_keys,   :layout_strategy, :limit, :modify_as, :name, :object, :sample_file_path,
+                :self_auth,
                 :singular_class,  :singular, :sql_type, :ownership_field,
                 :update_show_only
 
@@ -16,12 +18,13 @@ class Field
     form_placeholder_labels: ,
     hawk_keys: nil,
     layout_strategy:  ,
-    modify: ,
+    modify_as: ,   #note non-standard naming as to avoid collision with Ruby reserved word modify
     name: ,
     ownership_field: ,
     sample_file_path: nil,
     singular: ,
-    update_show_only:
+    update_show_only:,
+    self_auth:
   )
     @name = name
     @layout_strategy = layout_strategy
@@ -35,9 +38,10 @@ class Field
     @form_placeholder_labels = form_placeholder_labels
     @ownership_field = ownership_field
     @form_labels_position = form_labels_position
-    @modify = modify
+    @modify_as = modify_as
     @display_as = display_as
 
+    @self_auth = self_auth
     @default_boolean_display = default_boolean_display
 
     # TODO: remove knowledge of subclasses from Field
@@ -72,7 +76,7 @@ class Field
     if !modify_binary?
       "expect(page).to have_content(new_#{name})"
     else
-      "expect(page).to have_content('#{modify[:binary][:truthy]}'"
+      "expect(page).to have_content('#{modify_as[:binary][:truthy]}'"
     end
   end
 
@@ -82,12 +86,16 @@ class Field
   end
 
   def spec_list_view_natural_assertion
-    "expect(page).to have_content(#{singular}#{1}.#{name})"
+    if !self_auth
+      "expect(page).to have_content(#{singular}#{1}.#{name})"
+    else
+      "expect(page).to have_content(current_#{singular}.#{name})"
+    end
   end
 
   def spec_list_view_assertion
     if modify_binary?
-      "expect(page).to have_content('#{modify[:binary][:truthy]}'"
+      "expect(page).to have_content('#{modify_as[:binary][:truthy]}'"
     else
       spec_list_view_natural_assertion
     end
@@ -107,7 +115,7 @@ class Field
   end
 
   def viewable_output
-    if modify
+    if modify_as
       modified_display_output
     else
       "<%= #{singular}.#{name} %>"
@@ -115,11 +123,13 @@ class Field
   end
 
   def modified_display_output
-    if modify[:cast] && modify[:cast] == "$"
+    if modify_as[:cast] && modify_as[:cast] == "$"
       "<%= number_to_currency(#{singular}.#{name}) %>"
-    elsif modify[:binary]
-      "<%= #{singular}.#{name} ? '#{modify[:binary][:truthy]}' : '#{modify[:binary][:falsy]}' %>"
-    elsif modify[:enum]
+    elsif modify_as[:binary]
+      "<%= #{singular}.#{name} ? '#{modify_as[:binary][:truthy]}' : '#{modify_as[:binary][:falsy]}' %>"
+    elsif modify_as[:tinymce]
+
+    elsif modify_as[:enum]
       "<%= render partial: #{singular}.#{name}, locals: {#{singular}: #{singular}} %>"
     end
   end
@@ -128,16 +138,16 @@ class Field
     "  <%= f.text_field :#{name}, value: #{singular}.#{name}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "")  +  " %>\n " + "\n"
   end
 
-  def text_area_output(field_length )
+  def text_area_output(field_length, extra_classes: "")
     lines = field_length % 40
     if lines > 5
       lines = 5
     end
-    "<%= f.text_area :#{name}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "") + " %>"
+    "<%= f.text_area :#{name}, class: 'form-control#{extra_classes}', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "") + " %>"
   end
 
   def modify_binary? # safe
-    !!(modify && modify[:binary])
+    !!(modify_as && modify_as[:binary])
   end
 
   def display_boolean_as

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

@@ -16,7 +16,7 @@ class TextField < Field
     if sql_type == "varchar" || sql_type == "character varying"
       field_output( nil, limit || 40)
     else
-      text_area_output( 65536)
+      text_area_output( 65536, extra_classes: (modify_as == {tinymce: 1} ? " tinymce" : "" ))
     end
   end
 

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

@@ -17,7 +17,7 @@ module HotGlue
 
         @generator = generator
 
-        @modify = generator.modify
+        @modify_as = generator.modify_as
         @display_as =  generator.display_as
         @columns = generator.columns
         @smart_layout = generator.smart_layout
@@ -46,7 +46,7 @@ module HotGlue
 
           },
           buttons: { size: @buttons_width},
-          modify: @modify,
+          modify_as: @modify_as,
           display_as: @display_as
         }
 

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

@@ -105,7 +105,10 @@ module  HotGlue
             else
               columns_map[col].form_field_output
             end
-            add_spaces_each_line( "\n  <span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
+            # byebug
+            @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-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) +

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -18,10 +18,12 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   source_root File.expand_path('templates', __dir__)
   attr_accessor :alt_lookups, :attachments, :auth, :big_edit, :button_icons, :bootstrap_column_width, :columns,
                 :default_boolean_display,
-                :display_as, :downnest_children, :downnest_object, :hawk_keys, :layout_object, :modify,
+                :display_as, :downnest_children, :downnest_object, :hawk_keys, :layout_object,
+                :modify_as,
                 :nest_with, :path, :plural, :sample_file_path, :show_only_data, :singular,
                 :singular_class, :smart_layout, :stacked_downnesting, :update_show_only, :ownership_field,
-                :layout_strategy, :form_placeholder_labels, :form_labels_position, :pundit
+                :layout_strategy, :form_placeholder_labels, :form_labels_position, :pundit,
+                :self_auth
 
   class_option :singular, type: :string, default: nil
   class_option :plural, type: :string, default: nil
@@ -46,6 +48,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :no_controller, type: :boolean, default: false
   class_option :no_list, type: :boolean, default: false
   class_option :no_paginate, type: :boolean, default: false
+  class_option :paginate_per_page_selector, type: :boolean, default: false
   class_option :big_edit, type: :boolean, default: false
   class_option :show_only, type: :string, default: ""
   class_option :update_show_only, type: :string, default: ""
@@ -204,7 +207,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       puts "show only field #{@show_only}}"
     end
 
-    @modify = {}
+    @modify_as = {}
     if !options['modify'].empty?
 
       modify_input = options['modify'].split(",")
@@ -213,13 +216,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         key, lookup_as = $1, $2
 
         if ["$"].include?($2)
-          @modify[key.to_sym] =  {cast: $2}
+          @modify_as[key.to_sym] =  {cast: $2}
         elsif $2.include?("|")
           binary = $2.split("|")
-          @modify[key.to_sym] =  {binary: {truthy: binary[0], falsy: binary[1]}}
+          @modify_as[key.to_sym] =  {binary: {truthy: binary[0], falsy: binary[1]}}
         elsif $2 == "partial"
-          @modify[key.to_sym] =  {enum: :partials}
-
+          @modify_as[key.to_sym] =  {enum: :partials}
+        elsif $2 == "tinymce"
+          @modify_as[key.to_sym] =  {tinymce: 1}
         else
           raise "unknown modification direction #{$2}"
         end
@@ -293,6 +297,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     @no_create = options['no_create'] || false
     @no_paginate = options['no_paginate'] || false
+    @paginate_per_page_selector = options['paginate_per_page_selector']
+
     @big_edit = options['big_edit']
 
     @no_edit = options['no_edit'] || false
@@ -715,17 +721,19 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       if File.exist?(dest_file)
         existing_file = File.open(dest_file)
         existing_content = existing_file.read
-        if existing_content =~ /\#HOTGLUE-SAVESTART/
-          if existing_content !~ /\#HOTGLUE-END/
-            raise "Your file at #{dest_file} contains a #HOTGLUE-SAVESTART marker without #HOTGLUE-END"
+        if existing_content =~ /\# HOTGLUE-SAVESTART/
+          if existing_content !~ /\# HOTGLUE-END/
+            raise "Your file at #{dest_file} contains a # HOTGLUE-SAVESTART marker without # HOTGLUE-END"
           end
-          @existing_content = existing_content[(existing_content =~ /\#HOTGLUE-SAVESTART/)..(existing_content =~ /\#HOTGLUE-END/) - 1]
-          @existing_content << "#HOTGLUE-END"
+          @existing_content = existing_content[(existing_content =~ /\# HOTGLUE-SAVESTART/)..(existing_content =~ /\# HOTGLUE-END/) - 1]
+          @existing_content << "# HOTGLUE-END"
 
+        else
+          @existing_content = "  # HOTGLUE-SAVESTART\n  # HOTGLUE-END"
         end
         existing_file.rewind
       else
-        @existing_content = "  #HOTGLUE-SAVESTART\n  #HOTGLUE-END"
+        @existing_content = "  # HOTGLUE-SAVESTART\n  # HOTGLUE-END"
       end
 
       template "system_spec.rb.erb", dest_file
@@ -744,6 +752,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     singular_class.gsub("::", "_").underscore
   end
 
+  def factory_testing_name
+    if !@self_auth
+      "#{singular}1"
+    else
+      "current_#{singular}"
+    end
+  end
+
   def spec_related_column_lets
     @columns_map.collect { |col, col_object|
       col_object.spec_related_column_lets
@@ -769,7 +785,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def regenerate_me_code
-    "rails generate hot_glue:scaffold #{ @meta_args[0][0] } #{@meta_args[1].collect { |x| x.gsub(/\s*=\s*([\S\s]+)/, '=\'\1\'') }.join(" ")}"
+    "bin/rails generate hot_glue:scaffold #{ @meta_args[0][0] } #{@meta_args[1].collect { |x| x.gsub(/\s*=\s*([\S\s]+)/, '=\'\1\'') }.join(" ")}"
   end
 
   def object_parent_mapping_as_argument_for_specs
@@ -1089,7 +1105,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   def insert_into_nav_template
     # how does this get called(?)
     nav_file = "#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}"
-    if include_nav_template
+    if include_nav_template && @nested_set.none?
       append_text = "  <li class='nav-item'>
     <%= link_to '#{@list_label_heading}', #{path_helper_plural}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
   </li>"

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

@@ -66,20 +66,24 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   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 %>
   end<% end %>
+  <% if @paginate_per_page_selector %>def per
+    params[:per] || 10
+  end
 
-  def load_all_<%= plural %><% if @pundit %>
-    @<%= plural_name %> =  policy_scope(<%= class_name %>).page(params[:page])<%= n_plus_one_includes %>
+  <% end %>def load_all_<%= plural %><% if @pundit %>
+    @<%= plural_name %> =  policy_scope(<%= object_scope %>).page(params[:page])<%= n_plus_one_includes %><%= ".per(per)" if @paginate_per_page_selector %>
     authorize @<%= plural_name %>.all<% else %> <% 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.any? && @nested_set[0] &&  @nested_set[0][:optional] %><% if @nested_set[0] &&  @nested_set[0][:optional] %>
+    @<%= plural_name %> = <%= object_scope.gsub("@",'') %><%= n_plus_one_includes %>.page(params[:page])<%= ".per(per)" if @paginate_per_page_selector %><%= " 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] %>
     @<%= plural_name %> = <%= class_name %>.all<% end %><% else %>
-    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %><% end %>
+    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %>.page(params[:page])<%= ".per(per)" if @paginate_per_page_selector %><% end %>
     <% end %>
   end
 
   def index
     load_all_<%= plural %><% if @pundit %>
   rescue Pundit::NotAuthorizedError
-    flash[:alert] = "You are not authorized to perform this action."<% end %>
+    flash[:alert] = "You are not authorized to perform this action."
+    render "layouts/error"<% end %>
   end
 
 <% if create_action %>  def new<% if @object_owner_sym %>
@@ -155,7 +159,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <% end %>
     modified_params = modify_date_inputs_on_params(<% if @update_show_only %>update_<% end %><%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %><%= controller_update_params_tap_away_magic_buttons  %>, <%= current_user_object %>, <%= datetime_fields_list %>) <% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
     modified_params = modified_params.merge(<%= @object_owner_sym %>: <%= @object_owner_eval %>) <% elsif @object_owner_optional && any_nested? %>
-    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif !@object_owner_eval.empty? %>
+    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif ! @object_owner_eval.empty?  && !@self_auth%>
     modified_params = modified_params.merge(<%= @object_owner_eval %>) <% end %><%  if !merge_lookups.empty?  %>
     modified_params = modified_params.merge(<%= merge_lookups %>)
       <% end %>

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

@@ -51,6 +51,12 @@
       <%= @nested_set.collect{|arg| "      .merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {})"}.join("\n") %>
         %>
       <\% end %>
+      <% if @paginate_per_page_selector %>
+        <\%= form_with url: things_path, method: :get do |f| %>
+           Show per page
+        <\%= f.collection_select  "per", [10, 25, 100], :to_s, :to_s, {prompt: true, selected: params[:per]}, {onChange: "this.form.submit();"} %>
+        <\% end %>
+      <% end %>
     <%=  @no_paginate ? "" : paginate %>
   <% end  %>
   </div>

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

@@ -2,9 +2,9 @@
  if (eval(@singular_class).instance_methods.include?(display_class.to_s))
   item1_addOns << "#{display_class}: FFaker::Name.name"
  end
-item1_addOns << ", " + @columns_map.collect{|col, col_object|
+item1_addOns << ", \n                          " + @columns_map.collect{|col, col_object|
   col_object.spec_setup_let_arg
-}.compact.join(", ")
+}.compact.join(", \n                          ")
 %>require 'rails_helper'
 
 describe 'interaction for <%= controller_class_name %>' do
@@ -14,7 +14,18 @@ describe 'interaction for <%= controller_class_name %>' do
   <%= @existing_content %>
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<% end %>
 <%= spec_related_column_lets %>
-  let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )}
+ <% unless @self_auth %> let!(:<%= singular %>1) {
+    <%= singular %> = create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )
+<%= @attachments.collect{ |attachment|
+    "    #{singular}.#{ attachment[0].to_s }.attach(
+      io: File.open('spec/fixtures/glass_button.png'),
+      filename: 'glass_button.png',
+      content_type: 'image/png')"
+     }.join("\n")
+   %>
+    <%=singular%>.save!
+    <%=singular%>
+  }<% end %>
 <%= objest_nest_factory_setup %> <% unless @god || (@existing_content && @existing_content.include?("login_as")) %>
   before do
     login_as(<%= @auth %>)
@@ -53,25 +64,25 @@ describe 'interaction for <%= controller_class_name %>' do
   describe "edit & update" do
     it "should return an editable form" do
       visit <%= path_helper_plural %>
-      find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= singular %>1.id}/edit']").click
+      find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= factory_testing_name %>.id}/edit']").click
 
-      expect(page).to have_content("Editing #{<%= singular %>1.<%= @display_class %>.squish || "(no name)"}")
+      expect(page).to have_content("Editing #{<%= factory_testing_name %>.<%= @display_class %>.squish || "(no name)"}")
 <%= capybara_make_updates(:update) %>
       click_button "Save"
-      within("turbo-frame#<%= @namespace %>__#{dom_id(<%= singular %>1)} ") do
+      within("turbo-frame#<%= @namespace %>__#{dom_id(<%= factory_testing_name %>)} ") do
 <%= "        " + @columns_map.map{ |col, col_object|
   if @attachments.keys.collect(&:to_sym).include?(col)
   elsif @show_only.include?(col)
   else
       col_object.spec_make_assertion
   end
- }.compact.join("\n        ")
+ }.compact.join("\n       ")
   %>
       end
     end
-  end <% end %>
+  end <% end %><% if destroy_action %>
 
-<% unless @no_delete %>  describe "destroy" do
+  describe "destroy" do
     it "should destroy" do
       visit <%= path_helper_plural %>
       accept_alert do

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.23.1'
+    CURRENT = '0.5.25'
   end
 end

data/script/test

@@ -30,7 +30,9 @@ bin/rails generate hot_glue:scaffold Pet --gd
 
 bin/rails generate hot_glue:scaffold Human --gd
 
-#rails generate hot_glue:scaffold User --no-create --self-auth
+bin/rails generate hot_glue:scaffold User --no-create --self-auth
+
+
 #rails generate hot_glue:scaffold Jkl --gd
 #rails generate hot_glue:scaffold Appointment --hawk=pets --gd
 #rails generate hot_glue:scaffold Family --gd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.23.1
+  version: 0.5.25
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-01 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/hot-glue-for-rails/hot-glue
   homepage: https://heliosdev.shop/hot-glue
-  funding: https://school.jasonfleetwoodboldt.com/8188
+  funding: https://school.jfbcodes.com/8188
 post_install_message: |
   ---------------------------------------------
   Welcome to Hot Glue - A Scaffold Building Companion for Hotwire + Turbo-Rails