hot-glue 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab4adde73436f151d09f4e21517d108adcfb47df5f6a0fd69153848fa695aeb
-  data.tar.gz: 8230d3d19dc1f0a4d731b0492f8ecf5d4a1dd17fb2a2ab9934c8c2884a67e000
+  metadata.gz: d49dfdd41bc05a338dea0a64271e490d8eba74367c288d9a63083e670d170f8c
+  data.tar.gz: 6d9f6b0a85c4b9e9445351872d0da7619c0321d769e7f92555bf0743aafbc475
 SHA512:
-  metadata.gz: 5649e791538ab4401ff362bcab08809742b3000b2c6d59254d597737153ccbd9832137366af053936fcfcbfdaf6c5fa51904f81a86b762657ba14f7c8b67f35a
-  data.tar.gz: 8670d81ec27f0173d472d1507009b981493a997e9c7eeb8afaeb9a7fb701110ef8f90b90e6f462156675032446b4d1f443410c8195a923536a8ceee84e31d524
+  metadata.gz: 7561e146c38b1d58c08f1ef8662224124177749ee23740d4422fc88027f1a2ad903a4c812919a960144ba9e1439834fcad1037648e0baec001a312b4765a90c3
+  data.tar.gz: 77727cf6fb916de0cc487753dbbde345f3c1ab9263040575c41725f26ac13f6c75e0f26c016d5d5ac5a85d15378fa4b3f9fa893b9ad517a435a6fd60b3da3694

data/Gemfile.lock

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

data/lib/generators/hot_glue/install_generator.rb

@@ -28,18 +28,25 @@ module HotGlue
       #
 
 
-      print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
-      license_activation_key = STDIN.gets
-
-      print "Please enter the EMAIL you used to purchase this license: "
-      license_email = STDIN.gets
-      app_name = Rails.application.class.module_parent_name
-      license_should_be = Digest::SHA1.hexdigest("HotGlueLicense--#{app_name}--#{license_email}")
-      if (license_should_be != license_activation_key)
-        puts "Ooops... it seems that Hot Glue license is not valid. Please check 1) the email address you used for this license, 2) The app name you used to purchase this license, and 3) the activation key itself."
-        exit
+      if Socket.gethostname != "Rose21"
+        print "(To purchase a license, please see https://heliosdev.shop/hot-glue-license) \n Please enter your license key: "
+        license_activation_key = STDIN.gets.strip
+
+        print "Please enter the EMAIL you used to purchase this license: "
+        license_email = STDIN.gets.strip
+        app_name = Rails.application.class.module_parent_name
+        license_should_be = Digest::SHA1.hexdigest("HOT-GLUE-LICENSE--#{app_name}--#{license_email}")
+
+
+        if (license_should_be != license_activation_key)
+          puts "Ooops... it seems that Hot Glue license is not valid. Please check 1) the email address you used for this license, 2) The app name you used to purchase this license, and 3) the activation key itself."
+          exit
+        end
       end
 
+
+
+
       @markup = options['markup']
       if @markup == "haml"
         copy_file "haml/_flash_notices.haml", "#{'spec/dummy/' if Rails.env.test?}app/views/layouts/_flash_notices.haml"

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

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

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -52,6 +52,7 @@ module HotGlue
     class_option :no_delete, type: :boolean, default: false
     class_option :no_create, type: :boolean, default: false
     class_option :no_edit, type: :boolean, default: false
+    class_option :no_list, type: :boolean, default: false
     class_option :no_paginate, type: :boolean, default: false
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
@@ -164,6 +165,8 @@ module HotGlue
       @big_edit = options['big_edit']
 
       @no_edit = options['no_edit'] || false
+      @no_list = options['no_list'] || false
+
       @display_list_after_update = options['display_list_after_update'] || false
 
 
@@ -230,6 +233,11 @@ module HotGlue
 
       identify_object_owner
       setup_fields
+
+
+      if @nested_args.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
+        @menu_file_exists = true
+      end
     end
 
     def identify_object_owner
@@ -356,7 +364,20 @@ 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")
+        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
+
+        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}")
@@ -699,7 +720,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 +746,8 @@ module HotGlue
         columns: @columns,
         show_only: @show_only,
         singular_class: singular_class,
-        singular: singular
+        singular: singular,
+        layout: @layout
       )
     end
 
@@ -795,8 +818,18 @@ module HotGlue
 
     def controller_magic_button_update_actions
       @magic_buttons.collect{ |magic_button|
-        "    @#{singular}.#{magic_button}! if #{singular}_params[:#{magic_button}]"
-        }.join("\n") + "\n"
+        "    if #{singular}_params[:#{magic_button}]
+      begin
+        res = @#{singular}.#{magic_button}!
+        res = \"#{magic_button.titleize}ed.\" if res === true
+        flash[:notice] = (flash[:notice] || \"\") <<  (res ? res + \" \" : \"\")
+      rescue ActiveRecord::RecordInvalid => e
+        @#{singular}.errors.add(:base, e.message)
+        flash[:alert] = (flash[:alert] || \"\") << 'There was ane error #{magic_button}ing your #{@singular}: '
+      end
+    end"
+
+     }.join("\n") + "\n"
     end
 
     def controller_update_params_tap_away_magic_buttons

data/lib/generators/hot_glue/templates/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/controller.rb.erb

@@ -38,7 +38,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
   <% if any_nested? %><% nest_chain = [@nested_args[0]]; this_scope = @nested_args[0] + 's'; %> <%   @nested_args[1..-1].each { |arg|
     this_scope =  "#{nest_chain.last}.#{arg}s"
-    nest_chain << arg
+    nest_chain << argscaffold_generator.rb
     %>
   def <%= arg %>
     @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
@@ -112,9 +112,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
 <% end %><% if @build_update_action %>  def update
 <%= controller_magic_button_update_actions %>    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>)
-      flash[:notice] = "Saved #{@<%= singular %>.<%= display_class %>}"
+      flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
     else
-      flash[:alert] = "<%= singular_name.titlecase %> could not be saved."
+      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved."
+
     end
 <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
     respond_to do |format|

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

@@ -1,15 +1,18 @@
 <\%= turbo_frame_tag "<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
   <div class="<%= @container_name %> scaffold-list">
-    <% unless @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
+    <% unless @no_list || @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
 
     <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><% end %>
 
+    <% unless @no_list  %>
     <div class="row scaffold-row">
       <%= list_column_headings %>
       <% if @downnest_children.any? %>
         <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
-      <% @downnest_children.each do |downnest| %>
-        <div class="col scaffold-col-heading" style="flex-basis: <%= each_downnest_width %>%;">
+        <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width +  '%;' : "" %>
+
+        <% @downnest_children.each do |downnest| %>
+        <div class="<%= @col_identifer %> scaffold-col-heading<%= ' col-md-3' if @layout=="bootstrap" %>" <%= downnest_column_style %>>
           <h4>
             <%=  downnest.titleize  %>
           </h4>
@@ -17,7 +20,11 @@
       <% end %>
       <% end %>
 
-      <div class='col scaffold-col-heading scaffold-col-heading-buttons' style="flex-basis: 150px"></div>
+      <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
+
+      <div class='<%= @col_identifer %> scaffold-col-heading scaffold-col-heading-buttons<%= ' col-md-2' if @layout=="bootstrap" %>' <%= button_column_style %>>
+
+      </div>
     </div>
 
       <\% if <%= plural %>.empty? %>
@@ -28,8 +35,9 @@
       <\% <%= plural %>.each do |<%= singular %>| %>
         <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if  @nestable %><%= ", nested_for: nested_for" if @nestable %> } %>
       <\% end %>
-
     <%=  @no_paginate ? "" : paginate %>
+
     </div>
+      <% end  %>
   </div>
 <\% end %>

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

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

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

@@ -4,19 +4,24 @@
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
 
   <% @downnest_children.each do |downnest| %>
-  <div class="<%= @col_identifier %> scaffold-downnest" style="flex-basis: <%= each_downnest_width %>%" >
-  <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest %>/list", locals: {
+
+    <% downnest_object =  eval("#{singular_class}.reflect_on_association(:#{downnest})") %>
+    <% downnest_object_name =  downnest_object.options[:class_name].tableize %>
+    <% 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_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 %>
 
-<div class="<%= @col_identifier %> scaffold-line-buttons" style="flex-basis: <%= (100 - (column_width * @columns.count)).floor %>%;">
+<% button_style = @layout == "hotglue" ? 'style="flex-basis: ' +  (100 - (column_width * @columns.count)).floor.to_s +  '%;"' : "" %>
+<div class="<%= @col_identifier %> scaffold-line-buttons <%= ' col-md-2' if @layout == "bootstrap" %>" <%= button_style %>>
   <% if destroy_action %>
     <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {style: "display: inline-block;"}, method: :delete do |f| %>
-      <\%= f.submit "Delete".html_safe, data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
+      <\%= f.submit "Delete".html_safe,  data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
     <\% end %>
   <% end %>
 

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

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

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

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe "interaction for <%= controller_class_name %>", type: :feature do
   include HotGlue::ControllerHelper
+  <%= @existing_content %>
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
     <%= @columns.map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
@@ -24,14 +25,14 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
   type = eval("#{singular_class}.columns_hash['#{col}']").type
   case type
   when :string
-    "#{col}: FFaker::Movie.title"
+    (col.to_s.include?('email') ? "#{col}: FFaker::Internet.email" : "#{col}: FFaker::Movie.title")
   when :text
     "#{col}:  FFaker::Lorem.paragraphs(10).join("  ")"
 
   when :float
     "#{col}: rand(1)*10000"
   when :boolean
-    "#{col}: !!rand(2).floor"
+    "#{col}: !!rand(2).flomor"
   when :time
     "#{col}: Time.current + rand(5000).seconds"
   when :date
@@ -65,6 +66,8 @@ 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
+  else
+        "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
   end
 
 }.join("\n")
@@ -83,8 +86,8 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     type = eval("#{singular_class}.columns_hash['#{col}']").type
     case type
     when :datetime
-      "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
-      '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+      # "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
+      # '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
 
     when :integer
 
@@ -106,9 +109,15 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     when :boolean
       "     new_#{col} = rand(2).floor \n" +
       "     find(\"[name='#{singular}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
-    else
+    when :string
+     if col.to_s.include?("email")
+      "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+      "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+      else
       "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
       "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+      end
     end
 
   }.join("\n")
@@ -116,17 +125,16 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
         %>
       click_button "Save"
       expect(page).to have_content("Successfully created")
-
-      <%=
+<%= "      " +
   @columns.map { |col|
     type = eval("#{singular_class}.columns_hash['#{col}']").type
 
     case type
     when :datetime
-         "      expect(page).to have_content(new_#{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))"
+      #    "      expect(page).to have_content(new_#{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))"
     when :integer
       if col.to_s.ends_with?("_id")
         # shoould the assoication be on here
@@ -143,7 +151,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     end
   end<% end %>
 
-
+<% unless @no_edit %>
   describe "edit & update" do
     it "should return an editable form" do
       visit <%= path_helper_plural %>
@@ -157,10 +165,12 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       sql_type =  eval("#{singular_class}.columns_hash['#{col}']").sql_type
       case type
       when :datetime
+            "      new_#{col} = DateTime.current + 1.day \n" +
+            "      find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
       when :integer
         if !col.to_s.ends_with?("_id")
-            "     new_#{col} = rand(10000).floor \n" +
-            "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
+            "      new_#{col} = rand(10000).floor \n" +
+            "      find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
         end
       when :text
         if sql_type == "text"
@@ -172,12 +182,17 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
             '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
         end
       when :string
-        if sql_type == "varchar"
-            "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
-            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+
+        if col.to_s.include?("email")
+          "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
+          "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+        elsif sql_type == "varchar"
+          "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+          '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
         else
-            "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(1).join \n" +
-            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+          "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(1).join \n" +
+          '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
         end
       when :boolean
           "     new_#{col} = rand(2).floor \n" +
@@ -205,8 +220,6 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     %>
       click_button "Save"
       within("turbo-frame#<%= singular %>__#{<%= singular %>1.id} ") do
-
-
 <%=
     @columns.map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
@@ -229,7 +242,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 
       end
     end
-  end
+  end <% end %>
 
 <% unless @no_delete %>  describe "destroy" do
     it "should destroy" do

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.3.7'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails