hot-glue 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b9cdb44bde02376148703d050944c0c7cc169b42349b021539098afd8532bf
-  data.tar.gz: e4baffd1a1d3d4cf01b811c850b02827c803f7d1188a5b5166f40b11730a0821
+  metadata.gz: 1eacfaf1cc09c6a40597a8a0f3f2bda37e156f5ed63be68ff842de01a707dc5d
+  data.tar.gz: 20b3c4134a1443c2c5d134a5f5bcdecfb2e13c749c856a1620ecb43209245e68
 SHA512:
-  metadata.gz: f298a2685d19ebc5a27c16d72cb05806a74bdf3ffbe15b7f85e799164e0d4c56ae1605d950a0843749a3db840c957d1f8a30feb27d68b276656a277a3dd21d53
-  data.tar.gz: e5984cc18282e0b5b99f5992d764395dc9964c1a81b08c6848d9f498564e04e8623275fd40b4c67ca2759d400fe3d4e952ea4db61aada50a63f7fab3ef67a6d9
+  metadata.gz: 3c38593db0539b7259b05b3d3e86062f550d54f969c9a30ad9e2ffa035513c035e154a02ed3f9427def36a025929d0679b66ff0423fc7fdf4ae01623ffb2f540
+  data.tar.gz: 6c661dff1800dc911b23681622992fe4e7ac5d554c107e32aa5577f94250022bfbd07be78d33b9c6acab4149aacc2e2ce1047b8f5fd3f728c49139f1db07a4c2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.10)
+    hot-glue (0.6.12)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -76,6 +76,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
     bcrypt (3.1.18)
     builder (3.2.4)
     byebug (11.1.3)
@@ -139,7 +140,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.5.4)
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -245,7 +246,8 @@ GEM
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket (1.2.9)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)

data/README.md

@@ -1744,11 +1744,16 @@ If you have a partial in your view folder called `_list_after_each_row_heading`,
 
 The `within` partials should do operations within the form (like hidden fields), and the `after` partials should do entirely unrelated operations, like a different form entirely.
 
-These automatic pickups for partials are detected at buildtime. This means that if you add these partials later, you must rebuild your scaffold.
+These automatic pickups for partials are detected at build time. This means that if you add these partials later, you must rebuild your scaffold.
 
 
 # VERSION HISTORY
 
+#### 2025-02-19 - v0.6.12
+• adds decimal field type (displays as float-- there is no special handling for decimal on the UI)
+• guard against polymorphic belongs_to -- not a full implementation for polymorphic fields, just hides the fields on the form; on the list uses to_label always
+• fixes heading with multiword names on downnested portals to display nicely capitalized
+• removes open struct
 
 #### 2025-01-28 v0.6.11
 

data/app/helpers/hot_glue_helper.rb

@@ -1,10 +1,13 @@
 module HotGlueHelper
-
-
+  class KVObject
+    attr_accessor :key, :value
+    def initialize(key: , value: )
+      @key = key
+      @value = value
+    end
+  end
 
   def enum_to_collection_select(hash)
-    hash.collect{|k,v| OpenStruct.new({key: k, value: v})}
-
+    hash.collect{|k,v| KVObject.new(key: k, value: v)}
   end
-
 end

data/lib/generators/hot_glue/field_factory.rb

@@ -32,6 +32,8 @@ class FieldFactory
               TextField
             when :float
               FloatField
+            when :decimal
+              FloatField
             when :datetime
               DateTimeField
             when :date

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

@@ -24,17 +24,18 @@ class AssociationField < Field
       raise(HotGlue::Error, exit_message)
     end
 
-    @assoc_class = eval(assoc_model.try(:class_name))
+    if ! eval("#{class_name}.reflect_on_association(:#{assoc}).polymorphic?")
+      @assoc_class = eval(assoc_model.try(:class_name))
 
-    name_list = [:name, :to_label, :full_name, :display_name, :email]
+      name_list = [:name, :to_label, :full_name, :display_name, :email]
 
-    if assoc_class && name_list.collect{ |field|
-      assoc_class.respond_to?(field.to_s) || assoc_class.instance_methods.include?(field)
-    }.none?
-      exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{@assoc_name} association on the #{class_name} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
-      raise(HotGlue::Error, exit_message)
+      if assoc_class && name_list.collect{ |field|
+        assoc_class.respond_to?(field.to_s) || assoc_class.instance_methods.include?(field)
+      }.none?
+        exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{@assoc_name} association on the #{class_name} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
+        raise(HotGlue::Error, exit_message)
+      end
     end
-
   end
 
   def assoc_label
@@ -111,8 +112,8 @@ class AssociationField < Field
       # end
     elsif modify_as && modify_as[:typeahead]
       search_url  = "#{namespace ? namespace + "_" : ""}" +
-        modify_as[:nested].join("_") +
-        + "_#{assoc.class_name.downcase.pluralize}_typeahead_index_url"
+        modify_as[:nested].join("_") + ("_" if modify_as[:nested].any?) +
+        + "#{assoc.class_name.downcase.pluralize}_typeahead_index_url"
 
 
       if @modify_as[:nested].any?
@@ -140,7 +141,12 @@ class AssociationField < Field
 
       is_owner = name == ownership_field
       assoc_class_name = assoc.class_name.to_s
-      display_column = HotGlue.derrive_reference_name(assoc_class_name)
+      if assoc_class
+        display_column = HotGlue.derrive_reference_name(assoc_class_name)
+      else
+        # polymorphic
+        display_column = "name"
+      end
 
       if hawk_keys[assoc.foreign_key.to_sym]
         hawk_definition = hawk_keys[assoc.foreign_key.to_sym]
@@ -178,9 +184,16 @@ class AssociationField < Field
 
   def line_field_output
 
-    display_column =  HotGlue.derrive_reference_name(assoc_class.to_s)
 
-    "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
+    if assoc_class
+      display_column =  HotGlue.derrive_reference_name(assoc_class.to_s)
+
+      "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
+    else
+      "<%= #{singular}.#{assoc}.try(:to_label) || '<span class=\"content \">MISSING</span>'.html_safe %>"
+
+    end
+
   end
 
 

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

@@ -40,19 +40,18 @@ class BooleanField < Field
     if display_boolean_as.nil?
 
     end
-    "<div class='#{@layout_strategy.form_checkbox_wrapper_class} #{'form-switch' if display_boolean_as == 'switch'}'>\n" +
+    "<span class='#{@layout_strategy.form_checkbox_wrapper_class} #{'form-switch' if display_boolean_as == 'switch'}'>\n" +
       (if display_boolean_as == 'radio'
       radio_button_display
     elsif display_boolean_as == 'checkbox'
       checkbox_display
     elsif display_boolean_as == 'switch'
       switch_display
-   end) + "</div> \n"
+   end) + "</span> \n"
   end
 
   def form_field_output
-    (form_labels_position == 'before' ?  " <br />"  : "") +
-      form_field_display + (form_labels_position == 'after' ?  " <br />"  : "")
+    form_field_display
   end
 
   def line_field_output

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

@@ -40,7 +40,7 @@ class DateTimeField < Field
   end
 
   def form_field_output
-    "<%= f.datetime_field( :#{name}, value: #{singular}.#{name} && #{singular}.#{name}.change(sec: 0), class: '#{@layout_strategy.form_input_class}'  ) %>"
+    "<%= f.datetime_field( :#{name}, value: #{singular}.#{name} && #{singular}.#{name}.in_time_zone(current_timezone), class: '#{@layout_strategy.form_input_class}'  ) %><%= current_timezone %>"
   end
 
   def viewable_output

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

@@ -3,7 +3,7 @@ class RelatedSetField < Field
   attr_accessor :assoc_name, :assoc_class, :assoc
 
   def initialize( class_name: , default_boolean_display:, display_as: ,
-                  name: , singular: ,
+                  name: , singular: , plural:,
                   alt_lookup: ,
                   update_show_only: ,
                   hawk_keys: , auth: , sample_file_path:,  ownership_field: ,

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

@@ -156,18 +156,20 @@ module  HotGlue
                 "<% if @action == 'new' && policy(@#{singular}).#{col}_able? %>" + columns_map[col].form_field_output + "<% else %>" + columns_map[col].form_show_only_output + "<% end %>"
 
                  # 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 %>"
-            else
-              columns_map[col].form_field_output
-            end
+              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 %>"
+              else
+                columns_map[col].form_field_output
+              end
+
 
             @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
+
             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' ? the_label : "")   , 4) +
-                                    "\n  </span>\n  <br />", 2)
+                                    add_spaces_each_line( (form_labels_position == 'before' ? (the_label || "") + "<br />\n"  : "") +
+                                                        +  field_result +
+                                        (form_labels_position == 'after' ? "<br />\n" + (the_label || "") : "")  , 4) +
+                                    "\n  </span>\n ", 2)
 
           }.join("") + "\n  </div>"
       }.join("\n")

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -81,7 +81,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   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)
-  class_option :inline_list_labels, default: 'omit' # choices are before, after, omit
+  class_option :inline_list_labels, default: nil # default is set below
   class_option :factory_creation, default: ''
   class_option :alt_foreign_key_lookup, default: '' #
   class_option :attachments, default: ''
@@ -262,7 +262,11 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         elsif $2 == "tinymce"
           @modify_as[key.to_sym] =  {tinymce: 1, badges: $3}
         elsif $2 == "typeahead"
-          nested = $3.split("/")
+          if !$3.nil?
+            nested = $3.split("/")
+          else
+            nested = []
+          end
           @modify_as[key.to_sym] =  {typeahead: 1, nested: nested}
         elsif $2 == "timezone"
           @modify_as[key.to_sym] =  {timezone: 1, badges: $3}
@@ -303,7 +307,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     setup_hawk_keys
     @form_placeholder_labels = options['form_placeholder_labels'] # true or false
-    @inline_list_labels = options['inline_list_labels'] || 'omit' # 'before','after','omit'
+    @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)

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

@@ -72,13 +72,14 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     params[:per] || 10
   end<% end %>
   <% unless @no_list %>
-  def load_all_<%= plural %>
+  def load_all_<%= plural %><% if @search == "set" %>
+    @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo| {"#{foo}_match".to_sym => ((@columns_map[foo.to_sym].modify_as && @columns_map[foo.to_sym].modify_as[:binary]) ? "-1" : ""), "#{foo}_search".to_sym => ""}}.reduce({}, :merge)  } %> <% end %>
   <%= load_all_code %>
   end
 
-  def index<% if @search == "set" %>
-    @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo|
-    {"#{foo}_match".to_sym => ((@columns_map[foo.to_sym].modify_as && @columns_map[foo.to_sym].modify_as[:binary]) ? "-1" : ""), "#{foo}_search".to_sym => ""}}.reduce({}, :merge)  } %> <% end %><% if @search_fields %>
+  def index
+    load_all_<%= plural %>
+      <% if @search_fields %>
 <%= @search_fields.collect{|field_name| @columns_map[field_name.to_sym].code_to_reset_match_if_search_is_blank}.compact.join("     \n") %><% end %>
     load_all_<%= plural %><% if @pundit %><% if @pundit %>
     authorize @<%= plural_name %><% end %>
@@ -131,8 +132,18 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       <% unless @display_edit_after_create %>render :create, status: :unprocessable_entity<% else %>render :new , status: :unprocessable_entity<% end %>
     end<% if @pundit %>
   rescue Pundit::NotAuthorizedError => e
+    flash[:alert] = "Not authorized."
     @<%= singular %>.errors.add(:base, e.message)
-    render :create, status: :unprocessable_entity<% end %>
+    <% unless @display_edit_after_create %>render :create, status: :unprocessable_entity<% else %>redirect_to <%=   HotGlue.optionalized_ternary(namespace: @namespace,
+                                 top_level: true,
+                                 target:  @singular,
+                                 nested_set: @nested_set,
+                                 modifier: 'edit_',
+                                 with_params: true,
+                                 instance_last_item: true,
+                                 put_form: true).gsub("(#{singular}", "(@#{singular}") %><% end %>
+
+    <% end %>
   end
 
 <% end %>

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

@@ -11,6 +11,7 @@
 
 
 <% if @downnest_children.any? && @big_edit %>
+  <hr />
   <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
     <% @downnest_object.each do |downnest, size| %>
       <div class="row">
@@ -22,7 +23,7 @@
           <% downnest_style = @layout_strategy.downnest_style %>
           <% if @downnest_shows_headings %>
             <h3>
-              <%= downnest_class.humanize %>
+              <%= downnest_class.titlecase.pluralize %>
             </h3>
           <% end %>
           <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest_object_name %>/list", locals: {<%= @singular %>: @<%= @singular %>,  <%= downnest_object_name %>: @<%= @singular %>.<%= downnest %><% if @nested_set.any? %>, <%= @nested_set.collect{|x| "#{x[:singular]}: @#{x[:singular]}"}.join(", ") %>, nested_for: "<%= @nested_set.collect{|x| "#{x[:singular]}-" + "\#{" + "@#{x[:singular]}.id}"}.join("__") %>__<%= singular %>-#{@<%= @singular %>.id}" <% end %> } \%>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.11'
+    CURRENT = '0.6.12'
   end
 end

metadata

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