hot-glue 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce1267ee3ccc16a7f32068e1f4faa0aafab073d1f1af91744f02c7e63e2b40c
-  data.tar.gz: f87d7c1cecc3cd30ceff3d2176d82cc6e51ff62245ba54e02ffd8487cb214d75
+  metadata.gz: a3b2bb368a4cdb82730ae64b48bea2e06e8183eeca6b262fe26efa2291710f6d
+  data.tar.gz: cb9ac4fe4f6175098e940baa602f766bf962367c4b3de9b782c9b5f11a6b1891
 SHA512:
-  metadata.gz: b3740aff61a08504a01237aa822ff3e92ed09afc91666d4398e400bf8cede65d74d86dddd950e664ff155de69413707fd5b5460b31c0504428df50c6c18af8d5
-  data.tar.gz: 503b69ea3a5abe6074fcc0bc987db37c1efb88e38cbbb79ecf1fb5ff8a58fda01609469b4da0554c42ded090ef1c896e9dc00c759f1fa31fc31ed34b4ccbea7d
+  metadata.gz: 15dcae458d17b32d08922021b3baafb87a4be7f1d4f2a576aad23b933b532983835458a06c2d71dd2b8eb984c48df50df394a4d9b84e70a3a5ba56590e8e197f
+  data.tar.gz: d56153ba5db70d8ee003ec4d7ef7b85b99be5161deb09fc0453c52c967c8489b87a0f21596bfc826c6882e61e0aff6f317fa5b2c007ca380251baec876f66397

data/Gemfile.lock

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

data/README.md

@@ -1361,20 +1361,34 @@ Use `before` to make the labels come before or `after` to make them come after.
 
 
 ### Code insertions
+Insert some code into the `new`, `create` or `update` action actions.
 
-### `--code-before-create=`
-### `--code-after-create=`
-### `--code-before-update=`
-### `--code-after-update=`
-
-Insert some code into the `create` action or `update` actions.
-The **before code** is called _after authorization_ but _before saving_ (which creates the record, or fails validation).
-The **after create** code is called after the record is saved (and thus has an id in the case of the create action).
-Both should be wrapped in quotation marks when specified in the command line, and use semicolons to separate multiple lines of code.
+Wrapped in quotation marks when specified in the command line, and use semicolons to separate multiple lines of code.
 (Notice the funky indentation of the lines in the generated code. Adjust you input to get the indentation correct.)
 
 
 
+#### `--code-before-create=`
+
+called _after authorization_ but _before saving the new record_ 
+(which creates the record, or fails validation).
+Here you can do things like set default values, or modify the params before the record is saved.
+
+#### `--code-after-create=`
+is called after the record is saved (and thus has an id in the case of the create action).
+
+#### `--code-before-update=`
+is called in the `update` action _before_ it is saved.
+`
+#### `--code-after-update=`
+is called in the `update` action _after_ it is saved.
+
+#### `--code-after-new=`
+is called in the `new` after the .new() call
+
+
+
+
 ### `--search=` (options: simple, set, false predicate, default: false)
 
 
@@ -2019,6 +2033,22 @@ These automatic pickups for partials are detected at build time. This means that
 # VERSION HISTORY
 
 
+#### 2025-07-05 v0.6.21
+•Now use new code insertion `--code-after-new` for code that happens directly after `.new()` call. use semicolon (`;`) to create linebreaks; no reason why the factories should insert flash messages
+
+• removes duplicitous flash messages in factory context
+
+• adds documentation for `--code-before-create`, `--code-after-create`, `--code-before-update`, `--code-after-update` (these features were already implemented)
+
+• updates are now built using `.assign_attributes` followed by `.save` (previously, they were updated with one `.update()` call); this allows your Pundit policy to check if the changed values are valid and raise an exception if not allowed based on the changed data (can be checked on Rails models with `.changed` or `.changes`; see https://api.rubyonrails.org/classes/ActiveModel/Dirty.html)
+
+• Fixes to timezone aware input. If your `current_user` (or auth object) has a method `timezone`, your datetime and time inputs will be timezone-aware.
+
+If a timezone is present, datetimes & times will be converted from database-native UTC into the current user's timezone when displayed (either as viewable or editable)
+
+If a user puts a time into the interface, it is assumed to be in the user's timezone and is converted to UTC before being saved. 
+
+
 #### 2025-06-13 v0.6.20
 Breaking changes:
 • the setting in your hot_glue.yml file for `:pundit_default:` has been renamed just `:pundit:`.

data/app/helpers/hot_glue/controller_helper.rb

@@ -74,20 +74,31 @@ module HotGlue
         (Time.now.utc.month == 11 && Time.now.utc.day < (7 - Time.now.utc.wday))
     end
 
-    def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = nil)
-      use_timezone = (current_user_object.try(:timezone)) || Time.zone
+    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.nil? # legacy pre v0.5.18 behavior
-            include_me = k.ends_with?("_at") || k.ends_with?("_date")
-          else
-            include_me = field_list.include?(k.to_sym)
+          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?
             if use_timezone
+
               parse_date = "#{params[k].gsub("T", " ")} #{use_timezone.formatted_offset}"
               # 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
@@ -96,8 +107,12 @@ module HotGlue
               # 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
-              parsed_time = Time.strptime(parse_date, "%Y-%m-%d %H:%M %Z")
-              parsed_time = parsed_time.to_time - 60.minutes if uses_dst && is_dst_now?
+              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
+              # parsed_time = parsed_time.to_time - 60.minutes if uses_dst && is_dst_now?
               params[k] = parsed_time
             end
           end

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

@@ -39,6 +39,7 @@ class Field
     @god = scaffold.god
 
 
+
     # TODO: remove knowledge of subclasses from Field
     unless self.class == AttachmentField || self.class == RelatedSetField
       @sql_type = eval("#{class_name}.columns_hash['#{name}']").sql_type
@@ -194,7 +195,8 @@ class Field
   end
 
   def modify_binary?
-    !!(modify_as && modify_as[name.to_sym] && modify_as[name.to_sym][:binary])
+    return false if !modify_as
+    modify_as[:binary]
   end
 
   def display_boolean_as

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

@@ -10,7 +10,7 @@ class TimeField < Field
 
   def line_field_output
     "<% unless #{singular}.#{name}.nil? %>
-      <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%l:%M %p ') %>
+      <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%l:%M %p %Z') %>
      <% else %>
     <span class=''>MISSING</span>
     <% end %>"

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -106,6 +106,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :code_after_create, default: nil
   class_option :code_before_update, default: nil
   class_option :code_after_update, default: nil
+  class_option :code_after_new, default: nil
   class_option :record_scope, default: nil
   class_option :no_nav_menu, type: :boolean, default: false # suppress writing to _nav template
   class_option :include_object_names, type: :boolean, default: false
@@ -531,6 +532,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @code_after_create = options['code_after_create']
     @code_before_update = options['code_before_update']
     @code_after_update = options['code_after_update']
+    @code_after_new = options['code_after_new']
 
     buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + @magic_buttons.count
 
@@ -967,10 +969,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       #{@factory_creation}
       "
       res << "\n      " + "@#{singular} = factory.#{singular}" unless res.include?("@#{singular} = factory.#{singular}")
-      res << "\n      flash[:notice] = \"Successfully created \#{@#{singular}.name}\" unless @#{singular}.new_record?
-    rescue ActiveRecord::RecordInvalid
+      res << "\n    rescue ActiveRecord::RecordInvalid
       @#{singular} = factory.#{singular}
-      flash[:alert] = \"Oops, your #{singular} could not be created. #{@hawk_alarm}\"
       @action = 'new'
     end"
       res
@@ -1174,13 +1174,17 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def datetime_fields_list
-    @columns.select do |col|
-      if @the_object.columns_hash[col.to_s]
-        @the_object.columns_hash[col.to_s].type == :datetime
+    @columns.each_with_object({}) do |col, hash|
+      column = @the_object.columns_hash[col.to_s]
+      if column && [:datetime, :time].include?(column.type)
+        hash[col.to_sym] = column.type
       end
     end
   end
 
+
+
+
   def form_path_new_helper
     HotGlue.optionalized_ternary(namespace: @namespace,
                                  target: @controller_build_folder,
@@ -1320,12 +1324,13 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     # to know who the current user under this design
     # for timeinput = user_centered , we need to know who the current user is
     # so we can set the time zone to the user's time zone
-    #
+
     if options['auth']
       options['auth']
     elsif @god
-      # do we use current_user here
       "nil"
+    else
+      @auth
     end
   end
 

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

@@ -95,6 +95,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     @<%= singular_name %> = <%= class_name %>.new<% if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>(<%= @object_owner_sym %>: <%= @object_owner_eval %>)<% end %><% elsif @object_owner_optional && any_nested? %>
     @<%= singular_name %> = <%= class_name  %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}))<% else %>
     @<%= singular_name %> = <%= class_name  %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% end %>
+    <%=  @code_after_new ?  @code_after_new.gsub(";","\n") + "\n" : "" %>
+
     <% if @pundit && !@pundit_policy_override %>
     authorize @<%= singular %><% elsif @pundit && @pundit_policy_override %>
     skip_authorization
@@ -216,19 +218,20 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <% end %>
    <% if @hawk_keys.any? %> modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
     <%= controller_attachment_orig_filename_pickup_syntax %>
+    @<%= singular_name %>.assign_attributes(modified_params)
       <% if @pundit && !@pundit_policy_override %>
       authorize @<%= singular_name %>
       <%= @code_before_update ? "\n    " + @code_before_update.gsub(";", "\n") : "" %>
 
-    if @<%= singular_name %>.update(modified_params)
+    if @<%= singular_name %>.save
 
     <% elsif @pundit && @pundit_policy_override %>
     skip_authorization
     raise Pundit::NotAuthorizedError if ! <%= @pundit_policy_override %>.update?
-    if @<%= singular_name %>.update(modified_params)
+    if @<%= singular_name %>.save
       <% else %>
       <%= @code_before_update ? "\n    " + @code_before_update.gsub(";", "\n") : "" %>
-    if @<%= singular_name %>.update(modified_params)<% end %>
+    if @<%= singular_name %>.save<% end %>
       <%= post_action_parental_updates.compact.join("\n      ") %>
       <%= @code_after_update ? "\n    " + @code_after_update.gsub(";", "\n") : "" %>
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.20'
+    CURRENT = '0.6.21'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-13 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails