hot-glue 0.5.18 → 0.5.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a492a1e3528a8f8cbe485fe6e2c489896740184e55b8a910312bbaaeb9439e72
-  data.tar.gz: e935b8bb498f464b978a34d9714603f41bc7af3d530a9844b560693184344bf0
+  metadata.gz: 016741b47374d4b624bb04c96757bf92ca48bef198ca39ff642d94b571024949
+  data.tar.gz: 91ac3ecd1745958f7df484cb1ad009b63e02891e8f9021e7c7cd062aff7baaf6
 SHA512:
-  metadata.gz: aa2d1676222bc0a91b945654bd93d452a5c102625068f5ab6acbca3eb250f79b6e3030fdcaf2b3a61672d143d8813fc39280581542c8bb2e4d94760d0f0ad944
-  data.tar.gz: b048a9fb6f22d24f10920da6f67297aa8c1e57ccea6850ee442d6fe27f85be4ceeba76f86c5fdc2f79afd2691b0bbdc6f897738dc63a0857076824d15d1e332c
+  metadata.gz: 32b258df9e7f7d989d7827aa5ed420019bc6283447822f254a01ebfc4dd705dcb2428d73f9685a65ed2e6157b114a38a8395144f351a16144f03b61ecc4c26c7
+  data.tar.gz: e66eea5d26d987815a0583c80e49401a55fefaa59e5a2db503cc7fe488c403103a5699895966e73415dd2ca0de21452022cd1b68445859e8338330376c7aacf0

data/Gemfile.lock

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

data/README.md

@@ -672,9 +672,8 @@ here, even though `paid_at` is a datetime field, it will display as-if it is a b
 label or the falsy label depending on if `paid_at` is or is not null in the database.  
 For all fields except booleans, this affects only the viewable output — 
 what you see on the list page and on the edit page for show-only fields.  
-For booleans, it affects those outputs as well as the normal edit output: 
-The labels you specify are used as the labels for the radio buttons that the user can select.
-
+For booleans shown as radio buttons, it affects those outputs as well as the normal view output.
+For booleans shown as checkboxes or switches, it affects only the view output as the truthy and falsy labels are not displays in editbale view.
 
 You will need to separately specify them as show-only if you want them to be non-editable.
 
@@ -1299,9 +1298,31 @@ end
 
 ```
 
-
 # VERSION HISTORY
 
+#### 2023-09-02 - v0.5.19
+
+Given a table generated with this schema:
+```
+rails generate model Thing abc:boolean dfg:boolean hij:boolean klm_at:datetime
+```
+
+• You can now use new flag `--display-as` to determine how the booleans will be displayed: checkbox, radio, or switch
+
+rails generate hot_glue:scaffold Thing --include=abc,dfg,hij,klm_at --god --modify='klm_at{yes|no}' --display-as='abc{checkbox},dfg{radio},hij{switch}'
+
+You may specify a default `default_boolean_display` in `config/hot_glue.yml`, like so:
+:default_boolean_display: 'radio'
+
+(The options are checkbox, radio, or switch.)
+If none is given and no default is specified, legacy display behavior will be used (radio buttons)
+
+![Screenshot 2023-08-22 at 7 40 44 PM](https://github.com/hot-glue-for-rails/hot-glue/assets/59002/ba076cb0-fa40-4b68-a1a0-cab496670e00)
+
+You still use the `--modify` flag to determine the truthy and falsy labels, which are also used as the truth and false when a boolean is displays as radio button, as shown in the `klm_at` field above. (switches and checkboxes simply display with the field label and do not use the truthy and falsy labels)
+
+
+
 #### 2023-09-01 - v0.5.18
 - there three ways Hot Glue deals with Datetime fields:
 - 

data/app/helpers/hot_glue/controller_helper.rb

@@ -5,7 +5,7 @@ module HotGlue
       (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
     end
 
-    def datetime_field_localized(form_object, field_name, value, label )
+    def datetime_field_localized(form_object, field_name, value, label, nothing = nil )
       current_timezone
       form_object.text_field(field_name, class: 'form-control',
                                     type: 'datetime-local',

data/config/hot_glue.yml

@@ -1,5 +1,5 @@
 ---
 :layout: hotglue
 :markup: erb
-
-:sample_file_path: spec/files/computer_code.jpg
+:default_boolean_display: radio
+:sample_file_path: spec/files/computer_code.jpg

data/lib/generators/hot_glue/field_factory.rb

@@ -58,6 +58,8 @@ class FieldFactory
                              update_show_only: generator.update_show_only,
                              attachment_data: generator.attachments[name.to_sym],
                              sample_file_path: generator.sample_file_path,
-                             modify: generator.modify[name.to_sym] || nil )
+                             modify: generator.modify[name.to_sym] || nil,
+                             display_as: generator.display_as[name.to_sym] || nil,
+                             default_boolean_display: generator.default_boolean_display)
   end
 end

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

@@ -5,7 +5,9 @@ class AssociationField < Field
 
   attr_accessor :assoc_name, :assoc_class, :assoc
 
-  def initialize(name: , class_name: , alt_lookups: , singular: , update_show_only: ,
+  def initialize(alt_lookups: , class_name: , default_boolean_display:, display_as: ,
+                 name: , singular: ,
+                 update_show_only: ,
                  hawk_keys: , auth: , sample_file_path:,  ownership_field: ,
                  attachment_data: nil , layout_strategy: , form_placeholder_labels: nil,
                  form_labels_position:, modify:  )

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

@@ -1,6 +1,8 @@
 class AttachmentField < Field
   attr_accessor :attachment_data
-  def initialize(name:, class_name:, alt_lookups:, singular:, update_show_only:, hawk_keys:, auth:,
+  def initialize(name:, class_name:, alt_lookups:, default_boolean_display: ,
+                 display_as:,
+                 singular:, update_show_only:, hawk_keys:, auth:,
                  sample_file_path: nil, attachment_data:, ownership_field:, layout_strategy: ,
                  form_placeholder_labels: , form_labels_position:, modify: )
     super

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

@@ -1,3 +1,4 @@
+
 class BooleanField < Field
   def spec_setup_and_change_act(which_partial = nil)
     "      new_#{name} = 1 \n" +
@@ -15,15 +16,43 @@ class BooleanField < Field
   def spec_list_view_assertion
     ["expect(page).to have_content(#{singular}#{1}.#{name} ? 'YES' : 'NO')"].join("\n      ")
   end
-  
-  
+
+  def label_for
+    "#{singular}_#{name}"
+  end
+
+  def radio_button_display
+    "  <%= f.radio_button(:#{name}, '0', checked: #{singular}.#{name}  ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:falsy] || 'No'}', for: '#{singular}_#{name}_0') %>\n" +
+      " <br /> <%= f.radio_button(:#{name}, '1',  checked: #{singular}.#{name}  ? 'checked' : '' , class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:truthy] || 'Yes'}', for: '#{singular}_#{name}_1') %>\n"
+  end
+
+  def checkbox_display
+    "<%= f.check_box(:#{name}, class: '#{@layout_strategy.form_checkbox_input_class}', id: '#{singular}_#{name}', checked: #{singular}.#{name}) %>\n"
+  end
+
+  def switch_display
+    "<%= f.check_box(:#{name}, class: '#{@layout_strategy.form_checkbox_input_class}', role: 'switch', id: '#{singular}_#{name}', checked: #{singular}.#{name}) %>\n"
+  end
+
+  def form_field_display
+    if display_boolean_as.nil?
+      byebug
+    end
+    "<div 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
+
   def form_field_output
     (form_labels_position == 'before' ?  " <br />"  : "") +
-      "  <%= f.radio_button(:#{name},  '0', checked: #{singular}.#{name}  ? '' : 'checked') %>\n" +
-      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:falsy] || 'No'}', for: '#{singular}_#{name}_0') %>\n" +
-      " <br /> <%= f.radio_button(:#{name}, '1',  checked: #{singular}.#{name}  ? 'checked' : '') %>\n" +
-      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify[:binary][:truthy] || 'Yes'}', for: '#{singular}_#{name}_1') %>\n" +
-      (form_labels_position == 'after' ?  " <br />"  : "")
+      form_field_display + (form_labels_position == 'after' ?  " <br />"  : "")
   end
 
   def line_field_output
@@ -45,4 +74,8 @@ class BooleanField < Field
     <% end %>"
     end
   end
+
+  def label_class
+    super + " form-check-label"
+  end
 end

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

@@ -1,6 +1,6 @@
 class Field
   attr_accessor :assoc_model, :assoc_name, :assoc_class, :associations, :alt_lookups, :auth,
-                :assoc_label,  :class_name,  :form_placeholder_labels, :form_labels_position,
+                :assoc_label,  :class_name, :default_boolean_display, :display_as, :form_placeholder_labels, :form_labels_position,
                 :hawk_keys,   :layout_strategy, :limit, :modify, :name, :object, :sample_file_path,
                 :singular_class,  :singular, :sql_type, :ownership_field,
                 :update_show_only
@@ -10,6 +10,8 @@ class Field
     alt_lookups: ,
     attachment_data: nil,
     class_name: ,
+    default_boolean_display: ,
+    display_as: ,
     form_labels_position:,
     form_placeholder_labels: ,
     hawk_keys: nil,
@@ -34,6 +36,9 @@ class Field
     @ownership_field = ownership_field
     @form_labels_position = form_labels_position
     @modify = modify
+    @display_as = display_as
+
+    @default_boolean_display = default_boolean_display
 
     # TODO: remove knowledge of subclasses from Field
     unless self.class == AttachmentField
@@ -132,4 +137,25 @@ class Field
   def modify_binary? # safe
     !!(modify && modify[:binary])
   end
+
+  def display_boolean_as
+
+    if ! @default_boolean_display
+      @default_boolean_display = "radio"
+    end
+
+    if display_as
+      return display_as[:boolean] || "radio"
+    else
+      return @default_boolean_display
+    end
+  end
+
+  def label_class
+    "text-muted small form-text"
+  end
+
+  def label_for
+
+  end
 end

data/lib/generators/hot_glue/layout/builder.rb

@@ -3,6 +3,7 @@
 module HotGlue
   module Layout
     class Builder
+      include DefaultConfigLoader
       attr_reader :include_setting,
                   :downnest_object,
                   :buttons_width, :columns,
@@ -11,12 +12,13 @@ module HotGlue
 
       def initialize(generator: ,
                      include_setting: ,
-                     buttons_width:    )
+                     buttons_width:  )
 
 
         @generator = generator
 
         @modify = generator.modify
+        @display_as =  generator.display_as
         @columns = generator.columns
         @smart_layout = generator.smart_layout
         @stacked_downnesting = generator.stacked_downnesting || false
@@ -27,8 +29,11 @@ module HotGlue
 
         @no_buttons = @buttons_width == 0
         @specified_grouping_mode = include_setting.include?(":")
-        @bootstrap_column_width = generator.bootstrap_column_width
+        @bootstrap_column_width = generator.bootstrap_column_width.to_i
         @big_edit = generator.big_edit
+
+        @default_boolean_display = get_default_from_config(key: :default_boolean_display)
+
       end
 
       def construct
@@ -41,7 +46,8 @@ module HotGlue
 
           },
           buttons: { size: @buttons_width},
-          modify: @modify
+          modify: @modify,
+          display_as: @display_as
         }
 
         # downnest_object.each do |child, size|

data/lib/generators/hot_glue/layout_strategy/base.rb

@@ -30,5 +30,8 @@ module LayoutStrategy
     def page_begin; '<div> '; end
     def page_end ; '</div> '; end
     def style_with_flex_basis(x); "" ; end
+    def form_checkbox_input_class; ""; end
+    def form_checkbox_label_class; ""; end
+    def form_checkbox_wrapper_class; ""; end
   end
 end

data/lib/generators/hot_glue/layout_strategy/bootstrap.rb

@@ -56,4 +56,16 @@ class LayoutStrategy::Bootstrap < LayoutStrategy::Base
   def page_end
     '</div> </div>'
   end
+
+  def form_checkbox_input_class
+    "form-check-input"
+  end
+
+  def form_checkbox_wrapper_class
+    "form-check"
+  end
+
+  def form_checkbox_label_class
+    "form-check-label"
+  end
 end

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

@@ -87,7 +87,11 @@ module  HotGlue
 
             field_error_name = columns_map[col].field_error_name
 
-            the_label = "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
+
+            label_class = columns_map[col].label_class
+            label_for = columns_map[col].label_for
+
+            the_label = "\n<label class='#{label_class}' for='#{label_for}'>#{col.to_s.humanize}</label>"
             show_only_open = ""
             show_only_close = ""
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -17,7 +17,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   source_root File.expand_path('templates', __dir__)
   attr_accessor :alt_lookups, :attachments, :auth, :big_edit, :button_icons, :bootstrap_column_width, :columns,
-                :downnest_children, :downnest_object, :hawk_keys, :layout_object, :modify,
+                :default_boolean_display,
+                :display_as, :downnest_children, :downnest_object, :hawk_keys, :layout_object, :modify,
                 :nest_with, :path, :plural, :sample_file_path, :show_only_data, :singular,
                 :singular_class, :smart_layout, :stacked_downnesting, :update_show_only, :ownership_field,
                 :layout_strategy, :form_placeholder_labels, :form_labels_position
@@ -79,6 +80,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :bootstrap_column_width, default: nil # must be nil to detect if user has not passed
   class_option :button_icons, default: nil
   class_option :modify, default: {}
+  class_option :display_as, default: {}
 
   def initialize(*meta_args)
     super
@@ -118,6 +120,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @bootstrap_column_width ||= options['bootstrap_column_width'] ||
       get_default_from_config(key: :bootstrap_column_width) || 2
 
+
+
+    @default_boolean_display = get_default_from_config(key: :default_boolean_display)
     if options['layout']
       layout = options['layout']
     else
@@ -211,6 +216,19 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         end
       end
     end
+
+    @display_as = {}
+    if !options['display_as'].empty?
+      display_input = options['display_as'].split(",")
+
+      display_input.each do |setting|
+        setting =~ /(.*){(.*)}/
+        key, lookup_as = $1, $2
+        @display_as[key.to_sym] =  {boolean: $2}
+      end
+    end
+
+
     @update_show_only = []
     if !options['update_show_only'].empty?
       @update_show_only += options['update_show_only'].split(",").collect(&:to_sym)

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.18'
+    CURRENT = '0.5.19.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.19.2
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails