hot-glue 0.5.24 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: badba8cc091a29c8613194fa379cce1d7cdd720a1ae3627630a069afb5b4c352
-  data.tar.gz: d0e5cd8a96ae546596eabc865f1dc4979f0a528b82ffd19bdfdddf6dc92fe3f0
+  metadata.gz: 9c2b46bf01f0742356ab56ad4cd139534becbe919b8e38ac8d166f8ca1c1c47c
+  data.tar.gz: b697f19f9928249d693632ff040f7ebb97ddf396fd8fb8d74b60f3abfe3a6bca
 SHA512:
-  metadata.gz: 94ae4da0d2644a6b6311f5b81da1f864ae90d4a69c133b4a3259ad53f0221ed10bfedfe4964dc7ceb04d65e2d6ef28c420af6b5489bae4ec22bb7989f6b0249a
-  data.tar.gz: 9e0f23257368d5836f4a95c4f116f2d70057f063cce7ff14acecee0c2e7f62fd921e752d13fec73d073aa40ba6f89709a9efbb92a0c0f2bd823324a897cf93dd
+  metadata.gz: 9ad16ec01f21d5ac9013cbbc0ee2e364cce4deec8ff52544d34438c641a4009d763ff953e70813d2f4b5e5b35904959ca49b5fea50dc8187c254c0bc0a19850c
+  data.tar.gz: f7cbb297d36077486c6983b0dfebee09b32871b316f28fe215f3578df5054445f337d372e13b55d84f44f30a6e4e0de776df14cb3137a4ec12c8e481ed38abba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.5.24)
+    hot-glue (0.5.25)
       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.0)
+    net-imap (0.4.1)
       date
       net-protocol
     net-pop (0.1.2)

data/README.md

@@ -894,10 +894,15 @@ Produces ONLY the controller spec file, nothing else.
 Produces all the files except the spec file.
 
 
-### `--no-paginate`
+### `--no-paginate` (default: false)
 
 Omits pagination. (All list views have pagination by default.)
 
+### `--paginate-per-page-selector` (default: false)
+
+Show a small drop-down below the list to let the user choose 10, 25, or 100 results per page.
+
+
 ### `--no-list`
 
 Omits list action. Only makes sense to use this if want to create a view where you only want the create button or to navigate to the update screen alternative ways. (The new/create still appears, as well the edit, update & destroy actions are still created even though there is no natural way to navigate to them.)
@@ -1464,10 +1469,33 @@ bin/rails generate Thing --include=my_story --modify='my_story{tinymce}'
 
 # VERSION HISTORY
 
+#### 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
+- don't write to the nav file if we're building a nested controller (#134)
+- adds system specs for self-auth feature
+- Pagination Fixes:
+
+A new flag `--paginate-per-page-selector` (default false) will allow you to show a small drop-down to let the user choose 10, 25, or 100 results per page.
+
+To get pagination to work, choose either #1 OR #2 below. #1 will replace the templates in app/views/kaminari so don't do that if you have modified them since first generating them out of Kaminari.
+
+1. Replace the kaminari gem with my fork and regenerate your templates
+bundle remove kaminari
+bundle add kaminari --git="https://github.com/jasonfb/kaminari.git" --branch="master"
+bundle install
+rm -rf app/views/kaminari
+rails g kaminari:config
+
+
+2. Go into app/views/kaminari/ and modify each template in this folder by adding ` 'data-turbo-action': 'advance'` to all of the links (which mostly appear in this code as the `link_to_unless` helper-- add the parameter onto the end of the calls to those helpers.) 
+
+
+
 #### 2023-10-07 - v0.5.24
 
 - TinyMCE implementation. See 'TinyMCE' above.
-Note: I plan to also implement ActionText as an alternative in the future. However, because TinyMCE is implemented with a `text` field type an ActionText is implemented with a Rails-specific `rich_text` field type, the two mechanisms will be incompatible with one another. TinyMCE has an annoying drawback in how it works with Turbo refreshes (not very consistently), and style of loading Javascript is discordant with Rails moving forward. So I am leaving this implementation as experimental.
+Note: I also plan to implement ActionText as an alternative.  However, because TinyMCE is implemented with a `text` field type an ActionText is implemented with a Rails-specific `rich_text` field type, the two mechanisms will be incompatible with one another. TinyMCE has an annoying drawback in how it works with Turbo refreshes (not very consistently), and style of loading Javascript is discordant with Rails moving forward. So I am leaving this implementation as experimental.
 - Spec Savestart code: In the behavior specs, there is a code marker (start & end) where you can insert custom code that gets saved between 
 build. The start code maker has changed from `#HOTGLUE-SAVESTART` to `# HOTGLUE-SAVESTART`
 and the end code marker has changed from `#HOTGLUE-END` to `# HOTGLUE-END`. This now conforms to Rubocop. 
@@ -1968,7 +1996,5 @@ To run only the internal specs, use
 
 `rspec spec`
 
-Internal Test coverage as of 2023-02-10 (v0.5.7)
-
-<img width="1202" alt="Screen Shot 2023-02-10 at 4 43 59 PM" src="https://user-images.githubusercontent.com/59002/218204736-5740505b-1ec8-456f-b0fb-9c359f6f7037.png">
-
+Internal Test coverage as of 2023-10-15 (v0.5.24)
+All Files ( 86.29% covered at 75.64 hits/line )

data/lib/generators/hot_glue/field_factory.rb

@@ -55,6 +55,7 @@ class FieldFactory
                              class_name: generator.singular_class,
                              alt_lookups: generator.alt_lookups,
                              singular: generator.singular,
+                             self_auth: generator.self_auth,
                              update_show_only: generator.update_show_only,
                              attachment_data: generator.attachments[name.to_sym],
                              sample_file_path: generator.sample_file_path,

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

@@ -10,7 +10,7 @@ class AssociationField < Field
                  update_show_only: ,
                  hawk_keys: , auth: , sample_file_path:,  ownership_field: ,
                  attachment_data: nil , layout_strategy: , form_placeholder_labels: nil,
-                 form_labels_position:, modify_as:  )
+                 form_labels_position:, modify_as: , self_auth: )
     super
 
     @assoc_model = eval("#{class_name}.reflect_on_association(:#{assoc})")

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

@@ -4,7 +4,7 @@ class AttachmentField < Field
                  display_as:,
                  singular:, update_show_only:, hawk_keys:, auth:,
                  sample_file_path: nil, attachment_data:, ownership_field:, layout_strategy: ,
-                 form_placeholder_labels: , form_labels_position:, modify_as: )
+                 form_placeholder_labels: , form_labels_position:, modify_as:, self_auth: )
     super
 
     @attachment_data = attachment_data

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

@@ -3,6 +3,7 @@ class Field
                 :assoc_label,  :class_name, :default_boolean_display, :display_as, :form_placeholder_labels,
                 :form_labels_position,
                 :hawk_keys,   :layout_strategy, :limit, :modify_as, :name, :object, :sample_file_path,
+                :self_auth,
                 :singular_class,  :singular, :sql_type, :ownership_field,
                 :update_show_only
 
@@ -22,7 +23,8 @@ class Field
     ownership_field: ,
     sample_file_path: nil,
     singular: ,
-    update_show_only:
+    update_show_only:,
+    self_auth:
   )
     @name = name
     @layout_strategy = layout_strategy
@@ -39,6 +41,7 @@ class Field
     @modify_as = modify_as
     @display_as = display_as
 
+    @self_auth = self_auth
     @default_boolean_display = default_boolean_display
 
     # TODO: remove knowledge of subclasses from Field
@@ -83,7 +86,11 @@ class Field
   end
 
   def spec_list_view_natural_assertion
-    "expect(page).to have_content(#{singular}#{1}.#{name})"
+    if !self_auth
+      "expect(page).to have_content(#{singular}#{1}.#{name})"
+    else
+      "expect(page).to have_content(current_#{singular}.#{name})"
+    end
   end
 
   def spec_list_view_assertion

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -22,7 +22,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :modify_as,
                 :nest_with, :path, :plural, :sample_file_path, :show_only_data, :singular,
                 :singular_class, :smart_layout, :stacked_downnesting, :update_show_only, :ownership_field,
-                :layout_strategy, :form_placeholder_labels, :form_labels_position, :pundit
+                :layout_strategy, :form_placeholder_labels, :form_labels_position, :pundit,
+                :self_auth
 
   class_option :singular, type: :string, default: nil
   class_option :plural, type: :string, default: nil
@@ -47,6 +48,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   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 :paginate_per_page_selector, type: :boolean, default: false
   class_option :big_edit, type: :boolean, default: false
   class_option :show_only, type: :string, default: ""
   class_option :update_show_only, type: :string, default: ""
@@ -295,6 +297,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     @no_create = options['no_create'] || false
     @no_paginate = options['no_paginate'] || false
+    @paginate_per_page_selector = options['paginate_per_page_selector']
+
     @big_edit = options['big_edit']
 
     @no_edit = options['no_edit'] || false
@@ -748,6 +752,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     singular_class.gsub("::", "_").underscore
   end
 
+  def factory_testing_name
+    if !@self_auth
+      "#{singular}1"
+    else
+      "current_#{singular}"
+    end
+  end
+
   def spec_related_column_lets
     @columns_map.collect { |col, col_object|
       col_object.spec_related_column_lets
@@ -1093,7 +1105,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   def insert_into_nav_template
     # how does this get called(?)
     nav_file = "#{Rails.root}/app/views/#{namespace_with_trailing_dash}_nav.html.#{@markup}"
-    if include_nav_template
+    if include_nav_template && @nested_set.none?
       append_text = "  <li class='nav-item'>
     <%= link_to '#{@list_label_heading}', #{path_helper_plural}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
   </li>"

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

@@ -66,13 +66,16 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   def load_<%= singular_name %>
     @<%= singular_name %> = (<%= auth_object.gsub("@",'') %><%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set.any? && @nested_set[0][:optional] %>)<% if @nested_set.any? && @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
   end<% end %>
+  <% if @paginate_per_page_selector %>def per
+    params[:per] || 10
+  end
 
-  def load_all_<%= plural %><% if @pundit %>
-    @<%= plural_name %> =  policy_scope(<%= class_name %>).page(params[:page])<%= n_plus_one_includes %>
+  <% end %>def load_all_<%= plural %><% if @pundit %>
+    @<%= plural_name %> =  policy_scope(<%= object_scope %>).page(params[:page])<%= n_plus_one_includes %><%= ".per(per)" if @paginate_per_page_selector %>
     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 %> = <%= object_scope.gsub("@",'') %><%= n_plus_one_includes %>.page(params[:page])<%= ".per(per)" if @paginate_per_page_selector %><%= " 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 %><% end %>
+    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %>.page(params[:page])<%= ".per(per)" if @paginate_per_page_selector %><% end %>
     <% end %>
   end
 
@@ -156,7 +159,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <% 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_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif ! @object_owner_eval.empty?  && !@self_auth%>
     modified_params = modified_params.merge(<%= @object_owner_eval %>) <% end %><%  if !merge_lookups.empty?  %>
     modified_params = modified_params.merge(<%= merge_lookups %>)
       <% end %>

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

@@ -51,6 +51,12 @@
       <%= @nested_set.collect{|arg| "      .merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {})"}.join("\n") %>
         %>
       <\% end %>
+      <% if @paginate_per_page_selector %>
+        <\%= form_with url: things_path, method: :get do |f| %>
+           Show per page
+        <\%= f.collection_select  "per", [10, 25, 100], :to_s, :to_s, {prompt: true, selected: params[:per]}, {onChange: "this.form.submit();"} %>
+        <\% end %>
+      <% end %>
     <%=  @no_paginate ? "" : paginate %>
   <% end  %>
   </div>

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

@@ -14,7 +14,7 @@ describe 'interaction for <%= controller_class_name %>' do
   <%= @existing_content %>
   <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<% end %>
 <%= spec_related_column_lets %>
-  let!(:<%= singular %>1) {
+ <% unless @self_auth %> let!(:<%= singular %>1) {
     <%= singular %> = create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )
 <%= @attachments.collect{ |attachment|
     "    #{singular}.#{ attachment[0].to_s }.attach(
@@ -25,7 +25,7 @@ describe 'interaction for <%= controller_class_name %>' do
    %>
     <%=singular%>.save!
     <%=singular%>
-  }
+  }<% end %>
 <%= objest_nest_factory_setup %> <% unless @god || (@existing_content && @existing_content.include?("login_as")) %>
   before do
     login_as(<%= @auth %>)
@@ -64,25 +64,25 @@ describe 'interaction for <%= controller_class_name %>' do
   describe "edit & update" do
     it "should return an editable form" do
       visit <%= path_helper_plural %>
-      find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= singular %>1.id}/edit']").click
+      find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= factory_testing_name %>.id}/edit']").click
 
-      expect(page).to have_content("Editing #{<%= singular %>1.<%= @display_class %>.squish || "(no name)"}")
+      expect(page).to have_content("Editing #{<%= factory_testing_name %>.<%= @display_class %>.squish || "(no name)"}")
 <%= capybara_make_updates(:update) %>
       click_button "Save"
-      within("turbo-frame#<%= @namespace %>__#{dom_id(<%= singular %>1)} ") do
+      within("turbo-frame#<%= @namespace %>__#{dom_id(<%= factory_testing_name %>)} ") do
 <%= "        " + @columns_map.map{ |col, col_object|
   if @attachments.keys.collect(&:to_sym).include?(col)
   elsif @show_only.include?(col)
   else
       col_object.spec_make_assertion
   end
- }.compact.join("\n        ")
+ }.compact.join("\n       ")
   %>
       end
     end
-  end <% end %>
+  end <% end %><% if destroy_action %>
 
-<% unless @no_delete %>  describe "destroy" do
+  describe "destroy" do
     it "should destroy" do
       visit <%= path_helper_plural %>
       accept_alert do

data/lib/hotglue/version.rb

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

data/script/test

@@ -30,7 +30,9 @@ bin/rails generate hot_glue:scaffold Pet --gd
 
 bin/rails generate hot_glue:scaffold Human --gd
 
-#rails generate hot_glue:scaffold User --no-create --self-auth
+bin/rails generate hot_glue:scaffold User --no-create --self-auth
+
+
 #rails generate hot_glue:scaffold Jkl --gd
 #rails generate hot_glue:scaffold Appointment --hawk=pets --gd
 #rails generate hot_glue:scaffold Family --gd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.25
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/hot-glue-for-rails/hot-glue
   homepage: https://heliosdev.shop/hot-glue
-  funding: https://school.jasonfleetwoodboldt.com/8188
+  funding: https://school.jfbcodes.com/8188
 post_install_message: |
   ---------------------------------------------
   Welcome to Hot Glue - A Scaffold Building Companion for Hotwire + Turbo-Rails