hot-glue 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea147399cbbc04e307d97c495a43e549b88bf99b44946a3392c0f0cf96d53f2d
-  data.tar.gz: 2d05eb14eaf6360b4df436ba453484a13abf9dc94c6ae472a205744aac10c50c
+  metadata.gz: b43859a9d9550d50e2afb38b0a340bdbafd2c0cfc48864fca79134fa0ce96a73
+  data.tar.gz: 566e3be087670f1bd4eb7a869a67934d576ed854f0c975437cd8fa04043f634d
 SHA512:
-  metadata.gz: 1e29fd08a71cbc94ac38c5502bd5436184100378206d24222c20320f62ec441dc8863972bdb7e8486b5f80e2859d4070cf4247da1b637d3132c1f188725c9503
-  data.tar.gz: e24788fc22a3ed4bb2e63f4ea982650b722e3c5cf34ed960bbe8fee4540cbaa3b3a843a315488e6c6797790757f42c6b5154cea395b7f0bbbd04cf02e747e1cb
+  metadata.gz: 0d7fb818064534ad24e0b069c8355b7cb677a87ebc45e5f2c1da4cf148eb824200c82bf29ec1effb9dada56144279f858cc92fb85d36e6727e927fef84e9fc7e
+  data.tar.gz: 60bf9b8a843018bbba2d9457b99f212445dc51ca288e97f04940e17e9c25af72c586aa4c4fbbecf3bac900b0df1e844b80e62f3d276bbd7aa733fe60fb74f607

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: (schedule.respond_to?(:#{button_name}able?) && ! schedule.#{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
 
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -796,8 +796,16 @@ module HotGlue
 
     def controller_magic_button_update_actions
       @magic_buttons.collect{ |magic_button|
-        "    @#{singular}.#{magic_button}! if #{singular}_params[:#{magic_button}]"
-        }.join("\n") + "\n"
+        "    begin
+      if #{singular}_params[:#{magic_button}]
+        res = @#{singular}.#{magic_button}!
+        res = \"#{magic_button.titleize}ed.\" if res === true
+        flash[:notice] = (flash[:notice] || \"\") <<  (res ? res + \" \" : \"\")
+      end
+    rescue ActiveRecord::RecordInvalid => e
+      @#{singular}.errors.add(:base, e.message)
+      flash[:alert] = (flash[:alert] || \"\") << 'There was ane error #{magic_button}ing your #{@singular}: '
+    end" }.join("\n") + "\n"
     end
 
     def controller_update_params_tap_away_magic_buttons

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

@@ -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

@@ -4,12 +4,15 @@
 
     <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><% end %>
 
+
     <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? %>

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,8 +4,9 @@
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
 
   <% @downnest_children.each do |downnest| %>
-<% downnest_style =  @layout == "hotglue" ? 'style="flex-basis: ' +  each_downnest_width + '%"' : "" %>
-  <div class="<%= @col_identifier %> scaffold-downnest" <%= downnest_style  %> >
+
+    <% 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: {
     nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if nested_for}<% end %><%= @singular %>-#{<%= @singular %>.id}",
     <%= @singular %>: <%= @singular %><%= nest_assignments_operator(false, true) %>,
@@ -14,11 +15,11 @@
   <% end %>
 <% end %>
 
-<% button_style = @layout == "hotglue" ? 'style="flex-basis: ' +  (100 - (column_width * @columns.count)).floor +  '%;' : "" %>
-<div class="<%= @col_identifier %> scaffold-line-buttons" <%= button_style %>>
+<% 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

@@ -6,7 +6,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/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

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