hot-glue 0.5.20 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48857d455006404276d88ee9481b21664a413e14403f8432a26cb13fc4351f4a
-  data.tar.gz: d15f7a0d742a7164e0f58c4bd25a620198efed8106c7e36bfeea1a34251d4889
+  metadata.gz: e2d92541aa687117c64a4a52b034f9103f06f95ae7996bcbd1cf7f71f986ec34
+  data.tar.gz: 751619956a66052dc837b4f13ab85cbe3fe655b60c8ad820150b7e21f3737696
 SHA512:
-  metadata.gz: 916d29b5b2f60c273bf9d0094511d95b39b54f8d57c3b41c251d17dc9b7f918914a6ca529f4eca000461fa7c2b4e2b36f954fb3ee59f0fda8a8ed53038c773e0
-  data.tar.gz: cbddef65679e3dd42d18143d964f3a9ad9ccb25490bfc054d8fd73f23c24d0a74751a8e07c96fc5404792bb6fe553b2d70a6f6fc168ceaf4a39247d96a4d360e
+  metadata.gz: f5c4dfb35d0a673cc6f8b8a4b3833feafa7fca86a0e07d616b825c11c3c132af98fde4ec4a73ef9538f9f74a0982f38c2fceb562c1ca43f72764ad7d604bb864
+  data.tar.gz: f520ab73bebb9597e5cc4cc3651e4ef45641641157f99353c79abf7004cf9340b59d8222e2a1462d51b269bfef62e3c725732c962d21185bfc0f62f87dcc5a51

data/Gemfile

@@ -24,7 +24,7 @@ gem "sprockets-rails"
 gem "importmap-rails"
 gem "stimulus-rails"
 gem "turbo-rails"
-gem "byebug"
+
 
 gem "puma", "~> 5.0"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.5.19.2)
+    hot-glue (0.5.22)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)

data/README.md

@@ -909,6 +909,14 @@ Omits new & create actions.
 
 Omits delete button & destroy action.
 
+### `--no-controller`
+
+Omits controller.
+
+### `--no-list`
+
+Omits list views. 
+
 ### `--big-edit`
 
 If you do not want inline editing of your list items but instead want to fall back to full page style behavior for your edit views, use `--big-edit`. Turbo still handles the page interactions, but the user is taken to a full-screen edit page instead of an edit-in-place interaction.
@@ -1396,6 +1404,21 @@ end
 
 # VERSION HISTORY
 
+#### 2023-09-20- v0.5.22
+- adds back magic button tap-away params in the controller
+- changes creation of flash[:notice] in update method
+- adds pundit authorization for edit action in the edit method itself
+- adds a crude show method that redirects to the edit (Hot Glue takes the opinionated stance that show routes should not really exist. This addition makes it so that when the user is on the show route and re-loads the browse window, they don't see a route error)
+- adds RuboCop detection; omits the regen code at the top of the controller from line length cop 
+- fixes for specs
+
+#### 2023-09-18 - v0.5.21
+- Removes `@` symbols using instance variables in `_edit` partials and in the enum syntax
+- fixes in system_spec.rb.erb
+- Adds flags --no-controller --no-list
+- adds regen code to a file in the views folder REGENERATE.md if you have set --no-controller
+
+
 #### 2023-09-08 - v0.5.20
 `--pundit` authorization
 • Will look for a `XyzPolicy` class and method on your class named `*_able?` matching the fields on your object. See Pundit section for details.

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

@@ -104,7 +104,7 @@ class AssociationField < Field
       end
 
       (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
-        "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{name} }, class: 'form-control') %>\n" +
+        "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: #{singular}.#{name} }, class: 'form-control') %>\n" +
         (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
         (is_owner ? "\n<% end %>" : "")
     end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -43,6 +43,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   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_controller, 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: ""
@@ -289,6 +291,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     @no_edit = options['no_edit'] || false
     @no_list = options['no_list'] || false
+    @no_controller = options['no_controller'] || false
+    @no_list = options['no_list'] || false
     @no_list_label = options['no_list_label'] || false
     @no_list_heading = options['no_list_heading'] || false
     @stacked_downnesting = options['stacked_downnesting']
@@ -688,7 +692,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def copy_controller_and_spec_files
     @default_colspan = @columns.size
-    unless @specs_only
+    unless @specs_only || @no_controller
       template "controller.rb.erb", File.join("#{filepath_prefix}app/controllers#{namespace_with_dash}", "#{@controller_build_folder}_controller.rb")
       if @namespace
         begin
@@ -866,7 +870,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                                  nested_set: @nested_set,
                                  with_params: true,
                                  put_form: true,
-                                 top_level: true)
+                                 top_level: false)
   end
 
   def delete_path_helper
@@ -1021,6 +1025,11 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def copy_view_files
     return if @specs_only
+
+    if @no_controller
+      File.write("#{Rails.root}/app/views/#{namespace_with_trailing_dash}/#{plural}/REGENERATE.md", regenerate_me_code)
+    end
+
     all_views.each do |view|
       formats.each do |format|
         source_filename = cc_filename_with_extensions("#{@markup}/#{view}", "#{@markup}")
@@ -1120,6 +1129,11 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     if !(@no_edit && @no_create)
       res << '_form'
     end
+
+    if @no_list
+      res -= %w{_list _line index}
+    end
+
     res
   end
 

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

@@ -1,6 +1,8 @@
 class <%= controller_class_name %> < <%= controller_descends_from %>
   # regenerate this controller with
-  # <%= regenerate_me_code %>
+  <% if defined?(RuboCop) %># rubocop:disable Layout/LineLength
+  <% end %># <%= regenerate_me_code %><% if defined?(RuboCop) %>
+  # rubocop:enable Layout/LineLength <% end %>
 
   helper :hot_glue
   include HotGlue::ControllerHelper
@@ -70,7 +72,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     authorize @<%= plural_name %>.all<% else %> <% 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 %>
+    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %><% end %>
     <% end %>
   end
 
@@ -121,7 +123,18 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %>
-<% unless @no_edit %>  def edit
+<% unless @no_edit %>
+  def show
+    redirect_to <%=   HotGlue.optionalized_ternary(namespace: @namespace,
+                                 target:  @singular,
+                                 nested_set: @nested_set,
+                                 modifier: "edit_",
+                                 with_params: true,
+                                 put_form: true).gsub("(#{singular}", "(@#{singular}") %>
+  end
+
+  def edit<% if @pundit  %>
+    authorize @<%= singular_name %><% end %>
     render :edit<% if @pundit %>
   rescue Pundit::NotAuthorizedError
     flash[:alert] = "Editing #{@<%= singular %>.<%= display_class %>} not authorized."
@@ -129,12 +142,18 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
+    flash[:notice] = ""
+    flash[:alert] = nil
 <% 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(",") %>
-    <% @magic_buttons.each { |button| %>@<%= singular_name %>.<%= button %>! if <%= singular_name %>_params[:__<%= button %>]
-    <% } %>
-    modified_params = modify_date_inputs_on_params(<% if @update_show_only %>update_<% end %><%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %>, <%= current_user_object %>, <%= datetime_fields_list %>) <% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
+    <% @magic_buttons.each do |button| %>
+    if <%= singular_name %>_params[:__<%= button %>]
+      @<%= singular_name %>.<%= button %>!
+      flash[:notice] << "<% singular %> <%= button.titlecase %>."
+    end
+    <% end %>
+    modified_params = modify_date_inputs_on_params(<% if @update_show_only %>update_<% end %><%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %><%= controller_update_params_tap_away_magic_buttons  %>, <%= current_user_object %>, <%= datetime_fields_list %>) <% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
     modified_params = modified_params.merge(<%= @object_owner_sym %>: <%= @object_owner_eval %>) <% elsif @object_owner_optional && any_nested? %>
     modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif !@object_owner_eval.empty? %>
     modified_params = modified_params.merge(<%= @object_owner_eval %>) <% end %><%  if !merge_lookups.empty?  %>
@@ -158,11 +177,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     if @<%= singular_name %>.update(modified_params)
     <% end %>
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
-      flash[:notice] = "#{flash[:notice]} Saved #{@<%= singular %>.<%= display_class %>}"
+      flash[:notice] << "Saved #{@<%= singular %>.<%= display_class %>}"
       flash[:alert] = @hawk_alarm if @hawk_alarm
       render :update
     else
-      flash[:alert] = "#{flash[:notice]} <%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
+      flash[:alert] = "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
       render :update, status: :unprocessable_entity
     end<% if @pundit %>
   rescue Pundit::NotAuthorizedError

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

@@ -1,12 +1,11 @@
-<\%= turbo_frame_tag "<%= @namespace %>__#{dom_id(@<%= singular %>)}" do  %>
+<\%= turbo_frame_tag "<%= @namespace %>__#{dom_id(<%= singular %>)}" do  %>
 <div class="cell editable" style="position: relative;">
-  <\% if @<%= singular %>.errors.any? %>
-  <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: @<%= singular %> }) %>
+  <\% if <%= singular %>.errors.any? %>
+  <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: <%= singular %> }) %>
   <\% end %>
-
-  <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>
-  <\%= form_with model: <%= "@" + singular %>, url: <%= form_path_edit_helper %> do |f| %>
-  <\%=  render partial: "<%= namespace_with_trailing_dash + @controller_build_folder + "/" %>form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f}<%= @nested_set.collect{|arg| ".merge(@#{arg[:singular]} ? {#{arg[:singular]}: @#{arg[:singular]}} : {})" }.join %> \%>
+  <h2>Editing <\%= <%= singular %>.<%= display_class %> %></h2>
+  <\%= form_with model: <%= singular %>, url: <%= form_path_edit_helper %> do |f| %>
+  <\%=  render partial: "<%= namespace_with_trailing_dash + @controller_build_folder + "/" %>form",  locals: {:<%=  singular  %> => <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> \%>
   <\% end %>
 </div>
 <\% end %>

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

@@ -15,7 +15,7 @@ describe 'interaction for <%= controller_class_name %>' do
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<% end %>
 <%= spec_related_column_lets %>
   let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )}
-<%= objest_nest_factory_setup %> <% unless @god || @existing_content.include?("login_as")%>
+<%= objest_nest_factory_setup %> <% unless @god || (@existing_content && @existing_content.include?("login_as")) %>
   before do
     login_as(<%= @auth %>)
   end <% end %> <% if any_datetime_fields? %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.20'
+    CURRENT = '0.5.22'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.20
+  version: 0.5.22
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails