hot-glue 0.5.6 → 0.5.7

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

@@ -5,8 +5,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   helper :hot_glue
   include HotGlue::ControllerHelper
 
-  <% unless @auth_identifier == '' || @god %>before_action :<%= auth_root %><% end %>
-  <% if any_nested? %><% nest_chain = [] %> <% @nested_set.each { |arg|
+  <% unless @auth_identifier == '' || @god %>before_action :<%= auth_root %><% end %><% if any_nested? %>
+    <% nest_chain = [] %> <% @nested_set.each { |arg|
 
     if auth_identifier == arg[:singular]
       this_scope = auth_object
@@ -17,13 +17,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     end
 
      nest_chain << arg %>
-  before_action :<%= arg[:singular] %><%= ", if: -> { params.include?(:#{arg[:singular]}_id) }" if arg[:optional] %>
-
-    <% } %><% end %>
+  before_action :<%= arg[:singular] %><%= ", if: -> { params.include?(:#{arg[:singular]}_id) }" if arg[:optional] %><% } %><% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
-  after_action -> { flash.discard }, if: -> { request.format.symbol ==  :turbo_stream }
-<% if @nested_set.any? %>
-  def <%= @nested_set[0][:singular] %><% if @god
+  after_action -> { flash.discard }, if: -> { request.format.symbol == :turbo_stream }
+  <% if @nested_set.any? %>def <%= @nested_set[0][:singular] %><% if @god
        next_object = nil
        collect_objects = @nested_set.reverse.collect {|x|
            if eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})").nil?
@@ -39,9 +36,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
          root_object = @auth + "." + @nested_set[0][:plural]
        end
      end
- %>
-  <% if !@god && @nested_set[0][:singular] == @auth_identifier %>@<%= @nested_set[0][:singular] %> ||= <%= root_object %>
- <% else %>    @<%= @nested_set[0][:singular] %> ||= <%= root_object %>.find(params[:<%=  @nested_set[0][:singular]  %>_id])<%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %> <% end %>
+ %><% if !@god && @nested_set[0][:singular] == @auth_identifier %>
+    @<%= @nested_set[0][:singular] %> ||= <%= root_object %>
+ <% else %>
+    @<%= @nested_set[0][:singular] %> ||= <%= root_object %>.find(params[:<%=  @nested_set[0][:singular]  %>_id])<%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %> <% end %>
   end
   <% end %><% if any_nested? %><% nest_chain = [@nested_set[0][:singular]]; this_scope = @nested_set[0][:plural]; %>
     <%   for index in 0..(@nested_set.count - 1) do
@@ -54,18 +52,18 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   def <%= arg[:singular] %>
     @<%= arg[:singular] %> ||= (<%= this_scope %>.find(params[:<%= arg[:singular] %>_id])<%= " if params.include?(:#{last_arg[:singular]}_id)" if last_arg && @god && last_arg[:optional] %>)
       <% if @god && last_arg && (last_arg[:optional] ) %>@<%= arg[:singular] %> ||=  (<%=  collect_objects[index-1] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
-  end<% end %>
-    <% end %><% end %> <% if !@self_auth %>
+  end<% end %><% end %><% end %> <% if !@self_auth %>
   def load_<%= singular_name %>
-    @<%= singular_name %> = (<%= object_scope.gsub("@",'') %>.find(params[:id])<%= " if params.include?(:#{@nested_set.last[:singular]}_id)" if @nested_set[0] && @nested_set[0][:optional]  %>)<% if @nested_set[0] && @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
+    @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])<%= " if params.include?(:#{@nested_set.last[:singular]}_id)" if @nested_set[0] && @nested_set[0][:optional]  %><% if @nested_set[0] && @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
   end
   <% else %>
   def load_<%= singular_name %>
     @<%= singular_name %> = (<%= auth_object.gsub("@",'') %><%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set.any? && @nested_set[0][:optional] %>)<% if @nested_set.any? && @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
   end<% end %>
 
-  def load_all_<%= plural %> <% if !@self_auth %>
-    @<%= plural_name %> = ( <%= object_scope.gsub("@",'') %>.page(params[:page])<%= n_plus_one_includes %><%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set.any? && @nested_set[0] &&  @nested_set[0][:optional] %>) <% if @nested_set[0] &&  @nested_set[0][:optional] %> || <%= class_name %>.all<% end %> <% else %>
+  def load_all_<%= plural %><% if !@self_auth %>
+    @<%= plural_name %> = <%= object_scope.gsub("@",'') %>.page(params[:page])<%= n_plus_one_includes %><%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set.any? && @nested_set[0] &&  @nested_set[0][:optional] %><% if @nested_set[0] &&  @nested_set[0][:optional] %>
+    @<%= plural_name %> = <%= class_name %>.all<% end %><% else %>
     @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %> # returns iterable even though this <%= singular_name %> is only allowed access to themselves<% end %>
   end
 
@@ -73,19 +71,20 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     load_all_<%= plural %>
   end
 
-<% if create_action %>  def new <% if @object_owner_sym %>
-    @<%= singular_name %> = <%= class_name  %>.new(<%  if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>) <% elsif @object_owner_optional && any_nested? %>
-    @<%= singular_name %> = <%= class_name  %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {})) <% else %>
+<% if create_action %>  def new<% if @object_owner_sym %>
+    @<%= singular_name %> = <%= class_name  %>.new(<%  if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% elsif @object_owner_optional && any_nested? %>
+    @<%= singular_name %> = <%= class_name  %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}))<% else %>
     @<%= singular_name %> = <%= class_name  %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)
    <% end %>
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.merge!(<% if @object_owner_optional && any_nested? %><%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {} <% else  %> <%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>) <% end %>)
-<% if @hawk_keys.any? %>    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
-
-    @<%=singular_name %> = <%= class_name %>.create(modified_params)
-
+<% if @alt_lookups.any? %><%= @alt_lookups.collect{|key, data|
+    "    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"
+       }.join("/n") %><% end %> <% merge_lookups = @alt_lookups.collect{|key, data| "#{key.gsub("_id", "")}: #{key.gsub("_id", "")}" }.join(",") %>
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %><% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.merge!(<% if @object_owner_optional && any_nested? %><%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}<% else  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% end %>)<%= ".merge(#{merge_lookups})" if !merge_lookups.empty? %><% if @hawk_keys.any? %>
+    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
+    <%= creation_syntax %>
     if @<%= singular_name %>.save
       flash[:notice] = "Successfully created #{@<%= singular %>.<%= display_class %>}"
       load_all_<%= plural %>
@@ -102,9 +101,20 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
-    modified_params = modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %><% if @hawk_keys.any? %>
-    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
-      <%= controller_magic_button_update_actions %>
+<% if @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.any? %><%= @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.collect{|key, data|
+    "    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"
+       }.join("\n") %><% end %> <% merge_lookups = @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.collect{|key, data| "#{key.gsub("_id", "")}: #{key.gsub("_id", "")}" }.join(",") %>
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.merge!(<% if @object_owner_optional && any_nested? %><%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}<% else  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% end %>)<%= controller_update_params_tap_away_alt_lookups  %><%= ".merge(#{merge_lookups})" if !merge_lookups.empty? %>
+
+    <% if @hawk_keys.any? %>    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
+<% if @alt_lookups.any? %><%= @alt_lookups.collect{|key, data|
+    unless @factory_creation.include?("#{data[:assoc].downcase} = ")
+"    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"
+    end
+   }.join("/n") %><% end %><% if (@update_alt_lookups).any? %>
+      <%= @update_alt_lookups.collect{|key, data|
+   "    @#{ singular_name }.#{key.gsub("_id", "")} = #{key.gsub("_id", "")}"
+   }.join("/n") %><% end %>
     if @<%= singular_name %>.update(modified_params)
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
       flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
@@ -120,17 +130,17 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     begin
       @<%=singular_name%>.destroy
     rescue StandardError => e
-      flash[:alert] = "<%= singular_name.titlecase %> could not be deleted."
+      flash[:alert] = '<%= singular_name.titlecase %> could not be deleted.'
     end
     load_all_<%= plural %>
   end<% end %>
 
   def <%=singular_name%>_params
-    params.require(:<%= testing_name %>).permit( <%= (@columns - @show_only) + @magic_buttons.collect(&:to_sym) %> )
+    params.require(:<%= testing_name %>).permit(<%= (fields_filtered_for_email_lookups - @show_only) + @magic_buttons.collect(&:to_sym) %>)
   end
 
   def namespace
-    <% if @namespace %>"<%= @namespace %>/" <% else %>""<% end %>
+    <% if @namespace %>'<%= @namespace %>/'<% else %><% end %>
   end
 end
 

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

@@ -1,7 +1,7 @@
 <div class="row">
-<%= all_form_fields %>
+<%= form_fields_html %>
 
-  <div class="<%= @layout_strategy.column_classes_for_form_fields %>">
+  <div class="<%= @layout_strategy.column_classes_for_button_column %>">
     <\%= 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,7 +1,7 @@
 <% if @turbo_streams %><\%= turbo_stream_from <%= singular %>  %>
 <% end %><\%= turbo_frame_tag "<%= @namespace %>__#{ dom_id(<%= singular %>) }" do  %>
   <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 %> %>
+    <\%= 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>
 <\% end %>

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

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

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

@@ -1,9 +1,9 @@
 <\%= turbo_frame_tag "<%= @namespace %>__<%= singular %>-new" do %>
-<h3>
-  New <%= thing_label %>
+  <h3>
+    <%= @new_form_heading %>
   </h3>
   <\%= form_with model:  <%= singular %>, url: <%= form_path_new_helper %>, method: :post do  |f| \%>
     <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form",
-      locals: { <%=  singular %>: <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}}: {})" }.join %> \%>
-  <\% end %>
+locals: { <%=  singular %>: <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}}: {})" }.join %> \%>
+ <\% end %>
 <\% end %>

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

@@ -10,7 +10,7 @@
     <% downnest_class = downnest_object.class_name %>
     <% downnest_object_name = eval("#{downnest_class}.table_name") %>
     <% downnest_style = @layout_strategy.downnest_style %>
-    <div class="<%= " col-md-#{@layout_object[:portals][downnest][:size]}" if @layout == "bootstrap" %> scaffold-downnest" <%= downnest_style  %> >
+    <div class="<%= @layout_strategy.downnest_portal_column_width(downnest)  %> scaffold-downnest" <%= downnest_style  %> >
   <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {
         <%= @singular %>: <%= @singular %>,
         <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>
@@ -23,7 +23,7 @@
 <% end %>
 
 <%= @layout_strategy.button_style %>
-<div class="<%= @col_identifier %> scaffold-line-buttons <%= @layout_strategy.button_classes %>" <%= @layout_strategy.button_style %>>
+<div class=" scaffold-line-buttons <%= @layout_strategy.column_classes_for_button_column %>" <%= @layout_strategy.button_style %>>
   <%= magic_button_output %>
 
   <% if destroy_action %>

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

@@ -1,4 +1,4 @@
-<% if !@display_list_after_update %><\%= turbo_stream.replace "<%= namespace %>__#{dom_id(@<%= singular %>)}" do %>
+<% if !@display_list_after_update %><\%= turbo_stream.replace "<%= @namespace %>__#{dom_id(@<%= singular %>)}" do %>
   <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> }<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
 <\% end %><% else %><\%= turbo_stream.replace "<%= plural %>-list" do %>
   <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>

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

@@ -1,5 +1,5 @@
 .row
-<%= all_form_fields %>
+<%= form_fields_html %>
   .col
     = link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"}
     = f.submit "Save", class: "btn btn-primary pull-right"

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

@@ -1,23 +1,12 @@
 require 'rails_helper'
 
-describe "interaction for <%= controller_class_name %>", type: :feature do
+describe 'interaction for <%= controller_class_name %>', type: :feature do
   include HotGlue::ControllerHelper
   include ActionView::RecordIdentifier
 
   <%= @existing_content %>
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-<%= (@columns - @show_only).map { |col|
-    type = eval("#{singular_class}.columns_hash['#{col}']").type
-    case type
-    when :integer
-      if col.to_s.ends_with?("_id")
-        assoc = "#{col.to_s.gsub('_id','')}"
-        "  let!(:#{assoc}1) {create(:#{assoc}" +  (@hawk_keys["#{assoc}_id".to_sym] ? ", #{@auth.gsub('current_', '')}: #{@auth}": "")   + ")}"
-      end
-    else
-    end
-  }.compact.join("\n")
-        %>
+<%= spec_related_column_lets %>
   <% item1_addOns = ""
    if (eval(@singular_class).instance_methods.include?(display_class.to_s))
     item1_addOns << "#{display_class}: FFaker::Name.name"
@@ -27,7 +16,16 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
   type = eval("#{singular_class}.columns_hash['#{col}']").type
   case type
   when :string
-    (col.to_s.include?('email') ? "#{col}: FFaker::Internet.email" : "#{col}: FFaker::Movie.title")
+    faker_string =
+    if col.to_s.include?('email')
+      "#{col}: FFaker::Internet.email"
+    elsif  col.to_s.include?('domain')
+      "#{col}: FFaker::Internet.domain_name"
+    elsif col.to_s.include?('ip_address') || col.to_s.ends_with?('_ip')
+      "#{col}: FFaker::Internet.ip_v4_address"
+    else
+      "#{col}: FFaker::Movie.title"
+    end
   when :text
     "#{col}:  FFaker::Lorem.paragraphs(10).join("  ")"
 
@@ -47,10 +45,12 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     else
      "#{col}: rand(100)"
     end
+  when :uuid
+    "#{col.to_s.gsub('_id','')}: #{col.to_s.gsub('_id','')}1"
   end
 }.compact.join(", ")
   %>let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )}
-  <%= objest_nest_factory_setup %> <% unless @god %>
+<%= objest_nest_factory_setup %> <% unless @god || @existing_content.include?("login_as")%>
   before do
     login_as(<%= @auth %>)
   end <% end %>
@@ -61,6 +61,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 <%=
 @columns.map { |col|
   type = eval("#{singular_class}.columns_hash['#{col}']").type
+
   case type
   when :datetime
     "      " + ["expect(page).to have_content(#{singular}#{1}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(current_timezone)  )"].join("\n      ")
@@ -68,6 +69,15 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     if !col.ends_with?("_id")
       "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
     end
+  when :uuid
+    assoc_name = col.to_s.gsub('_id','')
+    association = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+
+
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{assoc_name}.#{HotGlue.derrive_reference_name(association.class_name)})"].join("\n      ")
+
+  when :boolean
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{col} ? 'YES' : 'NO')"].join("\n      ")
   else
         "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
   end
@@ -80,9 +90,9 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 <% unless @no_create %>  describe "new & create" do
     it "should create a new <%= singular.titlecase %>" do
       visit <%= path_helper_plural %>
-      click_link "New <%= thing_label %>"
-      expect(page).to have_selector(:xpath, './/h3[contains(., "New <%= thing_label %>")]')
-<%= test_capybara_block %>
+      click_link "<%= @new_button_label %>"
+      expect(page).to have_selector(:xpath, './/h3[contains(., "<%= @new_button_label %>")]')
+<%= test_capybara_block(:create) %>
       click_button "Save"
       expect(page).to have_content("Successfully created")
 <%="      " +
@@ -92,7 +102,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 
     case type
     when :datetime
-      #    "      expect(page).to have_content(new_#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y')  + \" @ \" +
+      #    "      expect(page).to have_content(#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y')  + \" @ \" +
       # new_#{col}.in_time_zone(current_timezone).strftime('%l').strip + \":\" +
       # new_#{col}.in_time_zone(current_timezone).strftime('%M %p').strip + \" \" +
       # timezonize(current_timezone))"
@@ -102,6 +112,10 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       else
          "expect(page).to have_content(new_#{col})"
       end
+
+    when :boolean
+        ["expect(page).to have_content(#{singular}#{1}.#{col} ? 'YES' : 'NO')"].join("\n      ")
+
     else
       "expect(page).to have_content(new_#{col})"
     end
@@ -118,25 +132,23 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= singular %>1.id}/edit']").click
 
       expect(page).to have_content("Editing #{<%= singular %>1.<%= @display_class %>.squish || "(no name)"}")
-<%= test_capybara_block %>
+<%= test_capybara_block(:update) %>
       click_button "Save"
       within("turbo-frame#<%= @namespace %>__#{dom_id(<%= singular %>1)} ") do
-<%=
-    (@columns - @show_only).map { |col|
+<%= (@columns - @show_only).map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
-      case type
-      when :datetime
-        # TODO: implement me
-      when :time
-        # TODO: implement me
-      when :date
-        # TODO: implement me
-      when :boolean
-        # TODO: implement me
+
+      if type == :uuid || (type == :integer && col.to_s.ends_with?("_id"))
+        assoc = col.to_s.gsub('_id', '')
+        class_name = eval("#{@singular_class}.reflect_on_association(:#{assoc})").class_name
+      "        expect(page).to have_content(#{assoc}1.#{HotGlue.derrive_reference_name(class_name)})"
+
+      elsif type == :boolean
+      '        expect(page).to have_content(new_' + col.to_s + ' ? "YES" : "NO")'
+
       else
-        unless type==:integer && col.to_s.ends_with?("_id")
-        '        expect(page).to have_content(new_' + col.to_s + ')'
-        end
+      '        expect(page).to have_content(new_' + col.to_s + ')'
+
       end
     }.compact.join("\n")
     %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.6'
+    CURRENT = '0.5.7'
   end
 end

data/script/clean_generated_code

@@ -5,6 +5,9 @@ rm dummy/app/controllers/dfgs_controller.rb
 rm dummy/app/controllers/cantelopes_controller.rb
 rm dummy/app/controllers/jkls_controller.rb
 rm dummy/app/controllers/users_controller.rb
+rm dummy/app/controllers/humans_controller.rb
+rm dummy/app/controllers/pets_controller.rb
+
 
 rm -rf dummy/app/views/cantelopes/*
 rm -rf dummy/app/views/jkls/*
@@ -12,6 +15,8 @@ rm -rf dummy/app/views/ghis/*
 rm -rf dummy/app/views/abcs/*
 rm -rf dummy/app/views/dfgs/*
 rm -rf dummy/app/views/users/*
+rm -rf dummy/app/views/humans/*
+rm -rf dummy/app/views/pets/*
 
 /bin/rm -rf dummy/spec/system/
 

data/script/test

@@ -31,13 +31,21 @@ rails generate hot_glue:scaffold Dfg --auth=current_user
 
 rails generate hot_glue:scaffold Fruits::Cantelope --gd
 
+rails generate hot_glue:scaffold Pet --gd
+
+rails generate hot_glue:scaffold Human --gd
+
 #rails generate hot_glue:scaffold User --no-create --self-auth
 #rails generate hot_glue:scaffold Jkl --gd
-#rails generate hot_glue:scaffold Pet --gd
 #rails generate hot_glue:scaffold Appointment --hawk=pets --gd
-#rails generate hot_glue:scaffold Humen --gd
 #rails generate hot_glue:scaffold Family --gd
 
+# TODO: test these
+# --update-show-only
+# --alt-lookup-foreign-keys
+# --factory-creation
+
+
 
 rspec spec || exit
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails