hot-glue 0.6.16 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09ebf223206d1bf224f02aaafe2796774bfa6b3d61c6892c1b0144ec2a8dd0f3'
-  data.tar.gz: 1fd04b5e1909ebcf2ecc9eeb5c4e212f7a6878d49c0fe918305e43e441cd73d3
+  metadata.gz: ddd7d67de32f74ce4e79fabcaaa216e9e5cfbbd84c4bb6d9ab53b6ba2dd57f00
+  data.tar.gz: 5e4e51cce50f7c7e3579bb09c452c5c0b02b4331870a22c9bd249281dab8cd7a
 SHA512:
-  metadata.gz: c01e39699fe999a7024850b9d738d5e205b4e5abe8c39d3619d10efa74fbed2384ac6cadfa4010d52c0a9fdea3878ae599aa23002cd439d323701f4b8524c3eb
-  data.tar.gz: 79c20e1f78772f79e396cecfc81990a70b3a0d17988962baebd6c2ea0b10eabedea59ebd8624f34d0ad7ce864d59bf7ad7be2afb8c712ef01f605ab06e272fce
+  metadata.gz: e250a3b6598e3e83312bad3b27d7da0f200563ab7e89a544f23aa46913eb1f23ea796854dcdf7d2939291ec8b8ce92fe245c629658982b4f47a71e20a19e1c5f
+  data.tar.gz: '08b99eba601f426decbcd5e2fe5daf6c9b121c1285e847d2f7b827da14f1c16a30bb20e2813770a68b20a623fe85584e1e9fe6784c86f42eb5d97c375715421d'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.15)
+    hot-glue (0.6.18)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -140,7 +140,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.5.6)
+    net-imap (0.5.8)
       date
       net-protocol
     net-pop (0.1.2)

data/README.md

@@ -680,15 +680,49 @@ For the `$` modifier only, if the field name ends with `_cents`, the modifier wi
 
 ### `--alt-foreign-key-lookup=`
 
-Use for a join table to specify that a field should be looked up by a different field
+Use for a join table to specify that a field should be looked up by a different field. For example, when you want to lookup a user by a (complete) email address.
 
+In these contexts, the lookup must be exact match to the text entered (no partial matches supported). 
 
-`./bin/rails generate hot_glue:scaffold AccountUser --alt-foreign-key-lookup=user_id{email}`
+Use `+` to map to the `find_or_create_by` method. (Without `+` it will use `find_by`.)
+
+This is accomlished using a little magic of a lookup field called `__lookup_X_Y` passed in the form parameters.
+
+The lookup field is used to look up the associated record, then deleted from the params.
+
+#### When used in `--gd` mode
+The lookup will use the base class and have access to all records.
+`user = User.find_or_create_by!(email: params[:__lookup_email])`
+`modified_params.tap { |hs| hs.delete(:__lookup_target_email)}`
+`modified_params.merge!(user: user)`
+
+Example 1
+`./bin/rails generate hot_glue:scaffold AccountUser --gd --alt-foreign-key-lookup=user_id{email}`
 
 Here we are specifying that the `user_id` field should be looked up by the `email` field on the User table. 
 If no existing user exists, we create one because we are using the `find_or_create_by!` method.
 
+### When used with a Hawk
+
+A hawk applied to the same field will be enforced within this mechanism.
+
+Example #2
+`bin/rails generate hot_glue:scaffold Appointment --gd --alt-foreign-key-lookup='user_id{email}' --hawk='user_id{current_user.family}'`
+
+
+Whether or not in Gd mode, the hawk is  enforced by scoping the find to the hawk's scope
+```
+user = current_user.family.users.find_by(email: appointment_params[:__lookup_user_email] )
+modified_params.tap { |hs| hs.delete(:__lookup_user_email)}
+@appointment = Appointment.new(modified_params.merge(user: user))
+```
+
+
+
+### With Factory
+
 Use with a factory pattern like this one:
+
 ``` 
 class AccountUserFactory
   attr_accessor :account_user
@@ -712,9 +746,17 @@ end
 this works with a factory creation syntax like so:
 
 ```
---factory-creation='factory = AccountUserFactory.new(params: account_user_params, account: account)
+rails generate hot_glue:scaffold AccountUser --alt-foreign-key-lookup=user_id{email} --factory-creation='factory = AccountUserFactory.new(params: account_user_params, account: account)
 ```
-*See the `--factory-creation` section. 
+
+In this example, the lookup is *not performed inside of the create action*, because it is assumed you will do so yourself inside of your factory.
+
+As you see in the example above, params is passed to your factory and it is the `account_user_params` fromm the controller. 
+
+#### Warning:
+When building a non-Gd controller with a `--alt-foreign-key-lookup`, if you don't also hawk the same field you will get an error. 
+
+To fix, either hawk the field or use with a factory creation pattern. This is because the associated object is on your graph but Hot Glue doesn't know how to securly load it without knowing its relationship to the current user. Use the `--hawk` mechanism to specify that relationship, and the lookup mechanism will integrate nicely. 
 
 
 
@@ -868,6 +910,92 @@ Remember, if there's a corresponding `*_able?` method on the policy, it will be
 As shown in the method `name_able?` of the example ThingPolicy above, if this field on your policy returns true, the field will be editable. If it returns false, the field will be viewable (read-only).
 
 
+### `--hidden`
+
+Separate list of fields. 
+
+These fields will be hidden from the form but will exist as hidden_field, and so the update will still work.
+
+
+EXAMPLE:
+
+```
+bin/rails generate hot_glue:scaffold Wrapper --namespace='account_dashboard' --no-nav-menu --big-edit --smart-layout --stimmify --hidden=raw_source
+```
+
+In the `wrappers` folder, I am using a special sticky partial `_edit_within_form.html.erb`, which contains code preserved from build-to-build and included in the form:
+
+
+```
+<div class="row" style="position: relative; width: 100%; overflow: auto;">
+  <div class="col-md-12">
+    <div id="wrapper__raw_source"
+         style="position: static">
+
+      <div id="wrapper__raw_source-toolbar">
+
+      </div>
+
+
+      <div cols="60"
+           data-wrapper-form-target="editor"
+           id="wrapper__raw_source-editor" >
+      </div>
+    </div>
+
+
+  </div>
+</div>
+<div class="col-md-2">
+</div>
+```
+
+
+Then, create a `app/javascript/controllers/wrapper_form_controller.js` file with the following code:
+
+```javascript
+
+
+import { Controller } from "@hotwired/stimulus"
+
+import {basicSetup} from "codemirror"
+import {EditorView} from "@codemirror/view"
+
+// Connects to data-controller="wrapper-form"
+export default class extends Controller {
+  static targets = ['rawSource', 'name', 'nameWrapper', 'editor'];
+
+  connect() {
+    console.log("WrapperFormController connected")
+    this.account_id = this.element.dataset['accountId']
+    this.crusade_id = this.element.dataset['crusadeId']
+    this.wrapper_id = this.element.dataset['wrapperId']
+
+    const view = new EditorView({
+      doc: this.rawSourceTarget.value,
+      parent: this.editorTarget,
+      extensions: [basicSetup]
+    })
+
+    this.view = view;
+    this.element.addEventListener('submit', this.formSubmit.bind(this))
+    // this.previewButtonTarget.addEventListener('click', this.previewClick.bind(this))
+  }
+
+  formSubmit(event) {
+    this.rawSourceTarget.value = this.view.state.doc.toString();
+  }
+}
+```
+
+Notice we are also using `--stimmify` to decorate the form with a Stimulus controller.
+
+The code above uses Code Mirror to act as a code editor, which requires pulling the value off the hidden form element (putting it into the code mirror interface) and pushing it back into the hidden form element when the Submit button is clicked.
+
+
+
+
+
 ### `--ujs_syntax=true` (Default is set automatically based on whether you have turbo-rails installed)
 
 If you are pre-Turbo (UJS), your delete buttons will come out like this:
@@ -1381,6 +1509,54 @@ Then run:
 This will 1) copy the dropzone_controller.js file into your app and 2) add the dropzone css into your app's application.css or application.bootstrap.css file.
 
 
+### Attach Stimulus JS Controllers to Your Forms with `--stimmify` or `--stimmify=xyz`
+
+Automatically build the new and edit form with `data-controller='xyz'` to attach cooresponding stimulus controllers. 
+
+If you use the shorthand (specify no `=`) your stimulus controller's name will be inferred from the Singular form of the scaffolding beild built, with dashes for underscores, and ending with `-form`
+
+`@singular.gsub("_", "-") + "-form"`
+
+(For example, `rails g hot_glue:scaffold Thing --stimmy` generates a form that looks like
+
+```
+    <%= form_with model: thing,
+                url: things_path(account,crusade,email_template),
+                  html: {
+                      'data-controller': "thing-form"
+                      }
+          %>
+          ...
+
+```
+
+Note that your fields also appended with `data-thing-target=abc` and also `data-thing-target=abcWrapper`
+(assuming `thing` is the scaffold being built and abc is the field name)
+
+
+Here, we are building a `thing` scaffold. The  field `name` is decorated twice: once for the wrapper span and again for the specific form element itself.
+```
+<span class="" data-thing-form-target="nameWrapper">
+        <input value="asdfadf" autocomplete="off" size="40" class="form-control" type="" data-thing-form-target="name" name="thing[name]" id="thing_name">
+
+
+      <label class="text-muted small form-text" for="">Name</label>
+    </span>
+```
+
+Your stimulus controller will need two targets for each field:
+
+```
+  static targets = ['name', 'nameWrapper'];
+```
+You can interact with the wrapper for things like clicks or hovers, or to hide/show the entire box surrounding the form element.
+
+Use the form field element itself to affect things like enabled or the value of the field.
+
+
+For a crash course on Stimulus, see
+https://jasonfleetwoodboldt.com/courses/rails-7-crash-course/rails-7-stimulus-js-basics-with-importmap-rails/
+
 
 
 ### `--factory-creation={ ... }`
@@ -1768,6 +1944,61 @@ These automatic pickups for partials are detected at build time. This means that
 
 # VERSION HISTORY
 
+#### 2025-05-18  v0.6.18
+• Significant additions to `--alt-foreign-key-lookups` which can now work:
+- on its on, without needing a factory
+- with a factory
+- with our without the hawk
+- in Gd mode or, if not, use with `--factory-creation` or use with `--hawk`
+
+See notes above for details.
+
+• Adds Integer as serachable field
+
+_ foo and bar are integers _ 
+
+`rails g hot_glue:scaffold Thing --include=foo,bar --search=set --search-fields=foo,bar`
+
+
+
+#### 2025-05-09 - v0.6.17
+
+
+• Adds Stimulus JS & `--stimmify` or `--stimmify=xyz`
+
+Automatically build the new and edit form with `data-controller='xyz'` to attach stimulus
+
+If you use the shorthand (specify no `=`) your stimulus controller's name will be inferred from the Singular form of the scaffolding beild built, with dashes for underscores, and ending with `-form`
+
+(For example, `rails g hot_glue:scaffold Thing --stimmy` generates a form that looks like
+
+```
+    <%= form_with model: thing,
+                url: things_path(account,crusade,email_template),
+                  html: {
+                      'data-controller': "thing-form"
+                      }
+          %>
+          ...
+
+```
+
+Note that your fields also appended with `data-thing-target=abc` and also `data-thing-target=abcWrapper`
+
+See section "Attach Stimulus JS Controllers to Your Forms with `--stimmify` or `--stimmify=xyz`"
+
+For a crash course on Stimulus, see
+https://jasonfleetwoodboldt.com/courses/rails-7-crash-course/rails-7-stimulus-js-basics-with-importmap-rails/
+
+
+• Adds `--hidden` option
+Pass a list of fields, like include or show-only. This will make the field hidden on the form *but still updated via its submission*
+
+• Show only fields associations are now safe-nil using `&` to not crash if the association doesn't exist
+
+
+
+
 #### 2025-03-31 v0.6.16
 
 • Bootstrap Tab Panes For Downnested Portals

data/app/helpers/hot_glue/controller_helper.rb

@@ -143,6 +143,27 @@ module HotGlue
       end
     end
 
+    def integer_query_constructor(match, search)
+      if match.blank? || search.blank?
+        nil
+      else
+        case match
+        when '='
+          "= #{search.to_i}"
+        when '≥'
+          ">= #{search.to_i}"
+        when '>'
+          "> #{search.to_i}"
+        when '≤'
+          "<= #{search.to_i}"
+        when '<'
+          "< #{search.to_i}"
+        else
+          nil
+        end
+      end
+    end
+
     def enum_constructor(field_name, value, **args)
       return nil if value.blank?
       ["#{field_name} = ?", value]

data/lib/generators/hot_glue/field_factory.rb

@@ -53,25 +53,25 @@ class FieldFactory
       raise "Field type could be identified  #{name} "
     end
 
-    @field = field_class.new(name: name,
-                             layout_strategy: generator.layout_strategy,
-                             form_placeholder_labels: generator.form_placeholder_labels,
-                             form_labels_position: generator.form_labels_position,
-                             ownership_field: generator.ownership_field,
-                             hawk_keys: generator.hawk_keys,
-                             auth: generator.auth,
-                             class_name: generator.singular_class,
-                             alt_lookup: generator.alt_lookups[name] || nil,
-                             singular: generator.singular,
-                             self_auth: generator.self_auth,
-                             update_show_only: generator.update_show_only,
-                             attachment_data: generator.attachments[name.to_sym],
-                             sample_file_path: generator.sample_file_path,
-                             modify_as: generator.modify_as[name.to_sym] || nil,
-                             plural: generator.plural,
-                             display_as: generator.display_as[name.to_sym] || nil,
-                             default_boolean_display: generator.default_boolean_display,
-                             namespace: generator.namespace_value,
-                             pundit: generator.pundit )
+    @field = field_class.new(scaffold: generator,  name: name)
+      #                        layout_strategy: generator.layout_strategy,
+      #                        form_placeholder_labels: generator.form_placeholder_labels,
+      #                        form_labels_position: generator.form_labels_position,
+      #                        ownership_field: generator.ownership_field,
+      #                        hawk_keys: generator.hawk_keys,
+      #                        auth: generator.auth,
+      #                        class_name: generator.singular_class,
+      #                        alt_lookup: generator.alt_lookups[name] || nil,
+      #                        singular: generator.singular,
+      #                        self_auth: generator.self_auth,
+      #                        update_show_only: generator.update_show_only,
+      #                        attachment_data: generator.attachments[name.to_sym],
+      #                        sample_file_path: generator.sample_file_path,
+      #                        modify_as: generator.modify_as[name.to_sym] || nil,
+      #                        plural: generator.plural,
+      #                        display_as: generator.display_as[name.to_sym] || nil,
+      #                        default_boolean_display: generator.default_boolean_display,
+      #                        namespace: generator.namespace_value,
+      #                        pundit: generator.pundit )
   end
 end

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

@@ -5,17 +5,8 @@ class AssociationField < Field
 
   attr_accessor :assoc_name, :assoc_class, :assoc, :alt_lookup
 
-  def initialize( alt_lookup: ,
-                  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_as: , self_auth: , namespace:, pundit: , plural:  )
+  def initialize(scaffold: , name: )
     super
-
-
     @assoc_model = eval("#{class_name}.reflect_on_association(:#{assoc})")
 
     if assoc_model.nil?
@@ -91,25 +82,23 @@ class AssociationField < Field
     display_column = HotGlue.derrive_reference_name(assoc_class_name)
 
 
-    "<%= #{singular}.#{assoc_name}.#{display_column} %>"
+    "<%= #{singular}.#{assoc_name}&.#{display_column} %>"
   end
 
   def form_field_output
     assoc_name = name.to_s.gsub("_id","")
+
+
     assoc = eval("#{class_name}.reflect_on_association(:#{assoc_name})")
 
-    if alt_lookup
-      alt = alt_lookup[:lookup_as]
+    if alt_lookup.keys.include?(name)
       assoc_name = name.to_s.gsub("_id","")
       assoc = eval("#{class_name}.reflect_on_association(:#{assoc_name})")
 
-      alt = alt_lookup[:lookup_as]
-      "<%= f.text_field :__lookup_#{alt}, value: @#{singular}.#{assoc_name}.try(:#{alt}), placeholder: \"search by #{alt}\" %>"
-
-      # if modify_as
-      #   modified_display_output
-      # else
-      # end
+      lookup_field = alt_lookup[name][:lookup_as]
+      assoc = alt_lookup[name][:assoc].downcase
+      parts = name.split('_')
+      "<%= f.text_field :__lookup_#{assoc}_#{lookup_field}, value: @#{singular}.#{assoc_name}&.#{lookup_field}, placeholder: \"#{lookup_field}\" " + (stimmify ? ", 'data-#{@stimmify}-target': '#{camelcase_name}' " : "")  + "%>"
     elsif modify_as && modify_as[:typeahead]
       search_url  = "#{namespace ? namespace + "_" : ""}" +
         modify_as[:nested].join("_") + ( modify_as[:nested].any? ? "_" : "") +
@@ -156,8 +145,17 @@ class AssociationField < Field
       end
 
 
+      if @stimmify
+        col_target = HotGlue.to_camel_case(name.to_s.gsub("_", " "))
+        data_attr = ", data: {'#{@stimmify}-target': '#{col_target}'} "
+      els
+        data_attr = ""
+      end
+
+
+
       (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
-        "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: #{singular}.#{name} }, class: 'form-control') %>\n" +
+        "  <%= f.collection_select(:#{name}, #{hawked_association}, :id, :#{display_column}, { prompt: true, selected: #{singular}.#{name} }, class: 'form-control'#{data_attr}) %>\n" +
         (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
         (is_owner ? "\n<% end %>" : "")
     end
@@ -188,11 +186,9 @@ class AssociationField < Field
 
     if assoc_class
       display_column =  HotGlue.derrive_reference_name(assoc_class.to_s)
-
       "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
     else
       "<%= #{singular}.#{assoc}.try(:to_label) || '<span class=\"content \">MISSING</span>'.html_safe %>"
-
     end
 
   end
@@ -274,5 +270,33 @@ class AssociationField < Field
     end
   end
 
+  def prelookup_syntax
+    field =  @alt_lookup[name.to_s]
+    if field[:with_create]
+
+      method_name = "find_or_create_by"
 
+    else
+      method_name = "find_by"
+    end
+    field_name = field[:assoc].downcase.gsub("_id","")
+    assoc_class = field[:assoc].classify
+
+    assoc = plural
+
+    ## TODO: add the hawk here
+    res = +""
+    if @hawk_keys[name.to_sym]
+      res << "#{field_name} = #{@hawk_keys[name.to_sym][:bind_to].first}.#{method_name}(#{field[:lookup_as]}: #{singular}_params[:__lookup_#{field[:assoc].downcase}_#{field[:lookup_as]}] )"
+    elsif @god
+      assoc_name = field[:assoc]
+      res << "#{field_name} = #{assoc_class}.#{method_name}(#{field[:lookup_as]}: #{singular}_params[:__lookup_#{field[:assoc].downcase}_#{field[:lookup_as]}] )"
+    else
+      raise "Field #{field_name} is an alt lookup in a non-Gd context which is a security vulnerability"
+    end
+
+    res << "\n    modified_params.tap { |hs| hs.delete(:__lookup_#{field[:assoc].downcase}_#{field[:lookup_as]})}"
+    return res
+
+  end
 end

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

@@ -1,25 +1,6 @@
 class AttachmentField < Field
   attr_accessor :attachment_data
-  def initialize(alt_lookup:,
-                 attachment_data:,
-                 plural:,
-                 auth:,
-                 class_name:,
-                 display_as:, singular:,
-                 default_boolean_display: ,
-                 form_placeholder_labels: ,
-                 form_labels_position:,
-                 hawk_keys:,
-                 layout_strategy: ,
-                 name:,
-                 namespace:,
-                 modify_as:,
-                 ownership_field:,
-                 pundit: ,
-                 sample_file_path: nil,
-                 self_auth:,
-                 update_show_only:
-  )
+  def initialize(scaffold:, name:)
     super
 
     @attachment_data = attachment_data

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

@@ -23,9 +23,9 @@ class BooleanField < Field
 
   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_as[:binary][:falsy] || 'No'}', for: '#{singular}_#{name}_0') %>\n" +
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify_as[name.to_sym][: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_as[:binary][:truthy] || 'Yes'}', for: '#{singular}_#{name}_1') %>\n"
+      "  <%= f.label(:#{name}, value: '#{modify_binary? && modify_as[name.to_sym][:binary][:truthy] || 'Yes'}', for: '#{singular}_#{name}_1') %>\n"
   end
 
   def checkbox_display
@@ -38,16 +38,16 @@ class BooleanField < Field
 
   def form_field_display
     if display_boolean_as.nil?
-
     end
+
     "<span class='#{@layout_strategy.form_checkbox_wrapper_class} #{'form-switch' if display_boolean_as == 'switch'}'>\n" +
       (if display_boolean_as == 'radio'
-      radio_button_display
-    elsif display_boolean_as == 'checkbox'
-      checkbox_display
-    elsif display_boolean_as == 'switch'
-      switch_display
-   end) + "</span> \n"
+         radio_button_display
+       elsif display_boolean_as == 'checkbox'
+         checkbox_display
+       elsif display_boolean_as == 'switch'
+         switch_display
+       end) + "</span> \n"
   end
 
   def form_field_output
@@ -59,9 +59,9 @@ class BooleanField < Field
       "<% if #{singular}.#{name}.nil? %>
         <span class=''>MISSING</span>
     <% elsif #{singular}.#{name} %>
-      #{modify_as[:binary][:truthy]}
+      #{modify_as[name.to_sym][:binary][:truthy]}
     <% else %>
-      #{modify_as[:binary][:falsy]}
+      #{modify_as[name.to_sym][:binary][:falsy]}
     <% end %>"
     else
       "<% if #{singular}.#{name}.nil? %>
@@ -75,11 +75,11 @@ class BooleanField < Field
   end
 
   def truthy_value
-    modify_as[:binary][:truthy] || 'Yes'
+    modify_as[name.to_sym][:binary][:truthy] || 'Yes'
   end
 
   def falsy_value
-    modify_as[:binary][:falsy] || 'No'
+    modify_as[name.to_sym][:binary][:falsy] || 'No'
   end
 
   def label_class

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

@@ -10,8 +10,10 @@ class DateField < Field
 
 
   def form_field_output
-    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, label:  '#{ name.to_s.humanize  }') %>"
-  end
+    parts = name.to_s.split('_')
+    camelcase_name = parts.map(&:capitalize).join
+    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, label:  '#{ name.to_s.humanize  }'" + (stimmify ? ", html: {'data-#{@stimmify}-target': '#{camelcase_name}'}" : "")  + ") %>"
+end
 
   def line_field_output
     "<% unless #{singular}.#{name}.nil? %>

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

@@ -31,6 +31,11 @@ class EnumField < Field
   end
 
   def form_field_output
+    if @stimmify
+      col_target = HotGlue.to_camel_case(name.to_s.gsub("_", " "))
+      data_attr = ",  data: {'#{@stimmify}-target': '#{col_target}'} "
+    end
+
     enum_type = eval("#{class_name}.columns.select{|x| x.name == '#{name}'}[0].sql_type")
 
     if eval("defined? #{class_name}.#{enum_type}_labels") == "method"
@@ -39,7 +44,7 @@ class EnumField < Field
       enum_definer = "#{class_name}.defined_enums['#{name}']"
     end
 
-    res = "<%= f.collection_select(:#{name},  enum_to_collection_select(#{enum_definer}), :key, :value, {include_blank: true, selected: #{singular}.#{name} }, class: 'form-control') %>"
+    res = "<%= f.collection_select(:#{name}, enum_to_collection_select(#{enum_definer}), :key, :value, {include_blank: true, selected: #{singular}.#{name} }, class: 'form-control' #{data_attr} )%>"
 
 
     if modify_as && modify_as[:enum] == :partials

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

@@ -5,50 +5,38 @@ class Field
                 :hawk_keys,   :layout_strategy, :limit, :modify_as, :name, :object, :sample_file_path,
                 :self_auth,
                 :singular_class,  :singular, :sql_type, :ownership_field,
-                :update_show_only, :namespace, :pundit, :plural
+                :update_show_only, :namespace, :pundit, :plural,
+                :stimmify, :hidden, :attachment_data, :god
+
 
   def initialize(
-    auth: ,
-    attachment_data: nil,
-    class_name: ,
-    alt_lookup: ,
-    default_boolean_display: ,
-    display_as: ,
-    form_labels_position:,
-    form_placeholder_labels: ,
-    hawk_keys: nil,
-    layout_strategy:  ,
-    modify_as: ,   #note non-standard naming as to avoid collision with Ruby reserved word modify
-    name: ,
-    ownership_field: ,
-    sample_file_path: nil,
-    singular: ,
-    update_show_only:,
-    self_auth:,
-    namespace:,
-    pundit: ,
-    plural:
+    scaffold:, name:
+
   )
     @name = name
-    @layout_strategy = layout_strategy
-    @alt_lookup = alt_lookup
-    @singular = singular
-    @class_name = class_name
-    @update_show_only = update_show_only
-    @hawk_keys = hawk_keys
-    @auth = auth
-    @sample_file_path = sample_file_path
-    @form_placeholder_labels = form_placeholder_labels
-    @ownership_field = ownership_field
-    @form_labels_position = form_labels_position
-    @modify_as = modify_as
-    @display_as = display_as
-    @pundit = pundit
-    @plural = plural
-
-    @self_auth = self_auth
-    @default_boolean_display = default_boolean_display
-    @namespace = namespace
+    @layout_strategy = scaffold.layout_strategy
+    @alt_lookup = scaffold.alt_lookups
+    @singular = scaffold.singular
+    @class_name = scaffold.singular_class
+    @update_show_only = scaffold.update_show_only
+    @hawk_keys = scaffold.hawk_keys
+    @auth = scaffold.auth
+    @sample_file_path = scaffold.sample_file_path
+    @form_placeholder_labels = scaffold.form_placeholder_labels
+    @ownership_field = scaffold.ownership_field
+    @form_labels_position = scaffold.form_labels_position
+    @modify_as = scaffold.modify_as
+    @display_as = scaffold.display_as
+    @pundit = scaffold.pundit
+    @plural = scaffold.plural
+    @self_auth = scaffold.self_auth
+    @default_boolean_display = scaffold.default_boolean_display
+    @namespace = scaffold.namespace_value
+    @stimmify = scaffold.stimmify
+    @hidden = scaffold.hidden
+    @attachment_data = scaffold.attachments[name.to_sym]
+    @god = scaffold.god
+
 
     # TODO: remove knowledge of subclasses from Field
     unless self.class == AttachmentField || self.class == RelatedSetField
@@ -125,7 +113,7 @@ class Field
   end
 
   def viewable_output
-    if modify_as
+    if modify_as[:modify]
       modified_display_output(show_only: true)
     else
       field_view_output
@@ -179,20 +167,34 @@ class Field
     if modify_as && modify_as[:timezone]
       "<%= f.time_zone_select :#{name}, ActiveSupport::TimeZone.all, {}, {class: 'form-control'} %>"
     else
-      "  <%= f.text_field :#{name}, value: #{singular}.#{name}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "")  +  " %>\n " + "\n"
+      parts = name.split('_')
+      camelcase_name = parts.first + parts[1..].map(&:capitalize).join
+      "  <%= f.text_field :#{name}, value: #{singular}.#{name}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}'"  + (form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "")  + (stimmify ? ", 'data-#{@stimmify}-target': '#{camelcase_name}' " : "")  +  " %>\n " + "\n"
     end
   end
 
+  def hidden_output
+    parts = name.split('_')
+    camelcase_name = parts.first + parts[1..].map(&:capitalize).join
+    "<%= f.hidden_field :#{name}, value: #{singular}.#{name} " +
+      (@stimmify ? ", 'data-#{@stimmify}-target': '#{camelcase_name}' " : "") +
+       " %>"
+  end
+
   def text_area_output(field_length, extra_classes: "")
     lines = field_length % 40
     if lines > 5
       lines = 5
     end
-    "<%= f.text_area :#{name}, class: 'form-control#{extra_classes}', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "") + " %>"
+
+    parts = name.split('_')
+    camelcase_name = parts.first + parts[1..].map(&:capitalize).join
+    "<%= f.text_area :#{name}, class: 'form-control#{extra_classes}', autocomplete: 'off', cols: 40, rows: '#{lines}'"  + ( form_placeholder_labels ? ", placeholder: '#{name.to_s.humanize}'" : "") +
+      (@stimmify ? ", 'data-#{@stimmify}-target': '#{camelcase_name}' " : "") + " %>"
   end
 
-  def modify_binary? # safe
-    !!(modify_as && modify_as[:binary])
+  def modify_binary?
+    !!(modify_as && modify_as[name.to_sym] && modify_as[name.to_sym][:binary])
   end
 
   def display_boolean_as
@@ -201,8 +203,8 @@ class Field
       @default_boolean_display = "radio"
     end
 
-    if display_as
-      return display_as[:boolean] || "radio"
+    if  display_as[name.to_sym]
+      return display_as[name.to_sym][:boolean] || "radio"
     else
       return @default_boolean_display
     end
@@ -224,4 +226,6 @@ class Field
     false
   end
 
+  def prelookup_syntax; nil; end
+
 end

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

@@ -29,6 +29,26 @@ class IntegerField < Field
   end
 
   def search_field_output
-    raise "Integer search not implemented"
+    "      <div>" +
+    "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['=', '='], " +
+    "\n         ['≥', '≥'], ['>', '>'], " +
+    "\n         ['≤', '≤'], ['<', '<']], @q[\'0\']['#{name}_match'] ), {} ," +
+    "\n         { class: 'form-control match' } %>"+
+    "\n        <%= f.text_field  'q[0][#{name}_search]',  {value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 4, class: 'form-control', type: 'number'} %>" +
+    "\n      </div>"
   end
+
+
+  def where_query_statement
+    ".where(\"#{name} \#{#{name}_query }\")"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = integer_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/related_set_field.rb

@@ -2,13 +2,7 @@ class RelatedSetField < Field
 
   attr_accessor :assoc_name, :assoc_class, :assoc
 
-  def initialize( class_name: , default_boolean_display:, display_as: ,
-                  name: , singular: , plural:,
-                  alt_lookup: ,
-                  update_show_only: ,
-                  hawk_keys: , auth: , sample_file_path:,  ownership_field: ,
-                  attachment_data: nil , layout_strategy: , form_placeholder_labels: nil,
-                  form_labels_position:, modify_as: , self_auth: , namespace:, pundit:)
+  def initialize( scaffold: , name: )
     super
 
     @related_set_model = eval("#{class_name}.reflect_on_association(:#{name})")
@@ -37,12 +31,13 @@ class RelatedSetField < Field
 
   def form_field_output
     disabled_syntax = +""
+
     if pundit
       disabled_syntax << ", {disabled: ! #{class_name}Policy.new(#{auth}, @#{singular}).role_ids_able?}"
     end
     " <%= f.collection_check_boxes :#{association_ids_method}, #{association_class_name}.all, :id, :label, {}#{disabled_syntax} do |m| %>
-      <%= m.check_box %> <%= m.label %><br />
-    <% end %>"
+    <%= m.check_box %> <%= m.label %><br />
+  <% end %>"
   end
 
   def association_ids_method

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

@@ -10,7 +10,8 @@ module  HotGlue
                   :form_placeholder_labels, :hawk_keys, :update_show_only,
                   :attachments, :show_only, :columns_map, :pundit, :related_sets,
                   :search, :search_fields, :search_query_fields, :search_position,
-                  :form_path, :layout_object, :search_clear_button, :search_autosearch
+                  :form_path, :layout_object, :search_clear_button, :search_autosearch,
+                  :stimmify, :stimmify_camel, :hidden
 
 
     def initialize(singular:, singular_class: ,
@@ -22,7 +23,7 @@ module  HotGlue
                  update_show_only:, attachments: , columns_map:, pundit:, related_sets:,
                  search:, search_fields:, search_query_fields: , search_position:,
                  search_clear_button:, search_autosearch:, layout_object:,
-                 form_path: )
+                 form_path: , stimmify: , stimmify_camel:, hidden: )
 
 
       @form_path = form_path
@@ -31,6 +32,9 @@ module  HotGlue
       @search_by_query = search_query_fields
       @search_position = search_position
       @layout_object = layout_object
+      @stimmify = stimmify
+      @stimmify_camel = stimmify_camel
+      @hidden = hidden
 
       @singular = singular
       @singular_class = singular_class
@@ -169,11 +173,21 @@ module  HotGlue
 
             @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
 
-            add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
-                                    add_spaces_each_line( (form_labels_position == 'before' ? (the_label || "") + "<br />\n"  : "") +
-                                                        +  field_result +
-                                        (form_labels_position == 'after' ? (  columns_map[col].newline_after_field? ? "<br />\n" : "") + (the_label || "") : "")  , 4) +
-                                    "\n  </span>\n ", 2)
+            if @stimmify
+              col_target = HotGlue.to_camel_case(col.to_s.gsub("_", " "))
+              data_attr = " data-#{@stimmify}-target='#{col_target}Wrapper'"
+            end
+
+            unless hidden.include?(col.to_sym)
+              add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>' #{data_attr} >\n" +
+                                      add_spaces_each_line( (form_labels_position == 'before' ? (the_label || "") + "<br />\n"  : "") +
+                                                              +  field_result +
+                                                              (form_labels_position == 'after' ? (  columns_map[col].newline_after_field? ? "<br />\n" : "") + (the_label || "") : "")  , 4) +
+                                      "\n  </span>\n ", 2)
+            else
+              columns_map[col].hidden_output
+            end
+
 
           }.join("") + "\n  </div>"
       }.join("\n")
@@ -214,6 +228,7 @@ module  HotGlue
           if eval("#{singular_class}.columns_hash['#{col}']").nil? && !attachments.keys.include?(col) && !related_sets.include?(col)
             raise "Can't find column '#{col}' on #{singular_class}, are you sure that is the column name?"
           end
+
           field_output = columns_map[col].line_field_output
           
           label = "<label class='small form-text text-muted'>#{col.to_s.humanize}</label>"

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -20,7 +20,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :big_edit, :button_icons, :bootstrap_column_width,
                 :columns,
                 :default_boolean_display,
-                :display_as, :downnest_children, :downnest_object, :hawk_keys, :layout_object,
+                :display_as, :downnest_children, :downnest_object, :god,  :hawk_keys, :layout_object,
                 :modify_as,
                 :nest_with, :path, :plural, :sample_file_path, :show_only_data, :singular,
                 :singular_class, :smart_layout, :stacked_downnesting,
@@ -28,7 +28,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :layout_strategy, :form_placeholder_labels,
                 :form_labels_position, :no_nav_menu, :pundit,
                 :self_auth, :namespace_value, :record_scope, :related_sets,
-                :search_clear_button, :search_autosearch, :include_object_names
+                :search_clear_button, :search_autosearch, :include_object_names,
+                :stimmify, :stimmify_camel, :hidden
   # important: using an attr_accessor called :namespace indirectly causes a conflict with Rails class_name method
   # so we use namespace_value instead
 
@@ -56,6 +57,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :big_edit, type: :boolean, default: false
   class_option :show_only, type: :string, default: ""
   class_option :update_show_only, type: :string, default: ""
+  class_option :hidden, 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
@@ -82,7 +84,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   # determines if labels appear within the rows of the VIEWABLE list (does NOT affect the list heading)
   class_option :inline_list_labels, default: nil # default is set below
-  class_option :factory_creation, default: ''
+  class_option :factory_creation, default: nil
   class_option :alt_foreign_key_lookup, default: '' #
   class_option :attachments, default: ''
   class_option :stacked_downnesting, default: false
@@ -102,6 +104,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :include_object_names, type: :boolean, default: false
   class_option :new_button_position, type: :string, default: 'above'
   class_option :downnest_shows_headings, type: :boolean, default: nil
+  class_option :stimmify, type: :string, default: nil
 
 
   # SEARCH OPTIONS
@@ -221,25 +224,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @include_fields += options['include'].split(":").collect { |x| x.split(",") }.flatten.collect(&:to_sym)
     end
 
-    # @show_only_data = {}
-    # if !options['show_only'].empty?
-    #   show_only_input = options['show_only'].split(",")
-    #   show_only_input.each do |setting|
-    #     if setting.include?("[")
-    #       setting =~ /(.*)\[(.*)\]/
-    #       key, lookup_as = $1, $2
-    #       @show_only_data[key.to_sym] = {cast: $2 }
-    #     else
-    #       @show_only_data[setting.to_sym] = {cast: nil}
-    #     end
-    #   end
-    # end
+
 
     @show_only = options['show_only'].split(",").collect(&:to_sym)
     if @show_only.any?
       puts "show only field #{@show_only}}"
     end
 
+    @hidden = options['hidden'].split(",").collect(&:to_sym)
+    if @hidden.any?
+      puts "hidden fields #{@hidden}}"
+    end
+
     @modify_as = {}
     if !options['modify'].empty?
       modify_input = options['modify'].split(",")
@@ -483,7 +479,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       end
     end
 
-    @factory_creation = options['factory_creation'].gsub(";", "\n")
+    unless options['factory_creation'].nil?
+      @factory_creation = options['factory_creation'].gsub(";", "\n")
+    end
+
     identify_object_owner
     setup_fields
 
@@ -509,6 +508,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       setting =~ /(.*){(.*)}/
       key, lookup_as = $1, $2
 
+      if !eval("#{class_name}.reflect_on_association(:#{key.to_s.gsub("_id","")})")
+        raise "couldn't find association for #{key} in the object #{class_name}"
+      end
       assoc = eval("#{class_name}.reflect_on_association(:#{key.to_s.gsub("_id","")}).class_name")
 
       data = {lookup_as: lookup_as.gsub("+",""),
@@ -517,14 +519,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @alt_lookups[key] = data
     end
 
-    puts "------ ALT LOOKUPS for #{@alt_lookups}"
+
 
     # @update_alt_lookups = @alt_lookups.collect{|key, value|
     #   @update_show_only.include?(key) ?
     #     {  key: value }
     #     : nil}.compact
 
-
+    @stimmify = options['stimmify']
+    if @stimmify === "stimmify"
+      @stimmify = @singular.gsub("_", "-") + "-form"
+      @stimify_camel = @stimmify.camelize
+    end
 
     # build a new polymorphic object
     @associations = []
@@ -577,6 +583,18 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       end
     end
 
+
+    puts "------ ALT LOOKUPS for #{@alt_lookups}"
+    @alt_lookups.each do |key, value|
+      if !@columns_map[key.to_sym].is_a?(AssociationField)
+        raise "You specified an alt-lookup for #{key} but that field is not an association field"
+      elsif !@columns_map[key.to_sym]
+        raise "You specified an alt-lookup for #{key} but that field does not exist in the list of columns"
+      elsif !@god && !@hawk_keys.include?(key.to_sym)
+        raise "You specified an alt-lookup for #{key} in non-Gd mode but this would leave the lookup unprotected. To fix, use with --hawk or with --factory-creation "
+      end
+    end
+
     # search
     @search = options['search']
     if @search == 'set'
@@ -649,7 +667,10 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         search_position: @search_position,
         search_clear_button: @search_clear_button,
         search_autosearch: @search_autosearch,
-        form_path: form_path_new_helper
+        form_path: form_path_new_helper,
+        stimmify: @stimmify,
+        stimmify_camel: @stimmify_camel,
+        hidden: @hidden
       )
     elsif @markup == "slim"
       raise(HotGlue::Error, "SLIM IS NOT IMPLEMENTED")
@@ -673,7 +694,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     if options["hawk"]
       options['hawk'].split(",").each do |hawk_entry|
         # format is: abc_id[thing]
-
         if hawk_entry.include?("{")
           hawk_entry =~ /(.*){(.*)}/
           key, hawk_to = $1, $2
@@ -683,6 +703,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         end
 
         hawk_scope = key.gsub("_id", "").pluralize
+
         if eval(singular_class + ".reflect_on_association(:#{key.gsub('_id', '')})").nil?
           raise "Could not find `#{key.gsub('_id', '')}` association; add this to the #{singular_class} class: \nbelongs_to :#{key.gsub('_id', '')} "
         end
@@ -832,6 +853,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                            :confirmation_token, :confirmed_at,
                            :confirmation_sent_at, :unconfirmed_email
 
+
+      # TODO: this should exclude any nested parents
       @exclude_fields.push(@ownership_field.to_sym) if !@ownership_field.nil?
 
       @columns = @the_object.columns.map(&:name).map(&:to_sym).reject { |field| @exclude_fields.include?(field) }
@@ -840,7 +863,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @columns = @the_object.columns.map(&:name).map(&:to_sym).reject { |field| !@include_fields.include?(field) }
     end
 
-    @columns = @columns -@nested_set.collect { |set| (set[:singular] + "_id").to_sym  }
+    @columns = @columns - @nested_set.collect { |set| (set[:singular] + "_id").to_sym  }
 
     if @attachments.any?
       puts "Adding attachments-as-columns: #{@attachments}"
@@ -884,8 +907,21 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def creation_syntax
-    if @factory_creation == ''
-      "@#{singular } = #{ class_name }.new(modified_params)"
+    if @factory_creation.nil? && ! @alt_lookups.any?
+      (      @hawk_keys.any? ?   "modified_params = hawk_params({#{ hawk_to_ruby }}, modified_params)\n    " : "")  + "@#{singular } = #{ class_name }.new(modified_params)"
+    elsif @factory_creation.nil? && @alt_lookups.any?
+
+      prelookup_syntax = @alt_lookups.collect{|lookup, data|
+        col = @columns_map[lookup.to_sym]
+        col.prelookup_syntax
+      }.join("\n")
+
+      prelookup_syntax + "\n     @#{singular } = #{ class_name }.new(modified_params" +
+        (@alt_lookups.any? ? (".merge(" + @alt_lookups.collect{|lookup,field|
+          field_name = lookup.gsub("_id","")
+          "#{field_name}: #{field_name}"
+        }.join(",") + ")" ) : "") + ")"
+
     else
       res = +"begin
       #{@factory_creation}
@@ -950,10 +986,11 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
       template "system_spec.rb.erb", dest_file
     end
-
-    if File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/_errors.#{@markup}")
-      File.delete("#{filepath_prefix}app/views#{namespace_with_dash}/_errors.#{@markup}")
-    end
+    # if !File.exist?("#{filepath_prefix}app/views#{namespace_with_dash}/_errors.#{@markup}")
+    #   # File.delete("#{filepath_prefix}app/views#{namespace_with_dash}/_errors.#{@markup}")
+    #
+    #   template "_errors.erb", File.join("#{filepath_prefix}app/views#{namespace_with_dash}", "_errors.#{@markup}")
+    # end
   end
 
   def spec_foreign_association_merge_hash
@@ -1085,6 +1122,17 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                                  top_level: top_level)
   end
 
+  def edit_parent_path_helper
+    # the path to the edit route of the PARENT
+    if @nested_set.any? && @nested
+      "edit_#{@namespace + "_" if @namespace}#{(@nested_set.collect { |x| x[:singular] }.join("_") + "_" if @nested_set.any?)}path(" +
+      "#{@nested_set.collect { |x| x[:singular] }.join(", ")}" + ")"
+
+    else
+      "edit_#{@namespace + "_" if @namespace}path"
+    end
+  end
+
   def datetime_fields_list
     @columns.select do |col|
       if @the_object.columns_hash[col.to_s]

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

@@ -27,10 +27,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     def <%= @nested_set[0][:singular] %><% if @god
        next_object = nil
        collect_objects = @nested_set.reverse.collect {|x|
-           if eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})").nil?
-             raise "***** Unable to find the association `#{x[:singular]}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
+           if eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})").nil? #&& eval("! #{next_object || class_name}.instance_methods.include?(:#{x[:singular]})")
+             raise "***** Unable to find the association `#{x[:singular]}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x[:singular]}` to the #{next_object || class_name} object?"
            end
+           # if  eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})")
            next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x[:singular]})").class_name
+           # end
        }
        root_object = collect_objects.last
      else
@@ -110,11 +112,10 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     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 %>} : {}) <% end %>
 
-      <% if @hawk_keys.any? %>
-    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
     <%= controller_attachment_orig_filename_pickup_syntax %>
     <%= creation_syntax %>
-    <% if @pundit %><% @related_sets.each do |key, related_set| %>
+
+      <% if @pundit %><% @related_sets.each do |key, related_set| %>
     check_<%= related_set[:association_ids_method].to_s %>_permissions(modified_params, :create)<% end %><% end %>
       <% if @pundit && !@pundit_policy_override %>
     authorize @<%= singular %><% elsif @pundit && @pundit_policy_override %>
@@ -195,8 +196,20 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% end %>
     <% if @pundit %><% @related_sets.each do |key, related_set| %>
     check_<%= related_set[:association_ids_method].to_s %>_permissions(modified_params, :update)<% end %><% end %>
+      <% if (@alt_lookups.any?) %>
+    <%=  @alt_lookups.collect{|lookup, data|
+       @columns_map[lookup.to_sym].prelookup_syntax unless @update_show_only.include?(lookup.to_sym)
+    }.join("\n") %>
+      <% elsif @factory_creation %>
 
-    <% if @hawk_keys.any? %>    modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
+      <% end %>
+      <% if (@alt_lookups.keys.collect(&:to_sym) - @update_show_only).any? %>
+    modified_params.merge!(<%=  @alt_lookups.collect{|lookup,field|
+    field_name = lookup.gsub("_id","")
+      "#{field_name}: #{field_name}" unless @update_show_only.include?(lookup.to_sym)
+    }.join(",") %>)
+    <% end %>
+   <% if @hawk_keys.any? %> modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
     <%= controller_attachment_orig_filename_pickup_syntax %>
       <% if @pundit && !@pundit_policy_override %>
       authorize @<%= singular_name %>
@@ -221,6 +234,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
      <% end %>
     else
       flash[:alert] = "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
+      <%= @alt_lookups.collect{ |k,v|
+      assoc = k.gsub("_id","")
+      "@#{singular }.#{k} = #{class_name}.find(@#{singular }.id).person.id if @#{singular }.errors.include?(:#{assoc})"
+
+      }.join("\n") %>
       @action = 'edit'
       <% unless @big_edit %>render :update<% else %>render :edit<% end %>, status: :unprocessable_entity
     end<% if @pundit %>
@@ -261,12 +279,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %><% end %>
 
   def <%=singular_name%>_params
-    params.require(:<%= testing_name %>).permit(<%= ((fields_filtered_for_strong_params - @show_only ) + @magic_buttons.collect{|x| "__#{x}"}).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "#{rs[:association_ids_method]}: []"}.join(", ") if @related_sets.any? %><%= ", " +  @alt_lookups.collect{|k,v|  ":__lookup_#{v[:lookup_as]}"  }.join(", ") if @alt_lookups.any? %>)
+    params.require(:<%= testing_name %>).permit(<%= ((fields_filtered_for_strong_params - @show_only ) + @magic_buttons.collect{|x| "__#{x}"}).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "#{rs[:association_ids_method]}: []"}.join(", ") if @related_sets.any? %><%= ", " +  @alt_lookups.collect{|k,v|  ":__lookup_#{v[:assoc].downcase}_#{v[:lookup_as]}"  }.join(", ") if @alt_lookups.any? %>)
   end<% if @update_show_only %>
 
   <% unless @no_edit %>
   def update_<%=singular_name%>_params
-    params.require(:<%= testing_name %>).permit(<%= ((fields_filtered_for_strong_params - @update_show_only)  + @magic_buttons.collect{|x| "__#{x}"}).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "#{rs[:association_ids_method]}: []"}.join(", ") if @related_sets.any? %>)
+    params.require(:<%= testing_name %>).permit(<%= ((fields_filtered_for_strong_params - @update_show_only)  + @magic_buttons.collect{|x| "__#{x}"}).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "#{rs[:association_ids_method]}: []"}.join(", ") if @related_sets.any? %><%=  ", " + @alt_lookups.collect{|k,v|  ":__lookup_#{v[:assoc].downcase}_#{v[:lookup_as]}"  }.join(", ") if @alt_lookups.any?  %>)
   end<% end %>
   <% end %>
 

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

@@ -4,7 +4,9 @@
   <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: <%= singular %> }) %>
   <\% end %>
   <h2>Editing <%= singular + " " if @include_object_names %><\%= <%= singular %>.<%= display_class %> %></h2>
-  <\%= form_with model: <%= singular %>, url: <%= form_path_edit_helper %><%= ", html: {'data-turbo': false}" if @big_edit %> do |f| %>
+  <\%= form_with model: <%= singular %>,
+   <% if @stimmify %> data: {controller: '<%= @stimmify %>' },
+   <% end %>url: <%= form_path_edit_helper %><%= ", html: {'data-turbo': false}" if @big_edit %> do |f| %>
     <\%=  render partial: "<%= namespace_with_trailing_dash + @controller_build_folder + "/" %>form", locals: {:<%=  singular  %> => <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> \%>
   <% if @edit_within_form_partial %><\%= render partial: "edit_within_form", locals: {f: f, <%=  singular  %>: <%= singular %>}<%= @nested_set.collect{|arg| ".merge(#{arg[:singular]} ? {#{arg[:singular]}: #{arg[:singular]}} : {})" }.join %> %><% end %>
   <\% end %>

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

@@ -2,7 +2,8 @@
 <%= form_fields_html %>
 
   <div class="<%= @layout_strategy.column_classes_for_button_column %>">
-    <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
+    <\%= link_to "Cancel", <%=
+    @nested_set.none? ? path_helper_plural : edit_parent_path_helper %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
     <\%= f.hidden_field "_________" %><% end %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>
   </div>

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

@@ -2,7 +2,9 @@
   <h3>
     <%= @new_form_heading %>
   </h3>
-  <\%= form_with model:  <%= singular %>, url: <%= form_path_new_helper %>, method: :post<%= @display_edit_after_create ? ", html: {'data-turbo': false}" : "" %> do  |f| \%>
+  <\%= form_with model:  <%= singular %>,
+         <% if @stimmify %>data: {controller: '<%= @stimmify %>' },
+<% end %>url: <%= form_path_new_helper %>, method: :post<%= @display_edit_after_create ? ", html: {'data-turbo': false}" : "" %> do  |f| \%>
     <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form",
 locals: { <%=  singular %>: <%= singular %>, f: f}<%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}}: {})" }.join %> \%>
 

data/lib/hot-glue.rb

@@ -10,6 +10,18 @@ module HotGlue
   class Error < StandardError
   end
 
+
+  def self.to_camel_case(str)
+    words = str.split(/[^a-zA-Z0-9]/) # split by non-alphanumeric characters
+    return '' if words.empty?
+
+    first_word = words.first.downcase
+    rest_words = words[1..-1].map { |w| w.capitalize }
+
+    first_word + rest_words.join
+  end
+
+
   def self.construct_downnest_object(input)
     res = input.split(",").map { |child|
       child_name = child.gsub("+","")

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.16'
+    CURRENT = '0.6.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.18
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails