hot-glue 0.4.9.2 → 0.5.2

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

@@ -1,6 +1,6 @@
 def login_as(user)
   visit '/users/sign_in'
-  within("#new_account") do
+  within("#new_user") do
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'password'
   end

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

@@ -2,7 +2,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   helper :hot_glue
   include HotGlue::ControllerHelper
 
-  <% unless @auth_identifier == '' || @god %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
+  <% unless @auth_identifier == '' || @god %>before_action :<%= auth_root %><% end %>
   <% if any_nested? %><% nest_chain = [] %> <% @nested_set.each { |arg|
 
     if auth_identifier == arg[:singular]
@@ -19,7 +19,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <% } %><% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   after_action -> { flash.discard }, if: -> { request.format.symbol ==  :turbo_stream }
-<% if @nested_args.any? %>
+<% if @nested_set.any? %>
   def <%= @nested_set[0][:singular] %><% if @god
        next_object = nil
        collect_objects = @nested_set.reverse.collect {|x|
@@ -36,9 +36,9 @@ 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
@@ -47,11 +47,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
       this_scope =  "#{nest_chain.last}.#{arg[:plural]}"
       nest_chain << arg %>
+  <% unless  @nested_set[0][:singular] == arg[:singular] %>
   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[:optional] ) %>@<%= arg[:singular] %> ||=  (<%=  collect_objects[index-1] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
-  end<% end %> <% end %> <% if !@self_auth %>
-
+      <% 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 %>
   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 %>
   end
@@ -73,8 +74,9 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% if create_action %>  def new
-    <% if ! @god %>
-    @<%= singular_name %> = <%= class_name  %>.new(<%= @object_owner_sym %>: <%= @object_owner_eval %>)
+    <% 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 %>)
@@ -85,8 +87,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if ! @object_owner_sym.empty? %>.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 %>)
-
+    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)
 
@@ -98,7 +100,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
         format.html { redirect_to <%= path_helper_plural %> }
       end
     else
-      flash[:alert] = "Oops, your <%= singular_name %> could not be created."
+      flash[:alert] = "Oops, your <%= singular_name %> could not be created. #{@hawk_alarm}"
       respond_to do |format|
         format.turbo_stream
         format.html
@@ -120,10 +122,13 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% 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 %>)
+    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 @<%= singular_name %>.update(modified_params)
       flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
+      flash[:alert] = @hawk_alarm  if !@hawk_alarm.empty?
     else
-      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved."
+      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
 
     end
 <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
@@ -137,7 +142,7 @@ 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 %>
     respond_to do |format|
@@ -147,11 +152,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def <%=singular_name%>_params
-    params.require(:<%=singular_name%>).permit( <%= @columns + @magic_buttons.collect(&:to_sym) %> )
-  end
-
-  def default_colspan
-    <%= @default_colspan %>
+    params.require(:<%=singular_name%>).permit( <%= (@columns - @show_only) + @magic_buttons.collect(&:to_sym) %> )
   end
 
   def namespace

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

@@ -1,5 +1,5 @@
 <\%= turbo_frame_tag "<%= 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_args.any? %> " %>
+    <\%= 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? %> " %>
   </div>
 <\% end %>

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

@@ -15,7 +15,7 @@
         <%= @singular %>: <%= @singular %>,
         <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>
       }
-      .merge({nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if defined?(nested_for)}<% end %><%= @singular %>-#{<%= @singular %>.id}"})
+      .merge({nested_for: "<% if @nested_set.any? %>#{nested_for + "__" if defined?(nested_for)}<% end %><%= @singular %>-#{<%= @singular %>.id}"})
       <%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {} )"}.join("\n") %>
     \%>
   </div>

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

@@ -10,7 +10,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     when :integer
       if col.to_s.ends_with?("_id")
         assoc = "#{col.to_s.gsub('_id','')}"
-        "let!(:#{assoc}1) {create(:#{assoc})}"
+        "let!(:#{assoc}1) {create(:#{assoc}" +  (@hawk_keys["#{assoc}_id".to_sym] ? ", #{@auth.gsub('current_', '')}: #{@auth}": "")   + ")}"
       end
     else
     end

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.4.9.2'
+    CURRENT = '0.5.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.9.2
+  version: 0.5.2
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,7 +85,6 @@ files:
 - lib/generators/hot_glue/scaffold_generator.rb
 - lib/generators/hot_glue/templates/base_controller.rb.erb
 - lib/generators/hot_glue/templates/capybara_login.rb
-- lib/generators/hot_glue/templates/confirmable.js
 - lib/generators/hot_glue/templates/controller.rb.erb
 - lib/generators/hot_glue/templates/erb/_errors.erb
 - lib/generators/hot_glue/templates/erb/_flash_notices.erb

data/lib/generators/hot_glue/templates/confirmable.js

@@ -1,14 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-console.log("defining Confirmable....")
-export default class extends Controller {
-  static values = { message: String }
-
-  confirm(event) {
-
-    if(!window.confirm(this.message)) {
-      event.preventDefault();
-      event.stopPropagation()
-    }
-  }
-}