hot-glue 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4770a6dafa96c7d17e2104d7349caf126a7922c660b3055b29c6a7eab6e7d851
-  data.tar.gz: cd730bb99e9d9dad8ca5ee22a504a9e91ace01123ce900e11c7ccffae3e26630
+  metadata.gz: eedf5dcbc79766ed47352778020a633eb34324ecefb715b5e9b5476f119f80e6
+  data.tar.gz: 95e59bd0f9dc73b62c7b1d4a653a9384fed801ec9b8d672f44cc9e4636b56dc9
 SHA512:
-  metadata.gz: 5f59544515a51f85e494bd7a1ec7ee4586ab761919554f53ad751b845906e412a5cd80f65e1447183d79246e295abbb1fe468814ef572cd93888970603aafb7a
-  data.tar.gz: 045115777e9399ddffd06f9b400d44cc1d5e230579ea9d2017213cf74ae786efe2ae42d52639dbc60b496d0628f8a955c0d03807cd7262203de1961e0ecf87c8
+  metadata.gz: 99c381f75071b812279eb0cda17d4e0086fafba3385e37283e838610fb2e8574d3659c7e130ef4ac2531309a564d3c4b7a1a1064475c4d370ba7de942d67dcfd
+  data.tar.gz: 5fd29976555c4dc94814afeec9759c8156db92d6df9c178ece27d7b9bbd9570db5e764f75c3b2c61a7c26391950718c181fa0b03224858e41f836654fc9a6a01

data/.gitignore

@@ -16,11 +16,18 @@ Gemfile.lock
 
 db/*.sqlite3
 
-spec/dummy/app/views/
-spec/dummy/app/controllers/
-spec/dummy/specs/
+dummy/app/views/
+dummy/app/controllers/
+dummy/specs/
+
+dummy/node_modules/
+dummy/log/
+dummy/Gemfile.lock
+dummy/config/hot_glue.yml
 
-spec/dummy/node_modules/
-spec/dummy/log/
 
 coverage/
+
+
+spec/dummy/
+dummy/spec/system/

data/README.md

@@ -29,10 +29,10 @@ How is it different than Rails scaffolding?
 
 Although inspired by the Rails scaffold generators (built-in to Rails), Hot Glue does something similiar but has made opinionated decisions that deviate from the normal Rails scaffold: 
 
-1. The Hot Glue scaffolds are complete packages and pre-optimized for 'edit-in-place.' (the Rails scaffolds still generate views that make you flip between pages to do create/update operations)
-2. Hot Glue does not create your models along with your scaffolding. Instead, create them first using `rails model new`
-3. Hot Glue *reads* the fields on your database and the relationships defined on your models, so unlike the Rails scaffolding you must do that step before building your scaffolding.
-4. Hot Glue has many more features for building layouts quickly, like choosing which fields to include or exclude and how to lay them out on the page, for stiching together related objects (nesting and child portals), and more. 
+1. The Hot Glue scaffolds are complete packages and pre-optimized for 'edit-in-place.' (the Rails scaffolds still generates views that make you flip between pages to do create/update operations)
+2. Hot Glue does not create your models along with your scaffolding. Instead, create them first using `rails generate model X`
+3. Hot Glue *reads* the fields on your database *and* the relationships defined on your models. Unlike the Rails scaffolding you must add relationships and migration your DB before building your scaffolding.
+4. Hot Glue has many more features for building layouts quickly, like choosing which fields to include or exclude and how to lay them out on the page, for stitching together related objects (nesting and child portals), and more. 
 
 Other than the opinionated differences and additional features, Hot Glue produces code that is fundamentally very similiar and works consistent with the Rails 7 ways of working. 
 
@@ -138,7 +138,7 @@ sed -i '' -e 's/, html: { method: :post })/, html: { method: :post, "data-turbo"
 git add . && git commit -m 'devise view fixes' &&
 rails generate model User name:string &&
 rails generate devise User && git add . && git commit -m "adds Users model with devise" && 
-rails db:migrate &&
+&& ./bin/setup && rails db:migrate &&
 git add . && git commit -m "schema file"
 ```
 
@@ -905,6 +905,33 @@ Child portals have the headings omitted automatically (there is a heading identi
 
 # VERSION HISTORY
 
+#### 2022-12-27 - v0.5.5 
+
+- Experimental support for Tailwind. Note I was not able to get Tailwind actually working in my app, and I'm not sure about how to think about the many flavors of Tailwind (all of which seem to be paid?). If anyone can lend a hand, the objects are now cleanly refactored so that the CSS logic is separated.
+
+- Support for UUIDs. Database UUIDs are treated as foreign keys and behave like integers ending with _id (they are treated as foreign keys whether or not they end with _id where as integers are treated as foreign keys only if they end with _id)
+
+- At the namespace level, you can now have a file called `_nav.html.erb` like this example for a two-tab bootstrap nav (you'll need to create this file manually). 
+- Here, our two tabs are called "Domains" and "Widgets"
+
+```
+<ul class="nav nav-tabs">
+  <li class="nav-item">
+    <%= link_to "Domains", domains_path, class: "nav-link #{'active' if nav == 'domains'}" %>
+  </li>
+  <li class="nav-item">
+  	<%= link_to "Widgets", widgets_path, class: "nav-link #{'active' if nav == 'widget'}" %>	
+  </li>
+</ul>
+```
+
+If the file is present, Hot Glue will automatically add this to the top of, for example, the "domains" index page:
+
+```
+<%= render partial: "owner/nav", locals: {nav: "domains"} %>
+```
+Use this to build a Bootstrap nav that correctly turns each tab active when navigated to.
+
 #### 2022-11-27 - v0.5.4 - new flag --with-turbo-streams will append callbacks after_update_commit and after_destroy_commit to the MODEL you are building with to use turbo to target the scaffolding being built and programmatically update it
 
 Adds `--with-turbo-streams`. Use `--with-turbo-streams` to create hot (live reload) interfaces. See docs above.

data/lib/generators/hot_glue/install_generator.rb

@@ -1,5 +1,5 @@
 require 'rails/generators/erb/scaffold/scaffold_generator'
-require_relative './helpers'
+
 require 'ffaker'
 
 module HotGlue
@@ -15,15 +15,15 @@ module HotGlue
 
     def initialize(*args) #:nodoc:
       super
-      @layout = options['layout'] || "hotglue"
+      layout = options['layout'] || "hotglue"
       @theme =  options['theme']
-      if @layout == "hotglue" && options['theme'].nil?
+      if layout == "hotglue" && options['theme'].nil?
         puts "You have selected to install Hot Glue without a theme. You can either use the --layout=bootstrap to install NO HOT GLUE THEME, or to use a Hot Glue theme please choose: like_boostrap, like_menlo_park, like_cupertino, like_mountain_view, dark_knight"
         return
       end
 
-      if @layout == 'boostrap'
-        puts "IMPORTANT: You have selected to install Hot Glue with Bootstrap layout (legacy). Be sure to always use ``--layout=bootstrap` when building your scaffold. No Hot Glue theme will be installed at this time.` "
+      if layout == 'boostrap'
+        puts "IMPORTANT: You have selected to install Hot Glue with Bootstrap layout.` "
       end
 
 
@@ -56,7 +56,7 @@ module HotGlue
 
 
       begin
-        rails_helper_contents = File.read("spec/rails_helper.rb")
+        rails_helper_contents = File.read("#{'spec/dummy/' if Rails.env.test?}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`  "
@@ -66,14 +66,14 @@ module HotGlue
           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`  "
+          puts "  HOTGLUE --> added to #{'spec/dummy/' if Rails.env.test?}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)
+        File.write("#{'spec/dummy/' if Rails.env.test?}spec/rails_helper.rb", rails_helper_contents)
 
       rescue StandardError => e
         puts "WARNING: error writing to spec/rails_helper --- #{e.message}"
@@ -96,7 +96,7 @@ module HotGlue
 
 
       begin
-        if @layout == "hotglue"
+        if layout == "hotglue"
           theme_location = "themes/hotglue_scaffold_#{@theme}.scss"
           theme_file = "hotglue_scaffold_#{@theme}.scss"
 
@@ -119,8 +119,8 @@ module HotGlue
 
 
       begin
-        if !File.exists?("config/hot_glue.yml")
-          yaml = {layout: @layout,
+        if !File.exists?("#{'spec/dummy/' if Rails.env.test?}config/hot_glue.yml")
+          yaml = {layout: layout,
                   markup: @markup}.to_yaml
           File.write("#{'spec/dummy/' if Rails.env.test?}config/hot_glue.yml", yaml)
 
@@ -131,11 +131,11 @@ module HotGlue
 
 
       begin
-        if !File.exists?("spec/support/capybara_login.rb")
+        if !File.exists?("#{'spec/dummy/' if Rails.env.test?}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}"
+        puts "WARNING: error writing to #{Rails.env.test? ? 'spec/dummmy/' : ''}spec/support/capybara_login.rb --- #{e.message}"
       end
     end
   end

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

@@ -8,15 +8,18 @@ module HotGlue
                   :buttons_width, :columns,
                   :smart_layout, :specified_grouping_mode
 
-      def initialize(params)
-        @include_setting = params[:include_setting]
-        @downnest_object = params[:downnest_object]
-
-        @buttons_width = params[:buttons_width]
+      def initialize(include_setting: nil,
+                     downnest_object: nil,
+                     buttons_width: nil,
+                     smart_layout: nil,
+                     columns: nil)
+        @include_setting = include_setting
+        @downnest_object = downnest_object
+        @buttons_width = buttons_width
+        @columns = columns
+        @smart_layout = smart_layout
 
         @no_buttons = @buttons_width == 0
-        @columns = params[:columns]
-        @smart_layout = params[:smart_layout]
         @specified_grouping_mode = include_setting.include?(":")
       end
 
@@ -132,4 +135,4 @@ module HotGlue
 
     end
   end
-end
+end

data/lib/generators/hot_glue/layout_strategy/base.rb

@@ -0,0 +1,31 @@
+module LayoutStrategy
+  class Base
+    attr_accessor :builder
+    def initialize(scaffold_builder)
+      @builder = scaffold_builder
+    end
+
+    def button_classes; ""; end
+    def button_column_style; "" ; end
+    def button_style ; ""; end
+    def column_headings_col_style; "" ; end
+    def column_width; ""; end
+    def column_classes_for_line_fields; ""; end
+    def column_classes_for_form_fields; ""; end
+    def column_classes_for_column_headings; ""; end
+    def col_width; 100; end
+    def container_name; ""; end
+    def downnest_style ; ""; end
+    def downnest_column_style ; "" ; end
+    def each_col
+      return col_width if builder.columns.count == 0
+      (col_width/(builder.columns.count)).to_i
+    end
+    def list_classes; ""; end
+    def row_classes; ""; end
+    def row_heading_classes; ""; end
+    def page_begin; '<div> '; end
+    def page_end ; '</div> '; end
+    def style_with_flex_basis(x); "" ; end
+  end
+end

data/lib/generators/hot_glue/layout_strategy/bootstrap.rb

@@ -0,0 +1,41 @@
+class LayoutStrategy::Bootstrap < LayoutStrategy::Base
+  def button_classes
+    " " + column_classes_for_line_fields
+  end
+
+  def column_classes_for_form_fields
+    "col-md-#{builder.layout_object[:columns][:size_each]}"
+  end
+
+  def column_classes_for_column_headings
+    column_classes_for_line_fields
+  end
+
+  def container_name
+    "container-fluid"
+  end
+
+  def column_classes_for_line_fields
+    "col-sm-#{builder.layout_object[:columns][:size_each]}"
+  end
+
+  def column_width
+    builder.layout_object[:columns][:size_each]
+  end
+
+  def downnest_portal_column_width(downnest)
+    "col-sm-#{ builder.layout_object[:portals][downnest][:size] }"
+  end
+
+  def page_begin
+    '<div class="row"> <div class="col-md-12">'
+  end
+
+  def row_classes
+    "row"
+  end
+
+  def page_end
+    '</div> </div>'
+  end
+end

data/lib/generators/hot_glue/layout_strategy/hot_glue.rb

@@ -0,0 +1,82 @@
+class LayoutStrategy::HotGlue < LayoutStrategy::Base
+  def button_column_style
+    'style="flex-basis: 150px'
+  end
+
+  def button_style
+    'style="flex-basis: ' +  (100 - (column_width * builder.columns.count)).floor.to_s +  '%;"'
+  end
+
+  def column_width
+    each_col * builder.columns.count
+  end
+
+  def column_headings_col_style
+    " style='flex-basis: #{column_width}%'"
+  end
+
+  def container_name
+    "scaffold-container"
+  end
+
+  def downnest_column_style
+    'style="flex-basis: ' + each_downnest_width.to_s +  '%;'
+  end
+
+  def downnest_style
+    'style="flex-basis: ' +  each_downnest_width.to_s + '%"'
+  end
+
+  def each_downnest_width
+    builder.downnest_children.count == 1 ? 33 : (53/builder.downnest_children.count).floor
+  end
+
+  def list_classes
+    "scaffold-list"
+  end
+
+  def row_classes
+    "scaffold-row"
+  end
+
+  def column_classes_for_form_fields
+    "scaffold-cell"
+  end
+
+  def row_heading_classes
+    "scaffold-heading-row"
+  end
+  def column_classes_for_line_fields
+    "scaffold-cell"
+  end
+
+  def column_classes_for_column_headings
+    "scaffold-cell"
+  end
+
+  def col_width
+    downnest_size = case (builder.downnest_children.count)
+        when 0
+          downnest_size = 0
+        when 1
+          downnest_size = 40
+
+        else
+          downnest_size = 60
+
+        end
+    100 - downnest_size - 5
+  end
+
+  def page_begin
+    '<div class=" scaffold-index-<%= plural %>">'
+  end
+
+  def page_end
+    '</div>'
+  end
+
+  def style_with_flex_basis(perc_width)
+    " style='flex-basis: #{perc_width}%'"
+  end
+end

data/lib/generators/hot_glue/layout_strategy/tailwind.rb

@@ -0,0 +1,28 @@
+
+
+class LayoutStrategy::Tailwind < LayoutStrategy::Base
+  def button_classes; ""; end
+  def button_column_style; "" ; end
+  def button_style ; ""; end
+  def column_headings_col_style; "" ; end
+  def column_width; ""; end
+  def column_classes_for_line_fields; ""; end
+  def column_classes_for_form_fields; ""; end
+  def column_classes_for_column_headings; ""; end
+  def col_width; 100; end
+  def container_name; ""; end
+  def downnest_style ; ""; end
+  def downnest_column_style ; "" ; end
+  def each_col
+    return col_width if builder.columns.count == 0
+    (col_width/(builder.columns.count)).to_i
+  end
+
+  def list_classes; "overflow-x-auto w-full"; end
+  def row_classes; "grid grid-cols-4 gap-x-16 py-5 px-4 text-sm text-gray-700 border-b border-gray-200 dark:border-gray-700"; end
+  def row_heading_classes; "grid grid-cols-4 gap-x-16 p-4 text-sm font-medium text-gray-900 bg-gray-100 border-t border-b border-gray-200 dark:bg-gray-800 dark:border-gray-700 dark:text-white"; end
+  def page_begin; '<div class="overflow-hidden min-w-max"> '; end
+  def page_end ; '</div> '; end
+  def style_with_flex_basis(x); "" ; end
+
+end

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

@@ -1,7 +1,7 @@
 module  HotGlue
   class TemplateBase
-    def initialize()
+    def initialize(layout_strategy: )
+      @layout_strategy = layout_strategy
     end
-
   end
-end
+end

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

@@ -3,7 +3,7 @@ module  HotGlue
 
     attr_accessor :path, :singular, :singular_class,
                   :magic_buttons, :small_buttons,
-                  :show_only, :column_width, :layout, :perc_width,
+                  :show_only, :column_width, :layout_strategy, :perc_width,
                   :ownership_field, :form_labels_position,
                   :inline_list_labels,
                   :columns, :column_width, :col_identifier, :singular,
@@ -16,14 +16,7 @@ module  HotGlue
       text.lines.collect{|line| add_spaces + line}.join("")
     end
 
-    def magic_button_output(*args)
-      path = args[0][:path]
-      # path_helper_singular = args[0][:path_helper_singular]
-      # path_helper_args = args[0][:path_helper_args]
-      singular = args[0][:singular]
-      magic_buttons = args[0][:magic_buttons]
-      small_buttons = args[0][:small_buttons]
-
+    def magic_button_output(path:, singular:, magic_buttons:, small_buttons: )
       magic_buttons.collect{ |button_name|
         "<%= form_with model: #{singular}, url: #{path}, 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}\" %>
@@ -36,13 +29,8 @@ module  HotGlue
       @columns = args[0][:columns]
       @column_width = args[0][:column_width]
       @col_identifier = args[0][:col_identifier]
-      @layout = args[0][:layout]
 
-      if layout == "hotglue"
-        col_style = " style='flex-basis: #{column_width}%'"
-      else
-        col_style = ""
-      end
+      col_style = @layout_strategy.column_headings_col_style
 
       result = columns.map{ |column|
         "<div class='#{col_identifier}'" + col_style + ">" +  column.map(&:to_s).map{|col_name| "#{col_name.humanize}"}.join("<br />")  + "</div>"
@@ -59,16 +47,17 @@ module  HotGlue
       @columns = args[0][:columns]
       @show_only = args[0][:show_only]
       @singular_class = args[0][:singular_class]
-      @col_identifier = args[0][:col_identifier]
       @ownership_field  = args[0][:ownership_field]
       @form_labels_position = args[0][:form_labels_position]
       @form_placeholder_labels = args[0][:form_placeholder_labels]
       @hawk_keys = args[0][:hawk_keys]
-
       @singular = args[0][:singular]
+
+      column_classes = args[0][:col_identifier]
+
       singular = @singular
       result = columns.map{ |column|
-        "  <div class='#{col_identifier}' >" +
+        "  <div class='#{column_classes}' >" +
           column.map { |col|
             field_result =
               if show_only.include?(col.to_sym)
@@ -81,12 +70,14 @@ module  HotGlue
                 case type
                 when :integer
                   integer_result(col)
+                when :uuid
+                  uuid_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, col_identifier)
+                  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
@@ -122,36 +113,46 @@ module  HotGlue
     def integer_result(col)
       # look for a belongs_to on this object
       if col.to_s.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}'"
-          exit
-        end
-
-        is_owner = col == ownership_field
-        assoc_class_name = assoc.active_record.name
-        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]
-          hawk_root = hawk_definition[0]
-          hawk_scope = hawk_definition[1]
-          hawked_association = "#{hawk_root}.#{hawk_scope}"
-        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 %>" : "")
-
+        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 uuid_result(col)
+      association_result(col)
+    end
+
+
+    def association_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.active_record.name
+      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]
+        hawk_root = hawk_definition[0]
+        hawk_scope = hawk_definition[1]
+        hawked_association = "#{hawk_root}.#{hawk_scope}"
+      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
+
     def string_result(col, sql_type, limit)
       if sql_type == "varchar" || sql_type == "character varying"
         field_output(col, nil, limit || 40, col_identifier)
@@ -216,18 +217,14 @@ module  HotGlue
       @singular_class = args[0][:singular_class]
       @singular = args[0][:singular]
       @perc_width = args[0][:perc_width]
-      @layout = args[0][:layout]
-      @col_identifier =   args[0][:col_identifier]  || (layout == "bootstrap" ? "col-md-2" :  "scaffold-cell")
+      @col_identifier =  @layout_strategy.column_classes_for_line_fields
+
       @inline_list_labels = args[0][:inline_list_labels] || 'omit'
 
       columns_count = columns.count + 1
       perc_width = (@perc_width).floor
 
-      if layout == "bootstrap"
-        style_with_flex_basis = ""
-      else
-        style_with_flex_basis = " style='flex-basis: #{perc_width}%'"
-      end
+      style_with_flex_basis = @layout_strategy.style_with_flex_basis(perc_width)
 
       result = columns.map{ |column|
         "<div class='#{col_identifier}'#{style_with_flex_basis}>" +
@@ -238,14 +235,30 @@ module  HotGlue
           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")
+          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.active_record.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?
@@ -258,37 +271,34 @@ module  HotGlue
               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
+            when :float
+              width = (limit && limit < 40) ? limit : (40)
               "<%= #{singular}.#{col}%>"
-            end
-          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? %>
+            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? %>
+            when :date
+              "<% unless #{singular}.#{col}.nil? %>
       <%= #{singular}.#{col} %>
     <% else %>
     <span class='alert-danger'>MISSING</span>
     <% end %>"
-          when :time
-            "<% unless #{singular}.#{col}.nil? %>
+            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
-            "
+            when :boolean
+              "
     <% if #{singular}.#{col}.nil? %>
         <span class='alert-danger'>MISSING</span>
     <% elsif #{singular}.#{col} %>
@@ -297,8 +307,9 @@ module  HotGlue
       NO
     <% end %>
 
-  "        when :enum
-             enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
+  "
+            when :enum
+              enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
 
                        "
     <% if #{singular}.#{col}.nil? %>
@@ -308,8 +319,7 @@ module  HotGlue
     <% end %>
 
 "
-                         end #end of switch
-
+          end #end of switch
 
           label = "<br/><label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
 
@@ -319,4 +329,4 @@ module  HotGlue
       }.join("\n")
     end
   end
-end
+end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -7,11 +7,18 @@ require_relative './markup_templates/erb'
 # require_relative './markup_templates/slim'
 
 require_relative './layout/builder'
+require_relative './layout_strategy/base'
+require_relative './layout_strategy/bootstrap'
+require_relative './layout_strategy/hot_glue'
+require_relative './layout_strategy/tailwind'
+
 
 module HotGlue
   class Error < StandardError
   end
 
+
+
   def self.construct_downnest_object(input)
     res = input.split(",").map { |child|
       child_name = child.gsub("+","")
@@ -21,18 +28,14 @@ module HotGlue
     Hash[*res.collect{|hash| hash.collect{|key,value| [key,value].flatten}.flatten}.flatten]
   end
 
-  def self.optionalized_ternary(params)
-    namespace = params[:namespace] || nil
-    target = params[:target]
-    nested_set = params[:nested_set]
-    modifier = params[:modifier] || ""
-    with_params = params[:with_params] || false
-    top_level = params[:top_level] || false
-
+  def self.optionalized_ternary(namespace: nil,
+                                target:,
+                                nested_set:,
+                                modifier: "",
+                                with_params: false,
+                                top_level: false,
+                                put_form: false)
     instance_sym = top_level ? "@" : ""
-
-    put_form =  params[:put_form] || false
-
     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
@@ -50,17 +53,23 @@ module HotGlue
       nonoptional[:optional] = false
       rest_of_nest = nested_set[1..-1]
 
-      all_params = {namespace: namespace,
-                    target: target,
-                    modifier: modifier,
-                    top_level: top_level,
-                    with_params: with_params,
-                    put_form: put_form}
-      is_present_path = HotGlue.optionalized_ternary(all_params.merge({  nested_set: [nonoptional, *rest_of_nest]})       )
-
-      is_missing_path = HotGlue.optionalized_ternary(all_params.merge({  nested_set: rest_of_nest})       )
-
-
+      is_present_path = HotGlue.optionalized_ternary(
+        namespace: namespace,
+         target: target,
+         modifier: modifier,
+         top_level: top_level,
+         with_params: with_params,
+         put_form: put_form,
+         nested_set: [nonoptional, *rest_of_nest])
+
+      is_missing_path = HotGlue.optionalized_ternary(
+        namespace: namespace,
+        target: target,
+        modifier: modifier,
+        top_level: top_level,
+        with_params: with_params,
+        put_form: put_form,
+        nested_set: rest_of_nest  )
       return "defined?(#{instance_sym + nested_set[0][:singular]}) ? #{is_present_path} : #{is_missing_path}"
     end
   end
@@ -78,8 +87,6 @@ module HotGlue
       display_column = "display_name"
     elsif assoc_class.new.respond_to?("email")
       display_column = "email"
-    # else # SHOULD BE UNREACHABLE
-    #   raise("this should have been caught by the checker in the initializer")
     end
     display_column
   end
@@ -89,6 +96,7 @@ module HotGlue
 
     source_root File.expand_path('templates', __dir__)
     attr_accessor :path, :singular, :plural, :singular_class, :nest_with
+    attr_accessor :columns, :downnest_children, :layout_object
 
     class_option :singular, type: :string, default: nil
     class_option :plural, type: :string, default: nil
@@ -150,6 +158,7 @@ module HotGlue
         raise(HotGlue::Error, message)
       end
 
+      @meta_args = meta_args
 
       if options['specs_only'] && options['no_specs']
         raise(HotGlue::Error,  "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. Aborting.")
@@ -180,32 +189,38 @@ module HotGlue
       yaml_from_config = YAML.load(File.read("config/hot_glue.yml"))
       @markup =  yaml_from_config[:markup]
 
-      if  @markup == "erb"
-        @template_builder = HotGlue::ErbTemplate.new
-      elsif  @markup == "slim"
-        raise(HotGlue::Error,  "SLIM IS NOT IMPLEMENTED")
-      elsif  @markup == "haml"
-        raise(HotGlue::Error,  "HAML IS NOT IMPLEMENTED")
+      if options['layout']
+        layout = options['layout']
+      else
+        layout = yaml_from_config[:layout]
 
+        if !['hotglue', 'bootstrap', 'tailwind'].include? layout
+          raise "Invalid option #{layout} in Hot glue config (config/hot_glue.yml). You must either use --layout= when generating or have a file config/hotglue.yml; specify layout as either 'hotglue' or 'bootstrap'"
+        end
       end
 
+      @layout_strategy =
+        case layout
+        when 'bootstrap'
+          LayoutStrategy::Bootstrap.new(self)
+        when 'tailwind'
+          LayoutStrategy::Tailwind.new(self)
+        when 'hotglue'
+          LayoutStrategy::HotGlue.new(self)
+        end
 
-      if !options['layout']
-        @layout = yaml_from_config[:layout]
 
-        if !['hotglue', 'bootstrap'].include? @layout
-          raise "Invalid option #{@layout} in Hot glue config (config/hot_glue.yml). You must either use --layout= when generating or have a file config/hotglue.yml; specify layout as either 'hotglue' or 'bootstrap'"
-        end
-      else
-        @layout = options['layout']
+      if  @markup == "erb"
+        @template_builder = HotGlue::ErbTemplate.new(layout_strategy: @layout_strategy)
+      elsif  @markup == "slim"
+        raise(HotGlue::Error,  "SLIM IS NOT IMPLEMENTED")
+      elsif  @markup == "haml"
+        raise(HotGlue::Error,  "HAML IS NOT IMPLEMENTED")
       end
 
       args = meta_args[0]
-
-
       @singular = args.first.tableize.singularize # should be in form hello_world
 
-
       if @singular.include?("/")
         @singular = @singular.split("/").last
       end
@@ -292,8 +307,7 @@ module HotGlue
         raise HotGlue::Error, "You specified both --smart-layout and also specified grouping mode (there is a : character in your field include list); you must remove the colon(s) from your --include tag or remove the --smart-layout option"
       end
 
-
-      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
+      @container_name = @layout_strategy.container_name
       @downnest = options['downnest'] || false
 
       @downnest_children = [] # TODO: defactor @downnest_children in favor of downnest_object
@@ -353,7 +367,6 @@ module HotGlue
             plural: arg.pluralize,
             optional: is_optional
           }
-
         }
         puts "NESTING: #{@nested_set}"
       end
@@ -361,7 +374,6 @@ module HotGlue
       # OBJECT OWNERSHIP & NESTING
       @reference_name = HotGlue.derrive_reference_name(singular_class)
       if @auth && @self_auth
-        # byebug
         @object_owner_sym = @auth.gsub("current_", "").to_sym
         @object_owner_eval = @auth
         @object_owner_optional = false
@@ -369,18 +381,15 @@ module HotGlue
 
 
       elsif @auth && ! @self_auth && @nested_set.none? && !@auth.include?(".")
-        # byebug
         @object_owner_sym = @auth.gsub("current_", "").to_sym
         @object_owner_eval = @auth
         @object_owner_optional = false
         @object_owner_name = @auth.gsub("current_", "").to_s
 
       elsif @auth && @auth.include?(".")
-        # byebug
         @object_owner_sym = nil
         @object_owner_eval = @auth
       else
-        # byebug
         if @nested_set.any?
           @object_owner_sym = @nested_set.last[:singular].to_sym
           @object_owner_eval = "@#{@nested_set.last[:singular]}"
@@ -405,13 +414,11 @@ module HotGlue
 
       buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + @magic_buttons.count
 
-      builder = HotGlue::Layout::Builder.new({
-                                              include_setting: options['include'],
+      builder = HotGlue::Layout::Builder.new(include_setting: options['include'],
                                               downnest_object: @downnest_object,
                                               buttons_width: buttons_width,
                                               columns: @columns,
-                                              smart_layout: @smart_layout
-                                            })
+                                              smart_layout: @smart_layout )
       @layout_object = builder.construct
 
       @menu_file_exists = true if @nested_set.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
@@ -447,7 +454,6 @@ module HotGlue
       if @object_owner_sym && ! @self_auth
         auth_assoc_field = auth_assoc + "_id" unless @god
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
-        # byebug
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
         elsif ! @nested_set.any?
@@ -586,19 +592,10 @@ module HotGlue
     end
 
     def list_column_headings
-      if @layout == "bootstrap"
-        column_width = @layout_object[:columns][:size_each]
-        col_identifier = "col-md-#{column_width}"
-      elsif @layout == "hotglue"
-        column_width = each_col * @columns.count
-        col_identifier = "scaffold-cell"
-      end
-
       @template_builder.list_column_headings(
         columns: @layout_object[:columns][:container],
-        col_identifier: col_identifier,
-        layout: @layout,
-        column_width: column_width
+        col_identifier: @layout_strategy.column_classes_for_column_headings,
+        column_width: @layout_strategy.column_width
       )
     end
 
@@ -619,6 +616,11 @@ module HotGlue
       }.join(", ")
     end
 
+
+    def regenerate_me_code
+      "rails generate hot_glue:scaffold #{ @meta_args[0][0] } #{@meta_args[1].join(" ")}"
+    end
+
     def object_parent_mapping_as_argument_for_specs
       if @nested_set.any?
         ", " + @nested_set.last[:singular] + ": " + @nested_set.last[:singular]
@@ -899,6 +901,15 @@ module HotGlue
       )
     end
 
+    def nav_template
+      "#{namespace_with_trailing_dash}nav"
+    end
+
+
+    def include_nav_template
+      File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}")
+    end
+
     def copy_view_files
       return if @specs_only
       all_views.each do |view|
@@ -943,9 +954,10 @@ module HotGlue
 
     def append_model_callbacks
       # somehow the generator invokes this
+
       if options['with_turbo_streams'] == true
         dest_filename = cc_filename_with_extensions("#{singular_class.underscore}", "rb")
-        dest_filepath = File.join("#{'dummy/' if Rails.env.test?}app/models", dest_filename)
+        dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/models", dest_filename)
 
 
         puts "appending turbo callbacks to #{dest_filepath}"
@@ -1026,24 +1038,19 @@ module HotGlue
     end
 
     def all_form_fields
-      col_identifier = (@layout == "hotglue") ? "scaffold-cell" : "col-md-#{@layout_object[:columns][:size_each]}"
-
       @template_builder.all_form_fields(
         columns: @layout_object[:columns][:container],
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
         hawk_keys: @hawk_keys,
-        col_identifier:  col_identifier,
+        col_identifier:  @layout_strategy.column_classes_for_form_fields,
         ownership_field: @ownership_field,
         form_labels_position: @form_labels_position,
         form_placeholder_labels: @form_placeholder_labels
       )
     end
 
-    def column_width
-      @each_col ||= each_col
-    end
 
     def list_label
       if(eval("#{class_name}.class_variable_defined?(:@@table_label_plural)"))
@@ -1061,39 +1068,15 @@ module HotGlue
       end
     end
 
-    def each_col
-      return col_width if @columns.count == 0
-      (col_width/(@columns.count)).to_i
-    end
-
-    def col_width
-      downnest_size = case (@downnest_children.count)
-
-                      when 0
-                        downnest_size = 0
-                      when 1
-                        downnest_size = 40
-
-                      else
-                        downnest_size = 60
-
-                      end
-      100 - downnest_size - 5
-    end
-
     def all_line_fields
-      col_identifier = (@layout == "hotglue") ? "scaffold-cell" : "col-md-#{@layout_object[:columns][:size_each]}"
-
       @template_builder.all_line_fields(
-        perc_width: column_width,
+        perc_width: @layout_strategy.each_col,     #undefined method `each_col'
         columns:  @layout_object[:columns][:container],
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        layout: @layout,
-        col_identifier: col_identifier,
+        col_identifier: @layout_strategy.column_classes_for_line_fields,
         inline_list_labels: @inline_list_labels
-
       )
     end
 
@@ -1152,15 +1135,6 @@ 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 controller_magic_button_update_actions
       @magic_buttons.collect{ |magic_button|
         "    if #{singular}_params[:#{magic_button}]
@@ -1192,7 +1166,6 @@ module HotGlue
       end
     end
 
-
     def n_plus_one_includes
       if @associations.any?
         ".includes(" + @associations.map{|x| ":#{x.to_s}"}.join(", ") + ")"
@@ -1236,6 +1209,3 @@ module HotGlue
     end
   end
 end
-
-
-

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

@@ -1,4 +1,7 @@
 class <%= controller_class_name %> < <%= controller_descends_from %>
+  # regenerate this controller with
+  # <%= regenerate_me_code %>
+
   helper :hot_glue
   include HotGlue::ControllerHelper
 

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

@@ -1,7 +1,7 @@
 <div class="row">
 <%= all_form_fields %>
 
-  <div class="<%= @layout == "hotglue" ? 'scaffold-cell' : 'col-md-2' %>">
+  <div class="<%= @layout_strategy.column_classes_for_form_fields %>">
     <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
     <\%= f.hidden_field "_________" %><% end %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>

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

@@ -1,6 +1,6 @@
 <% if @turbo_streams %><\%= turbo_stream_from <%= singular %>  %>
 <% end %><\%= turbo_frame_tag "<%= @namespace %>__#{ dom_id(<%= singular %>) }" do  %>
-  <div class='row scaffold-row' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
+  <div class='<%= @layout_strategy.row_classes %>' data-id='<\%= <%= singular  %>.id %>' data-edit='false'>
     <\%= render partial: '<%=  show_path_partial %>', locals: { <%= singular %>: <%= singular %> }<% @nested_set.each do |nest_arg| %>.merge(defined?(<%= nest_arg[:singular] %>) ? {<%= nest_arg[:singular] %>: <%= nest_arg[:singular] %>, nested_for: "<%= nest_arg[:singular] %>-#{<%= nest_arg[:singular] %>.id}"} : {})<% end %> %>
 
   </div>

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

@@ -1,5 +1,5 @@
 <\%= turbo_frame_tag "<%= @namespace %>__<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
-  <div class="<%= @container_name %> scaffold-list">
+  <div class="<%= @container_name %> <%= @layout_strategy.list_classes %>">
     <% unless @no_list  || @no_list_label || (@nested_set.any? && !@nested_set.collect{|x| x[:optional]}.any?)  %>
       <% unless list_label.nil? %><h4>
         <%= list_label %>
@@ -10,14 +10,12 @@
 
     <% unless @no_list %>
       <% unless @no_list_heading %>
-        <div class="row scaffold-heading-row">
+        <div class="<%= @layout_strategy.row_classes %> <%= @layout_strategy.row_heading_classes %>">
           <%= list_column_headings %>
           <% if @downnest_object.any? %>
-            <%# each_downnest_width = @downnest_object.count == 1 ? 40 : (60/@downnest_object.count).floor %>
-            <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width.to_s +  '%;' : "" %>
-
+            <%= @layout_strategy.downnest_column_style  %>
             <% @downnest_object.each do |downnest,i| %>
-              <div class=" scaffold-col-heading<%= " col-sm-#{ @layout_object[:portals][downnest][:size] }" if @layout=="bootstrap" %>" <%= downnest_column_style %>>
+              <div class=" scaffold-col-heading <%= @layout_strategy.downnest_portal_column_width(downnest) %> <%= @layout_strategy.downnest_column_style %>">
                 <strong>
                   <%=  downnest.titleize  %>
                 </strong>
@@ -25,10 +23,7 @@
             <% end %>
           <% end %>
 
-          <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
-
-          <div class=' scaffold-col-heading scaffold-col-heading-buttons<%= " col-md-#{ @layout_object[:buttons][:size] }" if @layout=="bootstrap" %>' <%= button_column_style %>>
-
+          <div class=' scaffold-col-heading scaffold-col-heading-buttons <%= @layout_strategy.column_classes_for_column_headings %>' <%= @layout_strategy.button_column_style %>>
           </div>
         </div>
       <% end %>

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

@@ -9,7 +9,7 @@
     <% if downnest_object.nil?; raise "no relationship for downnested portal `#{downnest}` found on `#{singular_class}`; please check relationship for has_many :#{downnest}"; end; %>
     <% downnest_class = downnest_object.class_name %>
     <% downnest_object_name = eval("#{downnest_class}.table_name") %>
-    <% downnest_style =  @layout == "hotglue" ? 'style="flex-basis: ' +  each_downnest_width.to_s + '%"' : "" %>
+    <% downnest_style = @layout_strategy.downnest_style %>
     <div class="<%= " col-md-#{@layout_object[:portals][downnest][:size]}" if @layout == "bootstrap" %> scaffold-downnest" <%= downnest_style  %> >
   <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
         <%= @singular %>: <%= @singular %>,
@@ -22,8 +22,8 @@
   <% end %>
 <% 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-#{ @layout_object[:buttons][:size] }" if @layout == "bootstrap" %>" <%= button_style %>>
+<%= @layout_strategy.button_style %>
+<div class="<%= @col_identifier %> scaffold-line-buttons <%= @layout_strategy.button_classes %>" <%= @layout_strategy.button_style %>>
   <%= magic_button_output %>
 
   <% if destroy_action %>

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

@@ -1,14 +1,11 @@
 <% if @menu_file_exists %><\%= render partial: "<%= namespace_with_trailing_dash %>menu", locals: {active: '<%= plural %>'} %><% end %>
 
 <div class="<%= @container_name %>">
-  <% if @layout == "bootstrap" %><div class="row"> <div class="col-md-12">
-  <% else %>
-    <div class=' scaffold-index-<%= plural %>'>
-  <% end %>
+  <%= @layout_strategy.page_begin %>
+  <% if include_nav_template %><\%= render partial: "<%= nav_template %>", locals: {nav: "<%= @plural %>"} %><% end %>
 
-  <div class="clearfix"></div>
   <\%= render partial: '<%= list_path_partial %>',
     locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
 
-  <% if @layout == "bootstrap" %></div></div><% else  %></div><% end %>
+  <%= @layout_strategy.page_end %>
 </div>

data/lib/hot-glue.rb

@@ -1,11 +1,7 @@
 require "hotglue/engine"
 require 'kaminari'
 
-
 module HotGlue
-
-
-
   module TemplateBuilders
 
   end

data/lib/hotglue/engine.rb

@@ -1,6 +1,6 @@
 module HotGlue
   class Engine < ::Rails::Engine
 
-    config.autoload_paths << File.expand_path("lib/helpers/hot_glue_helper.rb", __dir__)
+
   end
 end

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.4'
+    CURRENT = '0.5.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-27 00:00:00.000000000 Z
+date: 2022-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,9 +75,12 @@ 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/layout_strategy/base.rb
+- lib/generators/hot_glue/layout_strategy/bootstrap.rb
+- lib/generators/hot_glue/layout_strategy/hot_glue.rb
+- lib/generators/hot_glue/layout_strategy/tailwind.rb
 - lib/generators/hot_glue/markup_templates/base.rb
 - lib/generators/hot_glue/markup_templates/erb.rb
 - lib/generators/hot_glue/scaffold_generator.rb

data/lib/generators/hot_glue/helpers.rb

@@ -1,13 +0,0 @@
-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