hot-glue 0.5.22 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d92541aa687117c64a4a52b034f9103f06f95ae7996bcbd1cf7f71f986ec34
-  data.tar.gz: 751619956a66052dc837b4f13ab85cbe3fe655b60c8ad820150b7e21f3737696
+  metadata.gz: badba8cc091a29c8613194fa379cce1d7cdd720a1ae3627630a069afb5b4c352
+  data.tar.gz: d0e5cd8a96ae546596eabc865f1dc4979f0a528b82ffd19bdfdddf6dc92fe3f0
 SHA512:
-  metadata.gz: f5c4dfb35d0a673cc6f8b8a4b3833feafa7fca86a0e07d616b825c11c3c132af98fde4ec4a73ef9538f9f74a0982f38c2fceb562c1ca43f72764ad7d604bb864
-  data.tar.gz: f520ab73bebb9597e5cc4cc3651e4ef45641641157f99353c79abf7004cf9340b59d8222e2a1462d51b269bfef62e3c725732c962d21185bfc0f62f87dcc5a51
+  metadata.gz: 94ae4da0d2644a6b6311f5b81da1f864ae90d4a69c133b4a3259ad53f0221ed10bfedfe4964dc7ceb04d65e2d6ef28c420af6b5489bae4ec22bb7989f6b0249a
+  data.tar.gz: 9e0f23257368d5836f4a95c4f116f2d70057f063cce7ff14acecee0c2e7f62fd921e752d13fec73d073aa40ba6f89709a9efbb92a0c0f2bd823324a897cf93dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.5.22)
+    hot-glue (0.5.24)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -139,14 +139,14 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.3.7)
+    net-imap (0.4.0)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.8)
     nokogiri (1.13.9)

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.
@@ -1402,8 +1405,124 @@ 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-07 - v0.5.24
+
+- TinyMCE implementation. See 'TinyMCE' above.
+Note: I plan to also implement ActionText as an alternative in the future. 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.
+
+`--modify=status{partials}`
+
+Here, `status` is an enum field on your table; you must use the exact string `partials` when using this feature.
+
+You're telling Hot Glue to build scaffold that will display the `status` enum field as a partial. 
+
+It will look for a partial in the same build directory, whose name matches to the value of the enum. You will need to create a partial _for each enum option_ that you have defined.
+
+Remember when defining enums Rails will patch methods on your objects with the name of the enum types, so you must avoid namespace collisions with existing Ruby or Rails methods that are common to all objects -- like, for example, `new`.
+
+- Before this feature, enums always rendered like this on the show page:
+`<%= domain.status %>`
+(or, if you use custom labels:)
+`<%= Domain.status_labels(domain.status)`
+
+- After, you if you use the `--modify` flag and modify the enum to 'partials', your show output will render:
+```
+<%= render partial: thing.status, locals: {thing: thing} %>
+```
+(In this example `Thing` is the name of the model being built.)
+
+Your form will also render the partial, but after the collection_select used to create the drop-down.
+(This implementation has the draw-back that there is no immediate switch between the partials when changing the drop-down)
+
+Assuming your Thing enum is defined like so:
+```
+enum :status {abc: 'abc', dfg: 'dfg', hgk: 'hgk'}
+```
+
+You then would create three partials in the `things` directory. Make sure to create a partial for each defined enum, or else your app will crash when it tries to render a record with that enum.
+```
+_abc.html.erb
+_dfg.html.erb
+_hgk.html.erb
+```
+
+If your enum is on the show-only list, then the drop-down does not appear (but the partial is rendered).
+
+Proof-of-concept can be found here:
+https://github.com/hot-glue-for-rails/HGEnumWithPartials1
+
+Remember to see the section marked 'A Note About Enums' for more about working with Rails 7 enums.
+
+
 #### 2023-09-20- v0.5.22
 - adds back magic button tap-away params in the controller
 - changes creation of flash[:notice] in update method

data/lib/generators/hot_glue/field_factory.rb

@@ -58,7 +58,7 @@ class FieldFactory
                              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:  )
     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: )
     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

@@ -1,7 +1,7 @@
 class EnumField < Field
   def spec_setup_and_change_act(which_partial = nil)
     # what is the enum name
-    "      list_of_#{enum_type} = #{class_name}.defined_enums['#{enum_type}'].keys \n" +
+    "      list_of_#{enum_type} = #{class_name}.defined_enums['#{name}'].keys \n" +
       "      " + "new_#{name} = list_of_#{enum_type}[rand(list_of_#{enum_type}.length)].to_s \n" +
       '      find("select[name=\'' + singular + '[' + name + ']\']  option[value=\'#{new_' + name + '}\']").select_option'
   end
@@ -32,13 +32,19 @@ class EnumField < Field
 
   def form_field_output
     enum_type = eval("#{class_name}.columns.select{|x| x.name == '#{name}'}[0].sql_type")
-
     if eval("defined? #{class_name}.#{enum_type}_labels") == "method"
       enum_definer = "#{class_name}.#{enum_type}_labels"
     else
-      enum_definer = "#{class_name}.defined_enums['#{enum_type}']"
+      enum_definer = "#{class_name}.defined_enums['#{name}']"
+    end
+
+    res = "<%= f.collection_select(:#{name},  enum_to_collection_select(#{enum_definer}), :key, :value, {selected: #{singular}.#{name} }, class: 'form-control') %>"
+
+
+    if modify_as && modify_as[:enum] == :partials
+      res << partial_render
     end
-    return "<%= f.collection_select(:#{name},  enum_to_collection_select(#{enum_definer}), :key, :value, {selected: #{singular}.#{name} }, class: 'form-control') %>"
+    res
   end
 
   def line_field_output
@@ -47,14 +53,30 @@ class EnumField < Field
     if eval("defined? #{class_name}.#{enum_type}_labels") == "method"
       enum_definer = "#{class_name}.#{enum_type}_labels"
     else
-      enum_definer = "#{class_name}.defined_enums['#{enum_type}']"
+      enum_definer = "#{class_name}.defined_enums['#{name}']"
     end
-    "
+
+    res = "
     <% if #{singular}.#{name}.nil? %>
-        <span class='alert-danger'>MISSING</span>
-    <% else %>
-      <%=  #{enum_definer}[#{singular}.#{name}.to_sym] %>
-    <% end %>
-"
+        <span class='alert-danger'>Missing #{name}</span>
+    <% else %>"
+
+    if modify_as && modify_as[:enum] == :partials
+      res << partial_render
+    else
+      res << "<%=  #{enum_definer}[#{singular}.#{name}.to_sym] %>"
+    end
+
+    res << "<% end %>"
+    res
+  end
+
+  def partial_render
+    "<% if #{singular}.#{name} %><%=  render partial: #{singular}.#{name}, locals: { #{singular}: #{singular} } %><% end %>"
+  end
+
+
+  def form_show_only_output
+    viewable_output
   end
 end

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

@@ -1,7 +1,8 @@
 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,
                 :singular_class,  :singular, :sql_type, :ownership_field,
                 :update_show_only
 
@@ -16,7 +17,7 @@ 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,
@@ -35,7 +36,7 @@ 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
 
     @default_boolean_display = default_boolean_display
@@ -72,7 +73,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
 
@@ -87,7 +88,7 @@ class Field
 
   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 +108,7 @@ class Field
   end
 
   def viewable_output
-    if modify
+    if modify_as
       modified_display_output
     else
       "<%= #{singular}.#{name} %>"
@@ -115,10 +116,14 @@ 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_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
 
@@ -126,16 +131,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

@@ -97,18 +97,20 @@ module  HotGlue
               elsif update_show_only.include?(col) && !@pundit
                 "<% if action_name == 'edit' %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
               elsif update_show_only.include?(col) && @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
-                "<% if action_name == 'create' && policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
+                "<% if action_name == '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
+            end
+            # byebug
+            @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
 
-            add_spaces_each_line( "\n  <span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
-                                    add_spaces_each_line( (form_labels_position == 'before' ? the_label : "") +
-                                                        +  field_result +
+            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) +
                                     "\n  </span>\n  <br />", 2)
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -18,7 +18,8 @@ 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
@@ -204,18 +205,25 @@ 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(",")
       modify_input.each do |setting|
         setting =~ /(.*){(.*)}/
         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_as[key.to_sym] =  {enum: :partials}
+        elsif $2 == "tinymce"
+          @modify_as[key.to_sym] =  {tinymce: 1}
+        else
+          raise "unknown modification direction #{$2}"
         end
       end
     end
@@ -709,17 +717,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
@@ -763,7 +773,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

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

@@ -79,7 +79,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   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 %>
@@ -142,7 +143,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
-    flash[:notice] = ""
+    flash[:notice] = +''
     flash[:alert] = nil
 <% if @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.any? %><%= @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.collect{|key, data|
     "    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"

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 %> )}
+  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%>
+  }
 <%= objest_nest_factory_setup %> <% unless @god || (@existing_content && @existing_content.include?("login_as")) %>
   before do
     login_as(<%= @auth %>)

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.22'
+    CURRENT = '0.5.24'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.22
+  version: 0.5.24
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails