hot-glue 0.5.12 → 0.5.15

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

@@ -16,7 +16,7 @@ module  HotGlue
                    small_buttons: , show_only: ,
                    ownership_field: , form_labels_position: ,
                    inline_list_labels: ,
-                   form_placeholder_labels:, hawk_keys:,
+                   form_placeholder_labels:, hawk_keys: ,
                    update_show_only:, alt_lookups: , attachments: , columns_map: )
 
       @singular = singular
@@ -81,54 +81,16 @@ module  HotGlue
       result = columns.map{ |column|
         "  <div class='#{column_classes} cell--#{singular}--#{column.join("-")}' >" +
           column.map { |col|
-            if attachments.keys.include?(col)
-
-              field_result = columns_map[col].form_field_output
-              field_error_name = columns_map[col].field_error_name
-            else
-
-              type = eval("#{singular_class}.columns_hash['#{col}']").type
-              limit = eval("#{singular_class}.columns_hash['#{col}']").limit
-              sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
-
-              field_result =
-                if show_only.include?(col.to_sym)
-                  show_only_result(type: type, col: col, singular: singular)
-                else
-                  case type
-                  when :integer
-                    integer_result(col)
-                  when :uuid
-                    association_result(col)
-                  when :string
-                    string_result(col, sql_type, limit)
-                  when :text
-                    text_result(col, sql_type, limit)
-                  when :float
-                    field_output(col, nil, 5, column_classes)
-                  when :datetime
-                    "<%= datetime_field_localized(f, :#{col}, #{singular}.#{col}, '#{ col.to_s.humanize }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
-                  when :date
-                    "<%= date_field_localized(f, :#{col}, #{singular}.#{col}, '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
-                  when :time
-                    "<%= time_field_localized(f, :#{col}, #{singular}.#{col},  '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
-                  when :boolean
-                    boolean_result(col)
-                  when :enum
-                    enum_result(col)
-                  end
-                end
-
-              if (type == :integer) && col.to_s.ends_with?("_id")
-                field_error_name = col.to_s.gsub("_id","")
-              else
-                field_error_name = col
-              end
+            field_result = show_only.include?(col.to_sym) ?
+                             columns_map[col].form_show_only_output :
+                             columns_map[col].form_field_output
+
+            field_error_name = columns_map[col].field_error_name
 
-            end
             the_label = "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
             show_only_open = ""
             show_only_close = ""
+
             if update_show_only.include?(col)
               show_only_open = "<% if action_name == 'edit' %>" +
                 show_only_result(type: type, col: col, singular: singular) + "<% else %>"
@@ -137,7 +99,7 @@ module  HotGlue
 
             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 : "") +
-                                                            show_only_open +  field_result + show_only_close +
+                                                            show_only_open + field_result + show_only_close +
                                                             (form_labels_position == 'after' ? the_label : "")   , 4) +
                                     "\n  </span>\n  <br />", 2)
 
@@ -146,128 +108,6 @@ module  HotGlue
       return result
     end
 
-
-    def show_only_result(type:, col: , singular: )
-      if type == :uuid || (type == :integer && col.ends_with?("_id"))
-        association_read_only_result(col)
-      else
-        "<%= #{singular}.#{col} %>"
-      end
-    end
-
-    def integer_result(col)
-      # look for a belongs_to on this object
-      if col.to_s.ends_with?("_id")
-        association_result(col)
-      else
-        "  <%= f.text_field :#{col}, value: #{@singular}.#{col}, autocomplete: 'off', size: 4, class: 'form-control', type: 'number'"  + (@form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "")  +  " %>\n " + "\n"
-      end
-    end
-
-    def association_read_only_result(col)
-      assoc_name = col.to_s.gsub("_id","")
-      assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
-      if assoc.nil?
-        exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-        exit
-      end
-
-      is_owner = col == ownership_field
-      assoc_class_name = assoc.class_name.to_s
-      display_column = HotGlue.derrive_reference_name(assoc_class_name)
-
-      if @hawk_keys[assoc.foreign_key.to_sym]
-        hawk_definition = @hawk_keys[assoc.foreign_key.to_sym]
-        hawked_association = hawk_definition.join(".")
-      else
-        hawked_association = "#{assoc.class_name}.all"
-      end
-      "<%= #{@singular}.#{assoc_name}.#{display_column} %>"
-    end
-
-    def association_result(col)
-      assoc_name = col.to_s.gsub("_id","")
-      assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
-
-
-      if @alt_lookups.keys.include?(col.to_s)
-        alt = @alt_lookups[col.to_s][:lookup_as]
-        "<%= f.text_field :__lookup_#{alt}, value: @#{singular}.#{assoc_name}.try(:#{alt}), placeholder: \"search by #{alt}\" %>"
-      else
-        if assoc.nil?
-          exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-          exit
-        end
-
-        is_owner = col == ownership_field
-        assoc_class_name = assoc.class_name.to_s
-        display_column = HotGlue.derrive_reference_name(assoc_class_name)
-        if @hawk_keys[assoc.foreign_key.to_sym]
-          hawk_definition = @hawk_keys[assoc.foreign_key.to_sym]
-          hawked_association = hawk_definition[:bind_to].join(".")
-        else
-          hawked_association = "#{assoc.class_name}.all"
-        end
-
-        (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
-          "  <%= f.collection_select(:#{col}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
-          (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
-          (is_owner ? "\n<% end %>" : "")
-      end
-    end
-
-    def string_result(col, sql_type, limit)
-      if sql_type == "varchar" || sql_type == "character varying"
-        field_output(col, nil, limit || 40, col_identifier)
-      else
-        text_area_output(col, 65536, col_identifier)
-      end
-    end
-
-
-    def text_result(col, sql_type, limit)
-      if sql_type == "varchar"
-        field_output(col, nil, limit, col_identifier)
-      else
-        text_area_output(col, 65536, col_identifier)
-      end
-    end
-
-    def field_output(col, type = nil, width, col_identifier )
-      "  <%= f.text_field :#{col}, value: #{@singular}.#{col}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (@form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "")  +  " %>\n " + "\n"
-    end
-
-    def text_area_output(col, field_length, col_identifier )
-      lines = field_length % 40
-      if lines > 5
-        lines = 5
-      end
-
-      "<%= f.text_area :#{col}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( @form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "") + " %>"
-    end
-
-    def boolean_result(col)
-      (form_labels_position == 'before' ?  " <br />"  : "") +
-        "  <%= f.radio_button(:#{col},  '0', checked: #{singular}.#{col}  ? '' : 'checked') %>\n" +
-        "  <%= f.label(:#{col}, value: 'No', for: '#{singular}_#{col}_0') %>\n" +
-        "  <%= f.radio_button(:#{col}, '1',  checked: #{singular}.#{col}  ? 'checked' : '') %>\n" +
-        "  <%= f.label(:#{col}, value: 'Yes', for: '#{singular}_#{col}_1') %>\n" +
-      (form_labels_position == 'after' ?  " <br />"  : "")
-
-    end
-
-    def enum_result(col)
-      enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
-
-      if eval("defined? #{singular_class}.#{enum_type}_labels") == "method"
-        enum_definer = "#{singular_class}.#{enum_type}_labels"
-      else
-        enum_definer = "#{singular_class}.defined_enums['#{enum_type}']"
-      end
-
-      "<%= f.collection_select(:#{col},  enum_to_collection_select(#{enum_definer}), :key, :value, {selected: @#{singular}.#{col} }, class: 'form-control') %>"
-    end
-
     ################################################################
 
     def paginate(*args)
@@ -277,10 +117,9 @@ module  HotGlue
     end
 
 
-
-
     ################################################################
-
+    # THE SHOW ACTION
+    ################################################################
 
     def all_line_fields(layout_strategy:,
                         layout_object: ,
@@ -304,115 +143,11 @@ module  HotGlue
           if eval("#{singular_class}.columns_hash['#{col}']").nil? && !attachments.keys.include?(col)
             raise "Can't find column '#{col}' on #{singular_class}, are you sure that is the column name?"
           end
+          field_output = columns_map[col].line_field_output
+          
+          label = "<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
 
-          if attachments.keys.include?(col)
-            this_attachment  = attachments[col]
-            thumbnail = this_attachment[:thumbnail]
-
-            field_output =  (this_attachment[:thumbnail] ? "<%= #{singular}.#{col}.attached? ? image_tag(#{singular}.#{col}.variant(:#{thumbnail})) : '' %>" : "")
-
-          else
-            type = eval("#{singular_class}.columns_hash['#{col}']").type
-            limit = eval("#{singular_class}.columns_hash['#{col}']").limit
-            sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
-
-            field_output =
-              case type
-              when :integer
-                # look for a belongs_to on this object
-                if col.ends_with?("_id")
-                  assoc_name = col.to_s.gsub("_id","")
-                  assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
-
-                  if assoc.nil?
-                    exit_message =  "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-                    puts exit_message
-                    exit
-                    # raise(HotGlue::Error,exit_message)
-                  end
-                  assoc_class_name = assoc.class_name
-
-                  display_column =  HotGlue.derrive_reference_name(assoc_class_name)
-                  "<%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>"
-
-                else
-                  "<%= #{singular}.#{col}%>"
-                end
-
-              when :uuid
-                assoc_name = col.to_s.gsub("_id","")
-                assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
-
-                if assoc.nil?
-                  exit_message =  "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-                  puts exit_message
-                  exit
-                  # raise(HotGlue::Error,exit_message)
-                end
-
-                display_column =  HotGlue.derrive_reference_name(assoc.class_name.to_s)
-                "<%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>"
-
-              when :float
-                width = (limit && limit < 40) ? limit : (40)
-                "<%= #{singular}.#{col}%>"
-              when :string
-                width = (limit && limit < 40) ? limit : (40)
-                "<%= #{singular}.#{col} %>"
-              when :text
-                "<%= #{singular}.#{col} %>"
-              when :datetime
-                "<% unless #{singular}.#{col}.nil? %>
-  <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone) %>
-  <% else %>
-  <span class='alert-danger'>MISSING</span>
-  <% end %>"
-              when :date
-                "<% unless #{singular}.#{col}.nil? %>
-      <%= #{singular}.#{col} %>
-    <% else %>
-    <span class='alert-danger'>MISSING</span>
-    <% end %>"
-              when :time
-                "<% unless #{singular}.#{col}.nil? %>
-      <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone) %>
-     <% else %>
-    <span class='alert-danger'>MISSING</span>
-    <% end %>"
-              when :boolean
-                "
-    <% if #{singular}.#{col}.nil? %>
-        <span class='alert-danger'>MISSING</span>
-    <% elsif #{singular}.#{col} %>
-      YES
-    <% else %>
-      NO
-    <% end %>
-
-  "
-              when :enum
-                enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
-
-                if eval("defined? #{singular_class}.#{enum_type}_labels") == "method"
-                  enum_definer = "#{singular_class}.#{enum_type}_labels"
-                else
-                  enum_definer = "#{singular_class}.defined_enums['#{enum_type}']"
-                end
-                "
-    <% if #{singular}.#{col}.nil? %>
-        <span class='alert-danger'>MISSING</span>
-    <% else %>
-      <%=  #{enum_definer}[#{singular}.#{col}.to_sym] %>
-    <% end %>
-
-"
-              end #end of switch
-          end
-
-          label = "<br/><label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
-
-          (inline_list_labels == 'before' ? label : "") + field_output +
-            (inline_list_labels == 'after' ? label : "")
+          "#{inline_list_labels == 'before' ? label + "<br/>" : ''}#{field_output}#{inline_list_labels == 'after' ? "<br/>" + label : ''}"
         }.join(  "<br />") + "</div>"
       }.join("\n")
     end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -28,7 +28,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :nest_with,
                 :path,  :plural,
                 :sample_file_path,  :singular, :singular_class, :smart_layout,
-                :stacked_downnesting,  :update_show_only
+                :stacked_downnesting,  :update_show_only, :ownership_field,
+                :layout_strategy, :form_placeholder_labels, :form_labels_position
 
   class_option :singular, type: :string, default: nil
   class_option :plural, type: :string, default: nil
@@ -402,8 +403,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @columns_map[col] = this_column_object.field
     end
 
-
-
     # create the template object
     if  @markup == "erb"
       @template_builder = HotGlue::ErbTemplate.new(
@@ -648,10 +647,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     }.join(", ")
 
     if @factory_creation == ''
-      "@#{singular } = #{ class_name }.create(modified_params)"
+      "@#{singular } = #{ class_name }.create(modified_params#{'.merge(' + merge_with + ')' if !merge_with.empty?})"
     else
       "#{@factory_creation}\n" +
-        "    @#{singular } = #{ class_name }.create(modified_params#{'.merge(' + merge_with + ')' if !merge_with.empty?})"
+        "    @#{singular } = factory.#{singular}"
     end
   end
 
@@ -668,7 +667,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def filepath_prefix
-    'spec/dummy/' if Rails.env.test?
+    'spec/dummy/' if $INTERNAL_SPECS
   end
 
   def copy_controller_and_spec_files
@@ -707,7 +706,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       template "system_spec.rb.erb", dest_file
     end
 
-    template "#{@markup}/_errors.#{@markup}", File.join("#{filepath_prefix}app/views#{namespace_with_dash}", "_errors.#{@markup}")
+    if File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/_errors.#{@markup}")
+      File.delete("#{filepath_prefix}app/views#{namespace_with_dash}/_errors.#{@markup}")
+    end
   end
 
   def spec_foreign_association_merge_hash
@@ -1050,14 +1051,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def all_views
-    res =  %w(index  _line _list _show _errors)
+    res =  %w(index  _line _list _show)
 
     unless @no_create
       res += %w(new _new_form _new_button)
     end
 
     unless @no_edit
-      res << 'edit'
+      res += %w{edit _edit}
     end
 
     if !( @no_edit && @no_create)
@@ -1257,4 +1258,21 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   def any_datetime_fields?
     (@columns - @attachments.keys.collect(&:to_sym)).collect{|col| eval("#{singular_class}.columns_hash['#{col}']").type}.include?(:datetime)
   end
+
+  def post_action_parental_updates
+    if @nested_set.any?
+      "\n" + @nested_set.collect{ |data|
+        parent = data[:singular]
+        "@#{singular}.#{parent}.reload"
+      }.join("\n")
+    end
+  end
+
+  def turbo_parental_updates
+    @nested_set.collect{| data|
+      "<%= turbo_stream.replace \"#{@namespace + '__' if @namespace}\#{dom_id(@#{data[:singular]})}\" do %>
+    <%= render partial: \"#{@namespace}/#{data[:plural]}/edit\", locals: {#{data[:singular]}: @#{singular}.#{data[:singular]}.reload} %>
+  <% end %>"
+    }.join("\n")
+  end
 end

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

@@ -57,8 +57,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   def load_<%= singular_name %>
     <% if @nested_set[0] && @nested_set[0][:optional] %>if params.include?(:<%= @nested_set.last[:singular] %>_id)
       @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])
-    else
-  <% end %>@<%= singular_name %> = <%= object_scope %>.find(params[:id])<% if @nested_set[0] && @nested_set[0][:optional]  %>
+    else <% end %>@<%= singular_name %> = <%= object_scope %>.find(params[:id])<% if @nested_set[0] && @nested_set[0][:optional]  %>
     end<% end %>
   end
   <% else %>
@@ -93,6 +92,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
     if @<%= singular_name %>.save
       flash[:notice] = "Successfully created #{@<%= singular %>.<%= display_class %>}"
+      <%= post_action_parental_updates %>
       load_all_<%= plural %>
       render :create
     else
@@ -137,9 +137,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 <% end %><% if destroy_action %>  def destroy
     begin
       @<%=singular_name%>.destroy
+      flash[:notice] = '<%= singular_name.titlecase %> successfully deleted'
     rescue StandardError => e
-      flash[:alert] = '<%= singular_name.titlecase %> could not be deleted.'
-    end
+      flash[:alert] = '<%= singular_name.titlecase %> could not be deleted'
+    end <%= post_action_parental_updates %>
     load_all_<%= plural %>
   end<% end %>
 

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

@@ -0,0 +1,12 @@
+<\%= turbo_frame_tag "<%= @namespace %>__#{dom_id(@<%= singular %>)}" do  %>
+<div class="cell editable" style="position: relative;">
+  <\% if @<%= singular %>.errors.any? %>
+  <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: @<%= singular %> }) %>
+  <\% end %>
+
+  <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>
+  <\%= form_with model: <%= "@" + singular %>, url: <%= form_path_edit_helper %> do |f| %>
+  <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
+  <\% end %>
+</div>
+<\% end %>

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

@@ -1,12 +1,16 @@
 <%= turbo_frame_tag "flash_notices" do %>
-  <% unless notice.nil? %>
-    <div class="alert alert-notice alert-dismissible">
-      <%= notice %>
-    </div>
-  <% end %>
-  <% unless alert.nil? %>
-    <div class="alert alert-danger alert-dismissible">
-      <%= alert %>
+  <% unless notice.nil? && alert.nil? %>
+    <div class="alert alert-<%= alert ? 'danger' : 'primary' %> alert-dismissible">
+      <div><%= notice %></div>
+      <div><%= alert %></div>
+      <% if defined?(resource) && resource %>
+        <ul>
+          <% resource.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      <% end %>
+
     </div>
   <% end %>
 <% end %>

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

@@ -35,6 +35,6 @@
   <% end %>
 
   <% unless @no_edit %>
-  <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, <%= edit_path_helper %>, <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary btn-sm" %>
+  <\%= link_to "Edit <% if @button_icons == 'font-awesome' %><i class='fa fa-1x fa-list-alt'></i><% end %>".html_safe, <%= edit_path_helper %>, <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary btn-sm" %>
   <% end %>
 </div>

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

@@ -3,6 +3,7 @@
   <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
   <\% end %>
   <\% end %>
+<%= turbo_parental_updates %>
   <\%= turbo_stream.replace "<%= @namespace %>__<%= singular %>__<%= singular %>-new" do %>
   <\% if @<%= singular %>.errors.none? %>
   <\%= render partial: "new_button", locals: {}<%=  @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {" + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> %>
@@ -11,8 +12,6 @@
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "flash_notices" do %>
-  <\%= render partial: "layouts/flash_notices" %>
-  <\% if @<%= singular %>.errors.any? %>
-  <\%= render partial: "errors", locals: {resource: @<%= singular %>} %>
-  <\% end %>
+  <\%= render partial: "layouts/flash_notices", locals: {resource: @<%= singular %>} %>
+
 <\% end %>

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

@@ -1,3 +1,9 @@
-<\%= turbo_stream.replace "<%= @namespace %>__<%= plural %>-list" + <%= nested_for_turbo_nested_constructor %> do %>
+<%= turbo_parental_updates %>
+
+<\%= turbo_stream.update "<%= @namespace %>__<%= plural %>-list" + <%= nested_for_turbo_nested_constructor %> do %>
   <\%= render partial: "list", locals: {<%=plural%>: @<%=plural%> }<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
 <\% end %>
+
+<\%= turbo_stream.update "flash_notices" do %>
+<\%= render partial: "layouts/flash_notices", locals: {resource: @<%= singular %>} %>
+<\% end %>

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

@@ -4,18 +4,7 @@
     <div class="col-md-12">
       <\%= link_to "<% if @button_icons == 'font-awesome' %><i class='fa fa-arrow-circle-left  2x'></i><% end %> Back to list".html_safe, <%= path_helper_plural %> %>
 <% end %>
-<\%= turbo_frame_tag "<%= @namespace %>__#{dom_id(@<%= singular %>)}" do  %>
-  <div class="cell editable" style="position: relative;">
-    <\% if @<%= singular %>.errors.any? %>
-      <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: @<%= singular %> }) %>
-    <\% end %>
-
-    <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>
-    <\%= form_with model: <%= "@" + singular %>, url: <%= form_path_edit_helper %> do |f| %>
-    <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
-    <\% end %>
-  </div>
-<\% end %>
+<\%= render partial: "edit", locals: {<%= singular %>: @<%= singular %>} %>
 <% if @big_edit %>
     </div>
   </div>

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

@@ -4,10 +4,7 @@
   <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
 <\% end %>
 <% end %>
-
-<\%= turbo_stream.replace "flash_notices" do %>
-  <\%= render partial: "layouts/flash_notices" %>
-  <\% if @<%= singular %>.errors.any? %>
-  <\%= render partial: "errors", locals: {resource: @<%= singular %>} %>
-  <\% end %>
+<%= turbo_parental_updates %>
+<\%= turbo_stream.update "flash_notices" do %>
+  <\%= render partial: "layouts/flash_notices", locals: {resource: @<%= singular %>} %>
 <\% end %>

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

@@ -25,7 +25,7 @@ describe 'interaction for <%= controller_class_name %>' do
   describe "index" do
     it "should show me the list" do
       visit <%= path_helper_plural %>
-      <%= @columns_map.collect{|col, col_object| col_object.spec_list_view_assertion }   %>
+      <%= @columns_map.collect{|col, col_object| col_object.spec_list_view_assertion }.join("\n      ")   %>
     end
   end
 

data/lib/hot-glue.rb

@@ -27,14 +27,17 @@ module HotGlue
                                 top_level: false,
                                 put_form: false)
     instance_sym = top_level ? "@" : ""
+
     if nested_set.nil? || nested_set.empty?
       return modifier + "#{(namespace + '_') if namespace}#{target}_path" + (("(#{instance_sym}#{target})" if put_form) || "")
     elsif nested_set[0][:optional] == false
+
       return modifier + ((namespace + "_" if namespace) || "") + nested_set.collect{|x|
         x[:singular] + "_"
       }.join() + target + "_path" + (("(#{nested_set.collect{
         |x| instance_sym + x[:singular] }.join(",")
-      }#{ put_form ? ',' + instance_sym + target : '' })" if with_params) || "")
+      }#{ put_form ? ',' + instance_sym + target : '' })") || "")
+
 
     else
       # copy the first item, make a ternery in this cycle, and recursively move to both the

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.12'
+    CURRENT = '0.5.15'
   end
 end