hot-glue 0.6.26.1 → 0.6.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077bb2e61017931d3db8f961922f3af0d4440bfd9900cc56f86bfa26aeb2e188
-  data.tar.gz: 3feecb2d560274cab61e7cb5f673175cf426fd6d7cef09112612e72f88e74038
+  metadata.gz: a5a077658d795c25ef41694b36014191f2590351f6a1fa87e8419b049f03f5ad
+  data.tar.gz: f2effbb98f5728fd70e2b7807903f86ad352a1dd3598562c3a450a804dcd51fb
 SHA512:
-  metadata.gz: e2add6dcc569806f8953976332a63f29ea4cfa309ced3b8fdeb97b5c9108d030711d01a39fde8029bbfcacdde8fd7b0229861647258a40e340d1deeacfed13f8
-  data.tar.gz: 0c36945b6007e22bd672822bd206f842a1cd7eea54e819652fce71d613c66d8791b3902c51cb7c177f1c743a6e7a7241679b19e274e34e12bafe1dd06acbc187
+  metadata.gz: bc1d59497e67ba88e9da7305bfe5b2664874178243c744860bc30335a6f835808e784cf0b67533bf7c31166c48fdc4e5af0db55382623e9c07a3dc9f754beb81
+  data.tar.gz: 6fbc0bfbc0cb9651802525f711566bf3b67ad9b34a4742600412c1addfe69fb20eab93a6bab363776a7eead66245fc120e22a554ecbd45303fafbdaaec49468f

data/Gemfile.lock

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

data/README.md

@@ -2210,6 +2210,13 @@ These automatic pickups for partials are detected at build time. This means that
 
 
 # VERSION HISTORY
+#### 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/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(" ", "")

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.26.1'
+    CURRENT = '0.6.27'
   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.27
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails