hot-glue 0.5.17 → 0.5.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b466a03ce8d764332b3f3d8673bc29b6071308cb976706632a70713b6efb53b4
-  data.tar.gz: 03f8580d7266c767b1bed6a1e325c515bc09a5d9886356250ed9a4d936bab452
+  metadata.gz: 86497d64d197f64d4df68804b0cfcb02f5541c64d98932cdb723e1b19b4aa76b
+  data.tar.gz: 7e6161cee21f3a4e5968d450cb44ade8fcb4b7c6e15d3c466ffa47527c979ec7
 SHA512:
-  metadata.gz: 3e0b66aa6cbab6a813a810f6bee04503c0f7437f53dc2a7a2f27aadad8b09a559a1d540f7c6ce850c5a25f641ab847edeb6c5b26fc83c6b6728bb52278bbc3bb
-  data.tar.gz: 5bcc706e9ad0a620c33a5815fc5160fe7afef6b9468d1d920032d1daffbfc3bc304816dc661d1c359b1002fdc854d1757869844e7afe1efa2f0eb021df408827
+  metadata.gz: 2d0788389d37a0a477793bbce0a57c29141061d35e3d4bb26e56affa15ec446f4eba1e6b545c316118eba231c1c3e9d51d1c68dcc62dea2990cedd4dbcd59ca1
+  data.tar.gz: d2036061122d60696b6cc24bd3085aeee5525f531d950f40ea569e9f54d229a0cca6cdaf573f0da5a73aab3e3743857155d7b54ce83c47aa74e83fd74aa93731

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 
 orbs:
   ruby: circleci/ruby@1.0
-  browser-tools: circleci/browser-tools@1.4.1
+  browser-tools: circleci/browser-tools@1.4.4
 
 jobs:
   build:
@@ -47,7 +47,15 @@ jobs:
       RAILS_ENV: test
 
     steps:
-      - browser-tools/install-chrome
+      - run: sudo apt-get update
+      - browser-tools/install-browser-tools:
+          chrome-version: 116.0.5845.96 # TODO: remove when chromedriver downloads are fixed
+          replace-existing-chrome: true
+      - browser-tools/install-chrome:
+          # TODO remove following line when fixed https://github.com/CircleCI-Public/browser-tools-orb/issues/90
+          chrome-version: 116.0.5845.96
+          replace-existing: true
+
       - browser-tools/install-chromedriver
       - checkout
       - ruby/install-deps

data/.github/workflows/test_suite.yml

@@ -0,0 +1,46 @@
+# This workflow uses actions that are not certified by GitHub.  They are
+# provided by a third-party and are governed by separate terms of service,
+# privacy policy, and support documentation.
+#
+# This workflow will install a prebuilt Ruby version, install dependencies, and
+# run tests and linters.
+name: "Test Suite"
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:11-alpine
+        ports:
+          - "5432:5432"
+        env:
+          POSTGRES_DB: rails_test
+          POSTGRES_USER: rails
+          POSTGRES_PASSWORD: password
+      chrome:
+        image: selenium/standalone-chrome:latest
+        ports:
+          - 4444:4444
+    env:
+      RAILS_ENV: test
+      DATABASE_URL: "postgres://rails:password@localhost:5432/rails_test"
+
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        with:
+          bundler-cache: true
+
+      - name: internal tests
+        run: bundle exec rspec
+      - name: system tests
+        run: script/test
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.5.16)
+    hot-glue (0.5.19)
       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.
 
@@ -1159,13 +1158,13 @@ factory = AgentFactory.new(find_or_create_by_email: agent_company_params[:__look
                             params: modified_params)
 ```
 
-Here the new AgentFactory will recieve any variables by keyword argument, and since you're specifying the calling code here, Hot Glue does not dictate your factory's setup.
+Here the new AgentFactory will receive any variables by keyword argument, and since you're specifying the calling code here, Hot Glue does not dictate your factory's setup.
 However, two special variables are in scope which you can use in your calling code.
 
 `*_params` (where * is the name of the thing you are building)
-`modified_params` a variable that has been transmogrified for the timezone aware input
+`modified_params`
 
-Either one must be recieved by your factory for your factory to create data based off the inputted data. 
+Either one must be received by your factory for your factory to create data based off the inputted data. 
 
 Rememebr, `*_params` has the input params passed only the through the sanitizer, and modified_params has it passed through the timezone aware mechanism and other Hot Glue-specific defaults.
 
@@ -1179,14 +1178,14 @@ Always:
 Don't include this last line in your factory code. 
 
 ## Nav Templates
-At the namespace level, you can have a file called `_nav.html.erb` to create tabbed bootstrap nav (you'll need to create this file manually).
+At the namespace level, you can have a file called `_nav.html.erb` to create tabbed bootstrap nav 
 
-To create the default template, start by running
+To create the file for the first time (at each namespace), start by running
 ```
 bin/rails generate hot_glue:nav_template --namespace=xyz
-
 ```
-this will append the file `_nav.html.erb` to the views folder at `views/xyz`
+
+This will append the file `_nav.html.erb` to the views folder at `views/xyz`. To begin, this file contains only the following:
 
 ```
 <ul class='nav nav-tabs'>
@@ -1195,19 +1194,18 @@ this will append the file `_nav.html.erb` to the views folder at `views/xyz`
 
 Once the file is present, any further builds in this namespace will:
 
-1) Append to the `_nav.html.erb` file, adding a tab for the new built scaffold
-2) Add render to the list view of the built scaffold to include the partial:
+1) Append to this `_nav.html.erb` file, adding a tab for the new built scaffold
+2) On the list view of the scaffold being built, it will include a render to the _nav partial, passing the name of the currently-viewed thing as the local variable `nav` (this is how the nav template knows which tab to make active). 
 ```
 <%= render partial: "owner/nav", locals: {nav: "things"} %>
 ```
-(in this example `owner/` is the namespace and `things` is the name of the scaffold being built)
+(In this example `owner/` is the namespace and `things` is the name of the scaffold being built)
 
 ## Automatic Base Controller
 
-HotGlue will copy a file named base_controller.rb to the same folder where it tries to create any controller, unless such a file exists there already.
-
-The created controller will always have this base controller as its subclass. You are encouraged to implement functionality common to the *namespace* (shared between the controllers in the namespace) using this technique.
+Hot Glue will copy a file named `base_controller.rb` to the same folder where it tries to create any controller (so to the namespace), unless such a file exists there already.
 
+The created controller will always have this base controller as its subclass. You are encouraged to implement functionality common to all the controllers in the *namespace* in the base class. For example, authorizing your user to access that part of the app. 
 
 ## Special Table Labels
 
@@ -1300,11 +1298,60 @@ 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:
+- 
+- (1) with current users who have `timezone` method (field or method)
+- (2) without current user timezone and no global timezone set for your app
+- (3) without current user timezone and global timezone set for your app
+
+- For #1, previously this method returned a time zone offset (integer). After v0.5.18, the preferred return value is a Timezone string, but legacy implementation returning offset values will continue to work. 
+  Your user objects should have a field called `timezone` which should be a string.
+- Note that daylight savings time is accounted for in this implementation. 
+
+- For #2 (your user does not have a timezone field and you _have not_ set the timezone globally), all datetimes will display in UTC timezone. 
+
+- For #3  (your user does not have a timezone field but you _have_ set the timezone globally), your datetimes will display in the Rails-specified timezone.
+
+- be sure to configure in `config/application.rb` this: 
+```
+config.time_zone = 'Eastern Time (US & Canada)'
+```
+This should be your business's default timezone.
+
+
+(#93)
+fixes variables be more clear if they are TimeZone objects (https://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html) or are UTC offset (integers -/+ from UTC)
+- fixes spec assertions for DateTime and Time fields
+- removes randomness causing race conditions in the datetime object specs
+**- fixes issue where setting bootstrap-column-width was not preferred if… (#88)**
+- fixes flash notice output
 
-# VERSION HISTORY
 
 #### 2023-08-18 - v0.5.17
 

data/app/helpers/hot_glue/controller_helper.rb

@@ -5,10 +5,11 @@ module HotGlue
       (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
     end
 
-    def datetime_field_localized(form_object, field_name, value, label, timezone = nil )
+    def datetime_field_localized(form_object, field_name, value, label )
+      current_timezone
       form_object.text_field(field_name, class: 'form-control',
                                     type: 'datetime-local',
-                                    value: date_to_current_timezone(value, timezone))  + timezonize(timezone)
+                                    value: date_to_current_timezone(value, current_timezone))  + timezonize(current_timezone)
     end
 
 
@@ -18,53 +19,65 @@ module HotGlue
                                     value: value )
     end
 
-    def time_field_localized(form_object, field_name, value, label, timezone = nil )
+    def time_field_localized(form_object, field_name, value, label )
+      current_timezone
       form_object.text_field(field_name, class: 'form-control',
                                     type: 'time',
-                                    value: date_to_current_timezone(value, timezone)) + timezonize(timezone)
+                                    value: value && value.strftime("%H:%M"))
 
     end
 
     def current_timezone
+      # returns a TimeZone (https://apidock.com/rails/TimeZone) object
       if defined?(current_user)
         if current_user.try(:timezone)
-          Time.now.in_time_zone(current_user.timezone.to_i).strftime("%z").to_i/100
+          current_user.timezone
+
+          # Time.now.in_time_zone(current_user.timezone.to_i).zone
         else
-          server_timezone
+          Rails.application.config.time_zone
+          # Time.zone.name
         end
       else
-        server_timezone
+        Rails.application.config.time_zone
+        # Time.zone.name
       end
     end
 
     def date_to_current_timezone(date, timezone = nil)
-      # if the timezone is nil, use the server date'
-
-      if timezone.nil?
-        timezone = Time.now.strftime("%z").to_i/100
+      # used for displaying when in EDIT  mode
+      # (this format is how the browser expectes to receive the value='' of the input field)
+      if date.nil?
+        return nil
+      else
+        return date.in_time_zone(timezone).strftime("%Y-%m-%dT%H:%M")
       end
-
-      return nil if date.nil?
-
-      return date.in_time_zone(timezone).strftime("%Y-%m-%dT%H:%M")
-      # begin
-      #
-      # rescue
-      #   return nil
-      # end
     end
 
-    def modify_date_inputs_on_params(modified_params, current_user_object = nil)
-
-      use_timezone = (current_user_object.try(:timezone)) || Time.now.strftime("%z")
+    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|
-          if k.ends_with?("_at") || k.ends_with?("_date")
 
-            begin
-              params[k] = DateTime.strptime("#{params[k]} #{use_timezone}", '%Y-%m-%dT%H:%M %z')
-            rescue StandardError
+          if field_list.nil? # legacy pre v0.5.18 behavior
+            include_me = k.ends_with?("_at") || k.ends_with?("_date")
+          else
+            include_me = field_list.include?(k.to_sym)
+          end
+          if include_me
+            if use_offset != 0
+              puts "changing #{params[k]}"
+
+              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)
+              end
+              puts "changed #{params[k]}"
 
             end
           end
@@ -73,7 +86,6 @@ module HotGlue
       modified_params
     end
 
-
     def hawk_params(hawk_schema, modified_params)
       @hawk_alarm = ""
       hawk_schema.each do |hawk_key,hawk_definition|
@@ -94,8 +106,8 @@ module HotGlue
 
     private
 
-    def server_timezone
-      Time.now.strftime("%z").to_i/100
+    def server_timezone_offset # returns integer of hours to add/subtract from UTC
+      Time.now.in_time_zone(Rails.application.config.time_zone).strftime("%z").to_i/100
     end
   end
 end

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/date_field.rb

@@ -10,7 +10,7 @@ class DateField < Field
 
 
   def form_field_output
-    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize  }', #{auth ? auth+'.timezone' : 'nil'}) %>"
+    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize  }') %>"
   end
 
   def line_field_output

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

@@ -4,21 +4,21 @@ class DateTimeField < Field
   end
 
   def spec_setup_and_change_act(which_partial = nil)
-    "      " + "new_#{name} = DateTime.current + (rand(100).days) \n" +
+    "      " + "new_#{name} = DateTime.current + 1.year \n" +
     '      ' + "find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
 
   end
 
   def spec_make_assertion
     if !modify_binary?
-      "expect(page).to have_content(new_#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone))"
+      "expect(page).to have_content(new_#{name}.in_time_zone(testing_timezone).strftime('%m/%d/%Y @ %l:%M %p %Z').gsub('  ', ' '))"
     else
       "expect(page).to have_content('#{modify[:binary][:truthy]}'"
     end
   end
 
   def spec_setup_let_arg
-    "#{name}: DateTime.current + rand(1000).seconds"
+    "#{name}: DateTime.current + 1.day"
   end
 
   def spec_list_view_assertion
@@ -30,11 +30,11 @@ class DateTimeField < Field
   end
 
   def spec_list_view_natural_assertion
-    "expect(page).to have_content(#{singular}#{1}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(current_timezone) )"
+    "expect(page).to have_content(#{singular}#{1}.#{name}.in_time_zone(testing_timezone).strftime('%m/%d/%Y @ %l:%M %p %Z').gsub('  ', ' '))"
   end
 
   def form_field_output
-    "<%= datetime_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize }', #{auth ? auth+'.timezone' : 'nil'}) %>"
+    "<%= datetime_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize }') %>"
   end
 
   def line_field_output
@@ -42,7 +42,7 @@ class DateTimeField < Field
       modified_display_output
     else
       "<% unless #{singular}.#{name}.nil? %>
-  <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone) %>
+  <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p %Z') %>
   <% else %>
   <span class='alert-danger'>MISSING</span>
   <% 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/fields/time_field.rb

@@ -5,22 +5,30 @@ class TimeField < Field
   end
 
   def form_field_output
-    "<%= time_field_localized(f, :#{name}, #{singular}.#{name},  '#{ name.to_s.humanize  }', #{auth ? auth+'.timezone' : 'nil'}) %>"
+    "<%= time_field_localized(f, :#{name}, #{singular}.#{name},  '#{ name.to_s.humanize  }') %>"
   end
 
   def line_field_output
     "<% unless #{singular}.#{name}.nil? %>
-      <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone) %>
+      <%= #{singular}.#{name}.in_time_zone(current_timezone).strftime('%l:%M %p ') %>
      <% else %>
     <span class='alert-danger'>MISSING</span>
     <% end %>"
   end
 
+  def spec_setup_and_change_act(which_partial = nil)
+    "      new_#{name} = Time.current + 5.seconds \n" +
+    '      ' + "find(\"[name='#{testing_name}[#{ name.to_s }]']\").fill_in(with: new_#{name.to_s})"
+
+  end
+
   def spec_make_assertion
-    "#expect(page).to have_content(new_#{name} .in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone))"
+    "expect(page).to have_content(new_#{name}.strftime('%l:%M %p').strip)"
   end
 
   def spec_list_view_assertion
-    "#expect(page).to have_content(#{singular}#{1}.#{name})"
+    # "expect(page).to have_content(#{singular}#{1}.#{name})"
   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
@@ -115,8 +117,12 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     @markup = get_default_from_config(key: :markup)
     @sample_file_path = get_default_from_config(key: :sample_file_path)
-    @bootstrap_column_width ||= get_default_from_config(key: :bootstrap_column_width) || 2
+    @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
@@ -154,6 +160,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @controller_build_folder_singular = singular
 
     @auth = options['auth'] || "current_user"
+
+    @god = options['god'] || options['gd'] || false
     @auth_identifier = options['auth_identifier'] || (!@god && @auth.gsub("current_", "")) || nil
 
     if options['nest']
@@ -208,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)
@@ -256,7 +277,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       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
 
-    @god = options['god'] || options['gd'] || false
     @specs_only = options['specs_only'] || false
 
     @no_specs = options['no_specs'] || false
@@ -292,7 +312,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     if @god
       @auth = nil
     end
-
     # when in self auth, the object is the same as the authenticated object
 
     if @auth && auth_identifier == @singular
@@ -645,9 +664,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
   end
 
-  def auth_root
-    "authenticate_" + @auth_identifier.split(".")[0] + "!"
-  end
+
 
   def formats
     [format]
@@ -818,6 +835,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                                  nested_set: @nested_set)
   end
 
+  def datetime_fields_list
+    @columns.select do |col|
+      if @the_object.columns_hash[col.to_s]
+        @the_object.columns_hash[col.to_s].type == :datetime
+      end
+    end
+  end
+
   def form_path_new_helper
     HotGlue.optionalized_ternary(namespace: @namespace,
                                  target: @controller_build_folder,
@@ -951,6 +976,15 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @auth
   end
 
+  def current_user_object
+    default_current_user = options['auth'] || "current_user"
+    if eval("defined?(#{default_current_user})")
+      default_current_user
+    else
+      "nil"
+    end
+  end
+
   def no_devise_installed
     !Gem::Specification.sort_by { |g| [g.name.downcase, g.version] }.group_by { |g| g.name }['devise']
   end

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

@@ -5,7 +5,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   helper :hot_glue
   include HotGlue::ControllerHelper
 
-  <% unless @auth_identifier == '' || @god %>before_action :<%= auth_root %><% end %><% if any_nested? %>
+  <% unless @god %>before_action :<%= "authenticate_" + @auth_identifier.split(".")[0] + "!" %><% end %><% if any_nested? %>
     <% nest_chain = [] %> <% @nested_set.each { |arg|
 
     if auth_identifier == arg[:singular]
@@ -86,8 +86,16 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 <% if @alt_lookups.any? %><%= @alt_lookups.collect{|key, data|
     "    #{data[:assoc].downcase} = #{data[:assoc]}.#{data[:with_create] ? "find_or_create_by" : "find_by"}(#{data[:lookup_as]}: #{ singular_name }_params[:__lookup_#{data[:lookup_as]}])\n"
        }.join("/n") %><% end %> <% merge_lookups = @alt_lookups.collect{|key, data| "#{key.gsub("_id", "")}: #{key.gsub("_id", "")}" }.join(",") %>
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %><% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.merge!(<% if @object_owner_optional && any_nested? %><%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}<% else  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% end %>)<%= ".merge(#{merge_lookups})" if !merge_lookups.empty? %><% if @hawk_keys.any? %>
-    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %><%= controller_attachment_orig_filename_pickup_syntax %>
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %>, <%= current_user_object %>, <%= datetime_fields_list %>) <% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
+    modified_params = modified_params.merge(<%= @object_owner_sym %>: <%= @object_owner_eval %>) <% elsif @object_owner_optional && any_nested? %>
+    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif !@object_owner_eval.empty? %>
+    modified_params = modified_params.merge(<%= @object_owner_eval %>) <% end %><%  if !merge_lookups.empty?  %>
+    modified_params = modified_params.merge(<%= merge_lookups %>)
+    <% end %>
+
+      <% if @hawk_keys.any? %>
+    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
+      <%= controller_attachment_orig_filename_pickup_syntax %>
     <%= creation_syntax %>
 
     if @<%= singular_name %>.save
@@ -112,7 +120,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
        }.join("\n") %><% end %> <% merge_lookups = @alt_lookups.filter{|key,d| ! @update_show_only.include?(key.to_sym) }.collect{|key, data| "#{key.gsub("_id", "")}: #{key.gsub("_id", "")}" }.join(",") %>
     <% @magic_buttons.each { |button| %>@<%= singular_name %>.<%= button %>! if <%= singular_name %>_params[:__<%= button %>]
     <% } %>
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>.merge!(<% if @object_owner_optional && any_nested? %><%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}<% else  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)<% end %>)<%= controller_update_params_tap_away_alt_lookups  %><%= controller_update_params_tap_away_magic_buttons %><%= ".merge(#{merge_lookups})" if !merge_lookups.empty? %>
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<%= controller_update_params_tap_away_alt_lookups  %>, <%= current_user_object %>, <%= datetime_fields_list %>) <% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
+    modified_params = modified_params.merge(<%= @object_owner_sym %>: <%= @object_owner_eval %>) <% elsif @object_owner_optional && any_nested? %>
+    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif !@object_owner_eval.empty? %>
+    modified_params = modified_params.merge(<%= @object_owner_eval %>) <% end %><%  if !merge_lookups.empty?  %>
+    modified_params = modified_params.merge(<%= merge_lookups %>)
+      <% end %>
 
     <% if @hawk_keys.any? %>    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
 <% if @alt_lookups.any? %><%= @alt_lookups.collect{|key, data|
@@ -125,7 +138,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
    }.join("/n") %><% end %><%= controller_attachment_orig_filename_pickup_syntax %>
     if @<%= singular_name %>.update(modified_params)
       <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
-      flash[:notice] = "#{flash[:notice]} Saved \#{@<%= singular %>.<%= display_class %>}"
+      flash[:notice] = "#{flash[:notice]} Saved #{@<%= singular %>.<%= display_class %>}"
       flash[:alert] = @hawk_alarm if @hawk_alarm
       render :update
     else

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

@@ -19,8 +19,8 @@ describe 'interaction for <%= controller_class_name %>' do
   before do
     login_as(<%= @auth %>)
   end <% end %> <% if any_datetime_fields? %>
-  let(:current_timezone) {
-    <%= @auth_identifier %>.try(:timezone) || Time.now.strftime("%z").to_i/100
+  let(:testing_timezone) {
+    Rails.application.config.time_zone
   }<% end %>
   describe "index" do
     it "should show me the list" do
@@ -59,30 +59,14 @@ describe 'interaction for <%= controller_class_name %>' do
 <%= capybara_make_updates(:update) %>
       click_button "Save"
       within("turbo-frame#<%= @namespace %>__#{dom_id(<%= singular %>1)} ") do
-<%= ((@columns - @attachments.keys.collect(&:to_sym)) - (@show_only+@update_show_only)).map { |col|
-      type = eval("#{singular_class}.columns_hash['#{col}']").type
-
-      if type == :uuid || (type == :integer && col.to_s.ends_with?("_id"))
-        assoc = col.to_s.gsub('_id', '')
-        class_name = eval("#{@singular_class}.reflect_on_association(:#{assoc})").class_name
-      "        expect(page).to have_content(#{assoc}1.#{HotGlue.derrive_reference_name(class_name)})"
-
-      elsif type == :boolean
-      '        expect(page).to have_content(new_' + col.to_s + ' ? "YES" : "NO")'
-
-      elsif type == :enum && eval("#{singular_class}.respond_to?(:#{col}_labels)")
-       "        expect(page).to have_content(#{singular_class}.#{col}_labels[new_#{col}])"
-      elsif type == :string && eval("#{singular_class}.respond_to?(:devise_modules)") &&
-           #devise confirmable makes email updates go into unconfirmed_email
-           eval("#{singular_class}.devise_modules.include?(:confirmable)") && col.to_s == "email"
-            "        expect(page).to have_content(#{ singular }1.#{col.to_s})"
-      elsif type == :datetime
-            "        expect(page).to have_content(new_#{col.to_s}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone))"
-      else
-            "        expect(page).to have_content(new_#{col.to_s})"
-      end
-    }.compact.join("\n")
-    %>
+<%= "        " + @columns_map.map{ |col, col_object|
+  if @attachments.keys.collect(&:to_sym).include?(col)
+  elsif @show_only.include?(col)
+  else
+      col_object.spec_make_assertion
+  end
+ }.compact.join("\n        ")
+  %>
       end
     end
   end <% end %>

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.17'
+    CURRENT = '0.5.19.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.19.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,7 +61,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".github/FUNDING.yml"
-- ".github/workflows/test.yml"
+- ".github/workflows/test_suite.yml"
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"

data/.github/workflows/test.yml

@@ -1,49 +0,0 @@
-name: Test
-on: [ push, pull_request ]
-
-jobs:
-  internal_tests:
-    services:
-      # Label used to access the service container
-      postgres:
-        # Docker Hub image
-        image: postgres
-        # Provide the password for postgres
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: test_database_name
-        ports:
-          - 5432:5432
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
-        with:
-          # Not needed with a .ruby-version file
-          # runs 'bundle install' and caches installed gems automatically
-          bundler-cache: true
-      - name: bundle install
-        run: cd dummy && bundle install && cd ..
-
-      - name: run tests
-        env:
-          RUBYOPT: "-W:no-deprecated -W:no-experimental" # Suppress Rails 6 deprecation warnings for ruby 2.7
-          RAILS_ENV: "test"
-          DATABASE_URL: "postgres://postgres:postgres@localhost:5432/test_database_name"
-
-        run: |
-          cd dummy && bin/setup && cd ..
-          bundle install 
-          bundle exec rspec --fail-fast --backtrace
-
-
-
-