hot-glue 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe06433ca491d353bbc997003fdbc3735fd3bdf35692c35a25237fcaedf73db
-  data.tar.gz: 42b4b9077a245b75d0878e4bb84e866e8c5b7b61b4f9efd9ea1213678e7def7c
+  metadata.gz: f420219d9ff451f6fa20c743bef94003726a86c452fba51c8487f4d537d3c258
+  data.tar.gz: c031f7ffe2fb832a17ce13bd78051296baec30ed279de3d6b7b73c04dfdfd3c3
 SHA512:
-  metadata.gz: 657b12337809a015a32567497a6564afa738e2e29ca4cd4aff142a8d9e5718f15237a69b49b708b164f71d9f98f2b7ed7f21cc1130e45f78306dea4e9a93b00a
-  data.tar.gz: ac4aed4acb2c70df780f248f024834bf4b055aff18f8438d63415498616a2e8363ff489898f001ee8fbb7885ba99c926d80dbbb659b82f442f6a709bebbaafda
+  metadata.gz: f72f3d5376e8b2ca6c50e3a7c8044b83ed6b62b550a91d1c2e76cf6a4b33eeab882ea760f67ee744e6d8e5c844ba1019a51368325eab5d5f4de56bd2edcbd768
+  data.tar.gz: 3299ae7f5aff59f94b65b7fae3af98f31dc935e7aa3c3b132e41c05057ae790c1ee10e8888ef34ebe9d6e8ddf221f5dac7a3d1ce4a8261968bca2b5b59761739

data/Gemfile

@@ -10,6 +10,7 @@ gem 'sqlite3'
 gem 'byebug'
 gem 'rails'
 gem 'devise', require: true
+# gem 'progress_formatter'
 
 # for testing
 gem "rails-controller-testing", group: [:test]

data/Gemfile.lock

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

data/README.md

@@ -34,7 +34,7 @@ Hot Glue generates functionality that is quick and dirty. It lets you be crafty.
 
 |   |  |  
 | ------------- | ------------- |
-| ![Teachable-225x225](https://user-images.githubusercontent.com/59002/147857335-a919e095-e6de-4718-8513-736d1f283a0b.png)  | Now avaiale on [Teachable](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page)  |
+| ![Teachable-225x225](https://user-images.githubusercontent.com/59002/147857335-a919e095-e6de-4718-8513-736d1f283a0b.png)  | Now avaiale on [Teachable](https://jfbcodes.com/courses/hot-glue-in-depth-tutorial/?utm_source=github.com&utm_campaign=github_hot_glue_readme_page)  |
 
 
 ---
@@ -71,13 +71,13 @@ _If you are on Rails 6, see [LEGACY SETUP FOR RAILS 6](https://github.com/jasonf
 
 ## 1. Rails 7 New App
 
-There are two ways to create new apps on Rails 7: With or without ImportMap. These instructions prefer the **without Importmap** method, but to help you choose [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-do-i-need-importmap-rails/)
+There are two ways to create new apps on Rails 7: With or Without ImportMap. These instructions prefer the **without Importmap** method using ESBuild as the bundler, but to help you choose [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-do-i-need-importmap-rails/)
 
-`rails new --css=bootstrap --javascript=webpack --database=postgresql`
+`rails new --css=bootstrap --javascript=esbuild --database=postgresql`
 
-Confirm that both Stimulus and Turbo are working.
+**If using JSBundling, make sure to use the new `./bin/dev` to start your server instead of the old `rails server` or else your Turbo interactions will not work correctly.** 
 
-**If using JSBundling, make sure to use the new `bin/dev rails` instead of the old `rails server` or else your Webpack will not compile.** 
+Confirm that both Stimulus and Turbo are working.
 
 For the quick step-by-step guide to help you confirm that both Stimulus and Turbo are working for your new JSBundling-Rails/CSSBunlding-Rails setup [see this post](https://jasonfleetwoodboldt.com/courses/stepping-up-rails/rails-7-new-app-with-js-bundling-css-bundling/).
 
@@ -149,18 +149,13 @@ https://github.com/FortAwesome/font-awesome-sass
 
 
 ## 5. Devise
+!!! Warning: as of 2022-03-22, Devise is still not compatible out-of-the-box with Rails 7.
 
-(or only use --gd mode, see below)
-
-Add to your Gemfile
-
-As of now, Devise for Rails 7 is still not released so you must use **main branch**, like so:
+please see https://github.com/heartcombo/devise/issues/5478 or check this README for updated information. 
 
-`gem 'devise', branch: 'main', git: 'https://github.com/heartcombo/devise.git'`
 
 (If you are on Rails 6, you must do ALL of the steps in the Legacy Setup steps. Be sure not to skip **Legacy Step #5** below)
 
-For Rails 7, be sure you are on the main branch of devise above and your logins should work. (The previously necessary step of disabling turbo shown in Legacy Step #5 is no longer needed. )
 
 You MUST run the installer FIRST or else you will put your app into a non-workable state:
 ```
@@ -478,9 +473,42 @@ In this case a controller would be generated that would have NO before_action to
 Please note that this example would produce non-functional code, so you would need to manually fix your controllers to make sure `current_account` is available to the controller.
 
 
+### `--hawk=`
+
+Hawk a foreign key that is not the object's owner to within a specified scope. 
+
+Assuming a Pet belong_to a :human, when building an Appointments scaffold, you can hawk the `pet_id` to the current human's pets. (Whoever is the authentication object.)
+
+`--hawk=pet_id`
+
+This is covered in [Example #3 in the Hot Glue Tutorial](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/lectures/38584014)
+
+To hawk to a scope that is not the currently authenticated user, use curly braces `{...}` to specify the scope.
+
+`--hawk=user_id{current_user.family}`
+
+This would hawk the Appointment's `user_id` key to any users who are within the scope of the current_user's family. 
+
+This is covered in [Example #4 in the Hot Glue Tutorial](https://jfb.teachable.com/courses/hot-glue-in-depth-tutorial/lectures/38787505)
+
+
 ### `--plural=`
 
-You don't need this if the pluralized version is just + "s" of the singular version. Only use for non-standard plurlizations, and be sure to pass it as TitleCase (as if you pluralized the model name which is non-standard for Rails)
+You don't need this if the pluralized version is just + "s" of the singular version.
+Only use for non-standard plurlizations, and be sure to pass it as TitleCase (as if you pluralized the model name which is non-standard for Rails)
+
+An better alternative is to define the non-standard plurlizations globally in your app.
+
+Make a file at `config/initializers/inflections.rb`
+
+# Add new inflection rules using the following format
+ActiveSupport::Inflector.inflections do |inflect|
+    inflect.irregular 'clothing', 'clothes'
+    inflect.irregular 'human', 'humans'  
+
+
+    # the standard pluralization is pretty sexist and will pluralize `human` to `humen`
+end
 
 
 ### `--form-labels-position` (default: `after`; options are **before**, **after**, and **omit**)
@@ -707,10 +735,9 @@ See also setting `--form-labels-position` to control position or omit normal lab
 
 ### `--inline-list-labels` (before, after, omit; default: omit)
 
-Determines if field label will appear on the LIST VIEW. NOoe that because Hot Glue has no sparate show route or page, 
-this affects the `_show` template which is rendered as a partial from the LIST view.
+Determines if field label will appear on the LIST VIEW. Note that because Hot Glue has no separate show route or page, this affects the `_show` template which is rendered as a partial from the LIST view.
 
-Because the labels are already in the heading, this `omit` by default. (Use with `--no-list-heading` to omit the labels in the list heading.)
+Because the labels are already in the heading, this is `omit` by default. (Use with `--no-list-heading` to omit the labels in the list heading.)
 
 Use `before` to make the labels come before or `after` to make them come after. See Version 0.5.1 release notes for an example.
 
@@ -773,13 +800,20 @@ Child portals have the headings omitted automatically (there is a heading identi
 - Date: displayed as HTML5 date picker
 - Time: displayed as HTML5 time picker
 - Boolean: displayed radio buttons yes/ no
-- 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/
+- 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/
   - AFAIK, you must specify the enum definition both in your model and also in your database migration for both Rails 6 + Rails 7
 
 
 # VERSION HISTORY
 
-#### 2022-03-12  - v0.5.1 - Inline list Labels
+#### ???? - v0.5.2 - Hawked Foreign Keys
+
+
+
+
+
+#### 2022-03-12  - v0.5.1 - Inline List Labels
 
 `--inline-list-labels` (default: `after`; options are **before**, **after**, and **omit**)
 

data/app/helpers/hot_glue/controller_helper.rb

@@ -1,17 +1,14 @@
 module HotGlue
   module ControllerHelper
-
     def timezonize(tz)
       tz = tz.to_i
       (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
     end
 
-
     def datetime_field_localized(form_object, field_name, value, label, timezone = nil )
-        form_object.text_field(field_name, class: 'form-control',
+      form_object.text_field(field_name, class: 'form-control',
                                     type: 'datetime-local',
-                                    value: date_to_current_timezone(value, timezone))
-        + timezonize(timezone)
+                                    value: date_to_current_timezone(value, timezone))  + timezonize(timezone)
     end
 
 
@@ -24,8 +21,7 @@ module HotGlue
     def time_field_localized(form_object, field_name, value, label, timezone = nil )
       form_object.text_field(field_name, class: 'form-control',
                                     type: 'time',
-                                    value: date_to_current_timezone(value, timezone))
-      + timezonize(timezone)
+                                    value: date_to_current_timezone(value, timezone)) + timezonize(timezone)
 
     end
 
@@ -36,40 +32,30 @@ module HotGlue
         else
           server_timezone
         end
-      elsif true
-        server_timezone
-      # elsif defined?(controller) == "method"
-      #   # controller.try(:current_timezone)
-      # elsif self.class.ancestors.include?(ApplicationController)
-      #   self.try(:current_timezone)
       else
-        puts "no method current_user is available; please implement/override the method current_timezone IN YOUR CONTROLLER"
-        exit
+        server_timezone
       end
     end
 
-    def server_timezone
-      Time.now.strftime("%z").to_i/100
-    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
       end
 
       return nil if date.nil?
 
-      begin
-        return date.in_time_zone(timezone).strftime("%Y-%m-%dT%H:%M")
-      rescue
-        return nil
-      end
+      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")
 
       modified_params = modified_params.tap do |params|
@@ -86,5 +72,27 @@ module HotGlue
       end
       modified_params
     end
+
+
+    def hawk_params(hawk_schema, modified_params)
+      @hawk_alarm = ""
+      hawk_schema.each do |hawk_key,hawk_definition|
+        hawk_root = hawk_definition[0]
+        hawk_scope = hawk_definition[1]
+        begin
+          eval("hawk_root.#{hawk_scope}").find(modified_params[hawk_key.to_s])
+        rescue ActiveRecord::RecordNotFound => e
+          @hawk_alarm << "You aren't allowed to set #{hawk_key.to_s} to #{modified_params[hawk_key.to_s]}. "
+          modified_params.tap { |hs| hs.delete(hawk_key.to_s) }
+        end
+      end
+      modified_params
+    end
+
+    private
+
+    def server_timezone
+      Time.now.strftime("%z").to_i/100
+    end
   end
 end

data/config/database.yml

@@ -1,11 +1,11 @@
 development:
-  adapter: sqlite3
-  database: ../spec/dummy/db/development.sqlite3
+  adapter: postgresql
+  database: dummy_dev
   pool: 5
   timeout: 5000
 
 test:
-  adapter: sqlite3
-  database: ../spec/dummy/db/test.sqlite3
+  adapter: postgresql
+  database: dummy_test
   pool: 5
   timeout: 5000

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

@@ -7,7 +7,9 @@ module  HotGlue
                   :ownership_field, :form_labels_position,
                   :inline_list_labels,
                   :columns, :column_width, :col_identifier, :singular,
-                  :form_placeholder_labels
+                  :form_placeholder_labels, :hawk_keys
+
+
 
     def add_spaces_each_line(text, num_spaces)
       add_spaces = " " * num_spaces
@@ -30,8 +32,6 @@ module  HotGlue
       }.join("\n")
     end
 
-
-
     def list_column_headings(*args)
       @columns = args[0][:columns]
       @column_width = args[0][:column_width]
@@ -63,6 +63,7 @@ module  HotGlue
       @ownership_field  = args[0][:ownership_field]
       @form_labels_position = args[0][:form_labels_position]
       @form_placeholder_labels = args[0][:form_placeholder_labels]
+      @hawk_keys = args[0][:hawk_keys]
 
       @singular = args[0][:singular]
       singular = @singular
@@ -71,7 +72,7 @@ module  HotGlue
           column.map { |col|
             field_result =
               if show_only.include?(col.to_sym)
-                "<%= @#{singular}.#{col} %>"
+                "<%= #{singular}.#{col} %>"
               else
                 type = eval("#{singular_class}.columns_hash['#{col}']").type
                 limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -132,18 +133,22 @@ module  HotGlue
         assoc_class_name = assoc.active_record.name
         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]
+          hawk_root = hawk_definition[0]
+          hawk_scope = hawk_definition[1]
+          hawked_association = "#{hawk_root}.#{hawk_scope}"
+        else
+          hawked_association = "#{assoc.class_name}.all"
+        end
+
         (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
-          "  <%= f.collection_select(:#{col}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
+          "  <%= f.collection_select(:#{col}, #{hawked_association}, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col} }, class: 'form-control') %>\n" +
           (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
           (is_owner ? "\n<% end %>" : "")
 
       else
         "  <%= f.text_field :#{col}, value: #{@singular}.#{col}, autocomplete: 'off', size: 4, class: 'form-control', type: 'number'"  + (@form_placeholder_labels ? ", placeholder: '#{col.to_s.humanize}'" : "")  +  " %>\n " + "\n"
-
-        # field_output(col, nil, 4, col_identifier)
-        #
-        # # "<%= f.text_field :#{col}, value: #{singular}.#{col}, class: 'form-control', size: 4, type: 'number' %>"
-
       end
     end
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -68,19 +68,18 @@ module HotGlue
   def self.derrive_reference_name(thing_as_string)
     assoc_class = eval(thing_as_string)
 
-    if assoc_class.respond_to?("name")
+    if assoc_class.new.respond_to?("name")
       display_column = "name"
-    elsif assoc_class.respond_to?("to_label")
+    elsif assoc_class.new.respond_to?("to_label")
       display_column = "to_label"
-    elsif assoc_class.respond_to?("full_name")
+    elsif assoc_class.new.respond_to?("full_name")
       display_column = "full_name"
-    elsif assoc_class.respond_to?("display_name")
+    elsif assoc_class.new.respond_to?("display_name")
       display_column = "display_name"
-    elsif assoc_class.respond_to?("email")
+    elsif assoc_class.new.respond_to?("email")
       display_column = "email"
-    else
-      raise("this should have been caught by the checker in the initializer")
-      # puts "*** Oops: Can't find any column to use as the display label for the #{assoc.name.to_s} association on the #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, or 5) email directly on your #{assoc.class_name} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
+    # else # SHOULD BE UNREACHABLE
+    #   raise("this should have been caught by the checker in the initializer")
     end
     display_column
   end
@@ -123,6 +122,7 @@ module HotGlue
     class_option :smart_layout, type: :boolean, default: false
     class_option :markup, type: :string, default: nil # deprecated -- use in app config instead
     class_option :layout, type: :string, default: nil # if used here it will override what is in the config
+    class_option :hawk, type: :string, default: nil #
 
     class_option :no_list_label, type: :boolean, default: false
 
@@ -149,8 +149,9 @@ module HotGlue
         raise(HotGlue::Error, message)
       end
 
-      if !options['spec_only'].nil? && !options['no_spec'].nil?
-        puts "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. sorry."
+
+      if options['specs_only'] && options['no_specs']
+        raise(HotGlue::Error,  "*** Oops: You seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. Aborting.")
       end
 
       if !options['exclude'].empty? && !options['include'].empty?
@@ -162,20 +163,16 @@ module HotGlue
 
 
       if @stimulus_syntax.nil?
-        if Rails.version.split(".")[0].to_i >= 7
-          @stimulus_syntax = true
-        else
-          @stimulus_syntax = false
-        end
-      end
+        @stimulus_syntax = true
 
-      if !options['markup'].nil?
-        message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
-        raise(HotGlue::Error, message)
+        # if Rails.version.split(".")[0].to_i >= 7
+        #   @stimulus_syntax = true
+        # else
+        # end
       end
 
       if !options['markup'].nil?
-        message = "Using --layout flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
+        message = "Using --markup flag in the generator is deprecated; instead, use a file at config/hot_glue.yml with a key markup set to `erb` or `haml`"
         raise(HotGlue::Error, message)
       end
 
@@ -185,12 +182,10 @@ module HotGlue
       if  @markup == "erb"
         @template_builder = HotGlue::ErbTemplate.new
       elsif  @markup == "slim"
-        message =  "SLIM IS NOT IMPLEMENTED; please see https://github.com/jasonfb/hot-glue/issues/3"
-        raise(HotGlue::Error, message)
-        @template_builder = HotGlue::SlimTemplate.new
-
+        raise(HotGlue::Error,  "SLIM IS NOT IMPLEMENTED")
       elsif  @markup == "haml"
-        @template_builder = HotGlue::HamlTemplate.new
+        raise(HotGlue::Error,  "HAML IS NOT IMPLEMENTED")
+
       end
 
 
@@ -225,7 +220,7 @@ module HotGlue
       @controller_build_folder_singular = singular
 
       if ! @controller_build_folder.ends_with?("s")
-        raise "can't build with controller name #{@controller_build_folder} because it doesn't end with an 's'"
+        raise HotGlue::Error, "can't build with controller name #{@controller_build_folder} because it doesn't end with an 's'"
       end
 
       @auth = options['auth'] || "current_user"
@@ -234,7 +229,7 @@ module HotGlue
 
 
       if options['nest']
-        raise "STOP: the flag --nest has been replaced with --nested; please re-run using the --nested flag"
+        raise HotGlue::Error, "STOP: the flag --nest has been replaced with --nested; please re-run using the --nested flag"
 
       end
 
@@ -275,7 +270,8 @@ module HotGlue
 
       @form_labels_position = options['form_labels_position']
       if !['before','after','omit'].include?(@form_labels_position)
-        raise "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
+
+        raise HotGlue::Error, "You passed '#{@form_labels_position}' as the setting for --form-labels-position but the only allowed options are before, after (default), and omit"
       end
 
       @form_placeholder_labels = options['form_placeholder_labels'] # true or false
@@ -283,7 +279,7 @@ module HotGlue
 
 
       if !['before','after','omit'].include?(@inline_list_labels)
-        raise "You passed '#{@inline_list_labels}' as the setting for --inline-list-labels but the only allowed options are before, after, and omit (default)"
+        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
 
 
@@ -292,7 +288,7 @@ module HotGlue
       @smart_layout = options['smart_layout']
 
       if options['include'].include?(":") && @smart_layout
-        raise "You specified both --smart-layout and also specified grouping mode (there is a : character in your field include list); you must remove the colon(s) from your --include tag or remove the --smart-layout option"
+        raise HotGlue::Error, "You specified both --smart-layout and also specified grouping mode (there is a : character in your field include list); you must remove the colon(s) from your --include tag or remove the --smart-layout option"
       end
 
 
@@ -320,9 +316,24 @@ module HotGlue
         raise "This controller appears to be the same as the authentication object but in this context you cannot build a new/create action; please re-run with --no-create flag"
       end
 
-      # old syntax
-      @nested_args = []
+      @magic_buttons = []
+      if options['magic_buttons']
+        @magic_buttons = options['magic_buttons'].split(',')
+      end
+
+
+      @small_buttons = options['small_buttons'] || false
+
+      @build_update_action = !@no_edit || !@magic_buttons.empty?
+      # if the magic buttons are present, build the update action anyway
+
+      @ujs_syntax = options['ujs_syntax']
+      if !@ujs_syntax
+        @ujs_syntax = !defined?(Turbo::Engine)
+      end
+
 
+      # NEST CHAIN
       # new syntax
       # @nested_set = [
       # {
@@ -333,10 +344,6 @@ module HotGlue
       @nested_set = []
 
       if ! @nested.nil?
-
-
-        @nested_args = @nested.split("/").collect{|x| x.gsub("~","")}
-
         @nested_set = @nested.split("/").collect { |arg|
           is_optional = arg.start_with?("~")
           arg.gsub!("~","")
@@ -347,57 +354,51 @@ module HotGlue
           }
 
         }
-
-        puts "@nested_set is #{@nested_set}"
-        @nested_args_plural = {}
-
-
-        @nested_args.each do |a|
-          @nested_args_plural[a] = a + "s"
-        end
+        puts "NESTING: #{@nested_set}"
       end
 
-      @magic_buttons = []
-      if options['magic_buttons']
-        @magic_buttons = options['magic_buttons'].split(',')
-      end
-
-
-      @small_buttons = options['small_buttons'] || false
-
-      @build_update_action = !@no_edit || !@magic_buttons.empty?
-      # if the magic buttons are present, build the update action anyway
+      # OBJECT OWNERSHIP & NESTING
+      @reference_name = HotGlue.derrive_reference_name(singular_class)
+      if @auth && @self_auth
+        # byebug
+        @object_owner_sym = @auth.gsub("current_", "").to_sym
+        @object_owner_eval = @auth
+        @object_owner_optional = false
+        @object_owner_name = @auth.gsub("current_", "").to_s
 
 
-      if @auth && ! @self_auth && @nested_args.none?
+      elsif @auth && ! @self_auth && @nested_set.none? && !@auth.include?(".")
+        # byebug
         @object_owner_sym = @auth.gsub("current_", "").to_sym
         @object_owner_eval = @auth
         @object_owner_optional = false
-      else
+        @object_owner_name = @auth.gsub("current_", "").to_s
 
-        if @nested_args.any?
+      elsif @auth && @auth.include?(".")
+        # byebug
+        @object_owner_sym = nil
+        @object_owner_eval = @auth
+      else
+        # byebug
+        if @nested_set.any?
           @object_owner_sym = @nested_set.last[:singular].to_sym
           @object_owner_eval = "@#{@nested_set.last[:singular]}"
           @object_owner_name = @nested_set.last[:singular]
           @object_owner_optional = @nested_set.last[:optional]
         else
-          @object_owner_sym = ""
+          @object_owner_sym = nil
           @object_owner_eval = ""
         end
       end
 
+      identify_object_owner
+      setup_hawk_keys
 
-      @ujs_syntax = options['ujs_syntax']
 
-      if !@ujs_syntax
-        @ujs_syntax = !defined?(Turbo::Engine)
-      end
-      @reference_name = HotGlue.derrive_reference_name(singular_class)
 
-      identify_object_owner
+      # SETUP FIELDS & LAYOUT
       setup_fields
-
-      if  (@columns - @show_only - (@object_owner_sym.empty? ? [] : [@ownership_field.to_sym])).empty?
+      if  (@columns - @show_only - (@ownership_field ?  [@ownership_field.to_sym] : [])).empty?
         @no_field_form = true
       end
 
@@ -412,41 +413,61 @@ module HotGlue
                                             })
       @layout_object = builder.construct
 
-      @menu_file_exists = true if @nested_args.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
+      @menu_file_exists = true if @nested_set.none? && File.exists?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
+
 
     end
 
+    def setup_hawk_keys
+      @hawk_keys = {}
+
+      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
+          else
+            key = hawk_entry
+            hawk_to = @auth
+          end
+          hawk_scope = key.gsub("_id", "").pluralize
+          @hawk_keys[key.to_sym] = [hawk_to, hawk_scope]
+        end
+
+        puts "HAWKING: #{@hawk_keys}"
+      end
+    end
+
     def identify_object_owner
       auth_assoc = @auth && @auth.gsub("current_","")
 
-      if !@object_owner_sym.empty?
+      if @object_owner_sym && ! @self_auth
         auth_assoc_field = auth_assoc + "_id" unless @god
-
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
-
+        # byebug
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
-        elsif ! @nested_args.any?
-
-          exit_message = "*** Oops: It looks like is no association from class called #{@singular_class} to the current_#{@object_owner_sym}. If your user is called something else, pass with flag auth=current_X where X is the model for your users as lowercase. Also, be sure to implement current_X as a method on your controller. (If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for auth_identifier.) To make a controller that can read all records, specify with --god."
+        elsif ! @nested_set.any?
+          exit_message = "*** Oops: It looks like is no association `#{@object_owner_sym}` from the object #{@singular_class}. If your user is called something else, pass with flag auth=current_X where X is the model for your users as lowercase. Also, be sure to implement current_X as a method on your controller. (If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for auth_identifier.) To make a controller that can read all records, specify with --god."
           raise(HotGlue::Error, exit_message)
 
         else
-
           if eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s})").nil? && !eval(singular_class + ".reflect_on_association(:#{@object_owner_sym.to_s.singularize})").nil?
             exit_message = "*** Oops: you tried to nest #{singular_class} within a route for `#{@object_owner_sym}` but I can't find an association for this relationship. Did you mean `#{@object_owner_sym.to_s.singularize}` (singular) instead?"
-          else
-            exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym}  maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n (If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.  Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag). To make a controller that can read all records, specify with --god."
+          # else  # NOTE: not reachable
+          #   exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym}  maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n (If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.  Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag). To make a controller that can read all records, specify with --god."
           end
 
           raise(HotGlue::Error, exit_message)
         end
+      elsif  @object_owner_sym && ! @object_owner_eval.include?(".")
+        @ownership_field = @object_owner_name + "_id"
       end
     end
 
-
     def setup_fields
-      auth_assoc = @auth && @auth.gsub("current_","")
 
       if !@include_fields
         @exclude_fields.push :id, :created_at, :updated_at, :encrypted_password,
@@ -455,7 +476,6 @@ module HotGlue
                              :confirmation_token, :confirmed_at,
                              :confirmation_sent_at, :unconfirmed_email
 
-        @exclude_fields.push( (auth_assoc + "_id").to_sym) if ! auth_assoc.nil?
         @exclude_fields.push( @ownership_field.to_sym ) if ! @ownership_field.nil?
 
 
@@ -477,30 +497,34 @@ module HotGlue
             assoc_name = col.to_s.gsub("_id","")
 
 
-            begin
-              assoc_model = eval("#{singular_class}.reflect_on_association(:#{assoc_name}).active_record")
-            rescue NameError => e
-              exit_message = "*** Oops: The model #{singular_class} is missing an association for :#{assoc_name} or the model #{assoc_name.titlecase} doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; your model #{singular_class.titlecase} should belong_to :#{assoc_name}.  To make a controller that can read all records, specify with --god."
+            assoc_model = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+
+            if assoc_model.nil?
+              exit_message = "*** Oops: The model #{singular_class} is missing an association for :#{assoc_name} or the model #{assoc_name.titlecase} doesn't exist. TODO: Please implement a model for #{assoc_name.titlecase}; or add to #{singular_class} `belongs_to :#{assoc_name}`.  To make a controller that can read all records, specify with --god."
               puts exit_message
               raise(HotGlue::Error, exit_message)
             end
 
-
-            if assoc_model.nil?
-              exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
-              puts exit_message
-              raise(HotGlue::Error,exit_message)
+            begin
+              assoc_class = eval(assoc_model.try(:class_name))
+              @associations << assoc_name.to_sym
+              name_list = [:name, :to_label, :full_name, :display_name, :email]
+
+            rescue
+              # unreachable(?)
+              # if eval("#{singular_class}.reflect_on_association(:#{assoc_name.singularize})")
+              #   raise(HotGlue::Error,"*** Oops: #{singular_class} has no association for #{assoc_name.singularize}")
+              # else
+              #   raise(HotGlue::Error,"*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym}  maybe add `belongs_to :#{@object_owner_sym}` to #{singular_class}\n (If your user is called something else, pass with flag auth=current_X where X is the model for your auth object as lowercase.  Also, be sure to implement current_X as a method on your controller. If you really don't want to implement a current_X on your controller and want me to check some other method for your current user, see the section in the docs for --auth-identifier flag). To make a controller that can read all records, specify with --god.")
+              # end
             end
 
-            @associations << assoc_name.to_sym
-            assoc_class = eval(assoc_model.name)
-            name_list = [:name, :to_label, :full_name, :display_name, :email]
-            if name_list.collect{ |field|
+            if assoc_class && name_list.collect{ |field|
               assoc_class.column_names.include?(field.to_s) ||  assoc_class.instance_methods.include?(field)
             }.any?
               # do nothing here
             else
-              exit_message = "\n*** Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{assoc_name} association on the #{singular_class} model. TODO: Please implement just one of: \n1) name, \n2) to_label, \n3) full_name, \n4) display_name \n5) email \nYou can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
+              exit_message = "Oops: Missing a label for `#{assoc_class}`. Can't find any column to use as the display label for the #{assoc_name} association on the #{singular_class} model. TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name 5) email. You can implement any of these directly on your`#{assoc_class}` model (can be database fields or model methods) or alias them to field you want to use as your display label. Then RERUN THIS GENERATOR. (Field used will be chosen based on rank here.)"
               raise(HotGlue::Error,exit_message)
             end
           end
@@ -508,6 +532,11 @@ module HotGlue
       end
     end
 
+
+    def auth_root
+      "authenticate_" + @auth_identifier.split(".")[0] + "!"
+    end
+
     def formats
       [format]
     end
@@ -523,7 +552,7 @@ module HotGlue
         if @namespace
           begin
             eval(controller_descends_from)
-            puts "   skipping   base controller #{controller_descends_from}"
+            # puts "   skipping   base controller #{controller_descends_from}"
           rescue NameError => e
             template "base_controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "base_controller.rb")
           end
@@ -590,8 +619,8 @@ module HotGlue
     end
 
     def object_parent_mapping_as_argument_for_specs
-      if @nested_args.any?
-        ", " + @nested_args.last + ": " + @nested_args.last
+      if @nested_set.any?
+        ", " + @nested_set.last[:singular] + ": " + @nested_set.last[:singular]
       elsif @auth
         ", #{@auth_identifier}: #{@auth}"
       end
@@ -603,21 +632,19 @@ module HotGlue
         last_parent = ", #{@auth_identifier}: #{@auth}"
       end
 
-      @nested_args.each do |arg|
-        res << "  let(:#{arg}) {create(:#{arg} #{last_parent} )}\n"
-        last_parent = ", #{arg}: #{arg}"
+      @nested_set.each do |arg|
+        res << "  let(:#{arg[:singular]}) {create(:#{arg[:singular]} #{last_parent} )}\n"
+        last_parent = ", #{arg[:singular]}: #{arg[:singular]}"
       end
       res
     end
 
-
     def objest_nest_params_by_id_for_specs
-      @nested_args.map{|arg|
-        "#{arg}_id: #{arg}.id"
+      @nested_set.map{|arg|
+        "#{arg[:singular]}_id: #{arg[:singular]}.id"
       }.join(",\n          ")
     end
 
-
     def controller_class_name
       @controller_build_name
     end
@@ -639,8 +666,8 @@ module HotGlue
     end
 
     def path_helper_args
-      if @nested_args.any? && @nested
-        [(@nested_args).collect{|a| "#{a}"} , singular].join(",")
+      if @nested_set.any? && @nested
+        [(@nested_set).collect{|a| "#{a[:singular]}"} , singular].join(",")
       else
         singular
       end
@@ -648,7 +675,7 @@ module HotGlue
 
     def path_helper_singular
       if @nested
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{@controller_build_folder_singular}_path"
+        "#{@namespace+"_" if @namespace}#{(@nested_set.collect{|x| x[:singular]}.join("_") + "_" if @nested_set.any?)}#{@controller_build_folder_singular}_path"
       else
         "#{@namespace+"_" if @namespace}#{@controller_build_folder_singular}_path"
       end
@@ -697,7 +724,7 @@ module HotGlue
 
     def path_arity
       res = ""
-      if @nested_args.any? && @nested
+      if @nested_set.any? && @nested
         res << nested_objects_arity + ", "
       end
       res << "@" + singular
@@ -716,33 +743,24 @@ module HotGlue
     end
 
     def new_path_name
-
       HotGlue.optionalized_ternary(namespace: @namespace,
                                    target: singular,
                                    nested_set: @nested_set,
                                    modifier: "new_",
                                    with_params: true)
-      # base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{@controller_build_folder_singular}_path"
-      # if @nested_args.any?
-      #   base += "(" + @nested_args.collect { |arg|
-      #     "#{arg}.id"
-      #   }.join(", ") + ")"
-      # end
-      # base
     end
 
     def nested_assignments
-      return "" if @nested_args.none?
-      @nested_args.map{|a| "#{a}: #{a}"}.join(", ") #metaprgramming into Ruby hash
+      return "" if @nested_set.none?
+      @nested_set.map{|a| "#{a}: #{a}"}.join(", ") #metaprgramming into Ruby hash
     end
 
     def nested_assignments_top_level # this is by accessing the instance variable-- only use at top level
-      @nested_args.map{|a| "#{a}: @#{a}"}.join(", ") #metaprgramming into Ruby hash
+      @nested_set.map{|a| "#{a[:singular]}"}.join(", ") #metaprgramming into Ruby hash
     end
 
-
     def nest_assignments_operator(top_level = false, leading_comma = false)
-      if @nested_args.any?
+      if @nested_set.any?
         "#{", " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
       else
         ""
@@ -754,25 +772,25 @@ module HotGlue
     end
 
     def nested_objects_arity
-      @nested_args.map{|a| "@#{a}"}.join(", ")
+      @nested_set.map{|a| "@#{a[:singular]}"}.join(", ")
     end
 
     def nested_arity_for_path
-      [@nested_args[0..-1].collect{|a| "@#{a}"}].join(", ") #metaprgramming into arity for the Rails path helper
+      [@nested_set[0..-1].collect{|a| "@#{a[:singular]}"}].join(", ") #metaprgramming into arity for the Rails path helper
     end
 
     def object_scope
       if @auth
-        if @nested_args.none?
+        if @nested_set.none?
           @auth + ".#{plural}"
         else
-          "@" + @nested_args.last + ".#{plural}"
+          "@" + @nested_set.last[:singular] + ".#{plural}"
         end
       else
-        if @nested_args.none?
+        if @nested_set.none?
           @singular_class
         else
-          "@" + @nested_args.last + ".#{plural}"
+          "@" + @nested_set.last[:singular] + ".#{plural}"
         end
 
       end
@@ -783,10 +801,10 @@ module HotGlue
       if @auth
         if @self_auth
           @singular_class + ".where(id: #{@auth}.id)"
-        elsif @nested_args.none?
+        elsif @nested_set.none?
           @auth + ".#{plural}"
         else
-          "@" + @nested_args.last + ".#{plural}"
+          "@" + @nested_set.last[:singular] + ".#{plural}"
         end
       else
         @singular_class + ".all"
@@ -794,7 +812,7 @@ module HotGlue
     end
 
     def any_nested?
-      @nested_args.any?
+      @nested_set.any?
     end
 
     def all_objects_variable
@@ -859,7 +877,7 @@ module HotGlue
       #
       # if File.exists?(menu_file)
       #   # TODO: can I insert the new menu item into the menu programatically here?
-      #   # not sure how i would acheive this without nokogiri
+      #   # not sure how i would achieve this without nokogiri
       #
       # end
 
@@ -935,6 +953,7 @@ module HotGlue
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
+        hawk_keys: @hawk_keys,
         col_identifier:  col_identifier,
         ownership_field: @ownership_field,
         form_labels_position: @form_labels_position,
@@ -1024,9 +1043,8 @@ module HotGlue
           "display_name"
         elsif me.column_names.include?("email") || me.instance_methods(false).include?(:email)
           "email"
-        elsif me.column_names.include?("number") || me.instance_methods(false).include?(:number)
-          "number"
         else
+          # NOT UNREACHABLE BUT UNTESTED
           exit_message = "*** Oops: Can't find any column to use as the display label on #{singular_class} model . TODO: Please implement just one of: 1) name, 2) to_label, 3) full_name, 4) display_name, 5) email, or 6) number directly on your #{singular_class} model (either as database field or model methods), then RERUN THIS GENERATOR. (If more than one is implemented, the field to use will be chosen based on the rank here, e.g., if name is present it will be used; if not, I will look for a to_label, etc)"
           raise(HotGlue::Error, exit_message)
         end
@@ -1106,7 +1124,7 @@ module HotGlue
     def nested_for_turbo_nested_constructor(top_level = true)
       instance_symbol = "@" if top_level
       instance_symbol = "" if !top_level
-      if @nested_args.none?
+      if @nested_set.none?
         "\"\""
       else
         @nested_set.collect{|arg|
@@ -1118,10 +1136,10 @@ module HotGlue
     def nested_for_assignments_constructor(top_level = true)
       instance_symbol = "@" if top_level
       instance_symbol = "" if !top_level
-      if @nested_args.none?
+      if @nested_set.none?
         ""
       else
-        ", \n    nested_for: \"" + @nested_args.collect{|a| "#{a}-" + '#{' + instance_symbol + a + ".id}"}.join("__") + "\""
+        ", \n    nested_for: \"" + @nested_set.collect{|a| "#{a[:singular]}-" + '#{' + instance_symbol + a[:singular] + ".id}"}.join("__") + "\""
       end
     end
 
@@ -1130,6 +1148,12 @@ module HotGlue
     def cc_filename_with_extensions(name, file_format = format)
       [name, file_format].compact.join(".")
     end
+
+    def hawk_to_ruby
+      @hawk_keys.collect{ |k,v|
+        "#{k}: [#{v[0]}, \"#{v[1]}\"] "
+      }.join(", ")
+    end
   end
 end
 

data/lib/generators/hot_glue/templates/capybara_login.rb

@@ -1,6 +1,6 @@
 def login_as(user)
   visit '/users/sign_in'
-  within("#new_account") do
+  within("#new_user") do
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'password'
   end

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

@@ -2,7 +2,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   helper :hot_glue
   include HotGlue::ControllerHelper
 
-  <% unless @auth_identifier == '' || @god %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
+  <% unless @auth_identifier == '' || @god %>before_action :<%= auth_root %><% end %>
   <% if any_nested? %><% nest_chain = [] %> <% @nested_set.each { |arg|
 
     if auth_identifier == arg[:singular]
@@ -19,7 +19,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     <% } %><% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   after_action -> { flash.discard }, if: -> { request.format.symbol ==  :turbo_stream }
-<% if @nested_args.any? %>
+<% if @nested_set.any? %>
   def <%= @nested_set[0][:singular] %><% if @god
        next_object = nil
        collect_objects = @nested_set.reverse.collect {|x|
@@ -36,9 +36,9 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
          root_object = @auth + "." + @nested_set[0][:plural]
        end
      end
- %><% if !@god && @nested_set[0][:singular] == @auth_identifier %>
-    @<%= @nested_set[0][:singular] %> ||= <%= root_object %> <% else %>
-    @<%= @nested_set[0][:singular] %> ||= <%= root_object %>.find(params[:<%=  @nested_set[0][:singular]  %>_id])<%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %> <% end %>
+ %>
+  <% if !@god && @nested_set[0][:singular] == @auth_identifier %>@<%= @nested_set[0][:singular] %> ||= <%= root_object %>
+ <% else %>    @<%= @nested_set[0][:singular] %> ||= <%= root_object %>.find(params[:<%=  @nested_set[0][:singular]  %>_id])<%= " if params.include?(:#{@nested_set[0][:singular]}_id)" if @nested_set[0][:optional] %> <% end %>
   end
   <% end %><% if any_nested? %><% nest_chain = [@nested_set[0][:singular]]; this_scope = @nested_set[0][:plural]; %>
     <%   for index in 0..(@nested_set.count - 1) do
@@ -47,11 +47,12 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
       this_scope =  "#{nest_chain.last}.#{arg[:plural]}"
       nest_chain << arg %>
+  <% unless  @nested_set[0][:singular] == arg[:singular] %>
   def <%= arg[:singular] %>
     @<%= arg[:singular] %> ||= (<%= this_scope %>.find(params[:<%= arg[:singular] %>_id])<%= " if params.include?(:#{last_arg[:singular]}_id)" if last_arg && @god && last_arg[:optional] %>)
-    <% if @god &&  (last_arg[:optional] ) %>@<%= arg[:singular] %> ||=  (<%=  collect_objects[index-1] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
-  end<% end %> <% end %> <% if !@self_auth %>
-
+      <% if @god && last_arg && (last_arg[:optional] ) %>@<%= arg[:singular] %> ||=  (<%=  collect_objects[index-1] %>.find(params[:<%= arg[:singular] %>_id]) if params.include?(:<%= arg[:singular] %>_id) )   <% end %>
+  end<% end %>
+    <% end %><% end %> <% if !@self_auth %>
   def load_<%= singular_name %>
     @<%= singular_name %> = (<%= object_scope.gsub("@",'') %>.find(params[:id])<%= " if params.include?(:#{@nested_set.last[:singular]}_id)" if @nested_set[0] && @nested_set[0][:optional]  %>)<% if @nested_set[0] && @nested_set[0][:optional] %> || <%= class_name %>.find(params[:id])<% end %>
   end
@@ -73,8 +74,9 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% if create_action %>  def new
-    <% if ! @god %>
-    @<%= singular_name %> = <%= class_name  %>.new(<%= @object_owner_sym %>: <%= @object_owner_eval %>)
+    <% if @object_owner_sym %>
+    @<%= singular_name %> = <%= class_name  %>.new(<%  if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)
+
    <% elsif @object_owner_optional && any_nested? %>
     @<%= singular_name %> = <%= class_name  %>.new({}.merge(<%= @nested_set.last[:singular] %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {})) <% else %>
     @<%= singular_name %> = <%= class_name  %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)
@@ -85,8 +87,8 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if ! @object_owner_sym.empty? %>.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 %>)
-
+    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 %>)
+<% if @hawk_keys.any? %>    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
 
     @<%=singular_name %> = <%= class_name %>.create(modified_params)
 
@@ -98,7 +100,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
         format.html { redirect_to <%= path_helper_plural %> }
       end
     else
-      flash[:alert] = "Oops, your <%= singular_name %> could not be created."
+      flash[:alert] = "Oops, your <%= singular_name %> could not be created. #{@hawk_alarm}"
       respond_to do |format|
         format.turbo_stream
         format.html
@@ -120,10 +122,13 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
 <% end %><% if @build_update_action %>  def update
-<%= controller_magic_button_update_actions %>    if @<%= singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>)
+    modified_params = modify_date_inputs_on_params(<%= singular %>_params<%= @auth ? ', ' + @auth : '' %>)<%= controller_update_params_tap_away_magic_buttons %>
+<% if @hawk_keys.any? %>    modified_params = hawk_params( {<%= hawk_to_ruby %>}, modified_params)<% end %>
+      <%= controller_magic_button_update_actions %>    if @<%= singular_name %>.update(modified_params)
       flash[:notice] = (flash[:notice] || "") << "Saved #{@<%= singular %>.<%= display_class %>}"
+      flash[:alert] = @hawk_alarm  if !@hawk_alarm.empty?
     else
-      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved."
+      flash[:alert] = (flash[:alert] || "") << "<%= singular_name.titlecase %> could not be saved. #{@hawk_alarm}"
 
     end
 <% if @display_list_after_update %>    load_all_<%= plural %><% end %>
@@ -137,7 +142,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     begin
       @<%=singular_name%>.destroy
     rescue StandardError => e
-      flash[:alert] = "<%= singular_name.titlecase %> could not be deleted"
+      flash[:alert] = "<%= singular_name.titlecase %> could not be deleted."
     end
     load_all_<%= plural %>
     respond_to do |format|
@@ -147,11 +152,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def <%=singular_name%>_params
-    params.require(:<%=singular_name%>).permit( <%= @columns + @magic_buttons.collect(&:to_sym) %> )
-  end
-
-  def default_colspan
-    <%= @default_colspan %>
+    params.require(:<%=singular_name%>).permit( <%= (@columns - @show_only) + @magic_buttons.collect(&:to_sym) %> )
   end
 
   def namespace

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

@@ -1,5 +1,5 @@
 <\%= turbo_frame_tag "<%= singular %>-new" do %>
   <div>
-    <\%= link_to "New <%= thing_label %>",  <%= new_path_name %>, disable_with: "Loading...", class: "new-<%= singular %>-button btn btn-primary pull-right <%= 'btn-sm' if @nested_args.any? %> " %>
+    <\%= link_to "New <%= thing_label %>",  <%= new_path_name %>, disable_with: "Loading...", class: "new-<%= singular %>-button btn btn-primary pull-right <%= 'btn-sm' if @nested_set.any? %> " %>
   </div>
 <\% end %>

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

@@ -15,7 +15,7 @@
         <%= @singular %>: <%= @singular %>,
         <%= downnest_object_name %>: <%= @singular %>.<%= downnest %>
       }
-      .merge({nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if defined?(nested_for)}<% end %><%= @singular %>-#{<%= @singular %>.id}"})
+      .merge({nested_for: "<% if @nested_set.any? %>#{nested_for + "__" if defined?(nested_for)}<% end %><%= @singular %>-#{<%= @singular %>.id}"})
       <%= @nested_set.collect{|arg| ".merge(defined?(#{arg[:singular]}) ? {#{arg[:singular]}: #{arg[:singular]}} : {} )"}.join("\n") %>
     \%>
   </div>

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

@@ -10,7 +10,7 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
     when :integer
       if col.to_s.ends_with?("_id")
         assoc = "#{col.to_s.gsub('_id','')}"
-        "let!(:#{assoc}1) {create(:#{assoc})}"
+        "let!(:#{assoc}1) {create(:#{assoc}" +  (@hawk_keys["#{assoc}_id".to_sym] ? ", #{@auth.gsub('current_', '')}: #{@auth}": "")   + ")}"
       end
     else
     end

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.5.1'
+    CURRENT = '0.5.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-12 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A gem to build Tubro Rails scaffolding.