hot-glue 0.5.25 → 0.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2b46bf01f0742356ab56ad4cd139534becbe919b8e38ac8d166f8ca1c1c47c
-  data.tar.gz: b697f19f9928249d693632ff040f7ebb97ddf396fd8fb8d74b60f3abfe3a6bca
+  metadata.gz: 226e0b7e11441c4332105233fc63eb44f879d582c4ce791e18e56bd54de56627
+  data.tar.gz: a1befc9f7e6d059b502730f4d7411d7aab538b8a239572163e112d85a364d39a
 SHA512:
-  metadata.gz: 9ad16ec01f21d5ac9013cbbc0ee2e364cce4deec8ff52544d34438c641a4009d763ff953e70813d2f4b5e5b35904959ca49b5fea50dc8187c254c0bc0a19850c
-  data.tar.gz: f7cbb297d36077486c6983b0dfebee09b32871b316f28fe215f3578df5054445f337d372e13b55d84f44f30a6e4e0de776df14cb3137a4ec12c8e481ed38abba
+  metadata.gz: fb0ce5e6cf19d8528f3a7cdf421f4cdaf81a10c8670b132a6994ee178361e353b9ffba58de34bf14c8f422bae485bd4994c5c55a06240b2f0ab358419fd2660f
+  data.tar.gz: b9bc2326b8d1b8430e278a3fc9b74a6a198238fdfc015e21b37024761283f1dbb770b15e4a90bbf8bfebcb6acf5e110a704409e3a22093067fdd0d6ddd4ad4ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.5.25)
+    hot-glue (0.5.26)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -139,7 +139,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.4.1)
+    net-imap (0.4.2)
       date
       net-protocol
     net-pop (0.1.2)

data/README.md

@@ -1469,6 +1469,17 @@ bin/rails generate Thing --include=my_story --modify='my_story{tinymce}'
 
 # VERSION HISTORY
 
+
+#### 2023-10-23 - v0.5.26
+
+Various fixes:
+- fixed alert (danger) classes for bootstrap 5 ('alert alert-danger' was just 'alert-danger')
+- switches to use a self-defined instance var @action instead of action_name; this is so I can 
+  switch it back to 'new' or 'edit' upon a failure re-display to have the view behave the expected way
+- fix in create.turbo_stream.erb for failure redisplay (was not working)
+- fixes syntax error (in generated code) in edit.erb when there was a nested set
+
+
 #### 2023-10-16 - v0.5.25
 
 - Fixes scoping on Pundit-built controllers; even when using pundit we should still wrap to the current build's own ownership scope (#132

data/lib/generators/hot_glue/fields/association_field.rb

@@ -111,7 +111,7 @@ class AssociationField < Field
   end
 
   def field_error_name
-    name
+    assoc_name
   end
 
   def form_show_only_output
@@ -140,6 +140,6 @@ class AssociationField < Field
 
     display_column =  HotGlue.derrive_reference_name(assoc_class.to_s)
 
-    "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe %>"
+    "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
   end
 end

data/lib/generators/hot_glue/fields/boolean_field.rb

@@ -38,7 +38,7 @@ class BooleanField < Field
 
   def form_field_display
     if display_boolean_as.nil?
-      byebug
+
     end
     "<div class='#{@layout_strategy.form_checkbox_wrapper_class} #{'form-switch' if display_boolean_as == 'switch'}'>\n" +
       (if display_boolean_as == 'radio'
@@ -58,7 +58,7 @@ class BooleanField < Field
   def line_field_output
     if modify_binary?
       "<% if #{singular}.#{name}.nil? %>
-        <span class='alert-danger'>MISSING</span>
+        <span class=''>MISSING</span>
     <% elsif #{singular}.#{name} %>
       #{modify_as[:binary][:truthy]}
     <% else %>
@@ -66,7 +66,7 @@ class BooleanField < Field
     <% end %>"
     else
       "<% if #{singular}.#{name}.nil? %>
-        <span class='alert-danger'>MISSING</span>
+        <span class=''>MISSING</span>
     <% elsif #{singular}.#{name} %>
       YES
     <% else %>

data/lib/generators/hot_glue/fields/date_field.rb

@@ -17,7 +17,7 @@ class DateField < Field
     "<% unless #{singular}.#{name}.nil? %>
       <%= #{singular}.#{name} %>
     <% else %>
-      <span class='alert-danger'>MISSING</span>
+      <span class=''>MISSING</span>
     <% end %>"
   end
 end

data/lib/generators/hot_glue/fields/date_time_field.rb

@@ -13,7 +13,7 @@ class DateTimeField < Field
     if !modify_binary?
       "expect(page).to have_content(new_#{name}.in_time_zone(testing_timezone).strftime('%m/%d/%Y @ %l:%M %p %Z').gsub('  ', ' '))"
     else
-      "expect(page).to have_content('#{modify[:binary][:truthy]}'"
+      "expect(page).to have_content('#{modify_as[:binary][:truthy]}'"
     end
   end
 
@@ -23,7 +23,7 @@ class DateTimeField < Field
 
   def spec_list_view_assertion
     if modify_binary?
-      "expect(page).to have_content('#{modify[:binary][:truthy]}')"
+      "expect(page).to have_content('#{modify_as[:binary][:truthy]}')"
     else
       spec_list_view_natural_assertion
     end
@@ -44,7 +44,7 @@ class DateTimeField < Field
       "<% unless #{singular}.#{name}.nil? %>
   <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p %Z') %>
   <% else %>
-  <span class='alert-danger'>MISSING</span>
+  <span class=''>MISSING</span>
   <% end %>"
     end
   end

data/lib/generators/hot_glue/fields/time_field.rb

@@ -12,7 +12,7 @@ class TimeField < Field
     "<% unless #{singular}.#{name}.nil? %>
       <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%l:%M %p ') %>
      <% else %>
-    <span class='alert-danger'>MISSING</span>
+    <span class=''>MISSING</span>
     <% end %>"
   end
 

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

@@ -95,9 +95,9 @@ module  HotGlue
               if show_only.include?(col)
                 columns_map[col].form_show_only_output
               elsif update_show_only.include?(col) && !@pundit
-                "<% if action_name == 'edit' %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
+                "<% if @action == 'edit' %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
               elsif update_show_only.include?(col) && @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
-                "<% if action_name == 'new' && policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output + "<% end %>"
+                "<% if @action == 'new' && policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output + "<% end %>"
 
                              # show only on the update action overrides any pundit policy
             elsif @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
@@ -108,7 +108,7 @@ module  HotGlue
             # byebug
             @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
 
-            add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
+            add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
                                     add_spaces_each_line( (form_labels_position == 'before' ? the_label || "" : "") +
                                                         +  " <br />\n" + field_result +
                                         (form_labels_position == 'after' ? the_label : "")   , 4) +

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

@@ -91,6 +91,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     @<%= singular_name %> = <% if @pundit %>policy_scope(<% end %><%= class_name  %><% if @pundit %>)<% end %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}))<% else %>
     @<%= singular_name %> = <% if @pundit %>policy_scope(<% end %><%= class_name  %><% if @pundit %>)<% end %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% end %>
     <% if @pundit %>authorize @<%= singular_name %><% end %><% if @pundit %>
+    @action = "new"
   rescue Pundit::NotAuthorizedError
     flash[:alert] = "You are not authorized to perform this action."
     render :index<% end %>
@@ -119,6 +120,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       render :create
     else
       flash[:alert] = "Oops, your <%= singular_name %> could not be created. #{@hawk_alarm}"
+      @action = "new"
       render :create, status: :unprocessable_entity
     end<% if @pundit %>
   rescue Pundit::NotAuthorizedError
@@ -139,6 +141,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
   def edit<% if @pundit  %>
     authorize @<%= singular_name %><% end %>
+    @action = "edit"
     render :edit<% if @pundit %>
   rescue Pundit::NotAuthorizedError
     flash[:alert] = "Editing #{@<%= singular %>.<%= display_class %>} not authorized."
@@ -186,6 +189,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       render :update
     else
       flash[:alert] = "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
+      @action = "edit"
       render :update, status: :unprocessable_entity
     end<% if @pundit %>
   rescue Pundit::NotAuthorizedError

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

@@ -4,7 +4,7 @@
   <\% end %>
   <\% end %>
 <%= turbo_parental_updates %>
-  <\%= turbo_stream.replace "<%= @namespace %>__<%= singular %>__<%= singular %>-new" do %>
+  <\%= turbo_stream.replace "<%= @namespace %>__<%= singular %>-new" do %>
   <\% if @<%= singular %>.errors.none? %>
   <\%= render partial: "new_button", locals: {}<%=  @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {" + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> %>
   <\% else %>

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

@@ -4,7 +4,7 @@
     <div class="col-md-12">
       <\%= link_to "<% if @button_icons == 'font-awesome' %><i class='fa fa-arrow-circle-left  2x'></i><% end %> Back to list".html_safe, <%= path_helper_plural %> %>
 <% end %>
-<\%= render partial: "edit", locals: {<%= singular %>: @<%= singular %>} %>
+<\%= render partial: "edit", locals: {<%= singular %>: @<%= singular %><%= @nested_set.collect{|arg| ", #{arg[:singular]}: @#{arg[:singular]}" }.join(", ") %>}  %>
 <% if @big_edit %>
     </div>
   </div>

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

@@ -1,3 +1,3 @@
 <\%= turbo_stream.replace "<%= @namespace %>__#{dom_id(<%= singular %>)}" do %>
-  <\%= render 'edit' %>
+  <\%= render 'edit', locals: {<%= singular %>: @<%= singular %><%= @nested_set.collect{|arg| ", #{arg[:singular]}: @#{arg[:singular]}} " }.join("") %> %>
 <\% end %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.25'
+    CURRENT = '0.5.26'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.25
+  version: 0.5.26
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails