hot-glue 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f341b6907ade21c64956cab48b59503280aefaf9836b718d33e26ed854d32a
-  data.tar.gz: ada2f154b32372c90c107c7507cb57d65850e761017bd17c04e6d5afc7302097
+  metadata.gz: 54b2a13a1fb9740be4ca14f108d98b72d8f1250b6131389c5e1d2130f07578cb
+  data.tar.gz: 15010c5e7fb34e35503b5a43aa563159d52f19c0b36f690ff03d67b7f1468060
 SHA512:
-  metadata.gz: 7f38775a9cd7743c6dfb39fe4c4bed6e8b27e6987dd455b460205db6b0e13f8ea5c25e7bd24d59992ead7ca8d689f31fc71c73c5f40ea7578aaace49c41dfaca
-  data.tar.gz: ce1fa03301507fdc462d8a43d6d0253a4bbf8d1c2184d1a582683d56ff67d5d5b9eb21b60902a8d4dfe390d41e4b3ade485e255db659ab7683e34558d838388a
+  metadata.gz: 7b4c9a3e48ea19199f95314a4f0bbff28ca7dfd5635c8ee34e3e2304944ad227d31cb359db1d7c4200f75336ebdb20133cfdb3c762cbe034590630e6d3051a0a
+  data.tar.gz: c6c26412000d4bfa3ee27571aa430a8cf7b1c6dc454c55254a618bd312a14f754088ddb2dd77cf485dd69f433d06fe985a6ba34242f3df47607f4a3955703653

data/.github/FUNDING.yml

@@ -1 +1 @@
-custom: ["https://twitter.com/HotGlueForRails",  "https://school.jasonfleetwoodboldt.com/8188?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link"]
+custom: ["https://twitter.com/HotGlueForRails",  "https://school.jfbcodes.com/8188?utm_source=github.com&utm_campaign=github_hot_glue_repo_funding_link"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.0.1)
+    hot-glue (0.6.2)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -139,7 +139,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.4.4)
+    net-imap (0.4.7)
       date
       net-protocol
     net-pop (0.1.2)

data/README.md

@@ -38,7 +38,7 @@ Other than the opinionated differences and additional features, Hot Glue produce
 
 # Get Hot Glue
 
-## [GET THE COURSE TODAY](https://school.jasonfleetwoodboldt.com/8188/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page) **only $60 USD!**
+## [GET THE COURSE TODAY](https://school.jfbcodes.com/8188/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page) **only $60 USD!**
 
 
 ---
@@ -63,10 +63,14 @@ Instantly get a simple CRUD interface
 _If you are on Rails 6, see [LEGACY SETUP FOR RAILS 6](https://github.com/jasonfb/hot-glue/README2.md) and complete those steps FIRST._
 
 ## The Super-Quick Setup
+https://jasonfleetwoodboldt.com/courses/stepping-up-rails/jason-fleetwood-boldts-rails-cookbook/hot-glue-quick-install-mega-script/
+Copy & paste the whole code block into your terminal.
+Remember, there is a small "Copy" button at the top-right of the code block.
+Be sure to use your Node + Ruby version managers to switch into the Node & Ruby versions **before running the quick script**. 
 
-https://jasonfleetwoodboldt.com/courses/stepping-up-rails/jason-fleetwood-boldts-rails-cookbook/
 
-Copy & paste the whole code block from each section into your terminal. Remember, there is a small "Copy" button at the top-right of each code block to help you copy & paste the script into your terminal. 
+For more of a step-by-step, see the full cookbook at:
+https://jasonfleetwoodboldt.com/courses/stepping-up-rails/jason-fleetwood-boldts-rails-cookbook/
 
 These are the sections you need, you can ignore any others:
 
@@ -522,7 +526,7 @@ The short form looks like this. It presumes there is a 'pets' association from `
 
 (The long form equivalent of this would be `--hawk=pet_id{current_user.pets}`)
 
-This is covered in [Example #3 in the Hot Glue Tutorial](https://school.jasonfleetwoodboldt.com/8188)
+This is covered in [Example #3 in the Hot Glue Tutorial](https://school.jfbcodes.com/8188)
 
 To hawk to a scope that is not the currently authenticated user, use the long form with `{...}` 
 to specify the scope. Be sure to note to add the association name itself, like `users`: 
@@ -532,7 +536,7 @@ to specify the scope. Be sure to note to add the association name itself, like `
 This would hawk the Appointment's `user_id` key to any users who are within the scope of the 
 current_user's has_many association (so, for any other "my" family, would be `current_user.family.users`). 
 
-This is covered in [Example #4 in the Hot Glue Tutorial](https://school.jasonfleetwoodboldt.com/8188)
+This is covered in [Example #4 in the Hot Glue Tutorial](https://school.jfbcodes.com/8188)
 
 
 ### `--plural=`
@@ -691,11 +695,14 @@ If you enable Pundit, your controllers will look for a Policy that matches the n
 **Realtime Field-level Access**
 Hot Glue gives you automatic field level access control if you create `*_able?` methods for each field you'd like to control on your Pundit policy.
 
-(Although this is not what Pundit recommends for field level access control, it has been implemented this way to provide field-by-field user feedback to the user shown in red just like Rails validation errors are currently shown. This is is only hypothetical, because the interface correctly shows the field as viewable or editable anyway, making bad entry only something that could be achieved through a mistake or hacking. Nevertheless, rest assured that if there was a input mistake-- like a user having a field editable when it shouldn't be, the backend policy would guard against the disallowed input and show an error message.)
+(Although this is not what Pundit recommends for field level access control, it has been implemented this way to provide field-by-field user feedback to the user shown in red just like Rails validation errors are currently shown. A user having access to input text into a field they shouldn't have access to is *only hypothetical*, because the Hot Glue will correctly show the the user connect edit was view-only anyway, making unallowed entry only something that could be achieved through a mistake or hacking. Nevertheless, rest assured that if there was a input mistake-- like a user having a field editable when it shouldn't be, if you implement your backend policy correctly with an `update?` method guards against the disallowed input, your user will show an error message and the record will not be updated.)
+
+The `*_able?` method should return true or false depending on whether or not the field can be edited. No distinction is made between the `new` and `edit` contexts. You may check if the record is new using `new_record?`.
+
+
+**The `*_able?` method is used by Hot Glue only on the new and edit actions. You must incorporate it into the policy's `update?` method as in the example, or else no guard will check prevent the user doesn't pass a value to input it anyway.**
 
-The `*_able?` method should return true or false depending on whether or not the field can be edited. (No distinction is made between the different contexts. You may check if the record is new using `new_record?`.
 
-The `*_able?` method is used by Hot Glue only on the new and edit actions, but you should incorporate it into the policy's `update?` method as in the example, which will extend other operations since Hot Glue will use the policy to authorize the action
 Add one `*_able?` method to the policy for each field you want to allow field-level access control. 
 
 Replace `*` with the name of the field you want under access control. Remember to include `_id` for foreign keys. You do not need it for any field you don't want under access control.
@@ -852,7 +859,7 @@ This means you can be a somewhat lazy about your bang methods, but keep in mind
 
 Finally, you can raise an ActiveRecord error which will also get passed to the user in the flash alert area.
 
-For more information see Example 5 in the Tutorial
+For more information see [Example 5 in the Tutorial](https://school.jfbcodes.com/8188)
 
 
 ### `--downnest`
@@ -980,7 +987,7 @@ rails generate hot_glue:scaffold User --related-sets=roles --include=email,roles
 
 Note this leaves open a privileged escalation attack (a security vulnerability).
 
-To fix this, you'll need to use Pundit with special syntax designed for this purpose. Please see Example #16 in the [https://school.jfbcodes.com/8188](Hot Glue Tutorial).
+To fix this, you'll need to use Pundit with special syntax designed for this purpose. Please see [Example #17 in the Hot Glue Tutorial](https://school.jfbcodes.com/8188)
 
 
 ## "Thing" Label
@@ -1048,6 +1055,87 @@ Use `before` to make the labels come before or `after` to make them come after.
 Omits the heading of column names that appears above the 1st row of data.
 
 
+
+`--code-before-create`
+`--code-after-create`
+`--code-before-update`
+`--code-after-update`
+
+Insert some code into the `create` action or `update` actions.
+The **before code** is called _after authorization_ but _before saving_ (which creates the record, or fails validation).
+The **after create** code is called after the record is saved (and thus has an id in the case of the create action).
+Both should be wrapped in quotation marks when specified in the command line, and use semicolons to separate multiple lines of code.
+(Notice the funky indentation of the lines in the generated code. Adjust you input to get the indentation correct.)
+
+
+## Searching
+
+### `--search` (options: simple, set, false predicate, default: false)
+
+
+#### Set Search
+If you specify `--search` to `set`, you will get a whole bar across the top of the list with search fields for each field.
+Within the set, the search query is **_combinative_** ("and"), so records matching all criteria are shown as the **result set.**
+For date pickers and time pickers, you need the additional Stimulus.
+Install this with :
+
+```
+bin/rails generate hot_glue:set_search_interface_install
+```
+
+_Additional search option for Set Search_
+##### `--search-fields=aaa,bbb,ccc,ddd,eee` 
+to specify which fields you want to be searchable.
+
+
+##### `--search-query-fields=aaa,ddd` 
+to specify a list of strings only which will be taken out of the search set and presented in a singular query box (allowing search across multiple string fields)
+
+##### `--search-position=vertical` 
+to specify vertical or horizontal (default: horizontal)
+
+##### `--search-clear-button` (no option) 
+to specify whether to show a clear button to clear the whole search form at once (default: false)
+
+##### `--search-autosearch` (no option) 
+to specify whether to automatically search when the user exit or changes any field (default: false)
+
+examples:
+```
+bin/rails generate Thing --include=name,description --search=set --search-fields=name,description
+```
+
+_Make a searchable table with two foreign keys (author_id and category_id) and a query field for title, including a clear button._
+```
+bin/rails generate Articles --inclue=title,author_id,category_id --search=set --search-fields=title,author_id,category_id --search-query-fields=title --search-clear-button
+```
+
+_Make a searchable table with vertical position and autosearch on._
+```
+bin/rails generate Inications --inclue=patient_id,drug_id,quantity --search=set --search-fields=patient_id,drug_id --search-position=vertical --search-autosearch
+```
+
+
+Here's how you would add a search interface to Example #1 in the [Hot Glue Tutorial](https://school.jfbcodes.com/8188)
+```
+bin/rails generate Book --include=name,author_id --search=set --search-fields=name,author_id
+```
+
+
+
+
+
+#### Predicate
+NOT IMPLEMENTED YET
+TODO: implement me
+
+
+
+
+
+
+
+
 ## Special Features
 
 ### `--attachments`
@@ -1345,6 +1433,10 @@ Child portals have the headings omitted automatically (there is a heading identi
 - Enum - displayed as a drop-down list (defined the enum values on your model). 
   - For Rails 6 see https://jasonfleetwoodboldt.com/courses/stepping-up-rails/enumerated-types-in-rails-and-postgres/
   - You must specify the enum definition both in your model and also in your database migration for both Rails 6 + Rails 7
+  - You can modify an enum so that instead of a drop down list, it displays a partial view that you must build. See the [v0.5.23 Release notes](https://github.com/hot-glue-for-rails/hot-glue#2023-10-01---v0523) for details.
+
+
+
 
 # Note about enums
 
@@ -1389,6 +1481,8 @@ def self.status_labels
 
 Now, your labels will show up on the front-end as defined in the `_labels` ("Is currently pending", etc) instead of the database-values.
 
+You can modify an enum so that instead of a drop down list, it displays a partial view that you must build. See the [v0.5.23 Release notes](https://github.com/hot-glue-for-rails/hot-glue#2023-10-01---v0523) for details.
+
 ### Validation Magic
 
 Use ActiveRecord validations or hooks to validate your data. Hot Glue will automatically display the errors in the UI.
@@ -1491,9 +1585,94 @@ For example, to display the field `my_story` on the object `Thing`, you'd genera
 bin/rails generate Thing --include=my_story --modify='my_story{tinymce}'
 ```
 
+### Pickup Partial Includes for `_edit` and `_new` Screens
+
+If you have a partial already in the view folder called `_edit_within_form.html.erb`, it with get included within the edit form.
+If you have a partial already in the view folder called `_new_within_form.html.erb`, it with get included within the new form.
+For these, you can use any of the objects by local variable name or the special `f` local variable to access the form itself.
+
+These partials are good for including extra functionality in the form, like interactive widgets or hidden fields.
+If you have a partial already in the view folder called `_edit_after_form.html.erb`, it with get included **_after_** the edit form.
+If you have a partial already in the view folder called `_new_after_form.html.erb`, it with get included **_after_** the new form.
+You can use any of the objects by local variable name (but you cannot use the form object `f` because it is not in scope.)
+
+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.
+
+
+
+
+
 # VERSION HISTORY
 
-#### v0.6.1 - `--related-sets`
+#### D2024-01-15 - v0.6.3
+
+## Set Searching
+
+### `--search` (options: set, false default: false)
+
+(Future options include simple, predicate)
+
+A set search is a search form that allows you to search across multiple fields at once. It is a set of search fields, each of which is a search field for a single field.
+
+
+#### Set Search
+If you specify `--search` to `set`, you will get a whole bar across the top of the list with search fields for each field.
+Within the set, the search query is **_combinative_** ("and"), so records matching all criteria are shown as the **result set.**
+For date pickers, time pickers, and the clear form interaction, you need the additional Stimulus JS. 
+Install this with :
+
+```
+bin/rails generate hot_glue:set_search_interface_install
+```
+
+_Additional search option for Set Search_
+##### `--search-fields=aaa,bbb,ccc,ddd,eee`
+to specify which fields you want to be searchable.
+
+##### `--search-query-fields=aaa,ddd`
+to specify a list of strings only which will be taken out of the search set and presented in a singular query box (allowing search across multiple string fields)
+
+##### `--search-position=vertical`
+to specify vertical or horizontal (default: horizontal)
+
+##### `--search-clear-button` (no option)
+to specify whether to show a clear button to clear the whole search form at once (default: false)
+
+
+
+
+
+
+#### 2023-12-02 - v0.6.2
+
+• Fixes to typeahead when using Pundit.
+
+• New Code Hooks: Add Custom Code Before/After the Update or Create Actions
+
+`--code-before-create`
+`--code-after-create`
+`--code-before-update`
+`--code-after-update`
+
+
+Insert some code into the `create` action or `update` actions.
+
+The **before code** is called _after authorization_ but _before saving_ (which creates the record, or fails validation). 
+
+The **after create** code is called after the record is saved (and thus has an id in the case of the create action). 
+
+Both should be wrapped in quotation marks when specified in the command line, and use semicolons to separate multiple lines of code.
+(Notice the funky indentation of the lines in the generated code. Adjust you input to get the indentation correct.)
+
+• New Automatic Pickup Partial Includes for `_edit` and `_new` Screens
+
+See "Pickup Partial Includes for `_edit` and `_new` Screens" above
+
+
+
+#### 2023-11-21 - v0.6.1 - `--related-sets`
 
 Used to show a checkbox set of related records. The relationship should be a `has_and_belongs_to_many` or a `has_many through:` from the object being built.
 
@@ -1511,7 +1690,7 @@ Note that when making a scaffold like this, you may leave open a privileged esca
 
 To fix this, you'll need to use Pundit with special syntax designed for this purpose. 
 
-For a complete solution, please see Example #16 in the [https://school.jfbcodes.com/8188](Hot Glue Tutorial).
+For a complete solution, please see Example 17 in the [Hot Glue Tutorial](https://school.jfbcodes.com/8188).
 
 Without Pundit, due to a quirk in how this code works with ActiveRecord, all update operates to the related sets table are permitted (and go through), even if the update operation otherwise fails validation for the fields on the object. (ActiveRecord doesn't seem to have a way to validate the related sets directly.)
 
@@ -1910,8 +2089,8 @@ License check has been removed (Hot Glue is now free to use for hobbyists and in
 #### 2022-03-23 - v0.5.2 - Hawked Foreign Keys
 
  - You can now protect your foreign keys from malicious input and also restrict the scope of drop downs to show only records with the specified access control restriction.
- - [Example #3](https://school.jasonfleetwoodboldt.com/8188) in the Hot Glue Tutorial shows you how to use the hawk to limit the scope to the logged in user.
- - [Example #4](https://school.jasonfleetwoodboldt.com/8188) in the Hot Glue Tutorial shows how to hawk to a non-usual scope, the inverse of the current user's belongs_to (that is, hawk the scope to X where current_user `belongs_to :x`)
+ - [Example #3](https://school.jfbcodes.com/8188) in the Hot Glue Tutorial shows you how to use the hawk to limit the scope to the logged in user.
+ - [Example #4](https://school.jfbcodes.com/8188) in the Hot Glue Tutorial shows how to hawk to a non-usual scope, the inverse of the current user's belongs_to (that is, hawk the scope to X where current_user `belongs_to :x`)
  
 
 #### 2022-03-12  - v0.5.1 - Inline List Labels

data/app/helpers/hot_glue/controller_helper.rb

@@ -5,28 +5,42 @@ module HotGlue
       (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
     end
 
-    def datetime_field_localized(form_object, field_name, value, label, nothing = nil )
+    def datetime_field_localized(form_object, field_name, value, **args )
       current_timezone
-      form_object.text_field(field_name, class: 'form-control',
-                                    type: 'datetime-local',
-                                    value: date_to_current_timezone(value, current_timezone))  + timezonize(current_timezone)
+
+      args = args.merge({class: 'form-control',
+                                  type: 'datetime-local' })
+
+      if !value.nil?
+        args[:value] = date_to_current_timezone(value, current_timezone) + timezonize(current_timezone)
+      end
+
+      form_object.text_field(field_name, args)
+
     end
 
 
-    def date_field_localized(form_object, field_name, value, label, timezone = nil )
-      form_object.text_field(field_name, class: 'form-control',
-                                    type: 'date',
-                                    value: value )
+    def date_field_localized(form_object, field_name, value, **args)
+
+      form_object.text_field(field_name,  args.merge({class: 'form-control',
+                                                       type: 'date',
+                                                       value: value }))
     end
 
-    def time_field_localized(form_object, field_name, value, label )
+    def time_field_localized(form_object, field_name, value, **args )
       current_timezone
-      form_object.text_field(field_name, class: 'form-control',
-                                    type: 'time',
-                                    value: value && value.strftime("%H:%M"))
+
+      form_object.text_field(field_name,  args.merge({class: 'form-control',
+                                                      type: 'time',
+                                                      value: value }))
 
     end
 
+
+
+
+
+
     def current_timezone
       # returns a TimeZone (https://apidock.com/rails/TimeZone) object
       if defined?(current_user)
@@ -104,6 +118,96 @@ module HotGlue
       modified_params
     end
 
+    def string_query_constructor(match, search)
+      if match.blank? || search.blank?
+        nil
+      else
+        case match
+        when 'contains'
+          "%#{search}%"
+        when 'is_exactly'
+          "#{search}"
+        when 'starts_with'
+          "#{search}%"
+        when 'ends_with'
+          "%#{search}"
+        else
+          nil
+        end
+      end
+    end
+
+    def enum_constructor(field_name, value, **args)
+      return nil if value.blank?
+      ["#{field_name} = ?", value]
+    end
+
+
+    def date_query_constructor(field, match, search_start, search_end)
+      if match.blank?
+        nil
+      elsif ['is_on', 'not_on'].include?(match) && search_start.blank?
+        nil
+      elsif ['is_on_or_after','is_between'].include?(match) && (search_start.blank? )
+        nil
+      elsif ['is_before_or_on'].include?(match) && (search_end.blank? )
+        nil
+      elsif ['is_between'].include?(match) && (search_start.blank? || search_end.blank? )
+        nil
+      else
+        case match
+        when 'is_on'
+          ["#{field} = ?", search_start]
+        when 'is_on_or_after'
+          ["#{field} = ? OR #{field} > ?", search_start, search_start]
+        when "is_before_or_on"
+          ["#{field} = ? OR #{field} < ?", search_end, search_end]
+        when "is_between"
+          ["#{field} BETWEEN ? AND ?", search_start, search_end]
+        when "not_on"
+          ["#{field} != ?", search_start]
+        end
+      end
+    end
+
+    def time_query_constructor(field, match, search_start, search_end)
+      if match.blank?
+        nil
+      elsif ['is_at'].include?(match) && search_start.blank?
+        nil
+      elsif ['is_ar_or_after', 'is_before_or_at', 'is_between'].include?(match) && (search_start.blank? || search_end.blank?)
+        nil
+      else
+        case match
+        when 'is_at_exactly'
+          ["EXTRACT(HOUR FROM #{field}) = ?
+          AND EXTRACT(MINUTE FROM #{field}) = ? ", search_start.split(":")[0], search_start.split(":")[1]]
+        # when 'is_at_or_after'
+        #   ["#{field} = ? OR #{field} > ?", search_start, search_start]
+        # when "is_before_or_at"
+        #   ["#{field} = ? OR #{field} < ?", search_end, search_end]
+        # when "is_between"
+        #   ["#{field} BETWEEN ? AND ?", search_start, search_end]
+        end
+      end
+    end
+
+    def association_constructor(field, search)
+      unless search.blank?
+        ["#{field} = ?", search]
+      else
+        nil
+      end
+    end
+
+    def boolean_query_constructor(field, search)
+      unless search.blank?
+        ["#{field} = ?", search]
+      else
+        nil
+      end
+    end
+
     private
 
     def server_timezone_offset # returns integer of hours to add/subtract from UTC

data/app/helpers/hot_glue_helper.rb

@@ -1,5 +1,7 @@
 module HotGlueHelper
 
+
+
   def enum_to_collection_select(hash)
     hash.collect{|k,v| OpenStruct.new({key: k, value: v})}
 

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

@@ -78,9 +78,8 @@ class AssociationField < Field
   def form_field_output
     assoc_name = name.to_s.gsub("_id","")
     assoc = eval("#{class_name}.reflect_on_association(:#{assoc_name})")
-
     if modify_as && modify_as[:typeahead]
-      search_url  = "#{namespace ? namespace + "_" : ""}#{assoc.plural_name}_typeahead_index_url"
+      search_url  = "#{namespace ? namespace + "_" : ""}#{assoc.class_name.downcase.pluralize}_typeahead_index_url"
       "<div class='typeahead typeahead--#{assoc.name}_id'
       data-controller='typeahead'
       data-typeahead-url-value='<%= #{search_url} %>'
@@ -150,4 +149,76 @@ class AssociationField < Field
 
     "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
   end
+
+
+  def search_field_output
+
+    assoc_name = name.to_s.gsub("_id","")
+    assoc = eval("#{class_name}.reflect_on_association(:#{assoc_name})")
+    if modify_as && modify_as[:typeahead]
+      search_url  = "#{namespace ? namespace + "_" : ""}#{assoc.class_name.downcase.pluralize}_typeahead_index_url"
+
+      # \"q[0][#{name}_search]\"
+      # @q['0']['#{name}_search']
+      "<div class='typeahead typeahead--q_0_#{name}_search'
+      data-controller='typeahead'
+      data-typeahead-url-value='<%= #{search_url} %>'
+      data-typeahead-typeahead-results-outlet='#search-results'>
+      <%= text_field_tag \'q[0][#{name}_search]_query\', '', placeholder: 'Search #{assoc.plural_name}', class: 'search__input',
+                     data: { action: 'keyup->typeahead#fetchResults keydown->typeahead#navigateResults', typeahead_target: 'query' },
+                     autofocus: true,
+                     autocomplete: 'off',
+                     value: @q['0']['#{name}'] ? #{assoc.class_name}.find(@q['0']['#{name}']).try(:name) : \"\"  %>
+      <%= f.hidden_field \'q[0][#{name}]\', value: @q['0']['#{name}_search'].try(:id), 'data-typeahead-target': 'hiddenFormValue' %>
+      <div data-typeahead-target='results'></div>
+      <div data-typeahead-target='classIdentifier' data-id=\"typeahead--q_0_#{name}_search\"></div>
+      </div>"
+    else
+      if assoc.nil?
+        exit_message = "*** Oops. on the #{class_name} object, there doesn't seem to be an association called '#{assoc_name}'"
+        exit
+      end
+
+      is_owner = name == ownership_field
+      assoc_class_name = assoc.class_name.to_s
+      display_column = HotGlue.derrive_reference_name(assoc_class_name)
+
+      if hawk_keys[assoc.foreign_key.to_sym]
+        hawk_definition = hawk_keys[assoc.foreign_key.to_sym]
+        hawked_association = hawk_definition[:bind_to].join(".")
+      else
+        hawked_association = "#{assoc.class_name}.all"
+      end
+
+      (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
+        "  <%= f.collection_select(\"q[0][#{name}_search]\", #{hawked_association}, :id, :#{display_column}, {include_blank: true, selected: @q['0']['#{name}_search'] }, class: 'form-control') %>\n" +
+        (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
+        (is_owner ? "\n<% end %>" : "")
+    end
+
+
+    # "      "+
+    #   "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is on', 'is_on'], " +
+    #   "\n         ['is between', 'is_between'], ['is on or after', 'is_on_or_after'], " +
+    #   "\n         ['is before or on', 'is_before_or_on'], ['not on', 'not_on']], @q[\'0\']['#{name}_match'] ), {} ," +
+    #   "\n         { class: 'form-control match', 'data-action': 'change->date-range-picker#matchSelection' } %>"+
+    #   "\n        <%= date_field_localized f, 'q[0][#{name}_search_start]',  @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'start', 'data-date-range-picker-target': 'start' %>" +
+    #   "\n        <%= date_field_localized f, 'q[0][#{name}_search_end]',  @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'end' , 'data-date-range-picker-target': 'end'%>" +
+    #   "\n     "
+  end
+
+
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    if modify_as && modify_as[:typeahead]
+      "#{name}_query = association_constructor(:#{name}, @q['0'][:#{name}])"
+    else
+      "#{name}_query = association_constructor(:#{name}, @q['0'][:#{name}_search])"
+    end
+  end
+
+
 end

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

@@ -78,4 +78,34 @@ class BooleanField < Field
   def label_class
     super + " form-check-label"
   end
+
+
+
+  def search_field_output
+    "  <%= f.radio_button('q[0][#{name}_match]', '-1', checked: @q[\'0\']['#{name}_match']==-1  ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('q[0][#{name}_match]', value: '-1', for: 'q[0][#{name}_match]_-1'  ) %>\n" +
+
+      "  <%= f.radio_button('q[0][#{name}_match]', '0', checked: @q[\'0\']['#{name}_match']==0 ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('q[0][#{name}_match]_0', value: '#{modify_binary? && modify_as[:binary][:falsy] || 'No'}', for: 'q[0][#{name}_match]_0') %>\n" +
+      " <br /> <%= f.radio_button('q[0][#{name}_match]', '1',  checked: @q[\'0\']['#{name}_match']==1  ? 'checked' : '' , class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('q[0][#{name}_match]_1', value: '#{modify_binary? && modify_as[:binary][:truthy] || 'Yes'}', for: 'q[0][#{name}_match]_1') %>\n"
+
+
+    # "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' } %>"+
+    #   "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' %>"
+  end
+
+
+  def where_query_statement
+    ".where('#{name} ILIKE ?', #{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = boolean_query_constructor(@q['0'][:#{name}_match], @q['0'][:#{name}_search])"
+  end
+
+  # def code_to_reset_match_if_search_is_blank
+  #   "    @q['0'][:#{name}_match] = '' if @q['0'][:#{name}_search] == ''"
+  # 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  }') %>"
+    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, label:  '#{ name.to_s.humanize  }') %>"
   end
 
   def line_field_output
@@ -20,4 +20,24 @@ class DateField < Field
       <span class=''>MISSING</span>
     <% end %>"
   end
+
+  def search_field_output
+    "      <div data-controller='date-range-picker' >"+
+    "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is on', 'is_on'], " +
+    "\n         ['is between', 'is_between'], ['is on or after', 'is_on_or_after'], " +
+    "\n         ['is before or on', 'is_before_or_on'], ['not on', 'not_on']], @q[\'0\']['#{name}_match'] ), {} ," +
+    "\n         { class: 'form-control match', 'data-action': 'change->date-range-picker#matchSelection' } %>"+
+    "\n        <%= date_field_localized f, 'q[0][#{name}_search_start]',  @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'start', 'data-date-range-picker-target': 'start' %>" +
+    "\n        <%= date_field_localized f, 'q[0][#{name}_search_end]',  @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'end' , 'data-date-range-picker-target': 'end'%>" +
+    "\n      </div>"
+  end
+
+
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = date_query_constructor(:#{name}, @q['0'][:#{name}_match], @q['0'][:#{name}_search_start], @q['0'][:#{name}_search_end])"
+  end
 end