hot-glue 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe831af428ff123db3490a3a376cadb40c1acd01f10f8926213dced0b78abaa
-  data.tar.gz: 5091fd12e7ca86865891e6f4fbaa5ad36b78951f2dd99d1819eb5eab8e32a2a7
+  metadata.gz: c3f0bea54517d12d4518615c1807c783ec6cdbf1ea5c40eb8860771262929d82
+  data.tar.gz: 3e7aa8a54329f8d7601b7597477ec5010f2e7af8dd034173ab8ac7adff5e8aa1
 SHA512:
-  metadata.gz: 35ecea29e077ad022c227ad994f0dd98fea31e849eef0158e578aa6be8d1b3cd212d124285193169f3fd23f7643a24ee327f5b2edb47837069f6db44de122d5a
-  data.tar.gz: 7fa9b3bc28743cf2c0989a47705335b9270d42c208c6b8317a9efac6d7a7de4c6d1a873c9550c7d056e9a2f85003f2c521ce7c0d5a30b6f3535e1057299e2119
+  metadata.gz: fb01610edb92fae69b0db9eab7e25eb4595abc6952789c1f816b6b9e8910f86a37bf713e394a73676e691f9c7fdfb5b3488ba05bdae21bb8cbe01e5008086a87
+  data.tar.gz: 2d932ad6bda29b971ab7252b6fecbf120f05089a65b5bbcdca588aa24fd459b2b727d310a81735008c26a17beedd449d7d58258701f43a3be305edd26373f577

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.2.9E)
+    hot-glue (0.3.9)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1, <= 7.0.0)

data/lib/generators/hot_glue/install_generator.rb

@@ -29,17 +29,22 @@ module HotGlue
 
 
       print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
-      license_activation_key = STDIN.gets
+      license_activation_key = STDIN.gets.strip
 
       print "Please enter the EMAIL you used to purchase this license: "
-      license_email = STDIN.gets
+      license_email = STDIN.gets.strip
       app_name = Rails.application.class.module_parent_name
-      license_should_be = Digest::SHA1.hexdigest("HotGlueLicense--#{app_name}--#{license_email}")
+      license_should_be = Digest::SHA1.hexdigest("HOT-GLUE-LICENSE--#{app_name}--#{license_email}")
+
+
       if (license_should_be != license_activation_key)
         puts "Ooops... it seems that Hot Glue license is not valid. Please check 1) the email address you used for this license, 2) The app name you used to purchase this license, and 3) the activation key itself."
         exit
       end
 
+
+
+
       @markup = options['markup']
       if @markup == "haml"
         copy_file "haml/_flash_notices.haml", "#{'spec/dummy/' if Rails.env.test?}app/views/layouts/_flash_notices.haml"
@@ -52,85 +57,112 @@ module HotGlue
         copy_file "confirmable.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/controllers/confirmable.js"
       end
 
-      if Rails.version.split(".")[0].to_i == 6
-        app_js_contents = File.read("app/javascript/packs/application.js")
-        if app_js_contents.include?("import Turbolinks from \"turbolinks\"")
-          app_js_contents.gsub!("import Turbolinks from \"turbolinks\"", "import { Turbo } from \"@hotwired/turbo-rails\"")
-          puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax [ import { Turbo } from \"@hotwired/turbo-rails\" ] "
-        end
 
-        if app_js_contents.include?("Turbolinks.start()")
-          app_js_contents.gsub!("Turbolinks.start()", "Turbo.start()")
-          puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax[ Turbolinks.start() ] "
-        end
-        File.write("app/javascript/packs/application.js", app_js_contents)
+      begin
+        if Rails.version.split(".")[0].to_i == 6
+          app_js_contents = File.read("app/javascript/packs/application.js")
+          if app_js_contents.include?("import Turbolinks from \"turbolinks\"")
+            app_js_contents.gsub!("import Turbolinks from \"turbolinks\"", "import { Turbo } from \"@hotwired/turbo-rails\"")
+            puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax [ import { Turbo } from \"@hotwired/turbo-rails\" ] "
+          end
 
+          if app_js_contents.include?("Turbolinks.start()")
+            app_js_contents.gsub!("Turbolinks.start()", "Turbo.start()")
+            puts "  HOTGLUE --> fixed packs/application.js: swapping old Turbolinks syntas for new Turbo-Rails syntax[ Turbolinks.start() ] "
+          end
+          File.write("app/javascript/packs/application.js", app_js_contents)
+        end
+      rescue StandardError => e
+        puts "WARNING: error writing to app/javascript/packs/application.js --- #{e.message}"
       end
 
 
-      rails_helper_contents = File.read("spec/rails_helper.rb")
-      if !rails_helper_contents.include?("Capybara.default_driver =")
-        rails_helper_contents << "\nCapybara.default_driver = :selenium_chrome_headless "
-        puts "  HOTGLUE --> added to spec/rails_helper.rb: `Capybara.default_driver = :selenium_chrome_headless`  "
-      end
 
-      if !rails_helper_contents.include?("include FactoryBot::Syntax::Methods")
-        rails_helper_contents.gsub!("RSpec.configure do |config|", "RSpec.configure do |config| \n
-  config.include FactoryBot::Syntax::Methods
-")
-        puts "  HOTGLUE --> added to spec/rails_helper.rb: `config.include FactoryBot::Syntax::Methods`  "
-      end
+      begin
+        rails_helper_contents = File.read("spec/rails_helper.rb")
+        if !rails_helper_contents.include?("Capybara.default_driver =")
+          rails_helper_contents << "\nCapybara.default_driver = :selenium_chrome_headless "
+          puts "  HOTGLUE --> added to spec/rails_helper.rb: `Capybara.default_driver = :selenium_chrome_headless`  "
+        end
+
+        if !rails_helper_contents.include?("include FactoryBot::Syntax::Methods")
+          rails_helper_contents.gsub!("RSpec.configure do |config|", "RSpec.configure do |config| \n
+    config.include FactoryBot::Syntax::Methods
+  ")
+          puts "  HOTGLUE --> added to spec/rails_helper.rb: `config.include FactoryBot::Syntax::Methods`  "
+        end
+
+        if ! rails_helper_contents.include?("require 'support/capybara_login.rb'")
+          rails_helper_contents.gsub!("require 'rspec/rails'","require 'rspec/rails' \nrequire 'support/capybara_login.rb'")
+          puts "  HOTGLUE --> added to spec/rails_helper.rb: `require 'support/capybara_login.rb'`  "
+        end
+        File.write("spec/rails_helper.rb", rails_helper_contents)
 
-      if ! rails_helper_contents.include?("require 'support/capybara_login.rb'")
-        rails_helper_contents.gsub!("require 'rspec/rails'","require 'rspec/rails' \nrequire 'support/capybara_login.rb'")
-        puts "  HOTGLUE --> added to spec/rails_helper.rb: `require 'support/capybara_login.rb'`  "
+      rescue StandardError => e
+        puts "WARNING: error writing to spec/rails_helper --- #{e.message}"
       end
-      File.write("spec/rails_helper.rb", rails_helper_contents)
 
 
-      application_layout_contents = File.read("app/views/layouts/application.html.erb")
+      begin
+        application_layout_contents = File.read("app/views/layouts/application.html.erb")
 
-      if !application_layout_contents.include?("render partial: 'layouts/flash_notices'")
-        application_layout_contents.gsub!("<body>", "<body>\n
-<%= render partial: 'layouts/flash_notices' %>
-")
-        File.write("app/views/layouts/application.html.erb", application_layout_contents)
-        puts "  HOTGLUE --> added to app/views/layouts/application.html.erb: `<%= render partial: 'layouts/flash_notices' %>`  "
+        if !application_layout_contents.include?("render partial: 'layouts/flash_notices'")
+          application_layout_contents.gsub!("<body>", "<body>\n
+  <%= render partial: 'layouts/flash_notices' %>
+  ")
+          File.write("app/views/layouts/application.html.erb", application_layout_contents)
+          puts "  HOTGLUE --> added to app/views/layouts/application.html.erb: `<%= render partial: 'layouts/flash_notices' %>`  "
+        end
+      rescue StandardError => e
+        puts "WARNING: error writing to app/views/layouts/application.html.erb --- #{e.message}"
       end
 
 
-      if @layout == "hotglue"
-        theme_location = "themes/hotglue_scaffold_#{@theme}.scss"
-        theme_file = "hotglue_scaffold_#{@theme}.scss"
+      begin
+        if @layout == "hotglue"
+          theme_location = "themes/hotglue_scaffold_#{@theme}.scss"
+          theme_file = "hotglue_scaffold_#{@theme}.scss"
 
-        copy_file theme_location, "#{'spec/dummy/' if Rails.env.test?}app/assets/stylesheets/#{theme_file}"
+          copy_file theme_location, "#{'spec/dummy/' if Rails.env.test?}app/assets/stylesheets/#{theme_file}"
 
-        application_scss = File.read("app/assets/stylesheets/application.scss")
+          application_scss = File.read("app/assets/stylesheets/application.scss")
 
-        if !application_scss.include?("@import '#{theme_file}';")
-        application_scss << ( "\n @import '#{theme_file}'; ")
-          File.write("app/assets/stylesheets/application.scss", application_scss)
-          puts "  HOTGLUE --> added to app/assets/stylesheets/application.scss: @import '#{theme_file}' "
-        else
-          puts "  HOTGLUE --> already found theme in app/assets/stylesheets/application.scss: @import '#{theme_file}' "
+          if !application_scss.include?("@import '#{theme_file}';")
+          application_scss << ( "\n @import '#{theme_file}'; ")
+            File.write("app/assets/stylesheets/application.scss", application_scss)
+            puts "  HOTGLUE --> added to app/assets/stylesheets/application.scss: @import '#{theme_file}' "
+          else
+            puts "  HOTGLUE --> already found theme in app/assets/stylesheets/application.scss: @import '#{theme_file}' "
+          end
         end
+      rescue StandardError => e
+        puts "WARNING: error writing to app/assets/stylesheets/application.scss --- #{e.message}"
       end
 
 
 
-      if !File.exists?("config/hot_glue.yml")
+      begin
+
+        if !File.exists?("config/hot_glue.yml")
 
-        yaml = {layout: @layout,
-                markup: @markup,
-                license_activation_key: license_activation_key,
-                license_email: license_email}.to_yaml
-        File.write("#{'spec/dummy/' if Rails.env.test?}config/hot_glue.yml", yaml)
+          yaml = {layout: @layout,
+                  markup: @markup,
+                  license_activation_key: license_activation_key,
+                  license_email: license_email}.to_yaml
+          File.write("#{'spec/dummy/' if Rails.env.test?}config/hot_glue.yml", yaml)
 
+        end
+      rescue StandardError => e
+        puts "WARNING: error writing to config/hot_glue.yml --- #{e.message}"
       end
 
 
-      if !File.exists?("spec/support/capybara_login.rb")
-        copy_file "capybara_login.rb", "#{'spec/dummy/' if Rails.env.test?}spec/support/capybara_login.rb"
+      begin
+        if !File.exists?("spec/support/capybara_login.rb")
+          copy_file "capybara_login.rb", "#{'spec/dummy/' if Rails.env.test?}spec/support/capybara_login.rb"
+        end
+      rescue StandardError => e
+        puts "WARNING: error writing to spec/support/capybara_login.rb --- #{e.message}"
       end
     end
   end

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

@@ -21,7 +21,7 @@ module  HotGlue
       magic_buttons.collect{ |button_name|
         "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}) do |f| %>
       <%= f.hidden_field :#{button_name}, value: \"#{button_name}\" %>
-    <%= f.submit '#{button_name.titleize}'.html_safe, data: {confirm: 'Are you sure you want to #{button_name} this #{singular}?'}, class: '#{singular}-button btn btn-primary ' %>
+    <%= f.submit '#{button_name.titleize}'.html_safe, disabled: (#{singular}.respond_to?(:#{button_name}able?) && ! #{singular}.#{button_name}able? ), data: {confirm: 'Are you sure you want to #{button_name} this #{singular}?'}, class: '#{singular}-button btn btn-primary ' %>
     <% end %>"
       }.join("\n")
     end
@@ -43,8 +43,12 @@ module  HotGlue
       columns = args[0][:columns]
       column_width = args[0][:column_width]
       col_identifier = args[0][:col_identifier]
-
-      columns.map(&:to_s).map{|col_name| "<div class='#{col_identifier}'  style='flex-basis: #{column_width}%'>#{col_name.humanize}</div>"}.join("\n")
+      if @layout == "hotglue"
+        col_style = " style='flex-basis: #{column_width}%'"
+      else
+        col_style = ""
+      end
+      columns.map(&:to_s).map{|col_name| "<div class='#{col_identifier}'" + col_style +">#{col_name.humanize}</div>"}.join("\n")
     end
 
 
@@ -168,17 +172,20 @@ module  HotGlue
       singular_class = args[0][:singular_class]
       singular = args[0][:singular]
       perc_width = args[0][:perc_width]
+      layout = args[0][:layout]
 
       columns_count = columns.count + 1
       perc_width = (perc_width).floor
 
-      if @layout == "boostrap"
+      if layout == "bootstrap"
         col_identifer = "col"
-
+        style_with_flex_basis = ""
       else
+        style_with_flex_basis = " style='flex-basis: #{perc_width}%'"
         col_identifer = "scaffold-cell"
-
       end
+
+
       columns.map { |col|
         type = eval("#{singular_class}.columns_hash['#{col}']").type
         limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -203,30 +210,30 @@ module  HotGlue
 
             display_column =  HotGlue.derrive_reference_name(assoc.class_name)
 
-            "<div class='#{col_identifer}' style='flex-basis: #{perc_width}%'>
+            "<div class='#{col_identifer}'#{style_with_flex_basis}>
   <%= #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>
 </div>"
 
           else
-            "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+            "<div class='#{col_identifer}'#{style_with_flex_basis}>
   <%= #{singular}.#{col}%></div>"
           end
         when :float
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis}>
 <%= #{singular}.#{col}%></div>"
         when :string
           width = (limit && limit < 40) ? limit : (40)
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis} >
   <%= #{singular}.#{col} %>
 </div>"
         when :text
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'#{style_with_flex_basis}>
   <%= #{singular}.#{col} %>
 </div>"
         when :datetime
 
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% unless #{singular}.#{col}.nil? %>
 <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone) %>
 <% else %>
@@ -234,7 +241,7 @@ module  HotGlue
 <% end %>
 </div>"
         when :date
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% unless #{singular}.#{col}.nil? %>
     <%= #{singular}.#{col} %>
   <% else %>
@@ -242,7 +249,7 @@ module  HotGlue
   <% end %>
 </div>"
         when :time
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% unless #{singular}.#{col}.nil? %>
     <%= #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone) %>
    <% else %>
@@ -251,7 +258,7 @@ module  HotGlue
 </div>
 "
         when :boolean
-          "<div class='#{col_identifer}'  style='flex-basis: #{perc_width}%'>
+          "<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% elsif #{singular}.#{col} %>
@@ -261,7 +268,7 @@ module  HotGlue
   <% end %>
 </div>
 "        when :enum
-                                                                                                         "<div class='#{col_identifer}'>
+"<div class='#{col_identifer}'  #{style_with_flex_basis} >
   <% if #{singular}.#{col}.nil? %>
       <span class='alert-danger'>MISSING</span>
   <% else %>
@@ -273,8 +280,4 @@ module  HotGlue
       }.join("\n")
     end
   end
-
-
-
-
 end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -52,6 +52,7 @@ module HotGlue
     class_option :no_delete, type: :boolean, default: false
     class_option :no_create, type: :boolean, default: false
     class_option :no_edit, type: :boolean, default: false
+    class_option :no_list, type: :boolean, default: false
     class_option :no_paginate, type: :boolean, default: false
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
@@ -164,6 +165,8 @@ module HotGlue
       @big_edit = options['big_edit']
 
       @no_edit = options['no_edit'] || false
+      @no_list = options['no_list'] || false
+
       @display_list_after_update = options['display_list_after_update'] || false
 
 
@@ -724,7 +727,8 @@ module HotGlue
         columns: @columns,
         show_only: @show_only,
         singular_class: singular_class,
-        singular: singular
+        singular: singular,
+        layout: @layout
       )
     end
 
@@ -795,8 +799,18 @@ module HotGlue
 
     def controller_magic_button_update_actions
       @magic_buttons.collect{ |magic_button|
-        "    @#{singular}.#{magic_button}! if #{singular}_params[:#{magic_button}]"
-        }.join("\n")
+        "    if #{singular}_params[:#{magic_button}]
+      begin
+        res = @#{singular}.#{magic_button}!
+        res = \"#{magic_button.titleize}ed.\" if res === true
+        flash[:notice] = (flash[:notice] || \"\") <<  (res ? res + \" \" : \"\")
+      rescue ActiveRecord::RecordInvalid => e
+        @#{singular}.errors.add(:base, e.message)
+        flash[:alert] = (flash[:alert] || \"\") << 'There was ane error #{magic_button}ing your #{@singular}: '
+      end
+    end"
+
+     }.join("\n") + "\n"
     end
 
     def controller_update_params_tap_away_magic_buttons

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

@@ -112,9 +112,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
 <% 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 %>)
-      flash[:notice] = "Saved #{@<%= singular %>.<%= display_class %>}"
+      flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
     else
-      flash[:alert] = "<%= singular_name.titlecase %> could not be saved."
+      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved."
+
     end
 <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
     respond_to do |format|

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

@@ -1,15 +1,18 @@
 <\%= 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_list || @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 %>
 
+    <% unless @no_list  %>
     <div class="row scaffold-row">
       <%= list_column_headings %>
       <% 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 %>%;">
+        <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width +  '%;' : "" %>
+
+        <% @downnest_children.each do |downnest| %>
+        <div class="<%= @col_identifer %> scaffold-col-heading<%= ' col-md-3' if @layout=="bootstrap" %>" <%= downnest_column_style %>>
           <h4>
             <%=  downnest.titleize  %>
           </h4>
@@ -17,7 +20,11 @@
       <% end %>
       <% end %>
 
-      <div class='col scaffold-col-heading scaffold-col-heading-buttons' style="flex-basis: 150px"></div>
+      <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
+
+      <div class='<%= @col_identifer %> scaffold-col-heading scaffold-col-heading-buttons<%= ' col-md-2' if @layout=="bootstrap" %>' <%= button_column_style %>>
+
+      </div>
     </div>
 
       <\% if <%= plural %>.empty? %>
@@ -28,8 +35,9 @@
       <\% <%= plural %>.each do |<%= singular %>| %>
         <\%= 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>
+      <% end  %>
   </div>
 <\% end %>

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

@@ -1,3 +1,5 @@
 <\%= turbo_frame_tag "<%= singular %>-new" do %>
-  <\%= link_to "New <%= singular.titlecase %>",  <%= new_path_name %>, disable_with: "Loading...", class: "new-<%= singular %>-button btn btn-primary pull-right" %>
+  <div>
+    <\%= link_to "New <%= singular.titlecase %>",  <%= new_path_name %>, disable_with: "Loading...", class: "new-<%= singular %>-button btn btn-primary pull-right <%= 'btn-sm' if @nested_args.any? %> " %>
+  </div>
 <\% end %>

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

@@ -2,8 +2,11 @@
 
 <% 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 %>%" >
+
+    <% downnest_style =  @layout == "hotglue" ? 'style="flex-basis: ' +  each_downnest_width + '%"' : "" %>
+  <div class="<%= @col_identifier %><%= ' col-md-3' if @layout == "bootstrap" %> scaffold-downnest" <%= downnest_style  %> >
   <\%= 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) %>,
@@ -12,10 +15,11 @@
   <% end %>
 <% end %>
 
-<div class="<%= @col_identifier %> scaffold-line-buttons" style="flex-basis: 150px;">
+<% button_style = @layout == "hotglue" ? 'style="flex-basis: ' +  (100 - (column_width * @columns.count)).floor.to_s +  '%;"' : "" %>
+<div class="<%= @col_identifier %> scaffold-line-buttons <%= ' col-md-2' if @layout == "bootstrap" %>" <%= button_style %>>
   <% if destroy_action %>
     <\%= 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" %>
+      <\%= f.submit "Delete".html_safe,  data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
     <\% end %>
   <% end %>
 

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

@@ -6,7 +6,7 @@
 
   <div class="clearfix"></div>
   <\%= render partial: '<%= list_path_partial %>',
-  locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
+    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/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.3.5'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,7 +174,7 @@ post_install_message: |
   ---------------------------------------------
   Welcome to Hot Glue - A Scaffold Building Companion for Hotwire + Turbo-Rails
 
-  To purchase a license, please visit https://heliosdev.shop/hot-glue-licens
+  To purchase a license, please visit https://heliosdev.shop/hot-glue-license
   ---------------------------------------------
 rdoc_options: []
 require_paths: