hot-glue 0.6.26.1 → 0.6.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077bb2e61017931d3db8f961922f3af0d4440bfd9900cc56f86bfa26aeb2e188
-  data.tar.gz: 3feecb2d560274cab61e7cb5f673175cf426fd6d7cef09112612e72f88e74038
+  metadata.gz: 139de0a1f6e85c50561d3b69a74618abe2fc808908b7d217adefcd23bf1ee569
+  data.tar.gz: 547d675591fbf331fb2019fc29ddb5bebb080cdd97f523f4c5b8c9ca703739f1
 SHA512:
-  metadata.gz: e2add6dcc569806f8953976332a63f29ea4cfa309ced3b8fdeb97b5c9108d030711d01a39fde8029bbfcacdde8fd7b0229861647258a40e340d1deeacfed13f8
-  data.tar.gz: 0c36945b6007e22bd672822bd206f842a1cd7eea54e819652fce71d613c66d8791b3902c51cb7c177f1c743a6e7a7241679b19e274e34e12bafe1dd06acbc187
+  metadata.gz: 565d6cc9513225395e67015b00b7ef669be883fed53777d0a737328018241a7e2982dc2783bca48962ec7c0eb469ed816ca624b0c444d28f392b103b234364f6
+  data.tar.gz: 1ab45d51300b844444206c685b8ac068dc9b5e22e5399691d342173a5c00c9e0a238673b599a326a8f5919b6e6df78b4f3937fe6fcaf89a328701957cd36626c

data/Gemfile.lock

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

data/README.md

@@ -1680,7 +1680,7 @@ Within each option is a label and ruby scope, 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.
 
-example
+#### Radio Example
 
 `--phantom-search='radio_status[Pending:pending|Rejected:rejected|Accepted:accepted|All]'`
 
@@ -1702,10 +1702,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 +2233,18 @@ These automatic pickups for partials are detected at build time. This means that
 
 
 # VERSION HISTORY
+
+#### 2025-09-26 - v.0.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)
+
+- Fixes timezone awareness on **time field** inputs; your current_user must have a timezone (string) object
+This jerry-rigs a timezone (based on the current user's timezone & daylight savings time) onto the time object, storing it as-if it is in UTC (even though time fields are not associated with a timezone)  
+
+
 #### 2025-09-16 - v0.6.26
 • Phantom Searching
 `--phantom-search='{type}_{name}[All|choice A:scope_a|choice B:scope_b],radio_yyyy[choice C:scope_c|]`

data/app/helpers/hot_glue/controller_helper.rb

@@ -45,9 +45,7 @@ module HotGlue
       # returns a TimeZone (https://apidock.com/rails/TimeZone) object
       if defined?(current_user)
         if current_user.try(:timezone)
-          current_user.timezone
-
-          # Time.now.in_time_zone(current_user.timezone.to_i).zone
+          ActiveSupport::TimeZone[current_user.timezone]
         else
           Rails.application.config.time_zone
           # Time.zone.name
@@ -58,6 +56,49 @@ module HotGlue
       end
     end
 
+    def formatted_time_display(object, method, current_user)
+      tz = ActiveSupport::TimeZone[current_user.timezone]
+
+      t = object.public_send(method)
+
+      # Build UTC datetime for today + stored time
+      utc_datetime = Time.utc(
+        Time.now.year,
+        Time.now.month,
+        Time.now.day,
+        t.hour,
+        t.min,
+        t.sec
+      )
+
+      # Convert to user's timezone (DST-aware)
+      local_time = utc_datetime.in_time_zone(tz)
+
+      local_time.strftime('%-l:%M %p %Z')
+    end
+
+    def formatted_time_field(object, method, current_user)
+      tz = ActiveSupport::TimeZone[current_user.timezone]
+
+      t = object.public_send(method)
+
+      # Build UTC datetime from the stored time
+      utc_datetime = Time.utc(
+        Time.now.year,
+        Time.now.month,
+        Time.now.day,
+        t.hour,
+        t.min,
+        t.sec
+      )
+
+      # Convert to user's timezone (DST-aware)
+      local_time = utc_datetime.in_time_zone(tz)
+
+      # Format for HTML5 <input type="time"> (24h clock, HH:MM)
+      local_time.strftime('%H:%M')
+    end
+
     def date_to_current_timezone(date, timezone = nil)
       # used for displaying when in EDIT  mode
       # (this format is how the browser expectes to receive the value='' of the input field)
@@ -79,71 +120,112 @@ module HotGlue
       "#{sign}#{hour_abs}#{minute_str}"
     end
 
-    def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = {})
-
-      use_timezone = if current_user_object.try(:timezone)
-                       (ActiveSupport::TimeZone[current_user_object.timezone])
-                     else
-                       Time.zone
-                     end
+    # def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = {})
+    #
+    #   use_timezone = if current_user_object.try(:timezone)
+    #                    (ActiveSupport::TimeZone[current_user_object.timezone])
+    #                  else
+    #                    Time.zone
+    #                  end
+    #
+    #
+    #   uses_dst = (current_user_object.try(:locale_uses_dst)) || false
+    #
+    #   modified_params = modified_params.tap do |params|
+    #     params.keys.each{|k|
+    #       if field_list.is_a?(Hash)
+    #         include_me = field_list[k.to_sym].present?
+    #       elsif field_list.is_a?(Array)
+    #         field_list.include?(k.to_sym)
+    #       end
+    #
+    #       parsables =  {
+    #         datetime: "%Y-%m-%d %H:%M %z",
+    #         time: "%H:%M %z"
+    #       }
+    #
+    #
+    #       if include_me && params[k].present?
+    #         input_value = params[k].gsub("T", " ") # e.g. "2025-09-24 14:00" or "14:00"
+    #
+    #         if field_list.is_a?(Array)
+    #           # Datetime inputs (e.g. datetime-local)
+    #           parsed_time = Time.strptime(input_value, "%Y-%m-%d %H:%M")
+    #           parsed_time = parsed_time.utc.change(sec: 0)
+    #         else
+    #           case field_list[k.to_sym]
+    #           when :datetime
+    #             parsed_time = Time.strptime(input_value, "%Y-%m-%d %H:%M")
+    #             parsed_time = parsed_time.utc.change(sec: 0)
+    #           when :time
+    #
+    #             Rails.logger.info("input_value: #{input_value}")
+    #             # Parse as hour/minute only, no zone
+    #             t = Time.strptime(input_value, "%H:%M")
+    #
+    #             # Build a UTC time with today's date
+    #             parsed_time = Time.utc(Time.now.year, Time.now.month, Time.now.day, t.hour, t.min, 0)
+    #             # Convert back to a plain "time of day" (for DB `time` column)
+    #             parsed_time = parsed_time.to_time.change(sec: 0)
+    #             Rails.logger.info("parsed_time: #{parsed_time}")
+    #
+    #           else
+    #             raise "Unsupported field type: #{field_list[k.to_sym]}"
+    #           end
+    #         end
+    #
+    #         Rails.logger.info "parsed_time #{parsed_time}"
+    #         params[k] = parsed_time
+    #       end
+    #     }
+    #   end
+    #   modified_params
+    # end
 
+    def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = {})
+      use_timezone =
+        if current_user_object.try(:timezone)
+          ActiveSupport::TimeZone[current_user_object.timezone]
+        else
+          Time.zone
+        end
 
-      uses_dst = (current_user_object.try(:locale_uses_dst)) || false
+      modified_params.tap do |params|
+        params.keys.each do |k|
+          include_me =
+            if field_list.is_a?(Hash)
+              field_list[k.to_sym].present?
+            elsif field_list.is_a?(Array)
+              field_list.include?(k.to_sym)
+            end
 
-      modified_params = modified_params.tap do |params|
-        params.keys.each{|k|
-          if field_list.is_a?(Hash)
-            include_me = field_list[k.to_sym].present?
-          elsif field_list.is_a?(Array)
-            field_list.include?(k.to_sym)
+          next unless include_me && params[k].present?
+
+          input_value = params[k].gsub("T", " ") # "13:00" or "2025-09-24 13:00"
+
+          case field_list[k.to_sym]
+          when :datetime
+            # Interpret input as in user's local time zone
+            local_time = use_timezone.strptime(input_value, "%Y-%m-%d %H:%M")
+            # Convert to UTC for storage
+            parsed_time = local_time.utc.change(sec: 0)
+          when :time
+            # Parse as HH:MM (local wall clock time)
+            t = Time.strptime(input_value, "%H:%M")
+            # Interpret in user's timezone, with today's date
+            local_time = use_timezone.local(Time.now.year, Time.now.month, Time.now.day, t.hour, t.min, 0)
+            # Convert to UTC for storage
+            parsed_time = local_time.utc
+          else
+            next
           end
 
-          parsables =  {
-            datetime: "%Y-%m-%d %H:%M %z",
-            time: "%H:%M %z"
-          }
-
-
-          if include_me && params[k].present?
-            if use_timezone
-              natural_offset = use_timezone.formatted_offset
-              hour = natural_offset.split(":").first.to_i
-              min  = natural_offset.split(":").last.to_i
-
-              hour = hour + 1 if uses_dst && is_dst_now?
-
-              use_offset = format_timezone_offset(hour, min)
-              parse_date = "#{params[k].gsub("T", " ")} #{use_offset}"
-
+          Rails.logger.info "input_value: #{input_value}"
+          Rails.logger.info "parsed_time: #{parsed_time} (#{parsed_time.zone})"
 
-              Rails.logger.info("use_offset: #{use_offset}")
-
-              Rails.logger.info("parse_date: #{parse_date}")
-
-              # note: as according to https://stackoverflow.com/questions/20111413/html5-datetime-local-control-how-to-hide-seconds
-              # there is no way to set the seconds to 00 in the datetime-local input field
-              # as I have implemented a "seconds don't matter" solution,
-              # the only solution is to avoid setting any non-00 datetime values into the database
-              # if they already exist in your database, you should zero them out
-              # or apply .change(sec: 0) when displaying them as output in the form
-              # this will prevent seconds from being added by the browser
-              if  field_list.is_a?(Array)
-                parsed_time = Time.strptime(parse_date, "%Y-%m-%d %H:%M %z")
-              else
-                parsed_time = Time.strptime(parse_date, parsables[field_list[k.to_sym]])
-              end
-              Rails.logger.info "parsed_time #{parsed_time}"
-              Rails.logger.info "Timezone: #{use_timezone.name}"
-              Rails.logger.info "Offset: #{use_timezone.formatted_offset}"
-              Rails.logger.info "DST? #{uses_dst} | is_dst_now? => #{is_dst_now?}"
-              Rails.logger.info "Final offset used: #{use_offset}"
-
-              params[k] = parsed_time
-            end
-          end
-        }
+          params[k] = parsed_time
+        end
       end
-      modified_params
     end
 
     def hawk_params(hawk_schema, modified_params)

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

@@ -5,15 +5,15 @@ class TimeField < Field
   end
 
   def form_field_output
-    "<%= time_field_localized(f, :#{name}, #{singular}.#{name}&.in_time_zone(current_user.timezone)&.strftime('%H:%M'), label: '#{ name.to_s.humanize  }') %>"
+    "<%= time_field_localized(f, :#{name}, formatted_time_field(#{singular}, :#{name}, current_user), label: \"#{ name.to_s.humanize } \#{ current_user.timezone }\") %>"
   end
 
   def line_field_output
-    "<% unless #{singular}.#{name}.nil? %>
-      <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%l:%M %p %Z') %>
-     <% else %>
-    <span class=''>MISSING</span>
-    <% end %>"
+    "\n    <% unless #{singular}.#{name}.nil? %>
+      <%= formatted_time_display(#{singular}, :#{name}, current_user) %>
+    <% else %>
+      <span class=''>MISSING</span>
+    <% end %>\n"
   end
 
   def spec_setup_and_change_act(which_partial = nil)

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

@@ -149,22 +149,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
 
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -202,18 +202,22 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       end
 
     args = meta_args[0]
+
+
     @singular =   args.first.tableize.singularize # should be in form hello_world
 
     if @singular.include?("/")
       @singular = @singular.split("/").last
     end
 
-    @plural = (options['plural'] ||  args.first.tableize.singularize.pluralize) # respects what you set in inflections.rb, to override, use plural option
-
+    @plural = (options['plural'] || args.first.tableize.singularize.pluralize)
+    if @plural.include?("/")
+      @plural = @plural.split("/").last
+    end
+    # respects what you set in inflections.rb, to override, use plural option
     puts "SINGULAR: #{@singular}"
     puts "PLURAL: #{@plural}"
 
-
     @namespace = options['namespace'] || nil
     @namespace_value = @namespace
     use_controller_name =  plural.titleize.gsub(" ", "")
@@ -727,16 +731,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}"
@@ -1830,11 +1848,25 @@ 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
 
@@ -1903,12 +1935,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/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.26.1'
+    CURRENT = '0.6.28'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.26.1
+  version: 0.6.28
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails