hot-glue 0.4.0 → 0.4.4

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -6,6 +6,8 @@ require_relative './markup_templates/erb'
 require_relative './markup_templates/haml'
 require_relative './markup_templates/slim'
 
+require_relative './layout/builder'
+
 module HotGlue
   class Error < StandardError
   end
@@ -56,26 +58,27 @@ module HotGlue
     class_option :no_paginate, type: :boolean, default: false
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
-    class_option :stimulus_syntax, type: :boolean, default: nil
+
+    class_option :stimulus_syntax, type: :boolean, default: nil # TODO: rename to ujs_syntax and default to false
+
     class_option :downnest, type: :string, default: nil
-    class_option :nestable, type: :boolean, default: false
     class_option :magic_buttons, type: :string, 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 # deprecated -- use in app config instead
+    class_option :layout, type: :string, default: nil # if used here it will override what is in the config
 
 
     def initialize(*meta_args)
       super
 
+
       begin
         @the_object = eval(class_name)
       rescue StandardError => e
         message = "*** Oops: It looks like there is no object for #{class_name}. Please define the object + database table first."
         puts message
-        exit
-        # raise(HotGlue::Error, message)
+        raise(HotGlue::Error, message)
       end
 
       if !options['spec_only'].nil? && !options['no_spec'].nil?
@@ -83,10 +86,13 @@ module HotGlue
       end
 
       if !options['exclude'].empty? && !options['include'].empty?
-        puts "*** Oops: You seem to have specified both --include and --exclude. Please use one or the other. Aborting."
-        exit
+        exit_message =  "*** Oops: You seem to have specified both --include and --exclude. Please use one or the other. Aborting."
+        puts exit_message
+
+        raise(HotGlue::Error, exit_message)
       end
 
+
       if @stimulus_syntax.nil?
         if Rails.version.split(".")[0].to_i >= 7
           @stimulus_syntax = true
@@ -96,13 +102,14 @@ module HotGlue
       end
 
       if !options['markup'].nil?
-        puts "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
-        exit
+        message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        raise(HotGlue::Error, message)
+
       end
 
       if !options['markup'].nil?
-        puts "Using --layout flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
-        exit
+        message = "Using --layout flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        raise(HotGlue::Error, message)
       end
 
       yaml_from_config = YAML.load(File.read("config/hot_glue.yml"))
@@ -111,8 +118,8 @@ module HotGlue
       if  @markup == "erb"
         @template_builder = HotGlue::ErbTemplate.new
       elsif  @markup == "slim"
-        puts "SLIM IS NOT IMPLEMENTED; please see https://github.com/jasonfb/hot-glue/issues/3"
-        abort
+        message =  "SLIM IS NOT IMPLEMENTED; please see https://github.com/jasonfb/hot-glue/issues/3"
+        raise(HotGlue::Error, message)
         @template_builder = HotGlue::SlimTemplate.new
 
       elsif  @markup == "haml"
@@ -120,13 +127,16 @@ module HotGlue
       end
 
 
-      @layout = yaml_from_config[:layout]
+      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 pass either hotglue (default) or bootstrap to config"
+        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']
       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
@@ -144,7 +154,8 @@ module HotGlue
 
       if !options['include'].empty?
         @include_fields = []
-        @include_fields += options['include'].split(",").collect(&:to_sym)
+        # semicolon to denote layout columns; commas separate fields
+        @include_fields += options['include'].gsub(":","").split(",").collect(&:to_sym)
       end
 
 
@@ -168,10 +179,9 @@ module HotGlue
       @no_list = options['no_list'] || false
 
       @display_list_after_update = options['display_list_after_update'] || false
+      @smart_layout = options['smart_layout']
 
 
-
-      @col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col"
       @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
 
       @downnest = options['downnest'] || false
@@ -211,7 +221,6 @@ module HotGlue
       @build_update_action = !@no_edit || !@magic_buttons.empty?
       # if the magic buttons are present, build the update action anyway
 
-      # @nestable = options['nestable'] || false
 
       if @auth && ! @self_auth && @nested_args.none?
         @object_owner_sym = @auth.gsub("current_", "").to_sym
@@ -227,12 +236,22 @@ module HotGlue
         end
       end
 
-
-
       @reference_name = HotGlue.derrive_reference_name(singular_class)
 
       identify_object_owner
       setup_fields
+
+      builder = HotGlue::Layout::Builder.new({
+                                              include_setting: options['include'],
+                                              downnest_children: @downnest_children,
+                                              no_edit: @no_edit,
+                                              no_delete: @no_delete,
+                                              columns: @columns,
+                                              smart_layout: @smart_layout
+                                            })
+      @layout_object = builder.construct
+
+      @menu_file_exists = true if @nested_args.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
     end
 
     def identify_object_owner
@@ -251,17 +270,15 @@ module HotGlue
           if @god
             exit_message= "*** Oops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
           else
-            @auth_check = "current_user"
+            @auth_check = eval(@auth_identifier.titleize)
             @nested_args.each do |arg|
-
-              if !@auth_check.method("#{arg}s")
+              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."
               end
             end
           end
           puts exit_message
-          exit
-
+          raise(HotGlue::Error, exit_message)
         end
       end
     end
@@ -302,26 +319,20 @@ module HotGlue
             begin
               eval(assoc.class_name)
             rescue NameError => e
-              exit_message = "*** Oops: The model #{singular_class} is missing an association for #{assoc_name} or the model doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; your model #{singular_class.titlecase} should have_many :#{assoc_name}s.  To make a controller that can read all records, specify with --god."
+              exit_message = "*** Oops: The model #{singular_class} is missing an association for :#{assoc_name} or the model #{assoc_name.titlecase} doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; your model #{singular_class.titlecase} should belong_to :#{assoc_name}.  To make a controller that can read all records, specify with --god."
               puts exit_message
-              exit
-              # raise(HotGlue::Error, exit_message)
-
+              raise(HotGlue::Error, exit_message)
             end
 
 
             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)
+              raise(HotGlue::Error,exit_message)
             end
 
             assoc_class = eval(assoc.class_name)
-
             name_list = [:name, :to_label, :full_name, :display_name, :email]
-
-
             if name_list.collect{ |field|
               assoc_class.column_names.include?(field.to_s) ||  assoc_class.instance_methods.include?(field)
             }.any?
@@ -335,7 +346,6 @@ module HotGlue
       end
     end
 
-    #
     def formats
       [format]
     end
@@ -359,7 +369,25 @@ module HotGlue
       end
 
       unless @no_specs
-        template "system_spec.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
+        dest_file = File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_behavior_spec.rb")
+
+        if  File.exists?(dest_file)
+          existing_file = File.open(dest_file)
+          existing_content = existing_file.read
+          if existing_content =~ /\#HOTGLUE-SAVESTART/
+            if  existing_content !~ /\#HOTGLUE-END/
+              raise "Your file at #{dest_file} contains a #HOTGLUE-SAVESTART marker without #HOTGLUE-END"
+            end
+            @existing_content =  existing_content[(existing_content =~ /\#HOTGLUE-SAVESTART/) .. (existing_content =~ /\#HOTGLUE-END/)-1]
+            @existing_content << "#HOTGLUE-END"
+
+          end
+          existing_file.rewind
+        else
+          @existing_content = "  #HOTGLUE-SAVESTART\n  #HOTGLUE-END"
+        end
+
+        template "system_spec.rb.erb", dest_file
       end
 
       template "#{@markup}/_errors.#{@markup}", File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}", "_errors.#{@markup}")
@@ -368,24 +396,26 @@ module HotGlue
     def list_column_headings
       if @nested_args.any?
         column_width = each_col * @columns.count
-
-        "<div class='#{@col_identifier}'  style='flex-basis: #{column_width}%'>"
       else
-        @template_builder.list_column_headings(
-          column_width: each_col,
-          columns: @columns,
-          col_identifier: @col_identifier
-        )
+        column_width = 0
       end
 
+      if !@smart_layout
+        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-1"
+      else
+        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-2"
+      end
 
+      @template_builder.list_column_headings(
+        columns: @layout_object[:columns][:container],
+        col_identifier: col_identifier,
+        layout: @layout,
+        column_width: column_width
+      )
     end
 
     def columns_spec_with_sample_data
       @columns.map { |c|
-        if eval("#{singular_class}.columns_hash['#{c}']").nil?
-          byebug
-        end
         type = eval("#{singular_class}.columns_hash['#{c}']").type
         random_data = case type
                       when :integer
@@ -590,21 +620,6 @@ module HotGlue
         magic_buttons: @magic_buttons
       )
     end
-    # def erb_replace_ampersands!(filename = nil)
-    #
-    #   return if filename.nil?
-    #   file = File.open(filename, "r")
-    #   contents = file.read
-    #   file.close
-    #
-    #   file = File.open(filename, "w")
-    #   file.write( contents.gsub('\%', '%'))
-    #   file.close
-    # end
-
-
-
-
 
     def copy_view_files
       return if @specs_only
@@ -656,20 +671,35 @@ module HotGlue
     end
 
     def all_views
-      res =  %w(index edit _form _line _list _show _errors)
+      res =  %w(index  _line _list _show _errors)
 
       unless @no_create
         res += %w(new _new_form _new_button)
       end
 
+      unless @no_edit
+        res << 'edit'
+        res << '_form'
+      end
+
       res
     end
 
     def turbo_stream_views
-      res = %w(create  edit update)
+      res = []
       unless @no_delete
         res << 'destroy'
       end
+
+      unless @no_create
+        res << 'create'
+      end
+
+      unless @no_edit
+        res << 'edit'
+        res << 'update'
+      end
+
       res
     end
 
@@ -687,13 +717,19 @@ module HotGlue
     end
 
     def all_form_fields
+      # TODO: DRY THIS
+      if !@smart_layout
+        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-1"
+      else
+        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-2"
+      end
 
       @template_builder.all_form_fields(
-        columns: @columns,
+        columns: @layout_object[:columns][:container],
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        col_identifier:  @col_identifier
+        col_identifier:  col_identifier
       )
     end
 
@@ -702,7 +738,8 @@ module HotGlue
     end
 
     def each_col
-      (col_width/@columns.count).to_i
+      return col_width if @columns.count == 0
+      (col_width/(@columns.count)).to_i
     end
 
     def col_width
@@ -724,7 +761,7 @@ module HotGlue
 
       @template_builder.all_line_fields(
         perc_width: column_width,
-        columns: @columns,
+        columns:  @layout_object[:columns][:container],
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,

data/lib/generators/hot_glue/templates/capybara_login.rb

@@ -1,7 +1,7 @@
-def login_as(account)
-  visit '/accounts/sign_in'
+def login_as(user)
+  visit '/users/sign_in'
   within("#new_account") do
-    fill_in 'Email', with: account.email
+    fill_in 'Email', with: user.email
     fill_in 'Password', with: 'password'
   end
   click_button 'Log in'

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

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

@@ -2,31 +2,30 @@
   <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('\\',"")  %><% end %>
+    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><br /><% end %>
 
     <% unless @no_list  %>
-    <div class="row scaffold-row">
+    <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 +  '%;' : "" %>
+        <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width.to_s +  '%;' : "" %>
 
-        <% @downnest_children.each do |downnest| %>
-        <div class="<%= @col_identifer %> scaffold-col-heading<%= ' col-md-3' if @layout=="bootstrap" %>" <%= downnest_column_style %>>
-          <h4>
+        <% @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  %>
-          </h4>
+          </strong>
         </div>
       <% end %>
       <% end %>
 
       <% 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 class=' scaffold-col-heading scaffold-col-heading-buttons<%= ' col-md-2' if @layout=="bootstrap" %>' <%= button_column_style %>>
 
       </div>
     </div>
-
       <\% if <%= plural %>.empty? %>
     <div>
         None
@@ -36,8 +35,6 @@
         <\%= 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  %>
+  <% end  %>
   </div>
 <\% end %>

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

@@ -3,29 +3,31 @@
 <% if @downnest_children.any? %>
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
 
-  <% @downnest_children.each do |downnest| %>
+  <% @downnest_children.each_with_index do |downnest,i| %>
 
-    <% 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: {
+    <% downnest_object =  eval("#{singular_class}.reflect_on_association(:#{downnest})") %>
+    <% 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 + '%"' : "" %>
+    <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: {
     nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if nested_for}<% end %><%= @singular %>-#{<%= @singular %>.id}",
     <%= @singular %>: <%= @singular %><%= nest_assignments_operator(false, true) %>,
-    <%= downnest %>: <%= @singular %>.<%= downnest %>} %>
+    <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>} %>
   </div>
   <% 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-2' 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" %>
     <\% end %>
   <% end %>
 
-
-  <%= magic_button_output %>
-
   <% unless @no_edit %>
   <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary btn-sm" %>
   <% end %>

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

@@ -1,3 +1,5 @@
+<% 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 %>