hot-glue 0.4.9.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96fed7ffa4bfccbe2dbe0d22e4dc784a70304aebf50e0ef672b2fb30c6f4641
-  data.tar.gz: bb0398bf9529ad73c69c7703209a5888081ba0a629376a82880b726d5d74faa6
+  metadata.gz: ce580959416e9968343b55064541fe777cef3c213f6124add34aba96f13a194b
+  data.tar.gz: 902147016f8d3ef1b20a1ce713b84d68b9ff2b5700d2643369d1037d0658bbc2
 SHA512:
-  metadata.gz: 5064b5d5432f0f7f518b70b61a21b7d98a0182efd73a7e8784009f1e8d381edfa5f64cd6222214aefaebc1d9d30fd4adb4be870bf854fc2e8896d7bc77e66120
-  data.tar.gz: 6d88a66a54966f7179f4c041d61670fb799c6bcdddc5a0fc5b3d984011ebc3cabbb5b8713fa05fa534b68a1f07f912f8c1ad8b955be3d0f1281618e2b04f3429
+  metadata.gz: d4625645ea4bd58ee8614965ff26083ef86ca6d07398408bcf01cb72e3aceda62d60480a86fbe4a999e12f726bc74c427f35a3d889cba9e6d0ef7e54c42f1f79
+  data.tar.gz: 7dd4e7fc8d7a605c54818c60bfdaa38148727f65a13e8e1135002bcc23c6f63649be909787b76b207fd81b3f6a139e0598a526b59c872dc71e512f2983432fe4

data/Gemfile.lock

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

data/README.md

@@ -472,6 +472,13 @@ Please note that this example would produce non-functional code, so you would ne
 You don't need this if the pluralized version is just + "s" of the singular version. Only use for non-standard plurlizations, and be sure to pass it as TitleCase (as if you pluralized the model name which is non-standard for Rails)
 
 
+### `--form-labels-position` (default: `after`; options are **before**, **after**, and **omit**)
+By default form labels appear after the form inputs. To make them appear before or omit them, use this flag.
+
+See also `--form-placeholder-labels` to use placeolder labels. 
+
+
+
 ### `--exclude=`
 (separate field names by COMMA)
 
@@ -680,6 +687,13 @@ Omits list LABEL itself above the list. (Do not confuse with the field labels.)
 
 Note that list labels may  be automatically omitted on downnested scaffolds.
 
+### `--form-placeholder-labels` (default: false)
+
+When set to true, fields, numbers, and text areas will have placeholder labels.
+Will not apply to dates, times, datetimes, dropdowns (enums + foreign keys), or booleans.
+
+See also setting `--form-labels-position` to control position or omit normal labels.
+
 ### `--no-list-heading`
 
 Omits the heading of column names that appears above the 1st row of data.

data/app/helpers/hot_glue/controller_helper.rb

@@ -8,43 +8,25 @@ module HotGlue
 
 
     def datetime_field_localized(form_object, field_name, value, label, timezone = nil )
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+        form_object.text_field(field_name, class: 'form-control',
                                     type: 'datetime-local',
                                     value: date_to_current_timezone(value, timezone))
-
-      res << timezonize(timezone)
-      res
+        + timezonize(timezone)
     end
 
 
     def date_field_localized(form_object, field_name, value, label, timezone = nil )
-
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'date',
                                     value: value )
-
-      res
     end
 
     def time_field_localized(form_object, field_name, value, label, timezone = nil )
-      res = form_object.label(label,
-                              field_name,
-                              class: 'small form-text text-muted')
-
-      res << form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'time',
                                     value: date_to_current_timezone(value, timezone))
+      + timezonize(timezone)
 
-      res << timezonize(timezone)
-      res
     end
 
     def current_timezone

data/lib/generators/hot_glue/install_generator.rb

@@ -87,11 +87,6 @@ module HotGlue
 
       end
 
-      if Rails.version.split(".")[0].to_i >= 7
-        copy_file "confirmable.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/controllers/confirmable.js"
-      end
-
-
       begin
         if Rails.version.split(".")[0].to_i == 6
           app_js_contents = File.read("app/javascript/packs/application.js")

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

@@ -1,23 +1,19 @@
 module  HotGlue
   class ErbTemplate < TemplateBase
 
-
+    attr_accessor :path, :singular, :singular_class,
+                  :magic_buttons, :small_buttons,
+                  :show_only, :column_width, :layout, :perc_width,
+                  :ownership_field, :form_labels_position,
+                  :inline_list_labels,
+                  :columns, :column_width, :col_identifier, :singular,
+                  :form_placeholder_labels
 
     def add_spaces_each_line(text, num_spaces)
       add_spaces = " " * num_spaces
       text.lines.collect{|line| add_spaces + line}.join("")
     end
 
-
-    # include GeneratorHelper
-    attr_accessor :singular
-
-    def field_output(col, type = nil, width, col_identifier )
-      "  <%= f.text_field :#{col}, value: @#{@singular}.#{col}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
-      "\n"
-    end
-
-
     def magic_button_output(*args)
       path = args[0][:path]
       # path_helper_singular = args[0][:path_helper_singular]
@@ -34,20 +30,13 @@ module  HotGlue
       }.join("\n")
     end
 
-    def text_area_output(col, field_length, col_identifier )
-      lines = field_length % 40
-      if lines > 5
-        lines = 5
-      end
 
-      "<%= f.text_area :#{col}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>"
-    end
 
     def list_column_headings(*args)
-      layout_columns = args[0][:columns]
-      column_width = args[0][:column_width]
-      col_identifier = args[0][:col_identifier]
-      layout = args[0][:layout]
+      @columns = args[0][:columns]
+      @column_width = args[0][:column_width]
+      @col_identifier = args[0][:col_identifier]
+      @layout = args[0][:layout]
 
       if layout == "hotglue"
         col_style = " style='flex-basis: #{column_width}%'"
@@ -55,23 +44,29 @@ module  HotGlue
         col_style = ""
       end
 
-      result = layout_columns.map{ |column|
+      result = columns.map{ |column|
         "<div class='#{col_identifier}'" + col_style + ">" +  column.map(&:to_s).map{|col_name| "#{col_name.humanize}"}.join("<br />")  + "</div>"
       }.join("\n")
       return result
     end
 
 
+    ################################################################
+
+    # THE FORM
+
     def all_form_fields(*args)
-      layout_columns = args[0][:columns]
-      show_only = args[0][:show_only]
-      singular_class = args[0][:singular_class]
-      col_identifier = args[0][:col_identifier]
-      ownership_field  = args[0][:ownership_field]
+      @columns = args[0][:columns]
+      @show_only = args[0][:show_only]
+      @singular_class = args[0][:singular_class]
+      @col_identifier = args[0][:col_identifier]
+      @ownership_field  = args[0][:ownership_field]
+      @form_labels_position = args[0][:form_labels_position]
+      @form_placeholder_labels = args[0][:form_placeholder_labels]
 
       @singular = args[0][:singular]
       singular = @singular
-      result = layout_columns.map{ |column|
+      result = columns.map{ |column|
         "  <div class='#{col_identifier}' >" +
           column.map { |col|
             field_result =
@@ -84,41 +79,11 @@ module  HotGlue
 
                 case type
                 when :integer
-                  # look for a belongs_to on this object
-                  if col.to_s.ends_with?("_id")
-                    assoc_name = col.to_s.gsub("_id","")
-                    assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
-                    if assoc.nil?
-                      exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-                      exit
-                    end
-
-                    is_owner = col == ownership_field
-                    assoc_class_name = assoc.active_record.name
-                    display_column = HotGlue.derrive_reference_name(assoc_class_name)
-
-                    (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
-                      "  <%= f.collection_select(:#{col}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
-                      (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
-                      (is_owner ? "\n<% end %>" : "")
-
-                  else
-                    "<%= f.text_field :#{col}, value: #{singular}.#{col}, class: 'form-control', size: 4, type: 'number' %>"
-
-                  end
+                  integer_result(col)
                 when :string
-                  if sql_type == "varchar" || sql_type == "character varying"
-                    field_output(col, nil, limit || 40, col_identifier)
-                  else
-                    text_area_output(col, 65536, col_identifier)
-                  end
-
+                  string_result(col, sql_type, limit)
                 when :text
-                  if sql_type == "varchar"
-                    field_output(col, nil, limit, col_identifier)
-                  else
-                    text_area_output(col, 65536, col_identifier)
-                  end
+                  text_result(col, sql_type, limit)
                 when :float
                   field_output(col, nil, 5, col_identifier)
                 when :datetime
@@ -128,18 +93,10 @@ module  HotGlue
                 when :time
                   "<%= time_field_localized(f, :#{col}, #{singular}.#{col},  '#{ col.to_s.humanize  }', #{@auth ? @auth+'.timezone' : 'nil'}) %>"
                 when :boolean
-                  " " +
-                    "  <span>#{col.to_s.humanize}</span>" +
-                    "  <%= f.radio_button(:#{col},  '0', checked: #{singular}.#{col}  ? '' : 'checked') %>\n" +
-                    "  <%= f.label(:#{col}, value: 'No', for: '#{singular}_#{col}_0') %>\n" +
-                    "  <%= f.radio_button(:#{col}, '1',  checked: #{singular}.#{col}  ? 'checked' : '') %>\n" +
-                    "  <%= f.label(:#{col}, value: 'Yes', for: '#{singular}_#{col}_1') %>\n" +
-                    ""
+                  boolean_result(col)
                 when :enum
-                  enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
-                  "<%= f.collection_select(:#{col},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col} }, class: 'form-control') %>"
+                  enum_result(col)
                 end
-
               end
 
             if (type == :integer) && col.to_s.ends_with?("_id")
@@ -148,16 +105,93 @@ module  HotGlue
               field_error_name = col
             end
 
-            add_spaces_each_line( "\n  <span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{ 'style="display: inherit;"'}  >\n" +
-                                    add_spaces_each_line(field_result + "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>", 4) +
+            the_label = "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
+            add_spaces_each_line( "\n  <span class='<%= \"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 : "") +
+                                      field_result + (@form_labels_position == 'after' ? the_label : "")   , 4) +
                                     "\n  </span>\n  <br />", 2)
 
+
           }.join("") + "\n  </div>"
       }.join("\n")
       return result
     end
 
 
+    def integer_result(col)
+      # look for a belongs_to on this object
+      if col.to_s.ends_with?("_id")
+        assoc_name = col.to_s.gsub("_id","")
+        assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+        if assoc.nil?
+          exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+          exit
+        end
+
+        is_owner = col == ownership_field
+        assoc_class_name = assoc.active_record.name
+        display_column = HotGlue.derrive_reference_name(assoc_class_name)
+
+        (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
+          "  <%= f.collection_select(:#{col}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
+          (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
+          (is_owner ? "\n<% end %>" : "")
+
+      else
+        "  <%= f.text_field :#{col}, value: #{@singular}.#{col}, autocomplete: 'off', size: 4, class: 'form-control', type: 'number'"  + (@form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+
+        # field_output(col, nil, 4, col_identifier)
+        #
+        # # "<%= f.text_field :#{col}, value: #{singular}.#{col}, class: 'form-control', size: 4, type: 'number' %>"
+
+      end
+    end
+
+    def string_result(col, sql_type, limit)
+      if sql_type == "varchar" || sql_type == "character varying"
+        field_output(col, nil, limit || 40, col_identifier)
+      else
+        text_area_output(col, 65536, col_identifier)
+      end
+    end
+
+
+    def text_result(col, sql_type, limit)
+      if sql_type == "varchar"
+        field_output(col, nil, limit, col_identifier)
+      else
+        text_area_output(col, 65536, col_identifier)
+      end
+    end
+
+    def field_output(col, type = nil, width, col_identifier )
+      "  <%= f.text_field :#{col}, value: #{@singular}.#{col}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (@form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+    end
+
+    def text_area_output(col, field_length, col_identifier )
+      lines = field_length % 40
+      if lines > 5
+        lines = 5
+      end
+
+      "<%= f.text_area :#{col}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( @form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "") + " %>"
+    end
+
+    def boolean_result(col)
+      " <br />"  +
+        "  <%= f.radio_button(:#{col},  '0', checked: #{singular}.#{col}  ? '' : 'checked') %>\n" +
+        "  <%= f.label(:#{col}, value: 'No', for: '#{singular}_#{col}_0') %>\n" +
+        "  <%= f.radio_button(:#{col}, '1',  checked: #{singular}.#{col}  ? 'checked' : '') %>\n" +
+        "  <%= f.label(:#{col}, value: 'Yes', for: '#{singular}_#{col}_1') %>\n" +
+        ""
+    end
+
+    def enum_result(col)
+      enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col}'}[0].sql_type")
+      "<%= f.collection_select(:#{col},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col} }, class: 'form-control') %>"
+    end
+
+    ################################################################
 
     def paginate(*args)
       plural = args[0][:plural]
@@ -165,18 +199,24 @@ module  HotGlue
       "<% if #{plural}.respond_to?(:total_pages) %><%= paginate(#{plural}) %> <% end %>"
     end
 
+
+
+
+    ################################################################
+
+
     def all_line_fields(*args)
-      layout_columns = args[0][:columns]
-      show_only = args[0][:show_only]
-      singular_class = args[0][:singular_class]
-      singular = args[0][:singular]
-      perc_width = args[0][:perc_width]
-      layout = args[0][:layout]
-      col_identifier =   args[0][:col_identifier]  || (layout == "bootstrap" ? "col-md-2" :  "scaffold-cell")
+      @columns = args[0][:columns]
+      @show_only = args[0][:show_only]
+      @singular_class = args[0][:singular_class]
+      @singular = args[0][:singular]
+      @perc_width = args[0][:perc_width]
+      @layout = args[0][:layout]
+      @col_identifier =   args[0][:col_identifier]  || (layout == "bootstrap" ? "col-md-2" :  "scaffold-cell")
 
 
-      columns_count = layout_columns.count + 1
-      perc_width = (perc_width).floor
+      columns_count = columns.count + 1
+      perc_width = (@perc_width).floor
 
       if layout == "bootstrap"
         style_with_flex_basis = ""
@@ -184,7 +224,7 @@ module  HotGlue
         style_with_flex_basis = " style='flex-basis: #{perc_width}%'"
       end
 
-      result = layout_columns.map{ |column|
+      result = columns.map{ |column|
         "<div class='#{col_identifier}'#{style_with_flex_basis}>" +
 
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -97,7 +97,6 @@ module HotGlue
     class_option :nest, type: :string, default: nil # DEPRECATED —— DO NOT USE
     class_option :nested, type: :string, default: ""
 
-
     class_option :namespace, type: :string, default: nil
     class_option :auth, type: :string, default: nil
     class_option :auth_identifier, type: :string, default: nil
@@ -105,6 +104,7 @@ module HotGlue
     class_option :include, type: :string, default: ""
     class_option :god, type: :boolean, default: false
     class_option :gd, type: :boolean, default: false # alias for god
+
     class_option :specs_only, type: :boolean, default: false
     class_option :no_specs, type: :boolean, default: false
     class_option :no_delete, type: :boolean, default: false
@@ -116,24 +116,31 @@ module HotGlue
     class_option :show_only, type: :string, default: ""
 
     class_option :ujs_syntax, type: :boolean, default: nil
-
     class_option :downnest, type: :string, default: nil
     class_option :magic_buttons, type: :string, default: nil
     class_option :small_buttons, type: :boolean, default: nil
-
     class_option :display_list_after_update, type: :boolean, default: false
     class_option :smart_layout, type: :boolean, default: false
     class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
     class_option :layout, type: :string, default: nil # if used here it will override what is in the config
+
     class_option :no_list_label, type: :boolean, default: false
+
     class_option :no_list_heading, type: :boolean, default: false
 
-    class_option :before_list_labels, type: :boolean, default: false
+
+    # determines if the labels show up BEFORE or AFTER on the NEW/EDIT (form)
+    class_option :form_labels_position, default: 'after' #  choices are before, after, omit
+    class_option :form_placeholder_labels, default: false # puts the field names into the placeholder labels
+
+
+    # NOT YET IMPLEMENTED
+    # 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
 
     def initialize(*meta_args)
       super
 
-
       begin
         @the_object = eval(class_name)
       rescue StandardError => e
@@ -165,7 +172,6 @@ module HotGlue
       if !options['markup'].nil?
         message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
         raise(HotGlue::Error, message)
-
       end
 
       if !options['markup'].nil?
@@ -267,6 +273,18 @@ module HotGlue
       @no_list_label = options['no_list_label'] || false
       @no_list_heading = options['no_list_heading'] || false
 
+      @form_labels_position = options['form_labels_position']
+      if !['before','after','omit'].include?(@form_labels_position)
+        raise "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+      end
+
+      @form_placeholder_labels = options['form_placeholder_labels'] # true or false
+
+
+      # if !['before','after','omit'].include?(@form_placeholder_labels)
+      #   raise "You passed '#{@form_placeholder_labels}' as the setting for --form-placeholder-labels but the only allowed options are before, after, and omit (default)"
+      # end
+
       @display_list_after_update = options['display_list_after_update'] || false
       @smart_layout = options['smart_layout']
 
@@ -915,7 +933,9 @@ module HotGlue
         singular_class: singular_class,
         singular: singular,
         col_identifier:  col_identifier,
-        ownership_field: @ownership_field
+        ownership_field: @ownership_field,
+        form_labels_position: @form_labels_position,
+        form_placeholder_labels: @form_placeholder_labels
       )
     end
 

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.4.9.2'
+    CURRENT = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.9.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,7 +85,6 @@ files:
 - lib/generators/hot_glue/scaffold_generator.rb
 - lib/generators/hot_glue/templates/base_controller.rb.erb
 - lib/generators/hot_glue/templates/capybara_login.rb
-- lib/generators/hot_glue/templates/confirmable.js
 - lib/generators/hot_glue/templates/controller.rb.erb
 - lib/generators/hot_glue/templates/erb/_errors.erb
 - lib/generators/hot_glue/templates/erb/_flash_notices.erb
@@ -149,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A gem to build Tubro Rails scaffolding.

data/lib/generators/hot_glue/templates/confirmable.js

@@ -1,14 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-console.log("defining Confirmable....")
-export default class extends Controller {
-  static values = { message: String }
-
-  confirm(event) {
-
-    if(!window.confirm(this.message)) {
-      event.preventDefault();
-      event.stopPropagation()
-    }
-  }
-}