hot-glue 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00062223cad2c1adb79987dc16eec8e5a1cb612f18106c6b01878346630737d7
-  data.tar.gz: fd0fcf30cccc20b02e552d44628cf4856e08582338e296eea08699ff1318b85d
+  metadata.gz: 1ac74e056098b9847487adc764e7bb03b0024c94bdbdf151eb24eb688cc53309
+  data.tar.gz: a23e9e6c569539b30542b97446bea589317cd1118bd87bf7c4330fff3a08603d
 SHA512:
-  metadata.gz: 1ec04a5a3a6783caac2efc0035b409d9ac768a0d8094729b2f9551cdb363629f6433e24364a8caaaee675877ad996cbc51a219d666b9bfa05055143d372f3f77
-  data.tar.gz: '028e4f5fc7cb0a490ee715df7201976f79d026ff8916b5b0c9568901e215b61f61d54d4987a2748f40d48b7f91620acf719f59f6d52ed586853de6756eaefd61'
+  metadata.gz: eae357a387a886f4f24156f78f666a56f81a829d1aab3dd3e128698cbf59ede7136bf9d6c0c8e286b9840205860133ea6d17085ff7e340aea4a3b9be8bcacae1
+  data.tar.gz: d5d23aaac0178a602cbc0f1893819aba6b12d57270f218389742a54bdfdea5a59c6bd800b1a5e7b05cedb75d452bd6a8da170a6cc3a57fd6c2caf9edcca4c2e1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.7.2)
+    hot-glue (0.7.5)
       ffaker (~> 2.16)
       rails (> 5.1)
 
@@ -75,7 +75,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.18)
     builder (3.2.4)
     byebug (11.1.3)
@@ -90,7 +90,7 @@ GEM
       xpath (~> 3.2)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    date (3.4.1)
+    date (3.5.1)
     devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -113,21 +113,23 @@ GEM
     importmap-rails (1.1.5)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
+    logger (1.7.0)
     loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.1.0)
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.5.8)
+    net-imap (0.6.2)
       date
       net-protocol
     net-pop (0.1.2)
@@ -223,7 +225,7 @@ GEM
     stimulus-rails (1.1.1)
       railties (>= 6.0.0)
     thor (1.2.1)
-    timeout (0.4.3)
+    timeout (0.6.0)
     turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -233,7 +235,7 @@ GEM
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket (1.2.9)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

data/README.md

@@ -22,13 +22,13 @@ Hot Glue generates quick and dirty functionality. It lets you be crafty. However
 * Automatically reads your models (make them, add relationships, **and** migrate your database before building your scaffolding!)
 * Excellent for CREATE-READ-UPDATE-DELETE (CRUD), lists with pagination
 * Great for prototyping, but you should learn Rails fundamentals first.
-* 'Packaged' with Devise, Kaminari, Rspec
+* Defaults to Devise & Rspec, but these are optional
+* Use Pagy for pagination
 * Create system specs automatically along with the generated code.
 * Nest your routes model-by-model for built-in poor man's authentication.
 * Throw the scaffolding away when your app is ready to graduate to its next phase.
 
 How is it different than Rails scaffolding?
-77
 Although inspired by the Rails scaffold generators (built-in to Rails), Hot Glue does something similiar but has made opinionated decisions that deviate from the normal Rails scaffold: 
 
 1. The Hot Glue scaffolds are complete packages and are pre-optimized for 'edit-in-place' so that new and edit operations happen in-page smoothly. 
@@ -2146,6 +2146,18 @@ https://jasonfleetwoodboldt.com/courses/rails-7-crash-course/rails-7-stimulus-js
 # SPECIAL FEATURES DISCUSSION
 This section discusses features that don't correspond to a single option or flag.  
 
+## PAGINATION
+- Although legacy support Kaminari and will_paginate exist, I recommend Pagy.
+
+For Pagy version 9 or below
+1. include the gem
+2. in `config/initializers/pagy.rb` add `require 'pagy/extras/bootstrap'`
+3. add `include Pagy::Backend` to ApplicationController
+4. add `include Pagy::Frontend` to ApplicationHelper
+
+For Pagy version 43 (there was a version jump)
+*NOT YET COMPATIBLE WITH PAGY 43*
+TODO: implement pagy 43
 
 ## "Thing" Label
 
@@ -2461,11 +2473,27 @@ The `within` partials should do operations within the form (like hidden fields),
 These automatic pickups for partials are detected at build time. This means that if you add these partials later, you must rebuild your scaffold.
 
 
+
+
+
 # VERSION HISTORY
 
-#### 2025-12-24 - v0.7.3
+#### 2026-01-11 - v0.7.5
+This is mostly a maintenance release to address these two issues related to the hawk:
+- removes the hawk in the create action because we are alrady doing it in the creation_syntax
+- fixes variable mutation problem affecting when the singular hawk contains the name of the object itself, was duplicitiously adding @ to local variables, now fixed for to produce correct instance var for the controller code
+- when using the hawk, don't add @ in your syntax; a local variable the same name of the thing being built will automatically get @ appended to the front in controller code
+
+
+#### 2025-12-28 - v0.7.4
+• `--list-back-link-to-parent` has been renamed `--back-link-to-parent`
+• something was wrong with non-nested scaffolder calling `parent_resource_name` — thor invoked this method even when it wasn't called; it has been moved into a helper to prevent this
+• Check to only support Pagy version 9 or below; Pagy 43 has breaking changes and cannot yet be used (coming soon)
 
-`--list-back-link-to-parent` (default: false)
+
+#### 2025-12-24 - v0.7.3
+(previously `--list-back-link-to-parent`; release notes retroactively edited)
+`--back-link-to-parent` (default: false)
 
 If the parent is itself a big edit, and we got to the nested edit (also a big edit) through a tab showing subview list (loaded lazily via Turbo's built-in mechanism),
 then we don't typically want the "back to" link at the top of the edit page to take us back to the list of the current object.
@@ -2474,7 +2502,7 @@ That's because although the list of the current object exists as its own page, i
 
 The user came to _this_ edit page from the parent's edit page, so we should go back to the parent's edit page. 
 
-Use `--list-back-link-to-parent` to tell this build to use a "Back to ____" link at the top of the edit page (where ____ is the name of the parent)
+Use `--back-link-to-parent` to tell this build to use a "Back to ____" link at the top of the edit page (where ____ is the name of the parent)
 
 Otherwise, the link at the top of the edit page will read "Back to list" and take the user back to the list view of the current build. 
 

data/lib/generators/hot_glue/helpers/generator_helpers.rb

@@ -0,0 +1,6 @@
+module GeneratorHelpers
+
+  def parent_resource_name
+    @nested_set.last[:singular]
+  end
+end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -10,9 +10,12 @@ require_relative './layout_strategy/base'
 require_relative './layout_strategy/bootstrap'
 require_relative './layout_strategy/hot_glue'
 require_relative './layout_strategy/tailwind'
+require_relative './helpers/generator_helpers'
+
 
 class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   include DefaultConfigLoader
+  include GeneratorHelpers
   hook_for :form_builder, :as => :scaffold
 
   source_root File.expand_path('templates', __dir__)
@@ -31,7 +34,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :search_clear_button, :search_autosearch, :include_object_names,
                 :stimmify, :stimmify_camel, :hidden_create, :hidden_update,
                 :invisible_create, :invisible_update, :phantom_create_params,
-                :phantom_update_params, :lazy, :list_back_link_to_parent
+                :phantom_update_params, :lazy, :back_link_to_parent
   # important: using an attr_accessor called :namespace indirectly causes a conflict with Rails class_name method
   # so we use namespace_value instead
 
@@ -130,7 +133,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :search_position, default: 'vertical' # choices are vertical or horizontal
   class_option :search_clear_button, default: false
   class_option :search_autosearch, default: false
-  class_option :list_back_link_to_parent, default: nil
+  class_option :back_link_to_parent, default: nil
 
 
   # FOR THE PREDICATE SEARCH
@@ -171,7 +174,12 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
 
     if Gem::Specification.find_all_by_name('pagy').any?
-      @pagination_style = 'pagy'
+      if Gem::Specification.find_all_by_name('pagy').first.version.to_s.split(".").first.to_i <= 9
+        @pagination_style = 'pagy9'
+      else
+        raise "Pagy version 43 not yet compatible"
+        @pagination_style = 'pagy43'
+      end
     elsif Gem::Specification.find_all_by_name('will_paginate').any?
       @pagination_style = 'will_paginate'
     elsif Gem::Specification.find_all_by_name('kaminari').any?
@@ -494,7 +502,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @include_object_names = options['include_object_names'] || get_default_from_config(key: :include_object_names)
 
 
-    @list_back_link_to_parent = options['list_back_link_to_parent'] || false
+    @back_link_to_parent = options['back_link_to_parent'] || false
 
     if @god
       # @auth = nil
@@ -1154,7 +1162,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def creation_syntax
     if @factory_creation.nil? && ! @alt_lookups.any?
-      (      @hawk_keys.any? ?   "modified_params = hawk_params({#{ hawk_to_ruby }}, modified_params)\n    " : "")  + "@#{singular } = #{ class_name }.new(modified_params)"
+      (@hawk_keys.any? ?   "modified_params = hawk_params({#{ hawk_to_ruby(in_controller: true) }}, modified_params)\n    " : "")  + "@#{singular } = #{ class_name }.new(modified_params)"
     elsif @factory_creation.nil? && @alt_lookups.any?
 
       prelookup_syntax = @alt_lookups.collect{|lookup, data|
@@ -1377,9 +1385,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
   end
 
-  def parent_object_name
-    @nested_set.last[:singular]
-  end
+
 
   def datetime_fields_list
     @columns.each_with_object({}) do |col, hash|
@@ -1998,19 +2004,21 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     [name, file_format].compact.join(".")
   end
 
-  def hawk_to_ruby(in_controller: false) # false for views; true for controller
-
+  def hawk_to_ruby(in_controller: false)
+    # false for views; true for controller
 
     res = @hawk_keys.collect { |k, v|
-      bind_to_array = v[:bind_to]
-
+      bind_to_array = v[:bind_to].dup
       bind_to = bind_to_array.collect{|bt|
-        bt.gsub!(singular, "@#{singular}") if in_controller
-        bt
+        if in_controller
+          bt.gsub(singular, "@#{singular}")
+        else
+          bt
+        end
       }
 
       "#{k.to_s}: [#{bind_to.join(".")}]"
-    }.join(", ")
+    }.compact.join(", ")
     res
   end
 

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

@@ -123,7 +123,6 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <%= controller_attachment_orig_filename_pickup_syntax %>
     <%= creation_syntax %>
     <%= @code_after_new ?  @code_after_new.gsub(";","\n") + "\n" : "" %>
-    <% if @hawk_keys.any? %> modified_params = hawk_params({<%= hawk_to_ruby(in_controller: true) %>}, modified_params)<% end %>
 
       <% if @pundit %><% @related_sets.each do |key, related_set| %>
     check_<%= related_set[:association_ids_method].to_s %>_permissions(modified_params, :create)<% end %><% end %>

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

@@ -6,8 +6,8 @@
   <div class="row">
     <div class="col-md-12">
 
-      <% if @list_back_link_to_parent %>
-      <\%= link_to "&#11013;&#65039; Back to <%= parent_object_name %>".html_safe, <%= edit_parent_path_helper(true) %> %>
+      <% if @back_link_to_parent %>
+      <\%= link_to "&#11013;&#65039; Back to <%= parent_resource_name %>".html_safe, <%= edit_parent_path_helper(true) %> %>
       <% else %>
       <\%= link_to "&#11013;&#65039; Back to list".html_safe, <%= path_helper_plural(true) %> %>
       <% end %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.7.3'
+    CURRENT = '0.7.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-24 00:00:00.000000000 Z
+date: 2026-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,6 +82,7 @@ files:
 - lib/generators/hot_glue/fields/time_field.rb
 - lib/generators/hot_glue/fields/uuid_field.rb
 - lib/generators/hot_glue/flash_notices_install_generator.rb
+- lib/generators/hot_glue/helpers/generator_helpers.rb
 - lib/generators/hot_glue/hot_glue.rb
 - lib/generators/hot_glue/install_generator.rb
 - lib/generators/hot_glue/layout/builder.rb