hot-glue 0.4.3 → 0.4.7

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

@@ -1,12 +1,20 @@
 module  HotGlue
   class ErbTemplate < TemplateBase
 
+
+
+    def add_spaces_each_line(text, num_spaces)
+      add_spaces = " " * num_spaces
+      text.lines.collect{|line| add_spaces + line}.join("")
+    end
+
+
     # include GeneratorHelper
     attr_accessor :singular
 
     def field_output(col, type = nil, width, col_identifier )
       "  <%= f.text_field :#{col.to_s}, value: @#{@singular}.#{col.to_s}, autocomplete: 'off', size: #{width}, class: 'form-control', type: '#{type}' %>\n "+
-      "  <label class='form-text' >#{col.to_s.humanize}</label>\n"
+      "\n"
     end
 
 
@@ -15,11 +23,12 @@ module  HotGlue
       path_helper_args = args[0][:path_helper_args]
       singular = args[0][:singular]
       magic_buttons = args[0][:magic_buttons]
+      small_buttons = args[0][:small_buttons]
 
       magic_buttons.collect{ |button_name|
-        "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}) do |f| %>
+        "<%= form_with model: #{singular}, url: #{path_helper_singular}(#{path_helper_args}), html: {style: 'display: inline', data: {\"turbo-confirm\": 'Are you sure you want to #{button_name} this #{singular}?'}} do |f| %>
       <%= f.hidden_field :#{button_name}, value: \"#{button_name}\" %>
-    <%= f.submit '#{button_name.titleize}'.html_safe, disabled: (#{singular}.respond_to?(:#{button_name}able?) && ! #{singular}.#{button_name}able? ), data: {confirm: 'Are you sure you want to #{button_name} this #{singular}?'}, class: '#{singular}-button btn btn-primary ' %>
+    <%= f.submit '#{button_name.titleize}'.html_safe, disabled: (#{singular}.respond_to?(:#{button_name}able?) && ! #{singular}.#{button_name}able? ), class: '#{singular}-button btn btn-primary #{"btn-sm" if small_buttons}' %>
     <% end %>"
       }.join("\n")
     end
@@ -30,8 +39,7 @@ module  HotGlue
         lines = 5
       end
 
-      "<%= f.text_area :#{col.to_s}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>" +
-        "<label class='form-text'>#{col.to_s.humanize}</label>"
+      "<%= f.text_area :#{col.to_s}, class: 'form-control', autocomplete: 'off', cols: 40, rows: '#{lines}' %>"
     end
 
     def list_column_headings(*args)
@@ -58,23 +66,20 @@ module  HotGlue
       show_only = args[0][:show_only]
       singular_class = args[0][:singular_class]
       col_identifier = args[0][:col_identifier]
+      ownership_field  = args[0][:ownership_field]
 
 
       # TODO: CLEAN ME
       @singular = args[0][:singular]
       singular = @singular
 
-      col_spaces_prepend = "    "
-
-
       result = layout_columns.map{ |column|
-        "<div class='#{col_identifier}' >" +
+        "  <div class='#{col_identifier}' >" +
 
           column.map { |col|
 
           field_result = if show_only.include?(col)
-            "<%= @#{singular}.#{col.to_s} %>" +
-            "<label class='form-text'>#{col.to_s.humanize}</label>"
+            "<%= @#{singular}.#{col.to_s} %>"
           else
             type = eval("#{singular_class}.columns_hash['#{col}']").type
             limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -87,16 +92,18 @@ module  HotGlue
                   assoc_name = col.to_s.gsub("_id","")
                   assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
                   if assoc.nil?
-                    exit_message= "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+                    exit_message = "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
                     exit
                   end
+
+                  is_owner = col.to_s == ownership_field
                   display_column = HotGlue.derrive_reference_name(assoc.class_name)
-                  "<%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
-  <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
+
+                  # TODO: add is_owner && check if this nested arg is optional
+                  (is_owner ? "<% unless #{assoc_name} %>\n" : "") +  "  <%= f.collection_select(:#{col.to_s}, #{assoc.class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>\n" + (is_owner ? "<% end %>" : "")
 
                 else
-                  "<%= f.text_field :#{col.to_s}, value: #{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number' %>
-  <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
+                  "<%= f.text_field :#{col.to_s}, value: #{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number' %>"
 
                 end
               when :string
@@ -130,18 +137,22 @@ module  HotGlue
                   ""
               when :enum
                 enum_type = eval("#{singular_class}.columns.select{|x| x.name == '#{col.to_s}'}[0].sql_type")
-                "<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>
-  <label class='small form-text text-muted'>#{col.to_s.humanize}</label>"
-              end
-           end
+                "<%= f.collection_select(:#{col.to_s},  enum_to_collection_select( #{singular_class}.defined_enums['#{enum_type}']), :key, :value, {selected: @#{singular}.#{col.to_s} }, class: 'form-control') %>"
+            end
+
+          end
 
           if (type == :integer) && col.to_s.ends_with?("_id")
             field_error_name = col.to_s.gsub("_id","")
           else
             field_error_name = col.to_s
           end
-           "<span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{ 'style="display: inherit;"'}  >" + field_result + "</span>"
-          }.join("<br />\n") + "</div>"
+
+          add_spaces_each_line( "\n  <span class='<%= \"alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{ 'style="display: inherit;"'}  >\n" +
+            add_spaces_each_line(field_result + "\n<label class='small form-text text-muted'>#{col.to_s.humanize}</label>", 4) +
+            "\n  </span>\n  <br />", 2)
+
+          }.join("") + "\n  </div>"
       }.join("\n")
       return result
     end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -41,7 +41,10 @@ module HotGlue
     class_option :singular, type: :string, default: nil
     class_option :plural, type: :string, default: nil
     class_option :singular_class, type: :string, default: nil
-    class_option :nest, type: :string, default: ""
+    class_option :nest, type: :string, default: nil # DEPRECATED —— DO NOT USE
+    class_option :nested, type: :string, default: ""
+
+
     class_option :namespace, type: :string, default: nil
     class_option :auth, type: :string, default: nil
     class_option :auth_identifier, type: :string, default: nil
@@ -59,15 +62,18 @@ module HotGlue
     class_option :big_edit, type: :boolean, default: false
     class_option :show_only, type: :string, default: ""
 
-    class_option :stimulus_syntax, type: :boolean, default: nil # TODO: rename to ujs_syntax and default to false
+    class_option :ujs_syntax, type: :boolean, default: nil
 
     class_option :downnest, type: :string, default: nil
     class_option :magic_buttons, type: :string, default: nil
+    class_option :small_buttons, type: :boolean, default: nil
+
     class_option :display_list_after_update, type: :boolean, default: false
     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 :no_list_labels, type: :boolean, default: false
+    class_option :before_list_labels, type: :boolean, default: false
 
     def initialize(*meta_args)
       super
@@ -138,14 +144,34 @@ module HotGlue
       end
 
       args = meta_args[0]
+
+
       @singular = args.first.tableize.singularize # should be in form hello_world
       @plural = options['plural'] || @singular + "s" # supply to override; leave blank to use default
+      @namespace = options['namespace'] || nil
+
+
+      use_controller_name =  plural.titleize.gsub(" ", "")
+
+      @controller_build_name = (( @namespace.titleize.gsub(" ","") + "::" if @namespace) || "") + use_controller_name + "Controller"
+      @controller_build_folder = use_controller_name.underscore
+      @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'"
+      end
+
       @auth = options['auth'] || "current_user"
       @auth_identifier = options['auth_identifier'] || (! @god && @auth.gsub("current_", "")) || nil
 
 
-      @nest = (!options['nest'].empty? && options['nest']) || nil
-      @namespace = options['namespace'] || nil
+
+      if options['nest']
+        raise "STOP: the flag --nest has been replaced with --nested; please re-run using the --nested flag"
+
+      end
+
+      @nested = (!options['nested'].empty? && options['nested']) || nil
 
       @singular_class = @singular.titleize.gsub(" ", "")
       @exclude_fields = []
@@ -164,7 +190,6 @@ module HotGlue
         @show_only += options['show_only'].split(",").collect(&:to_sym)
       end
 
-
       @god = options['god'] || options['gd'] || false
       @specs_only = options['specs_only'] || false
 
@@ -177,13 +202,12 @@ module HotGlue
 
       @no_edit = options['no_edit'] || false
       @no_list = options['no_list'] || false
-
+      @no_list_labels = options['no_list_labels'] || false
       @display_list_after_update = options['display_list_after_update'] || false
       @smart_layout = options['smart_layout']
 
 
       @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
-
       @downnest = options['downnest'] || false
 
       @downnest_children = []
@@ -198,13 +222,18 @@ module HotGlue
       end
 
       # when in self auth, the object is the same as the authenticated object
+
       if @auth && auth_identifier == @singular
         @self_auth = true
       end
 
+      if @self_auth && !@no_create
+        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
+
       @nested_args = []
-      if !@nest.nil?
-        @nested_args = @nest.split("/")
+      if ! @nested.nil?
+        @nested_args = @nested.split("/")
         @nested_args_plural = {}
         @nested_args.each do |a|
           @nested_args_plural[a] = a + "s"
@@ -218,6 +247,9 @@ module HotGlue
         @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
 
@@ -236,16 +268,27 @@ module HotGlue
         end
       end
 
+
+      @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
 
+      if  (@columns - @show_only - (@object_owner_sym.empty? ? [] : [@ownership_field.to_sym])).empty?
+        @no_field_form = true
+      end
+
+      buttons_width = ((!@no_edit && 1) || 0) + ((!@no_delete && 1) || 0) + @magic_buttons.count
+
       builder = HotGlue::Layout::Builder.new({
                                               include_setting: options['include'],
                                               downnest_children: @downnest_children,
-                                              no_edit: @no_edit,
-                                              no_delete: @no_delete,
+                                              buttons_width: buttons_width,
                                               columns: @columns,
                                               smart_layout: @smart_layout
                                             })
@@ -261,23 +304,19 @@ module HotGlue
         auth_assoc_field = auth_assoc + "_id" unless @god
         assoc = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})")
 
+
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
-        elsif !@nest
+        elsif ! @nested_args.any?
           exit_message = "*** Oops: It looks like is no association from current_#{@object_owner_sym} to a class called #{@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."
 
         else
-          if @god
-            exit_message= "*** Oops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
+
+          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
-            @auth_check = eval(@auth_identifier.titleize)
-            @nested_args.each do |arg|
-              if ! @auth_check.reflect_on_association("#{arg}s".to_sym)
-                exit_message = "*** Oops:  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
-              end
-            end
+            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
-          puts exit_message
           raise(HotGlue::Error, exit_message)
         end
       end
@@ -357,7 +396,7 @@ module HotGlue
     def copy_controller_and_spec_files
       @default_colspan = @columns.size
       unless @specs_only
-        template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
+        template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{@controller_build_folder}_controller.rb")
         if @namespace
           begin
             eval(controller_descends_from)
@@ -461,10 +500,7 @@ module HotGlue
 
 
     def controller_class_name
-      res = ""
-      res << @namespace.titleize + "::" if @namespace
-      res << plural.titleize.gsub(" ", "") + "Controller"
-      res
+      @controller_build_name
     end
 
     def singular_name
@@ -480,7 +516,7 @@ module HotGlue
     end
 
     def path_helper_args
-      if @nested_args.any? && @nest
+      if @nested_args.any? && @nested
         [(@nested_args).collect{|a| "#{a}"} , singular].join(",")
       else
         singular
@@ -488,16 +524,16 @@ module HotGlue
     end
 
     def path_helper_singular
-      if @nest
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
+      if @nested
+        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{@controller_build_folder_singular}_path"
       else
-        "#{@namespace+"_" if @namespace}#{singular}_path"
+        "#{@namespace+"_" if @namespace}#{@controller_build_folder_singular}_path"
       end
     end
 
     def path_helper_plural
-      if ! @nest
-        "#{@namespace+"_" if @namespace}#{plural}_path"
+      if ! @nested
+        "#{@namespace+"_" if @namespace}#{@controller_build_folder}_path"
       else
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
       end
@@ -505,26 +541,26 @@ module HotGlue
 
     def path_arity
       res = ""
-      if @nested_args.any? && @nest
+      if @nested_args.any? && @nested
         res << nested_objects_arity + ", "
       end
       res << "@" + singular
     end
 
     def line_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/line"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/line"
     end
 
     def show_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/show"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/show"
     end
 
     def list_path_partial
-      "#{@namespace+"/" if @namespace}#{plural}/list"
+      "#{@namespace+"/" if @namespace}#{@controller_build_folder}/list"
     end
 
     def new_path_name
-      base =   "new_#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_") if @nested_args.any?}#{singular}_path"
+      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"
@@ -545,7 +581,7 @@ module HotGlue
 
     def nest_assignments_operator(top_level = false, leading_comma = false)
       if @nested_args.any?
-        "#{', ' + "\n     " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
+        "#{", " if leading_comma}#{top_level ? nested_assignments_top_level : nested_assignments }"
       else
         ""
       end
@@ -617,7 +653,8 @@ module HotGlue
         path_helper_singular: path_helper_singular,
         path_helper_args: path_helper_args,
         singular: singular,
-        magic_buttons: @magic_buttons
+        magic_buttons: @magic_buttons,
+        small_buttons: @small_buttons
       )
     end
 
@@ -630,7 +667,7 @@ module HotGlue
 
 
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    plural, dest_filename)
+                                    @controller_build_folder, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -644,7 +681,7 @@ module HotGlue
           source_filename = cc_filename_with_extensions( "#{@markup}/#{view}.turbo_stream.#{@markup}")
           dest_filename = cc_filename_with_extensions("#{view}", "turbo_stream.#{@markup}")
           dest_filepath = File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}",
-                                    plural, dest_filename)
+                                    @controller_build_folder, dest_filename)
 
 
           template source_filename, dest_filepath
@@ -652,6 +689,15 @@ module HotGlue
 
         end
       end
+
+      # menu_file = "app/views#{namespace_with_dash}/menu.erb"
+      #
+      # 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
+      #
+      # end
+
     end
 
     def namespace_with_dash
@@ -729,7 +775,8 @@ module HotGlue
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        col_identifier:  col_identifier
+        col_identifier:  col_identifier,
+        ownership_field: @ownership_field
       )
     end
 
@@ -770,8 +817,8 @@ module HotGlue
     end
 
     def controller_descends_from
-      if defined?(@namespace.titlecase + "::BaseController")
-        @namespace.titlecase + "::BaseController"
+      if defined?(@namespace.titlecase.gsub(" ", "") + "::BaseController")
+        @namespace.titlecase.gsub(" ", "") + "::BaseController"
       else
         "ApplicationController"
       end
@@ -825,13 +872,13 @@ module HotGlue
      @template_builder.paginate(plural: plural)
     end
 
-    def delete_confirmation_syntax
-      if !@stimulus_syntax
-       "{confirm: 'Are you sure?'}"
-      else
-       "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ #{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
-      end
-    end
+    # def delete_confirmation_syntax
+    #   if !@stimulus_syntax
+    #    "{confirm: 'Are you sure?'}"
+    #   else
+    #    "{controller: 'confirmable', 'confirm-message': \"Are you sure you want to delete \#{ #{@singular}.#{ display_class } } \", 'action': 'confirmation#confirm'}"
+    #   end
+    # end
 
 
     def controller_magic_button_update_actions

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

@@ -4,50 +4,51 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
   <% unless @auth_identifier == '' || @god %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
   <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
-    this_scope =   nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
-      nest_chain << arg %>
+
+    if auth_identifier == arg
+      this_scope = auth_object
+    elsif nest_chain.empty?
+      this_scope =  "#{@auth ? auth_object : class_name}.#{arg}s"
+    else
+      this_scope = "#{nest_chain.last}.#{arg}s"
+    end
+
+     nest_chain << arg %>
   before_action :<%= arg %>
     <% } %><% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   after_action -> { flash.discard }, if: -> { request.format.symbol ==  :turbo_stream }
-
-<% if no_devise_installed %>
-  # TODO: implement current_user or use Devise
-<% end %>
-
-  <% if @nested_args.any? %>
-  def <%= @nested_args[0] %>
-    <% if @god
-    next_object = nil
-     collect_objects = @nested_args.reverse.collect {|x|
-         if eval("#{next_object || class_name}.reflect_on_association(:#{x})").nil?
-           raise "***** Unable to find the association `#{x}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
-         end
-         next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x})").class_name
-     }
-     root_object = collect_objects.last
+<% if @nested_args.any? %>
+  def <%= @nested_args[0] %><% if @god
+       next_object = nil
+       collect_objects = @nested_args.reverse.collect {|x|
+           if eval("#{next_object || class_name}.reflect_on_association(:#{x})").nil?
+             raise "***** Unable to find the association `#{x}` on the class #{next_object || class_name} ..... you probably want to add `belongs_to :#{x}` to the #{next_object || class_name} object?"
+           end
+           next_object = eval("#{next_object || class_name}.reflect_on_association(:#{x})").class_name
+       }
+       root_object = collect_objects.last
      else
-       root_object = @auth + "." + @nested_args[0] + "s"
+       if @nested_args[0] == @auth_identifier
+         root_object = @auth
+       else
+         root_object = @auth + "." + @nested_args[0] + "s"
+       end
      end
-
-     %>
-    <% if !@god %> @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id])
-    <% else %> @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% end %>
+ %><% if !@god &&  @nested_args[0] == @auth_identifier %>
+    @<%= @nested_args[0] %> ||= <%= root_object %> <% elsif !@god %>
+    @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% else %>
+    @<%= @nested_args[0] %> ||= <%= root_object %>.find(params[:<%=  @nested_args[0]  %>_id]) <% end %>
   end
   <% end %>
-
   <% if any_nested? %><% nest_chain = [@nested_args[0]]; this_scope = @nested_args[0] + 's'; %> <%   @nested_args[1..-1].each { |arg|
     this_scope =  "#{nest_chain.last}.#{arg}s"
     nest_chain << arg
     %>
   def <%= arg %>
     @<%= arg %> ||= <%= this_scope %>.find(params[:<%= arg %>_id])
-  end<% } %>
-
-  <% end %>
-
+  end<% } %> <% end %> <% if !@self_auth %>
 
-<% if !@self_auth %>
   def load_<%= singular_name %>
     @<%= singular_name %> = <%= object_scope.gsub("@",'') %>.find(params[:id])
   end
@@ -57,7 +58,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
 
   def load_all_<%= plural %>
+    <% if !@self_auth %>
     @<%= plural_name %> = <%= object_scope.gsub("@",'') %>.page(params[:page])
+    <% else %>
+    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id) # returns iterable even though this <%= singular_name %> is anly allowed access to themselves
+    <% end %>
   end
 
   def index
@@ -67,10 +72,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     end
   end
 
-<% if create_action %>  def new <% if ! @god %>
+<% if create_action %>  def new
+    <% if ! @god %>
     @<%= singular_name %> = <%= class_name  %>.new(<%= @object_owner_sym %>: <%= @object_owner_eval %>)
    <% else %>
-    @<%= singular_name %> = <%= class_name  %>.new
+    @<%= singular_name %> = <%= class_name  %>.new(<% if any_nested? %><%= @object_owner_sym %>: <%= @object_owner_eval %><% end %>)
    <% end %>
     respond_to do |format|
       format.html
@@ -78,8 +84,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!(<%= @object_owner_sym %>: <%= @object_owner_eval %> )<% end %> <%= @auth ? ', ' + @auth : '' %>)
-    @<%=singular_name %> = <%=class_name %>.create(modified_params)
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup<% if ! @object_owner_sym.empty? %>.merge!(<%= @object_owner_sym %>: <%= @object_owner_eval %> )<% end %> <%= @auth ? ', ' + @auth : '' %>)
+    @<%=singular_name %> = <%= class_name %>.create(modified_params)
 
     if @<%= singular_name %>.save
       flash[:notice] = "Successfully created #{@<%= singular %>.<%= display_class %>}"

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

@@ -1,8 +1,9 @@
 <div class="row">
-  <%= all_form_fields %>
+<%= all_form_fields %>
 
   <div class="<%= @layout == "hotglue" ? 'scaffold-cell' : 'col-md-2' %>">
-    <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %>
+    <\%= link_to "Cancel", <%= path_helper_plural %>,  {class: "btn btn-secondary"} %><% if @no_field_form %>
+    <\%= f.hidden_field "_________" %><% end %>
     <\%= f.submit "Save", class: "btn btn-primary pull-right" %>
   </div>
 </div>