hot-glue 0.6.14 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e3938ec168ea29eb7311c82742601f1d19ceb5c670e909ddd6ab5efda1a8bca
-  data.tar.gz: 4a2a21046045ab745e0c2d3ba3b5faddab2507628e245d5caae159f9c6c8bca2
+  metadata.gz: 4e3993f35ba9d926cec0a205bb06708be83c2d72012eaafebce6cb384da07a92
+  data.tar.gz: 509b98c64699c6561435d63da9b0ae6afe2924d6c1624dbcedf1a3288a5dfc0d
 SHA512:
-  metadata.gz: 37aa5ce09632029e929cd9d085c48bab155ee4db0560e76d9a8bf9aac5ab541929fd604111674da4390383c123e3b7c53b2826a0a374e2de507f665bb440d49c
-  data.tar.gz: 50b1a2f1fac6ae0e144bb949c9febb63165a3eeec7d0780035998234e7b854631c949246c06886d0a75c9dc0baf83fe8103948981d2fec3167086ecff1c8fa34
+  metadata.gz: b3d097f4f7130718597c9024173980e2d7b59826d4bb355ce34c22f70f0fec01e6265784007bdc296f41e0cd232d96d7a1ed2e0b055a6f7dbb1eef644fac5da7
+  data.tar.gz: 83905ccb51e15676d2dff4253f656ef29a330272ed0549ebbbb74a7272ee9aa42b04491ba4ef88c2bf9fb84ec047991da89fa027e519cf048f3197bd7687ccd1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.12)
+    hot-glue (0.6.14)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -140,14 +140,14 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.5.8)
     nokogiri (1.13.9)

data/README.md

@@ -1751,6 +1751,13 @@ These automatic pickups for partials are detected at build time. This means that
 
 # VERSION HISTORY
 
+#### 2025-03-17 - v0.6.15
+
+• now store on your current_user model (this is automatically passed into the method modify_date_inputs_on_params). HG will set user-inputted values correctly to daylight savings time during April-Nov months only (#195)
+• fixes issue with turbo frame name after create is rendered (#194)
+• removes vestigates of optionalized partents
+
+
 #### 2025-02-28 - v0.6.14
 
 • fixes bug in association field involving scaffolds built without nesting

data/app/helpers/hot_glue/controller_helper.rb

@@ -68,8 +68,16 @@ module HotGlue
       end
     end
 
+    def is_dst_now?
+      Time.now.utc.month > 3 && Time.now.month < 11 ||
+        (Time.now.utc.month == 3 && Time.now.day >= (14 - Time.now.utc.wday)) ||
+        (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
+      uses_dst = (current_user_object.try(:locale_uses_dst)) || false
+
       modified_params = modified_params.tap do |params|
         params.keys.each{|k|
 
@@ -88,7 +96,9 @@ 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
-              params[k] = Time.strptime(parse_date, "%Y-%m-%d %H:%M %Z")
+              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?
+              params[k] = parsed_time
             end
           end
         }

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

@@ -155,6 +155,7 @@ class AssociationField < Field
         hawked_association = "#{assoc.class_name}.all"
       end
 
+
       (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
         "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: #{singular}.#{name} }, class: 'form-control') %>\n" +
         (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
@@ -253,6 +254,13 @@ class AssociationField < Field
     #   "\n     "
   end
 
+  def newline_after_field?
+    if modify_as && modify_as[:typeahead]
+      false
+    else
+      true
+    end
+  end
 
   def where_query_statement
     ".where(*#{name}_query)"

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

@@ -219,4 +219,9 @@ class Field
   def code_to_reset_match_if_search_is_blank
     nil
   end
+
+  def newline_after_field?
+    false
+  end
+
 end

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

@@ -158,6 +158,8 @@ module  HotGlue
                  # show only on the update action overrides any pundit policy
               elsif @pundit && eval("defined? #{singular_class}Policy") && eval("#{singular_class}Policy").instance_methods.include?("#{col}_able?".to_sym)
                 "<% if policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output  + "<% end %>"
+              elsif update_show_only.include?(col)
+                "<% if @action == 'edit' %>" + columns_map[col].form_show_only_output + "<% else %>" + columns_map[col].form_field_output + "<% end %>"
               else
                 columns_map[col].form_field_output
               end
@@ -168,7 +170,7 @@ module  HotGlue
             add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
                                     add_spaces_each_line( (form_labels_position == 'before' ? (the_label || "") + "<br />\n"  : "") +
                                                         +  field_result +
-                                        (form_labels_position == 'after' ? "<br />\n" + (the_label || "") : "")  , 4) +
+                                        (form_labels_position == 'after' ? (  columns_map[col].newline_after_field? ? "<br />\n" : "") + (the_label || "") : "")  , 4) +
                                     "\n  </span>\n ", 2)
 
           }.join("") + "\n  </div>"

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -77,7 +77,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :no_list_heading, type: :boolean, default: false
 
   # determines if the labels show up BEFORE or AFTER on the NEW/EDIT (form)
-  class_option :form_labels_position, type: :string, default: 'after' #  choices are before, after, omit
+  class_option :form_labels_position, type: :string #  choices are before, after, omit
   class_option :form_placeholder_labels, type: :boolean, default: false # puts the field names into the placeholder labels
 
   # determines if labels appear within the rows of the VIEWABLE list (does NOT affect the list heading)
@@ -310,10 +310,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @inline_list_labels = options['inline_list_labels'] || get_default_from_config(key: :inline_list_labels) || 'omit' # 'before','after','omit'
 
     @form_labels_position = options['form_labels_position']
-    if !['before', 'after', 'omit'].include?(@form_labels_position)
-      raise HotGlue::Error, "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+    if @form_labels_position.nil?
+      @form_labels_position = get_default_from_config(key: :form_labels_position)
+      if @form_labels_position.nil?
+        @form_labels_position = 'after'
+      end
+    else
+      if !['before', 'after', 'omit'].include?(@form_labels_position)
+        raise HotGlue::Error, "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+      end
     end
 
+
     if !['before', 'after', 'omit'].include?(@inline_list_labels)
       raise HotGlue::Error, "You passed '#{@inline_list_labels}' as the setting for --inline-list-labels but the only allowed options are before, after, and omit (default)"
     end
@@ -651,6 +659,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @menu_file_exists = true if @nested_set.none? && File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
 
     @turbo_streams = !!options['with_turbo_streams']
+
+    puts "show only #{@show_only}"
+    puts "update show only #{@update_show_only}"
+
   end
 
   def setup_hawk_keys
@@ -1330,9 +1342,12 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       append_text = "  <li class='nav-item'>
     <%= link_to '#{@list_label_heading.humanize}', #{path_helper_plural(@nested_set.any? ? true: false)}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
   </li>"
+      alt_append_text = "  <li class='nav-item'>
+    <%= link_to '#{@list_label_heading.humanize.upcase}', #{path_helper_plural(@nested_set.any? ? true: false)}, class: \"nav-link \#{'active' if nav == '#{plural_name}'}\" %>
+  </li>"
 
       text = File.read(nav_file)
-      if text.include?(append_text)
+      if text.include?(append_text) || text.include?(alt_append_text)
         puts "SKIPPING: Nav link for #{singular_name} already exists in #{nav_file}"
       else
         puts "APPENDING: nav link for #{singular_name} #{nav_file}"
@@ -1531,9 +1546,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     if @nested_set.none?
       "\"\""
     else
-      @nested_set.collect { |arg|
-        "(((\"__#{arg[:singular]}-\#{" + "@" + arg[:singular] + ".id}\") if @" + arg[:singular] + ") || \"\")"
-      }.join(" + ")
+      "\"" + @nested_set.collect { |arg|
+        "__#{arg[:singular]}-\#{" + "@" + arg[:singular] + ".id}"
+      }.join("") + "\""
     end
   end
 

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

@@ -1,7 +1,8 @@
 <\% if @<%= singular %>.errors.none? %>
   <\%= turbo_stream.replace "<%= @namespace %>__<%= plural %>-list" + <%= nested_for_turbo_nested_constructor %> do %>
-  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %>}<%= @nested_set.collect{|arg| ".merge(@" + arg[:singular] + " ? {nested_for: \"" + arg[:singular] + "-\#{@" + arg[:singular] + ".id}\"" + ", " + arg[:singular] + ": @" + arg[:singular] + "} : {})"}.join()  %> \%>
-  <\% end %>
+  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %><% if @nested_set.any? %>, <%= @nested_set.collect{|arg| "#{arg[:singular]}: @#{arg[:singular]}"}.join(", ")  %>, nested_for: '<%= @nested_set.collect{|arg| "\"#{arg[:singular]}-\#{@#{arg[:singular]}.id}\""}.join("__") %>' <% end %> } %>
+
+<\% end %>
   <\% end %>
 <!-- parental updated -->
 <%= turbo_parental_updates %>
@@ -15,5 +16,4 @@
   <\% end %>
   <\%= turbo_stream.replace "flash_notices" do %>
   <\%= render partial: "layouts/flash_notices", locals: {resource: @<%= singular %>} %>
-
 <\% end %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.14'
+    CURRENT = '0.6.15'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails