hot-glue 0.2.9E → 0.3.5

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

@@ -15,17 +15,37 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   # TODO: implement current_user or use Devise
 <% end %>
 
-  <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
-    if !@god
-      this_scope = nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
-    else
-      this_scope = eval(class_name + ".reflect_on_association(:#{arg})").class_name
-    end
+  <% if @nested_args.any? %>
+  def <%= @nested_args[0] %>
+    <% if @god
+    next_object = nil
+     collect_objects = @nested_args.reverse.collect {|x|
+         if eval("#{next_object || class_name}.reflect_on_association(:#{x})").nil?
+           raise "***** Unable to find the association `#{x}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
+         end
+         next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x})").class_name
+     }
+     root_object = collect_objects.last
+     else
+       root_object = @auth + "." + @nested_args[0] + "s"
+     end
+
+     %>
+    <% if !@god %> @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id])
+    <% else %> @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% end %>
+  end
+  <% end %>
+
+  <% if any_nested? %><% nest_chain = [@nested_args[0]]; this_scope = @nested_args[0] + 's'; %> <%   @nested_args[1..-1].each { |arg|
+    this_scope =  "#{nest_chain.last}.#{arg}s"
     nest_chain << arg
     %>
   def <%= arg %>
     @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
-  end<% } %><% end %>
+  end<% } %>
+
+  <% end %>
+
 
 <% if !@self_auth %>
   def load_<%= singular_name %>
@@ -37,8 +57,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def load_all_<%= plural %>
-    <% if !@self_auth %>@<%= plural_name %> = <%= object_scope.gsub("@",'') %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
-    <% else %>@<%= plural_name %> = [<%= auth_object %>]<% end %>
+    @<%= plural_name %> = <%= object_scope.gsub("@",'') %>.page(params[:page])
   end
 
   def index
@@ -92,9 +111,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
-<%= controller_magic_button_update_actions %>
-
-    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>)
+<%= controller_magic_button_update_actions %>    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>)
       flash[:notice] = "Saved #{@<%= singular %>.<%= display_class %>}"
     else
       flash[:alert] = "<%= singular_name.titlecase %> could not be saved."
@@ -117,9 +134,9 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       format.turbo_stream
       format.html { redirect_to <%= path_helper_plural %> }
     end
-  end
+  end<% end %>
 
-<% end %>def <%=singular_name%>_params
+  def <%=singular_name%>_params
     params.require(:<%=singular_name%>).permit( <%= @columns + @magic_buttons.collect(&:to_sym) %> )
   end
 
@@ -130,10 +147,6 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   def namespace
     <% if @namespace %>"<%= @namespace %>/" <% else %>""<% end %>
   end
-
-  def common_scope
-    @nested_args
-  end
 end
 
 

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

@@ -1,7 +1,7 @@
 <div class="row">
   <%= all_form_fields %>
 
-  <div class="col">
+  <div class="<% @layout == "hotglue" ? 'scaffold-cell' : 'col' %>">
     <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>
   </div>

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

@@ -1,7 +1,8 @@
 
 <\%= turbo_frame_tag "<%= singular %>__#{ <%= singular %>.id }" do  %>
-  <div class='row' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
-    <\%= render partial: '<%=  show_path_partial %>', locals: { <%= singular %>: <%= singular %><%= nest_assignments_operator(false, true) if @nestable %> } %>
+  <div class='row scaffold-row' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
+    <\%= render partial: '<%=  show_path_partial %>', locals: { <%= singular %>: <%= singular %><%= nest_assignments_operator(false, true) if @nestable %><%= (", nested_for: \"" + @nested_args.collect{|a| a + "-" + '#{'+ a + '.id}' }.join("__") + "\"") if @nestable %> } %>
+
   </div>
 <\% end %>
 

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

@@ -1,27 +1,35 @@
-<\%= turbo_frame_tag "<%= plural %>-list" do %>
-  <div class="container-fluid ">
-    <h4><%= plural.gsub("_", " ").upcase %></h4>
-    <div class="row">
-      <div class="col-md-12">
-        <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><% end %>
-      </div>
-    </div>
+<\%= turbo_frame_tag "<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
+  <div class="<%= @container_name %> scaffold-list">
+    <% unless @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
 
+    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><% end %>
 
-    <div class="row">
+    <div class="row scaffold-row">
       <%= list_column_headings %>
-      <div class='col buttons-col'></div>
+      <% if @downnest_children.any? %>
+        <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
+      <% @downnest_children.each do |downnest| %>
+        <div class="col scaffold-col-heading" style="flex-basis: <%= each_downnest_width %>%;">
+          <h4>
+            <%=  downnest.titleize  %>
+          </h4>
+        </div>
+      <% end %>
+      <% end %>
+
+      <div class='col scaffold-col-heading scaffold-col-heading-buttons' style="flex-basis: 150px"></div>
     </div>
 
       <\% if <%= plural %>.empty? %>
-        <div>
-            None
-        </div>
+    <div>
+        None
+    </div>
       <\% end %>
       <\% <%= plural %>.each do |<%= singular %>| %>
-        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if  @nestable %> } %>
+        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if  @nestable %><%= ", nested_for: nested_for" if @nestable %> } %>
       <\% end %>
 
     <%=  @no_paginate ? "" : paginate %>
+    </div>
   </div>
 <\% end %>

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

@@ -1,17 +1,21 @@
 <%= all_line_fields %>
 
-<% if @downnest_relationship %>
-  <div class="col">
-  <\%= render partial: "dashboard/<%= @downnest_relationship %>/list", locals: {
-  <%= @singular %>: <%= @singular %>,
-  <%= @downnest_relationship %>: <%= @singular %>.<%= @downnest_relationship %>} %>
+<% if @downnest_children.any? %>
+  <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
+  <% @downnest_children.each do |downnest| %>
+  <div class="<%= @col_identifier %> scaffold-downnest" style="flex-basis: <%= each_downnest_width %>%" >
+  <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest %>/list", locals: {
+    nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if nested_for}<% end %><%= @singular %>-#{<%= @singular %>.id}",
+    <%= @singular %>: <%= @singular %><%= nest_assignments_operator(false, true) %>,
+    <%= downnest %>: <%= @singular %>.<%= downnest %>} %>
   </div>
+  <% end %>
 <% end %>
 
-<div class="col">
+<div class="<%= @col_identifier %> scaffold-line-buttons" style="flex-basis: 150px;">
   <% if destroy_action %>
-    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), method: :delete do |f| %>
-      <\%= f.submit "Delete".html_safe, data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary " %>
+    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {style: "display: inline-block;"}, method: :delete do |f| %>
+      <\%= f.submit "Delete".html_safe, data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
     <\% end %>
   <% end %>
 
@@ -19,6 +23,6 @@
   <%= magic_button_output %>
 
   <% unless @no_edit %>
-  <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary " %>
+  <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% 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

@@ -1,6 +1,6 @@
 <\% if @<%= singular %>.errors.none? %>
-  <\%= turbo_stream.replace "<%= plural %>-list" do %>
-  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %> <%= nest_assignments_operator(true, true) %>} %>
+  <\%= turbo_stream.replace "<%= plural %>-list<%= nested_for_turbo_nested_constructor %>" do %>
+  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) %>} %>
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "<%= singular %>-new" do %>

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

@@ -1,3 +1,3 @@
-<\%= turbo_stream.replace "<%=plural%>-list" do %>
-  <\%= render partial: "list", locals: {<%=plural%>: @<%=plural%> <%= nest_assignments_operator(true, true) %>}  %>
+<\%= turbo_stream.replace "<%= plural %>-list<%= nested_for_turbo_nested_constructor %>" do %>
+  <\%= render partial: "list", locals: {<%=plural%>: @<%=plural%> <%= nested_for_assignments_constructor %> <%= nest_assignments_operator(true, true) %>}  %>
 <\% end %>

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

@@ -5,7 +5,7 @@
   <div class="cell editable" style="position: relative;">
 
     <\% if @<%= singular %>.errors.any? %>
-      <\%= render(partial: "#{controller.namespace}errors", locals: {resource: @<%= singular %> }) %>
+      <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: @<%= singular %> }) %>
     <\% end %>
 
     <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>

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

@@ -1,9 +1,12 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="clearfix"></div>
-      <\%= render partial: '<%= list_path_partial %>',
-              locals: {<%= plural %>: @<%= plural %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
-    </div>
-  </div>
+<div class="<%= @container_name %>">
+  <% if @layout == "bootstrap" %><div class="row"> <div class="col-md-12">
+  <% else %>
+    <div class=' scaffold-index-<%= plural %>'>
+  <% end %>
+
+  <div class="clearfix"></div>
+  <\%= render partial: '<%= list_path_partial %>',
+  locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
+
+  <% if @layout == "bootstrap" %></div></div><% else  %></div><% end %>
 </div>

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

@@ -1,7 +1,7 @@
 <% if !@display_list_after_update %><\%= turbo_stream.replace "<%= singular%>__#{@<%= singular %>.id}" do %>
   <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> <%= nest_assignments_operator(true,true) %> } %>
 <\% end %><% else %><\%= turbo_stream.replace "<%= plural %>-list" do %>
-  <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
+  <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %><%= nest_assignments_operator(true, true) if @nestable %><%= nested_for_assignments_constructor %> } \%>
 <\% end %>
 <% end %>
 

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

@@ -1,5 +1,5 @@
 = turbo_frame_tag "<%= plural %>-list" do
-  .container-fluid.<%= singular %>-table
+  %div{class: "<%= @container_name %> <%= singular %>-table"}
     .row
       .col-md-12
         <%= '= render partial: "' + (@namespace+"/" if @namespace) +  plural + '/new_button", locals: {'  + nested_assignments + '}'  unless @no_create %>
@@ -11,5 +11,5 @@
       - if <%= plural %>.empty?
         None
       - <%= plural %>.each do |<%= singular %>|
-        = render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if @nestable %> }
+        = render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if @nest %> }
     <%=  @no_paginate ? "" : paginate %>

data/lib/generators/hot_glue/templates/haml/index.haml

@@ -1,4 +1,4 @@
-.container-fluid
+%div{class: "#{@container_name }"}
   .row
     .col-md-12
       .clearfix

data/lib/generators/hot_glue/templates/themes/hotglue_scaffold_dark_knight.scss

@@ -0,0 +1,158 @@
+body {
+  font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  background-color: black;
+  color: white;
+
+  .alert.alert-danger {
+    padding: 1em;
+    border: solid 1px crimson;
+    background-color: #ffd9d9;
+    color: black;
+    font-weight: bold;
+  }
+}
+
+.scaffold-container {
+
+
+
+
+  .cell input {
+    -webkit-writing-mode: horizontal-tb !important;
+    text-rendering: auto;
+    letter-spacing: normal;
+    word-spacing: normal;
+    line-height: normal;
+    text-transform: none;
+    text-indent: 0px;
+    text-shadow: none;
+    display: inline-block;
+    text-align: start;
+    appearance: auto;
+    -webkit-rtl-ordering: logical;
+    margin: 0em;
+    border-image: initial;
+
+    display: block;
+    padding: 0.375rem 0.75rem;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    border-radius: 0.25rem;
+    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+    color: #212529;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+  }
+
+  .scaffold-row {
+    .scaffold-col-heading  {
+    }
+    .scaffold-col, .scaffold-col-heading {
+
+    }
+
+    .scaffold-cell {
+    }
+
+    .scaffold-list {
+      flex: 0 0 auto;
+      width: 100%;
+    }
+  }
+
+  .container-fluid, .scaffold-container {
+    width: 100%;
+
+    margin-right: auto;
+    margin-left: auto;
+  }
+
+  .row {
+    display: flex;
+    --bs-gutter-x: 1.5rem;
+    --bs-gutter-y: 0;
+    display: flex;
+    flex-wrap: wrap;
+
+    margin-top: calc(-1 * var(--bs-gutter-y));
+  }
+
+  .btn-primary {
+    color: #212529;
+
+    background-color: #4D889E;
+    &:hover {
+      color: #fff;
+      border-color: #4D889E;
+    }
+  }
+
+  .btn-secondary {
+    color: white;
+
+    background-color: darkgrey;
+    &:hover {
+      color: lightgrey;
+      border-color: black;
+    }
+  }
+
+  .scaffold-list {
+    input, .btn {
+      font-size: 0.8rem;
+      font-weight: 400;
+      line-height: 1.4;
+    }
+
+
+    .scaffold-list {
+      input, .btn {
+        font-size: 0.8rem;
+        line-height: 1.2;
+      }
+
+
+
+      .scaffold-list {
+        input, .btn {
+          font-size: 0.55rem;
+          line-height: 1.0;
+        }
+      }
+    }
+  }
+
+
+  .btn {
+    display: inline-block;
+    font-weight: 400;
+    line-height: 1.5;
+    color: #212529;
+    text-align: center;
+    text-decoration: none;
+    vertical-align: middle;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    border: 1px solid transparent;
+    padding: 0.375rem 0.75rem;
+    font-size: 1rem;
+    border-radius: 6px;
+    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+
+    box-shadow: 0px 0px 12px 2px whitesmoke;
+    margin-right: 0.6em;
+  }
+
+
+
+}

data/lib/generators/hot_glue/templates/themes/hotglue_scaffold_like_bootstrap.scss

@@ -0,0 +1,154 @@
+body {
+  font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  background-color: white;
+  color: darkslategrey;
+
+  .alert.alert-danger {
+    padding: 1em;
+    border: 1px solid transparent;
+    color: #721c24;
+    background-color: #f8d7da;
+    border-color: #f5c6cb;
+  }
+}
+
+
+.scaffold-container {
+  .cell input {
+    -webkit-writing-mode: horizontal-tb !important;
+    text-rendering: auto;
+    letter-spacing: normal;
+    word-spacing: normal;
+    line-height: normal;
+    text-transform: none;
+    text-indent: 0px;
+    text-shadow: none;
+    display: inline-block;
+    text-align: start;
+    appearance: auto;
+    -webkit-rtl-ordering: logical;
+    margin: 0em;
+    border-image: initial;
+
+    display: block;
+    padding: 0.375rem 0.75rem;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    border-radius: 0.25rem;
+    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+    color: #212529;
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+  }
+
+  .scaffold-row {
+    .scaffold-col-heading  {
+    }
+    .scaffold-col, .scaffold-col-heading {
+
+    }
+
+    .scaffold-cell {
+    }
+
+    .scaffold-list {
+      flex: 0 0 auto;
+      width: 100%;
+    }
+  }
+
+  .container-fluid, .scaffold-container {
+    width: 100%;
+
+    margin-right: auto;
+    margin-left: auto;
+  }
+
+  .row {
+    display: flex;
+    --bs-gutter-x: 1.5rem;
+    --bs-gutter-y: 0;
+    display: flex;
+    flex-wrap: wrap;
+
+    margin-top: calc(-1 * var(--bs-gutter-y));
+  }
+
+  .btn-primary {
+    color: #212529;
+
+    background-color: #0d6efd;
+    &:hover {
+      color: #fff;
+      border-color: #0a58ca;
+    }
+  }
+
+  .btn-secondary {
+    color: white;
+
+    background-color: darkgrey;
+    &:hover {
+      color: lightgrey;
+      border-color: black;
+    }
+  }
+
+  .scaffold-list {
+    input, .btn {
+      font-size: 0.8rem;
+      font-weight: 400;
+      line-height: 1.4;
+    }
+
+
+    .scaffold-list {
+      input, .btn {
+        font-size: 0.8rem;
+        line-height: 1.2;
+      }
+
+
+
+      .scaffold-list {
+        input, .btn {
+          font-size: 0.55rem;
+          line-height: 1.0;
+        }
+      }
+    }
+  }
+
+
+  .btn {
+    display: inline-block;
+    font-weight: 400;
+    line-height: 1.5;
+    color: #212529;
+    text-align: center;
+    text-decoration: none;
+    vertical-align: middle;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    border: 1px solid transparent;
+    padding: 0.375rem 0.75rem;
+    font-size: 1rem;
+    border-radius: 0.25rem;
+    transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  }
+
+
+
+}