hot-glue 0.4.2 → 0.4.6

data/lib/generators/hot_glue/helpers.rb

@@ -0,0 +1,13 @@
+class HotGlue::Helpers
+
+
+  def self.open_page( link)
+    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+      system "start #{link}"
+    elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+      system "open #{link}"
+    elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+      system "xdg-open #{link}"
+    end
+  end
+end

data/lib/generators/hot_glue/install_generator.rb

@@ -1,4 +1,5 @@
 require 'rails/generators/erb/scaffold/scaffold_generator'
+require_relative './helpers'
 require 'ffaker'
 
 module HotGlue
@@ -10,6 +11,8 @@ module HotGlue
 
     source_root File.expand_path('templates', __dir__)
 
+
+
     def initialize(*args) #:nodoc:
       super
       @layout = options['layout'] || "hotglue"
@@ -25,28 +28,58 @@ module HotGlue
       end
 
       ### INTERACTIVE LICENSING
-      #
 
 
-      if Socket.gethostname != "Rose21"
-        print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
-        license_activation_key = STDIN.gets.strip
+      print "Do you have a license key (y/N)? "
+      do_you_have_a_license = STDIN.gets.strip || "N"
 
-        print "Please enter the EMAIL you used to purchase this license: "
+      if do_you_have_a_license.downcase == "y"
+        print "Please enter the EMAIL you used to purchase a Hot Glue license, \nTeachable tutorial, or Helios Merch Shop product: "
         license_email = STDIN.gets.strip
-        app_name = Rails.application.class.module_parent_name
-        license_should_be = Digest::SHA1.hexdigest("HOT-GLUE-LICENSE--#{app_name}--#{license_email}")
+        require 'open-uri'
 
+        # ask HeliosDev.shop if this email is good
+        stream = URI.open("https://heliosdev.shop/check_licenses/hot-glue-license?email=#{license_email}")
+        resp = JSON.parse(stream.read)
 
-        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."
+        if resp['status'] == 'success'
+          if resp['redirect']
+            HotGlue::Helpers.open_page(resp['redirect'])
+          end
+          puts "\n" + "    * " + resp['response'] + " * \n\n"
+        else
+          puts "\n" + "    * " + resp['response'] + " * \n\n"
+
+          print "You can get a license in one of the follow ways: \n"
+          print "https://heliosdev.shop/hot-glue-license \n"
+          print "https://jfb.teachable.com/p/hot-glue-in-depth-tutorial \n"
+          print "https://shop.heliosdev.shop/ \n"
+          print "All purchases come with a Hot Glue lifetime license for individuals and hobbyists\n"
           return
         end
+      else
+        print "Please pick an option to get a Hot Glue license: \n"
+        print "1) Professional/Business with support (see heliosdev.shop/hot-glue-license for prices)  \n"
+        print "2) Individual/hobbyist: Get the tutorial on Teachable ($60) \n"
+        print "3) Individual/hobbyist: Get some merchandise ($5 and up) \n"
+        print "Please type 1, 2, or 3: "
+        choice = STDIN.gets.strip
+
+        if choice == "1"
+          HotGlue::Helpers.open_page("https://heliosdev.shop/hot-glue-license?utm_campaing=hotglue-installer")
+        elsif choice == "2"
+          HotGlue::Helpers.open_page("https://jfb.teachable.com/p/hot-glue-in-depth-tutorial?utm_source=hotglue-installer")
+          print "All purchases come with a Hot Glue lifetime license for individuals and hobbyists\n"
+
+        else
+          HotGlue::Helpers.open_page("https://shop.heliosdev.shop/?utm_source=hotglue-installer")
+          print "ALSO check out the HOT GLUE TUTORIAL here: \n"
+          print "https://jfb.teachable.com/p/hot-glue-in-depth-tutorial \n"
+          print "All purchases come with a Hot Glue lifetime license for individuals and hobbyists\n"
+        end
+        return
       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"
@@ -146,10 +179,8 @@ module HotGlue
       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)
 

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

@@ -3,13 +3,15 @@
 module HotGlue
   module Layout
     class Builder
-      attr_reader :include_setting, :downnest_children, :no_edit, :no_delete, :columns, :smart_layout
+      attr_reader :include_setting, :downnest_children, :buttons_width, :columns, :smart_layout
 
       def initialize(params)
         @include_setting = params[:include_setting]
         @downnest_children = params[:downnest_children]
-        @no_edit = params[:no_edit]
-        @no_delete = params[:no_delete]
+
+        @buttons_width = params[:buttons_width]
+
+        @no_buttons = @buttons_width == 0
         @columns = params[:columns]
         @smart_layout = params[:smart_layout]
       end
@@ -23,7 +25,7 @@ module HotGlue
           portals:  {
 
           },
-          buttons: { size: ''}
+          buttons: { size: @buttons_width}
         }
 
         downnest_children.each do |child|
@@ -32,9 +34,8 @@ module HotGlue
 
         # smart layout: 2 columns per field; 4 column for EACH downnested portals, 2 column for buttons
         how_many_downnest = downnest_children.size
-        button_column_size = (no_edit && no_delete) ? 0 : 2
 
-        bootstrap_columns = (12-button_column_size)
+        bootstrap_columns = (12-@buttons_width )
         bootstrap_columns = bootstrap_columns - (how_many_downnest*4)
         available_columns = (bootstrap_columns / 2).floor # bascially turns the 12-column grid into a 6-column grid
 
@@ -55,7 +56,7 @@ module HotGlue
 
           if columns.size > available_columns
             each_col_can_have = (columns.size.to_f / available_columns.to_f).round
-            # byebug
+
             layout_object[:columns][:container] = (0..available_columns-1).collect { |x|
               columns.slice(0+(x*each_col_can_have),each_col_can_have)
             }
@@ -71,15 +72,16 @@ module HotGlue
           layout_object[:columns][:container] = columns.collect{|col| [col]}
 
         else
+
           (0..available_columns-1).each do |int|
             layout_object[:columns][:container][int] = []
           end
 
           # input control
-          user_layout_columns = options['include'].split(":")
+          user_layout_columns = @include_setting .split(":")
 
           if user_layout_columns.size > available_columns
-            raise "Your include statement #{options['include']}  has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
+            raise "Your include statement #{@include_setting }  has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
           end
           user_layout_columns.each_with_index  do |column,i|
             layout_object[:columns][:container][i] = column.split(",")

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

@@ -15,11 +15,12 @@ module  HotGlue
       path_helper_args = args[0][:path_helper_args]
       singular = args[0][:singular]
       magic_buttons = args[0][:magic_buttons]
+      small_buttons = args[0][:small_buttons]
 
       magic_buttons.collect{ |button_name|
-        "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}) do |f| %>
+        "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}), html: {style: 'display: inline', data: {\"turbo-confirm\": 'Are you sure you want to #{button_name} this #{singular}?'}} do |f| %>
       <%= f.hidden_field :#{button_name}, value: \"#{button_name}\" %>
-    <%= 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 ' %>
+    <%= f.submit '#{button_name.titleize}'.html_safe, disabled: (#{singular}.respond_to?(:#{button_name}able?) && ! #{singular}.#{button_name}able? ), class: '#{singular}-button btn btn-primary #{"btn-sm" if small_buttons}' %>
     <% end %>"
       }.join("\n")
     end
@@ -129,12 +130,9 @@ module  HotGlue
                   "  <%= f.label(:#{col.to_s}, value: 'Yes', for: '#{singular}_#{col.to_s}_1') %>\n" +
                   ""
               when :enum
-                enum_name = "enum_name"
-
                 enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col.to_s}'}[0].sql_type")
-                "<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
+                "<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
   <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
-
               end
            end
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -59,15 +59,18 @@ module HotGlue
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
 
-    class_option :stimulus_syntax, type: :boolean, default: nil # TODO: rename to ujs_syntax and default to false
+    class_option :ujs_syntax, type: :boolean, default: nil
 
     class_option :downnest, type: :string, default: nil
     class_option :magic_buttons, type: :string, default: nil
+    class_option :small_buttons, type: :boolean, default: nil
+
     class_option :display_list_after_update, type: :boolean, default: false
     class_option :smart_layout, type: :boolean, default: false
     class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
     class_option :layout, type: :string, default: nil # if used here it will override what is in the config
-
+    class_option :no_list_labels, type: :boolean, default: false
+    class_option :alt_controller_name, type: :string, default: nil
 
     def initialize(*meta_args)
       super
@@ -138,14 +141,34 @@ module HotGlue
       end
 
       args = meta_args[0]
+
+
       @singular = args.first.tableize.singularize # should be in form hello_world
       @plural = options['plural'] || @singular + "s" # supply to override; leave blank to use default
+      @namespace = options['namespace'] || nil
+
+
+      @alt_controller_name = options['alt_controller_name']
+      use_controller_name = @alt_controller_name || plural.titleize.gsub(" ", "")
+
+      @controller_build_name = (( @namespace.titleize + "::" if @namespace) || "") + use_controller_name + "Controller"
+      @controller_build_folder = use_controller_name.underscore
+
+      if ! @controller_build_folder.ends_with?("s")
+        raise "can't build with controller name #{@controller_build_folder} because it doesn't end with an 's'"
+      end
+
+      if @alt_controller_name
+        @controller_build_folder_singular = @controller_build_folder.gsub(/s$/,'')
+      else
+        @controller_build_folder_singular = singular
+      end
+
       @auth = options['auth'] || "current_user"
       @auth_identifier = options['auth_identifier'] || (! @god && @auth.gsub("current_", "")) || nil
 
 
       @nest = (!options['nest'].empty? && options['nest']) || nil
-      @namespace = options['namespace'] || nil
 
       @singular_class = @singular.titleize.gsub(" ", "")
       @exclude_fields = []
@@ -164,7 +187,6 @@ module HotGlue
         @show_only += options['show_only'].split(",").collect(&:to_sym)
       end
 
-
       @god = options['god'] || options['gd'] || false
       @specs_only = options['specs_only'] || false
 
@@ -177,13 +199,13 @@ module HotGlue
 
       @no_edit = options['no_edit'] || false
       @no_list = options['no_list'] || false
-
+      @no_list_labels = options['no_list_labels'] || false
       @display_list_after_update = options['display_list_after_update'] || false
       @smart_layout = options['smart_layout']
 
 
-      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
 
+      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
       @downnest = options['downnest'] || false
 
       @downnest_children = []
@@ -218,6 +240,9 @@ module HotGlue
         @magic_buttons = options['magic_buttons'].split(',')
       end
 
+
+      @small_buttons = options['small_buttons'] || false
+
       @build_update_action = !@no_edit || !@magic_buttons.empty?
       # if the magic buttons are present, build the update action anyway
 
@@ -236,16 +261,24 @@ module HotGlue
         end
       end
 
+
+      @ujs_syntax = options['ujs_syntax']
+
+      if !@ujs_syntax
+        @ujs_syntax = !defined?(Turbo::Engine)
+        puts "You did not specify ujs_syntax and so I default it to #{@ujs_syntax}"
+      end
       @reference_name = HotGlue.derrive_reference_name(singular_class)
 
       identify_object_owner
       setup_fields
 
+      buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + @magic_buttons.count
+
       builder = HotGlue::Layout::Builder.new({
                                               include_setting: options['include'],
                                               downnest_children: @downnest_children,
-                                              no_edit: @no_edit,
-                                              no_delete: @no_delete,
+                                              buttons_width: buttons_width,
                                               columns: @columns,
                                               smart_layout: @smart_layout
                                             })
@@ -261,23 +294,33 @@ module HotGlue
         auth_assoc_field = auth_assoc + "_id" unless @god
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
 
+
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
         elsif !@nest
           exit_message = "*** Oops: It looks like is no association from current_#{@object_owner_sym} to a class called #{@singular_class}. If your user is called something else, pass with flag auth=current_X where X is the model for your users as lowercase. Also, be sure to implement current_X as a method on your controller. (If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for auth_identifier.) To make a controller that can read all records, specify with --god."
 
         else
+          exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym} \n
+maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n
+(If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.
+Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag)
+
+To make a controller that can read all records, specify with --god."
+
           if @god
-            exit_message= "*** Oops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
+            exit_message << "does #{singular_class} have a relOops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
           else
+
             @auth_check = eval(@auth_identifier.titleize)
             @nested_args.each do |arg|
+
               if ! @auth_check.reflect_on_association("#{arg}s".to_sym)
-                exit_message = "*** Oops:  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
+                exit_message <<  "...  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
               end
             end
           end
-          puts exit_message
+          puts "\n" + exit_message
           raise(HotGlue::Error, exit_message)
         end
       end
@@ -357,7 +400,7 @@ module HotGlue
     def copy_controller_and_spec_files
       @default_colspan = @columns.size
       unless @specs_only
-        template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
+        template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{@controller_build_folder}_controller.rb")
         if @namespace
           begin
             eval(controller_descends_from)
@@ -370,7 +413,8 @@ module HotGlue
 
       unless @no_specs
         dest_file = File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
-          if  File.exists?(dest_file)
+
+        if  File.exists?(dest_file)
           existing_file = File.open(dest_file)
           existing_content = existing_file.read
           if existing_content =~ /\#HOTGLUE-SAVESTART/
@@ -460,10 +504,7 @@ module HotGlue
 
 
     def controller_class_name
-      res = ""
-      res << @namespace.titleize + "::" if @namespace
-      res << plural.titleize.gsub(" ", "") + "Controller"
-      res
+      @controller_build_name
     end
 
     def singular_name
@@ -488,15 +529,15 @@ module HotGlue
 
     def path_helper_singular
       if @nest
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
+        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{@controller_build_folder_singular}_path"
       else
-        "#{@namespace+"_" if @namespace}#{singular}_path"
+        "#{@namespace+"_" if @namespace}#{@controller_build_folder_singular}_path"
       end
     end
 
     def path_helper_plural
       if ! @nest
-        "#{@namespace+"_" if @namespace}#{plural}_path"
+        "#{@namespace+"_" if @namespace}#{@controller_build_folder}_path"
       else
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
       end
@@ -511,19 +552,19 @@ module HotGlue
     end
 
     def line_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/line"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/line"
     end
 
     def show_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/show"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/show"
     end
 
     def list_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/list"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/list"
     end
 
     def new_path_name
-      base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{singular}_path"
+      base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{@controller_build_folder_singular}_path"
       if @nested_args.any?
         base += "(" + @nested_args.collect { |arg|
           "#{arg}.id"
@@ -616,7 +657,8 @@ module HotGlue
         path_helper_singular: path_helper_singular,
         path_helper_args: path_helper_args,
         singular: singular,
-        magic_buttons: @magic_buttons
+        magic_buttons: @magic_buttons,
+        small_buttons: @small_buttons
       )
     end
 
@@ -629,7 +671,7 @@ module HotGlue
 
 
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    plural, dest_filename)
+                                    @controller_build_folder, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -643,7 +685,7 @@ module HotGlue
           source_filename = cc_filename_with_extensions( "#{@markup}/#{view}.turbo_stream.#{@markup}")
           dest_filename = cc_filename_with_extensions("#{view}", "turbo_stream.#{@markup}")
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    plural, dest_filename)
+                                    @controller_build_folder, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -651,6 +693,15 @@ module HotGlue
 
         end
       end
+
+      # menu_file = "app/views#{namespace_with_dash}/menu.erb"
+      #
+      # if File.exists?(menu_file)
+      #   # TODO: can I insert the new menu item into the menu programatically here?
+      #   # not sure how i would acheive this without nokogiri
+      #
+      # end
+
     end
 
     def namespace_with_dash
@@ -824,13 +875,13 @@ module HotGlue
      @template_builder.paginate(plural: plural)
     end
 
-    def delete_confirmation_syntax
-      if !@stimulus_syntax
-       "{confirm: 'Are you sure?'}"
-      else
-       "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ #{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
-      end
-    end
+    # def delete_confirmation_syntax
+    #   if !@stimulus_syntax
+    #    "{confirm: 'Are you sure?'}"
+    #   else
+    #    "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ #{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
+    #   end
+    # end
 
 
     def controller_magic_button_update_actions

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

@@ -2,30 +2,33 @@
   <div class="<%= @container_name %> scaffold-list">
     <% 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('\\',"")  %><br /><% end %>
+    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  @controller_build_folder + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><br /><% end %>
 
-    <% unless @no_list  %>
-    <div class="row scaffold-heading-row">
-      <%= list_column_headings %>
-      <% if @downnest_children.any? %>
-        <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
-        <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width.to_s +  '%;' : "" %>
+    <% unless @no_list %>
+      <% unless @no_list_labels %>
+        <div class="row scaffold-heading-row">
+          <%= list_column_headings %>
+          <% if @downnest_children.any? %>
+            <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
+            <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width.to_s +  '%;' : "" %>
 
-        <% @downnest_children.each_with_index do |downnest,i| %>
-        <div class=" scaffold-col-heading<%= " col-sm-#{ @layout_object[:portals][downnest][:size] }" if @layout=="bootstrap" %>" <%= downnest_column_style %>>
-          <strong>
-            <%=  downnest.titleize  %>
-          </strong>
-        </div>
-      <% end %>
-      <% end %>
+            <% @downnest_children.each_with_index do |downnest,i| %>
+            <div class=" scaffold-col-heading<%= " col-sm-#{ @layout_object[:portals][downnest][:size] }" if @layout=="bootstrap" %>" <%= downnest_column_style %>>
+              <strong>
+                <%=  downnest.titleize  %>
+              </strong>
+            </div>
+          <% end %>
+          <% end %>
 
-      <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
+          <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
 
-      <div class=' scaffold-col-heading scaffold-col-heading-buttons<%= ' col-md-2' if @layout=="bootstrap" %>' <%= button_column_style %>>
+          <div class=' scaffold-col-heading scaffold-col-heading-buttons<%= " col-md-#{ @layout_object[:buttons][:size] }" if @layout=="bootstrap" %>' <%= button_column_style %>>
+
+          </div>
+        </div>
+      <% end %>
 
-      </div>
-    </div>
       <\% if <%= plural %>.empty? %>
     <div>
         None

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

@@ -3,6 +3,6 @@
   New <%= singular.titlecase %>
   </h3>
   <\%= form_with model:  <%= singular %>, url: <%= path_helper_plural %>(<%= nested_objects_arity %>), method: "post" do  |f| %>
-    <\%=  render partial: "<%= namespace_with_slash + @plural %>/form", locals: { <%=  singular %>:  <%= singular %>, f: f} %>
+    <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form", locals: { <%=  singular %>:  <%= singular %>, f: f} %>
   <\% end %>
 <\% end %>

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

@@ -19,12 +19,12 @@
 <% end %>
 
 <% 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 %>>
+<div class="<%= @col_identifier %> scaffold-line-buttons <%= " col-md-#{ @layout_object[:buttons][:size] }" if @layout == "bootstrap" %>" <%= button_style %>>
   <%= magic_button_output %>
 
   <% 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" %>
+    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {data: {'<%= @ujs_syntax ? 'confirm' : 'turbo-confirm' %>': "Are you sure you want to delete #{ <%= @singular + "." + display_class %> }?"}, style: "display: inline-block;"}, method: :delete do |f| %>
+      <\%= f.submit "Delete".html_safe,  class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
     <\% end %>
   <% end %>
 

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.4.2'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.6
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +78,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
-- LICENCE
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/config/manifest.js
@@ -95,6 +89,7 @@ files:
 - config/database.yml
 - config/hot_glue.yml
 - db/schema.rb
+- lib/generators/hot_glue/helpers.rb
 - lib/generators/hot_glue/install_generator.rb
 - lib/generators/hot_glue/layout/builder.rb
 - lib/generators/hot_glue/markup_templates/base.rb
@@ -144,19 +139,15 @@ files:
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
 - lib/hotglue/version.rb
-homepage: https://jasonfleetwoodboldt.com/hot-glue/
+homepage: https://jfb.teachable.com/p/hot-glue-in-depth-tutorial?utm_source=rubygems.org&utm_campaign=rubygems_link
 licenses:
-- Nonstandard
+- Commercial with free option
 metadata:
   source_code_uri: https://github.com/jasonfb/hot-glue
-  tutorial: https://jfbcodes.com/hot-glue-tutorial
-  buy_license: https://heliosdev.shop/hot-glue-licens
-  get_merch: https://shop.heliosdev.shop/?utm_source=rubygems&utm_campaign=hot_glue_gem_metadata
 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-license
+  For license options visit https://heliosdev.shop/hot-glue-license
   ---------------------------------------------
 rdoc_options: []
 require_paths: