hot-glue 0.6.27 → 0.6.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a077658d795c25ef41694b36014191f2590351f6a1fa87e8419b049f03f5ad
-  data.tar.gz: f2effbb98f5728fd70e2b7807903f86ad352a1dd3598562c3a450a804dcd51fb
+  metadata.gz: b2adecf8cc5b25919ee16219a6dbf4176a178a1a393adf6a79ae1370a9fe89a9
+  data.tar.gz: 0e02cf776a658911f19bc65f057eb60b57cb04e54a783883e6eb17cc05c0a2fb
 SHA512:
-  metadata.gz: bc1d59497e67ba88e9da7305bfe5b2664874178243c744860bc30335a6f835808e784cf0b67533bf7c31166c48fdc4e5af0db55382623e9c07a3dc9f754beb81
-  data.tar.gz: 6fbc0bfbc0cb9651802525f711566bf3b67ad9b34a4742600412c1addfe69fb20eab93a6bab363776a7eead66245fc120e22a554ecbd45303fafbdaaec49468f
+  metadata.gz: 7789fd5eae2defcc87512f2d10fb3e40c8c68c8ae33380ea072b80239b985edd4f3a1cb4593472fc468e084b4ff480c450ea6edc79384fa3a3013fede972aff6
+  data.tar.gz: 0c5ed6e3d2478c86c6bfa08ed0b4e0306ff9160673c557cb02e633509ce5e93d636b4bd36c11e5d955de5443e5945d71c23caca424979dc9cc0f6377e88b418a

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.26.1)
+    hot-glue (0.6.28)
       ffaker (~> 2.16)
-      kaminari (~> 1.2)
       rails (> 5.1)
 
 GEM
@@ -114,18 +113,6 @@ GEM
     importmap-rails (1.1.5)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
-    kaminari (1.2.2)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.2)
-      kaminari-activerecord (= 1.2.2)
-      kaminari-core (= 1.2.2)
-    kaminari-actionview (1.2.2)
-      actionview
-      kaminari-core (= 1.2.2)
-    kaminari-activerecord (1.2.2)
-      activerecord
-      kaminari-core (= 1.2.2)
-    kaminari-core (1.2.2)
     loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

data/README.md

@@ -1658,12 +1658,17 @@ bin/rails generate Book --include=name,author_id --search=set --search-fields=na
 ```
 
 ### `--phantom-search='{type}_{name}[All|choice A:scope_a|choice B:scope_b]`
+`--phantom-search='radio_{name}[All|choice A:scope_a|choice B:scope_b]`
+`--phantom-search='checkboxes_{name}[All|choice A:off_scope_a:on_scope_a|choice B:off_scope_b:on_scope_b]`
+
 
 A phantom search is a search we are doing on this result set that doesn't correspond to a single field. Currently, the only available implementation is for scopes with no arguments, as in the example below. It is called 'phantom' because it could be (probably is) querying fields within the scope, but the search doesn't match up with a single field on your model. (So it's like creating 'phantom' criteria.). Only RADIO type is implemented, dropdown & checkboxes an a way to input a search value passed into the scope as an argument is TBD.
 
-{type} is any of: radio, dropdown, checkboxes
+{type} is any of: radio, checkboxes (showing one of each type above)
 
-{name} is a designation for this phantom search. Should NOT match any field name on your table. This should describe the kind of categorization we are performing.
+{name} is a designation for this phantom search. 
+Should NOT match any field name on your table. 
+This should describe the kind of categorization we are performing. Name is used for radio only; not shown to the user for checkboxes
 
 Your phantom search selector will be appended to the search fields and will be treated like a first-class search input, able to be combined with any of the other fields specified in a set search.
 
@@ -1676,11 +1681,16 @@ After the type & name, comes a block marked by square braces [ ... ]
 
 Within the square  braces, each search option is separated by a pipe (|) character. 
 
-Within each option is a label and ruby scope, separated by a colon (:).
+Within each option is a label and either one ruby scope (for radios) or an OFF scope and ON scope (for checkboxes), separated by a colon (:).
 
-The label comes before the colon the ruby scope. The ruby scope should be specified here without a dot. Each ruby scope must be defined on your model. If there is no scope specified, we assume "all", but we still need to specify a label for "All", which is why in the example above "All" has no colon after it.
+The label comes before the first colon the ruby scope. For checkboxes, you will have two colons followed by an "off" and "on scope'
+label:off scope:on scope
 
-example
+The ruby scope can be specified with or without a dot.
+
+Each ruby scope must be defined on your model. If there is no scope specified (empty), we assume "all", but we still need to specify a label for "All", which is why in the example above "All" has no colon after it.
+
+#### Radio Example
 
 `--phantom-search='radio_status[Pending:pending|Rejected:rejected|Accepted:accepted|All]'`
 
@@ -1702,10 +1712,33 @@ This produces a search interface with four options listed as radio buttons:
 
 The pending, approved, and rejected options will return search results with the corresponding scopes applied. The 'All' option will behave as a no-op, leaving the root search intact (giving all of the other modifications that Hot glue provides in different functionality).
 
-#### Predicate Search
-NOT IMPLEMENTED YET
-TODO: implement me
+##### Checkboxes example
+
+`rails generate hot_glue:scaffold Invoice --gd --phantom-search='checkboxes_AAA[With Paid:not_paid:|Hide free accounts::without_free_accounts]'`
+
+
+The syntax is similiar to the radio buttons except that each choice (within `[...]`, separated by `|`) is required to have THREE options, separated by colons `:`
+1) the label
+2) the OFF case (checkbox is unchecked)
+3) the ON case (checkbox is checked)
+
+The scope definition between the `:` characters **may be empty**, in which case this is interprested as "all"
+
+Since checkboxes start as off (unchecked) by default, you can create layouts that show the normal case with the checkboxes off, but show special cases with the checkboxes on.
+(This can either exclude or include depending on your preference.)
+
+In this Invoice scaffold, we have two scopes, searching for fields on our invoice model:
+
+`scope :not_paid, -> {where(paid_at: nil)}`
+`scope :without_free_accounts, -> {where(free_account: false)}`
+
+In the checkboxes phantom search we build above, notice by default:
+
+- the PAID invoices do not appear in the search result (the scope `.not_paid` is applied as the OFF scope for the "With Paid" choice. So when you load the page, you see only unpaid invoices. If you check "With Paid" checkbox, there is no scope specified "all" is used indicating not modification is applied and all records are shown. 
+- both free & non-free accounts (which are simply tracked by a boolean `free_account`) are shown by default, but when you use the "Hide free accounts" checkbox, the scope `.without_free_accounts` is applied, thus hiding the free accounts. 
 
+Remember, unlike radio choices which apply exclusively (since the user can select only 1 radio choice at time), checkboxes create 
+combined search criteria. These combine with all of the other search criteria within the search set, making one big "AND ... AND ... AND" query.
 
 ### `--stimmify` or `--stimmify=xyz`
 
@@ -2210,6 +2243,37 @@ These automatic pickups for partials are detected at build time. This means that
 
 
 # VERSION HISTORY
+
+#### 2025-10-11 - v0.6.39
+
+• When specifying  a alt lookup in non-Gd mode, we treat this a security concern because alt lookups can get any related record from the database; if you use a factory when creating your object, you can pass the lookup to the factory and scope your lookup in there; fix to not raise exception when specified an alt lookup in non-Gd mode if you are also using a factory
+
+• Attachments now have a graceful fail if the attachment is invariable (cannot be made into a thumbnail), and so there is no thumbnail to display. Instead, a small box with the file type ("pdf" or "msword") is shown in place where the thumbnail would display
+
+• Adds a 'tripple' implementation for newer pagination gems: will_paginate and pagy. HG will auto detect which pagination gem you have in your Gemfile, and pick ONE of the three based on this preference order: Pagy over will_paginate; will_paginate over Kaminari, no pagination if none of the three are installed.
+
+Kaminari is barely workable with newer Rails and seems somewhat abandoned; will_paginate is officially in maintenance mode, so Pagy is the way to go. I have implemented all three for the widest legacy support. On my Rails Cookbook pages, I have replaced Kaminari with Pagy.
+
+Migrating a large app from Kaminari to Pagy:
+
+- If you rip out Kaminari right away, it will be necessary to rebuild all of your Hot Glue controllers & views. On a large or customized app, this will be too tedious to do at once. Instead, contrary to the Pagy documentation, which encourages you to aggressively rip out the old gem (Kaminari),  you can leave both gems in place, operating side-by-side. As you rebuild each scaffold controller by controller, newly built scaffolds will use Pagy, replacing the older Kaminari syntax.
+
+• Hot Glue is now _OFFICIALLY dependency-free_! I've been building and working with Rails gems for years and years, and one of the interesting challenges that Rails 7 & 8 posed is that when the JavaScript and CSS delivery paradigms shift, it caused a massive atrophy of several old Rails gems. Codebases that relied on, for example, the old jquery-rails gem suddenly found themselves pantless. JS tool-only Gems are now discouraged, in favor of importmaps, propshaft, or JSBundling.
+
+When you build a gem, the naive gem builder thinks to themselves: Let me pull in other people's tools to make my tool stand on the shoulders of giants. 
+
+But when paradigms shift, those gems the gem depends on become a blocker for your Gem moving forward.
+
+I already had very few dependencies in Hot Glue — really just Rspec, Kaminari, and Rails itself. Although you need Turbo (and by extension JS), bootstrap is optional (but recommended), and Rspec is optional (but default). 
+
+The ONLY remaining dependency is ffaker (sorry!), which is necessary for the specs.
+
+Hot Glue is a companion tool to Turbo itself. Where Turbo Rails goes, we go. Although this gem is primarily built for Bootstrap, Bootstrap remains officially optional. Although you need Turbo for it to work, how you bring Turbo is up to you (bundling, pinning, propshafting, etc). With the removal of Kaminari and new support for will_paginate and Pagy, I hope this Gem can be integrated into more apps who may already have chosen their pagination system.
+
+#### 2025-09-26 - v0.6.28
+- Checkboxes option for Phantom Search (previously phantom searches only supported radio).
+See "Checkboxes example" under the docs for `--phantom-search` above
+
 #### 2025-09-24 - v0.6.27
 - Fixes to namespaced models (this is when the model file has a namespace); it now correctly does not namespace the route (fix to plurality)
 

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

@@ -42,7 +42,16 @@ def spec_setup_and_change_act(which_partial = nil)
 
   def line_field_output
     thumbnail = attachment_data[:thumbnail]
-
-    (thumbnail ? "<%= #{singular}.#{name}.attached? ? image_tag(#{singular}.#{name}.variant(:#{thumbnail})) : '' %>" : "")
+    if thumbnail
+      "<% if #{singular}.#{name}.attached? %>
+    <% if !#{singular}.#{name}.variable? %>
+      <span class=\"badge bg-secondary\"><%= #{singular}.#{name}.blob.content_type.split('/')[1] %></span>
+    <% else %>
+      <%= image_tag(#{singular}.#{name}.variant(:thumb)) %>
+    <% end %>
+    <% end %>"
+    else
+      ""
+    end
   end
 end

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -12,7 +12,7 @@ module  HotGlue
                   :search, :search_fields, :search_query_fields, :search_position,
                   :form_path, :layout_object, :search_clear_button, :search_autosearch,
                   :stimmify, :stimmify_camel, :hidden_create, :hidden_update, :invisible_create,
-                  :invisible_update, :plural, :phantom_search
+                  :invisible_update, :plural, :phantom_search, :pagination_style
 
 
     def initialize(singular:, singular_class: ,
@@ -25,7 +25,8 @@ module  HotGlue
                  search:, search_fields:, search_query_fields: , search_position:,
                  search_clear_button:, search_autosearch:, layout_object:,
                  form_path: , stimmify: , stimmify_camel:, hidden_create:, hidden_update: ,
-                 invisible_create:, invisible_update: , plural: , phantom_search:)
+                 invisible_create:, invisible_update: , plural: , phantom_search:,
+                   pagination_style: )
 
 
       @form_path = form_path
@@ -66,6 +67,7 @@ module  HotGlue
       @attachments = attachments
       @related_sets = related_sets
       @phantom_search = phantom_search
+      @pagination_style = pagination_style
     end
 
     def add_spaces_each_line(text, num_spaces)
@@ -149,22 +151,29 @@ module  HotGlue
       # phantom searches
       @phantom_search.each_key do |search_field|
         data = @phantom_search[search_field]
-        if data[:type] == "radio"
-          res << "<div>"
+        res << "<div>"
+        res << "<label>#{data[:name]}</label><br />"
 
-          res << "<label>#{data[:name]}</label><br />"
-
-          data[:choices].each do |choice|
+        data[:choices].each do |choice|
+          dom_label = choice[:label].downcase.gsub(" ","_")
+          if data[:type] == "radio"
             res << "\n<input type='radio'
-                            id='#{search_field}_search__#{choice[:label]}'
-                            name='q[0][#{search_field}_search]' value='#{choice[:label]}'
-           <%= 'checked' if  @q['0'][:#{search_field}_search] == \"#{choice[:label]}\" %> />"
-            res << "\n<label for='#{search_field}_search__#{choice[:label]}'>#{choice[:label]}</label> <br/>"
+                            id='#{search_field}_search__#{dom_label}}'
+                            name='q[0][#{search_field}_search]' value='#{dom_label}'
+           <%= 'checked' if  @q['0'][:#{search_field}_search] == \"#{dom_label}\" %> />"
+          elsif data[:type] == "checkboxes"
+            res << "\n<input type='checkbox'
+                            id='#{search_field}_search__#{dom_label}'
+                            name='q[0][#{search_field}_search__#{dom_label}]'
+                            value='1'
+           <%= 'checked' if  @q['0'][:#{search_field}_search__#{dom_label}]  %> />"
+
           end
+          res << "\n<label for='#{search_field}_search__#{dom_label}'>#{choice[:label]}</label> <br/>"
+        end
 
-          res << "</div>"
+        res << "</div>"
 
-        end
       end
 
 
@@ -259,7 +268,17 @@ module  HotGlue
     def paginate(*args)
       plural = args[0][:plural]
 
-      "<% if #{plural}.respond_to?(:total_pages) %><%= paginate(#{plural}) %> <% end %>"
+      if @pagination_style == "kaminari"
+        "<% if #{plural}.respond_to?(:total_pages) %><%= paginate(#{plural}) %> <% end %>"
+      elsif @pagination_style == "will_paginate"
+        "<% if #{plural}.respond_to?(:total_pages) %><%= will_paginate(#{plural}) %> <% end %>"
+      elsif @pagination_style == "pagy"
+        if !@layout_strategy == "bootstrap"
+          "<%== pagy_nav(@pagy, anchor_string: 'data-turbo-action=\"advance\"') %>"
+        else
+          "<%== pagy_bootstrap_nav(@pagy, anchor_string: 'data-turbo-action=\"advance\"') %>"
+        end
+      end
     end
 
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -166,6 +166,15 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @stimulus_syntax = true
     end
 
+
+    if Gem::Specification.find_all_by_name('pagy').any?
+      @pagination_style = 'pagy'
+    elsif Gem::Specification.find_all_by_name('will_paginate').any?
+      @pagination_style = 'will_paginate'
+    elsif Gem::Specification.find_all_by_name('kaminari').any?
+      @pagination_style = 'kaminari'
+    end
+
     if !options['markup'].nil?
       message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
       raise(HotGlue::Error, message)
@@ -704,7 +713,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         raise "You specified an alt-lookup for #{key} but that field is not an association field"
       elsif !@columns_map[key.to_sym]
         raise "You specified an alt-lookup for #{key} but that field does not exist in the list of columns"
-      elsif !@god && !@hawk_keys.include?(key.to_sym)
+      elsif !@god && !@hawk_keys.include?(key.to_sym) && !@factory_creation
         raise "You specified an alt-lookup for #{key} in non-Gd mode but this would leave the lookup unprotected. To fix, use with --hawk or with --factory-creation "
       end
     end
@@ -731,16 +740,30 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       }
 
       choices.each do |choice|
-        choice_label = choice.split(":")[0]
-        choice_scope = choice.split(":")[1]
-        if choice_scope.nil?
+        if type == "radio"
+          choice_label = choice.split(":")[0]
+          choice_scope = choice.split(":")[1]
+        elsif type == "checkboxes"
+          choice_label = choice.split(":")[0]
+          choice_scope_negative = choice.split(":")[1]
+          choice_scope  = choice.split(":")[2]
+        end
+
+        if choice_scope.nil? || choice_scope.strip.empty?
           choice_scope = "all"
         end
 
+        if choice_scope_negative.nil? || choice_scope_negative.strip.empty?
+          choice_scope_negative = "all"
+        end
+
         choice_scope = ".#{choice_scope}" if !choice_scope.start_with?(".")
+        choice_scope_negative = ".#{choice_scope_negative}" if !choice_scope_negative.start_with?(".")
+
         @phantom_search[label.to_sym][:choices] << {
           label: choice_label,
           scope: choice_scope,
+          scope_negative: choice_scope_negative,
         }
       end
       puts "phantom search #{@phantom_search}"
@@ -831,7 +854,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         hidden_update: @hidden_update,
         invisible_create: @invisible_create,
         invisible_update: @invisible_update,
-        phantom_search: @phantom_search
+        phantom_search: @phantom_search,
+        pagination_style: @pagination_style
       )
     elsif @markup == "slim"
       raise(HotGlue::Error, "SLIM IS NOT IMPLEMENTED")
@@ -1434,10 +1458,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   def any_nested?
     @nested_set.any?
   end
-
-  def all_objects_variable
-    all_objects_root + ".page(params[:page])"
-  end
+  #
+  # def all_objects_variable
+  #   all_objects_root + ".page(params[:page])"
+  # end
 
   def auth_object
     @auth
@@ -1801,7 +1825,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     else
       if !@self_auth
 
-        res << spaces(4) + "@#{ plural_name } = #{ object_scope.gsub("@",'') }#{ n_plus_one_includes }#{record_scope}"
+        res << spaces(4) + "@#{ plural_name } = #{ object_scope.gsub("@",'') }#{ n_plus_one_includes }#{record_scope}#{".all" if n_plus_one_includes.blank? && record_scope.blank? }"
 
         if @search_fields
           res << @search_fields.collect{ |field|
@@ -1834,15 +1858,36 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
 
     @phantom_search.each do |phantom_key, phantom_data|
-      phantom_data[:choices].each do |choice|
-        unless choice[:scope] == ".all"
-          res << "\n    @#{plural} = @#{plural}#{choice[:scope]} if @q['0'][:#{phantom_key}_search] == \"#{choice[:label]}\""
+      if phantom_data[:type] == "radio"
+        phantom_data[:choices].each do |choice|
+          unless choice[:scope] == ".all"
+            res << "\n    @#{plural} = @#{plural}#{choice[:scope]} if @q['0'][:#{phantom_key}_search] == \"#{choice[:label]}\""
+          end
+        end
+      elsif phantom_data[:type] == "checkboxes"
+        phantom_data[:choices].each do |choice|
+
+          # positive case
+          unless choice[:scope] == ".all"
+            res << "\n    @#{plural} = @#{plural}#{choice[:scope]} if @q['0'][:#{phantom_key}_search__#{choice[:label].gsub(" ", "_").downcase}] == \"1\""
+          end
+          unless choice[:scope_negative] == ".all"
+            res << "\n    @#{plural} = @#{plural}#{choice[:scope_negative]} if @q['0'][:#{phantom_key}_search___#{choice[:label].gsub(" ", "_").downcase}] != \"1\""
+          end
         end
       end
+
       res << "\n"
     end
 
-    res << "    @#{plural} = @#{plural}.page(params[:page])#{ ".per(per)" if @paginate_per_page_selector }"
+
+    if @pagination_style == "kaminari"
+      res << "    @#{plural} = @#{plural}.page(params[:page])#{ ".per(per)" if @paginate_per_page_selector }"
+    elsif @pagination_style == "will_paginate"
+      res << "    @#{plural} = @#{plural}.paginate(page: params[:page], #{ ", per_page: per" if @paginate_per_page_selector })"
+    elsif @pagination_style == "pagy"
+      res << "    @pagy, @#{plural} = pagy(@#{plural})"
+    end
     res
   end
 
@@ -1907,12 +1952,24 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     }.reduce({}, :merge)
 
     phantom_search_fields = @phantom_search.collect{| k,v|
-      default = v[:choices][0]
-      {
-        "#{k}_match".to_sym => "",
-        "#{k}_search".to_sym => "#{default[:label]}"
-      }
-    }.reduce({}, :merge)
+      if v[:type] == "radio"
+        default = v[:choices][0]
+        {
+          "#{k}_match".to_sym => "",
+          "#{k}_search".to_sym => "#{default[:label]}"
+        }
+      elsif v[:type] == "checkboxes"
+        v[:choices].collect{ |c|
+          {
+            "#{k}_#{c[:label].gsub(" ", "_").downcase}".to_sym => ""
+          }
+        }
+      end
+    }
+
+    phantom_search_fields.flatten!
+    phantom_search_fields = phantom_search_fields.reduce({}, :merge)
+
     return {"0" => (default_fields.merge(phantom_search_fields))}
   end
 end

data/lib/hot-glue.rb

@@ -1,5 +1,4 @@
 require "hotglue/engine"
-require 'kaminari'
 
 module HotGlue
   module TemplateBuilders
@@ -10,7 +9,6 @@ module HotGlue
   class Error < StandardError
   end
 
-
   def self.to_camel_case(str)
     words = str.split(/[^a-zA-Z0-9]/) # split by non-alphanumeric characters
     return '' if words.empty?

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.27'
+    CURRENT = '0.6.29'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.27
+  version: 0.6.29
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-24 00:00:00.000000000 Z
+date: 2025-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement