hot-glue 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dba1b859e4d938e78c7b52783d63bdbda1a777443cfd3ffaa563b09d30e87d8
-  data.tar.gz: a4ca56dc9f3d29b3824ec5f9d305c1bca3ec54ea500cc9d5e334a294affd9449
+  metadata.gz: e3eed7ea3e4a53cd699a7c6dcbc3b3ddc32daaaa2d4c2c1404b273a558c56164
+  data.tar.gz: 1969aecb3e38316da444557cc636aeb4b199bcabf74230212abf4a0c0b50039f
 SHA512:
-  metadata.gz: e04f745ed5b0c699ef10ba60bb0aad77f8870720ffaea550976901342c6289e031a565fbc2c663555db7fed1fd98678ac58c594ba0dc191558b05e3fc3852261
-  data.tar.gz: 280916089abee5264deda93738c2cf5922da5da90eaffb268959f403d091019e851980e59130938ba5cede468217e40f8b69a0bfd55b673a390096eec92d944e
+  metadata.gz: c68c27d95ed2359a8f8518aac33dbbf363cfd86b97252849445750680a4f04bf0caad6bf70639c35392baf9212e1f4224c1dec9a9658ab7a4e02b03ef2787bdf
+  data.tar.gz: ba2e7f93b676bb2e50b2ebb96b4d88b1f8153c6fbd6aef119c17585ac6ad623030604927224e78da5df2510280ccb275250a9eab9e6d8304c3adef391141d1a5

data/.github/workflows/test_suite.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@v1 # v1.146.0
         with:
           bundler-cache: true
 

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.2.4

data/Gemfile.lock

@@ -255,6 +255,7 @@ GEM
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -62,7 +62,8 @@ Instantly get a simple CRUD interface
 # Getting Started Video
 [Hot Glue Getting Started (JSBundling)](https://www.youtube.com/watch?v=bzpXOhBkiDk)
 
-_If you are on Rails 6, see [LEGACY SETUP FOR RAILS 6](https://github.com/jasonfb/hot-glue/README2.md) and complete those steps FIRST._
+_If you are on Rails 6, see [LEGACY SETUP FOR RAILS 6](https://github.com/hot-glue-for-rails/hot-glue/blob/main/README2.md) and complete those steps FIRST._
+
 
 ## The Super-Quick Setup
 https://jasonfleetwoodboldt.com/courses/stepping-up-rails/jason-fleetwood-boldts-rails-cookbook/hot-glue-quick-install-mega-script/
@@ -113,7 +114,7 @@ To run Turbo (which Hot Glue requires), you must either (1) be running an Import
 
 (For the old method of installing Bootstrap [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-bootstrap/))
 
-(Remember, for Rails 6 you must go through the [LEGACY SETUP FOR RAILS 6](https://github.com/jasonfb/hot-glue/blob/main/README2.md) before continuing.)
+(Remember, for Rails 6 you must go through the [LEGACY SETUP FOR RAILS 6](https://github.com/hot-glue-for-rails/hot-glue/blob/main/README2.md) before continuing.)
 
 
 ### 2. ADD RSPEC, FACTORY-BOT, AND FFAKER
@@ -681,13 +682,15 @@ You will need to separately specify them as show-only if you want them to be non
 
 Notice that each modifiers can be used with specific field types. 
 
-| user modifier                 | what it does                                                                                                                                                     | Field types                       |   |   |
-|-------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------|---|---|
-| $                             | wraps output in `number_to_currency()`                                                                                                                           | floats and integers               |   |   |
+| user modifier                 | what it does                                                                                                                                                         | Field types                       |   |   |
+|-------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------|---|---|
+| $                             | wraps output in `number_to_currency()`                                                                                                                               | floats and integers               |   |   |
 | (truthy label)\|(falsy label) | specify a binary switch with a pipe (\|) character if the value is truthy, it will display as "truthy label" if the value is falsy, it will display as "falsy label" | booleans, datetimes, dates, times |   |    |
-| partials                      | applies to enums only, you must have a partial whose name matches each enum type                                                                                 | enums only                        |   |   |
-| tinymce                       | applies to text fields only, be sure to setup TineMCE globally                                                                                                   | text fields only                  |    |   |
-| typeahead                     | turns a foreign key (only) into a searchable typeahead field                                                                                                     | foreign keys only                 |   |   |
+| partials                      | applies to enums only, you must have a partial whose name matches each enum type                                                                                     | enums only                        |   |   |
+| tinymce                       | applies to text fields only, be sure to setup TineMCE globally                                                                                                       | text fields only                  |    |   |
+| typeahead                     | turns a foreign key (only) into a searchable typeahead field                                                                                                         | foreign keys only                 |   |   |
+| timezone                      | turns a string (varchar) into a drop down of timezones                                                                                                               | foreign keys only                 |   |   |
+
 
 Except for "(truthy label)" and "(falsy label)" which use the special syntax, use the modifier _exactly_ as it is named.
 
@@ -1612,6 +1615,19 @@ These automatic pickups for partials are detected at buildtime. This means that
 
 # VERSION HISTORY
 
+#### 2024-10-11 - v0.6.5
+• Adds timezone support as a modify option
+
+`--modify='time_zone{timezone}'`
+
+Note that this is a string field that will be displayed as a dropdown list of timezones using the rails `time_zone_select` helper.
+
+Unlike the previous implementation which used `timezone`, this one uses the Rails locale names as provided by the `name` method returned from the `ActiveSupport::TimeZone` object.
+
+• Fixes redisplay issue on big edit
+
+• Fix for time parsing
+
 
 #### 2024-08-08 - v0.6.4 (renumbered v 6.0.3.3)
 
@@ -2309,3 +2325,9 @@ To run only the internal specs, use
 
 Internal Test coverage as of 2023-10-15 (v0.5.24)
 All Files ( 86.29% covered at 75.64 hits/line )
+
+
+### Reference
+
+https://stackoverflow.com/questions/78313570/unable-to-bundle-install-nio4r-on-a-new-mac-m3
+

data/app/helpers/hot_glue/controller_helper.rb

@@ -70,7 +70,6 @@ module HotGlue
 
     def modify_date_inputs_on_params(modified_params, current_user_object = nil, field_list = nil)
       use_offset = (current_user_object.try(:timezone)) || server_timezone_offset
-
       modified_params = modified_params.tap do |params|
         params.keys.each{|k|
 
@@ -81,18 +80,14 @@ module HotGlue
           end
           if include_me
             if use_offset != 0
-              puts "changing #{params[k]}"
+              zone = DateTime.now.in_time_zone(use_offset).zone
 
               if use_offset.is_a? String
-                puts "parsing #{use_offset}"
-                zone = DateTime.now.in_time_zone(use_offset).zone
                 params[k] = DateTime.parse(params[k].gsub("T", " ") + " #{zone}")
               else
-                puts "parsing #{use_offset}"
-                params[k] = DateTime.strptime("#{params[k]} #{use_offset}", '%Y-%m-%dT%H:%M %z').new_offset(0)
+                parse_date = "#{params[k].gsub("T", " ")} #{zone}"
+                params[k] = Time.strptime(parse_date, "%Y-%m-%d %H:%M:%S %Z")
               end
-              puts "changed #{params[k]}"
-
             end
           end
         }

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

@@ -137,6 +137,8 @@ class Field
       res += "<%= #{singular}.#{name} ? '#{modify_as[:binary][:truthy]}' : '#{modify_as[:binary][:falsy]}' %>"
     elsif modify_as[:tinymce]
 
+    elsif modify_as[:timezone]
+      res += "<%= #{singular}.#{name} %>"
     elsif modify_as[:enum]
       res += "<%= render partial: #{singular}.#{name}, locals: {#{singular}: #{singular}} %>"
     end
@@ -153,7 +155,11 @@ class Field
   end
 
   def field_output(type = nil, width )
-    "  <%= f.text_field :#{name}, value: #{singular}.#{name}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+    if modify_as && modify_as[:timezone]
+      "<%= f.time_zone_select :#{name}, ActiveSupport::TimeZone.all, {}, {class: 'form-control'} %>"
+    else
+      "  <%= f.text_field :#{name}, value: #{singular}.#{name}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+    end
   end
 
   def text_area_output(field_length, extra_classes: "")

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -258,6 +258,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
           @modify_as[key.to_sym] =  {tinymce: 1, badges: $3}
         elsif $2 == "typeahead"
           @modify_as[key.to_sym] =  {typeahead: 1, badges: $3}
+        elsif $2 == "timezone"
+          @modify_as[key.to_sym] =  {timezone: 1, badges: $3}
         else
           raise "unknown modification direction #{$2}"
         end
@@ -1175,7 +1177,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   def copy_view_files
     return if @specs_only
     @edit_within_form_partial = File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/#{@controller_build_folder}/_edit_within_form.html.#{@markup}")
-    @edit_after_form_partial = File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/#{@controller_build_folder}/_edit_within_form.html.#{@markup}")
+    @edit_after_form_partial = File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/#{@controller_build_folder}/_edit_after_form.html.#{@markup}")
     @new_within_form_partial = File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/#{@controller_build_folder}/_new_within_form.html.#{@markup}")
     @new_after_form_partial = File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/#{@controller_build_folder}/_new_within_form.html.#{@markup}")
     @index_before_list_partial = File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/#{@controller_build_folder}/_index_before_list.html.#{@markup}")

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

@@ -73,7 +73,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
   <% unless @no_list %>
   def load_all_<%= plural %>
-<%= load_all_code %>  end
+    <%= load_all_code %>
+  end
 
   def index<% if @search == "set" %>
     @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo|
@@ -185,15 +186,16 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
       flash[:notice] << "Saved #{@<%= singular %>.<%= display_class %>}"
       flash[:alert] = @hawk_alarm if @hawk_alarm
-      render :update
+      <% unless @big_edit %>render :update, status: :unprocessable_entity<% else  %>redirect_to <%= @namespace %>_<%= @plural %>_path<% end %>
     else
       flash[:alert] = "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
       @action = 'edit'
-      render :update, status: :unprocessable_entity
+      <% unless @big_edit %>render :update<% else %>render :edit<% end %>, status: :unprocessable_entity
     end<% if @pundit %>
   rescue Pundit::NotAuthorizedError
     flash[:alert] = "Updating #{@<%= singular_name %>.<%= display_class %>} not authorized. "
-    render :update<% end %>
+      <% unless @big_edit %>render :update<% else %>render :edit<% end %>, status: :unprocessable_entity
+        <% end %>
   end
 
 <% end %><% if destroy_action %>  def destroy

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

@@ -8,6 +8,6 @@
     <\%=  render partial: "<%= namespace_with_trailing_dash + @controller_build_folder + "/" %>form", locals: {:<%=  singular  %> => <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> \%>
   <% if @edit_within_form_partial %><\%= render partial: "edit_within_form", locals: {f: f, <%=  singular  %>: <%= singular %>}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> %><% end %>
   <\% end %>
-  <% if @edit_within_form_partial %><\%= render partial: "edit_after_form", locals: {<%=  singular  %>: <%= singular %>}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> %><% end %>
+  <% if @edit_after_form_partial %><\%= render partial: "edit_after_form", locals: {<%=  singular  %>: <%= singular %>}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> %><% end %>
 </div>
 <\% end %>

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

@@ -1,3 +1,3 @@
 <\%= turbo_stream.replace "<%= @namespace %>__#{dom_id(<%= singular %>)}" do %>
-  <\%= render 'edit', locals: {<%= singular %>: @<%= singular %><%= @nested_set.collect{|arg| ", #{arg[:singular]}: @#{arg[:singular]}} " }.join("") %> %>
+  <\%= render 'edit', locals: { <%= singular %>: @<%= singular %><%= @nested_set.collect{|arg| ", #{arg[:singular]}: @#{arg[:singular]} " }.join("") %> } %>
 <\% end %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.4'
+    CURRENT = '0.6.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A gem to build Turbo Rails scaffolding.