hot-glue 0.4.4 → 0.4.8.1

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -3,8 +3,8 @@ require 'ffaker'
 
 require_relative './markup_templates/base'
 require_relative './markup_templates/erb'
-require_relative './markup_templates/haml'
-require_relative './markup_templates/slim'
+# require_relative './markup_templates/haml'
+# require_relative './markup_templates/slim'
 
 require_relative './layout/builder'
 
@@ -12,6 +12,50 @@ module HotGlue
   class Error < StandardError
   end
 
+  def self.optionalized_ternary(params)
+    namespace = params[:namespace] || nil
+    target = params[:target]
+    nested_set = params[:nested_set]
+    modifier = params[:modifier] || ""
+    with_params = params[:with_params] || false
+    top_level = params[:top_level] || false
+
+    instance_sym = top_level ? "@" : ""
+
+    put_form =  params[:put_form] || false
+
+    if nested_set.nil? || nested_set.empty?
+      return modifier + "#{(namespace + '_') if namespace}#{target}_path" + (("(#{instance_sym}#{target})" if put_form) || "")
+    elsif nested_set[0][:optional] == false
+      return modifier + ((namespace + "_" if namespace) || "") + nested_set.collect{|x|
+        x[:singular] + "_"
+      }.join() + target + "_path" + (("(#{nested_set.collect{
+        |x| instance_sym + x[:singular] }.join(",")
+      }#{ put_form ? ',' + instance_sym + target : '' })" if with_params) || "")
+
+    else
+      # copy the first item, make a ternery in this cycle, and recursively move to both the
+      # is present path and the is optional path
+
+      nonoptional = nested_set[0].dup
+      nonoptional[:optional] = false
+      rest_of_nest = nested_set[1..-1]
+
+      all_params = {namespace: namespace,
+                    target: target,
+                    modifier: modifier,
+                    top_level: top_level,
+                    with_params: with_params,
+                    put_form: put_form}
+      is_present_path = HotGlue.optionalized_ternary(all_params.merge({  nested_set: [nonoptional, *rest_of_nest]})       )
+
+      is_missing_path = HotGlue.optionalized_ternary(all_params.merge({  nested_set: rest_of_nest})       )
+
+
+      return "defined?(#{instance_sym + nested_set[0][:singular]}) ? #{is_present_path} : #{is_missing_path}"
+    end
+  end
+
   def self.derrive_reference_name(thing_as_string)
     assoc_class = eval(thing_as_string)
 
@@ -41,7 +85,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 +106,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 +188,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 +234,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 +246,16 @@ 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']
 
+      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"
+      end
 
-      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
 
+      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
       @downnest = options['downnest'] || false
 
       @downnest_children = []
@@ -198,26 +270,60 @@ 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
+
+      # old syntax
       @nested_args = []
-      if !@nest.nil?
-        @nested_args = @nest.split("/")
+
+      # new syntax
+      # @nested_set = [
+      # {
+      #    singular: ...,
+      #    plural: ...,
+      #    optional: false
+      # }]
+      @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!("~","")
+          {
+            singular: arg,
+            plural: arg.pluralize,
+            optional: is_optional
+          }
+
+        }
+
+        puts "@nested_set is #{@nested_set}"
         @nested_args_plural = {}
+
+
         @nested_args.each do |a|
           @nested_args_plural[a] = a + "s"
         end
       end
-      @nestable = @nested_args.any?
-
 
       @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
 
@@ -225,27 +331,41 @@ module HotGlue
       if @auth && ! @self_auth && @nested_args.none?
         @object_owner_sym = @auth.gsub("current_", "").to_sym
         @object_owner_eval = @auth
+        @object_owner_optional = false
       else
 
         if @nested_args.any?
-          @object_owner_sym = @nested_args.last.to_sym
-          @object_owner_eval = "@#{@nested_args.last}"
+          @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_eval = ""
         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
                                             })
@@ -263,21 +383,19 @@ module HotGlue
 
         if assoc
           @ownership_field = assoc.name.to_s + "_id"
-        elsif !@nest
-          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."
+        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."
+          raise(HotGlue::Error, exit_message)
 
         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 +475,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 +579,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 +595,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,49 +603,88 @@ 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"
-      else
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
-      end
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @controller_build_folder,
+                                   nested_set: @nested_set)
+    end
+
+    def form_path_new_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @controller_build_folder,
+                                   nested_set: @nested_set,
+                                   with_params: true,
+                                   top_level: false)
+    end
+
+    def form_path_edit_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @singular,
+                                   nested_set: @nested_set,
+                                   with_params: true,
+                                   put_form: true,
+                                   top_level: true)
+    end
+
+
+    def delete_path_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @singular,
+                                   nested_set: @nested_set,
+                                   with_params: true,
+                                   put_form: true)
+    end
+
+    def edit_path_helper
+      HotGlue.optionalized_ternary(namespace: @namespace,
+                                   target: @singular,
+                                   nested_set: @nested_set,
+                                   modifier: "edit_",
+                                   with_params: true,
+                                   put_form: true)
     end
 
     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"
-      if @nested_args.any?
-        base += "(" + @nested_args.collect { |arg|
-          "#{arg}.id"
-        }.join(", ") + ")"
-      end
-      base
+
+      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
@@ -545,7 +699,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
@@ -614,10 +768,14 @@ module HotGlue
 
     def magic_button_output
       @template_builder.magic_button_output(
-        path_helper_singular: path_helper_singular,
-        path_helper_args: path_helper_args,
+        path: HotGlue.optionalized_ternary(namespace: @namespace,
+                                           target: @singular,
+                                           nested_set: @nested_set,
+                                           with_params: true,
+                                           put_form: true),
         singular: singular,
-        magic_buttons: @magic_buttons
+        magic_buttons: @magic_buttons,
+        small_buttons: @small_buttons
       )
     end
 
@@ -630,7 +788,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 +802,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 +810,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
@@ -717,19 +884,15 @@ module HotGlue
     end
 
     def all_form_fields
-      # TODO: DRY THIS
-      if !@smart_layout
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-1"
-      else
-        col_identifier = @layout == "hotglue" ? "scaffold-cell" : "col-md-2"
-      end
+      col_identifier = (@layout == "hotglue") ? "scaffold-cell" : "col-md-#{@layout_object[:columns][:size_each]}"
 
       @template_builder.all_form_fields(
         columns: @layout_object[:columns][:container],
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        col_identifier:  col_identifier
+        col_identifier:  col_identifier,
+        ownership_field: @ownership_field
       )
     end
 
@@ -758,6 +921,7 @@ module HotGlue
     end
 
     def all_line_fields
+      col_identifier = (@layout == "hotglue") ? "scaffold-cell" : "col-md-#{@layout_object[:columns][:size_each]}"
 
       @template_builder.all_line_fields(
         perc_width: column_width,
@@ -765,13 +929,14 @@ module HotGlue
         show_only: @show_only,
         singular_class: singular_class,
         singular: singular,
-        layout: @layout
+        layout: @layout,
+        col_identifier: col_identifier
       )
     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 +990,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
@@ -858,10 +1023,10 @@ module HotGlue
 
 
     def nested_for_turbo_id_list_constructor
-      if @nested_args.none?
-        ""
+      if @nested_set.any?
+        '+ (((\'__\' + nested_for) if defined?(nested_for)) || "")'
       else
-        "+ ('__' + nested_for)"
+        ""
       end
     end
 
@@ -869,9 +1034,11 @@ module HotGlue
       instance_symbol = "@" if top_level
       instance_symbol = "" if !top_level
       if @nested_args.none?
-        ""
+        "\"\""
       else
-        "__" + @nested_args.collect{|a| "#{a}-" + '#{' + instance_symbol + a + '.id}'}.join("__")
+        @nested_set.collect{|arg|
+          "(((\"__#{arg[:singular]}-\#{" + "@" + arg[:singular] + ".id}\") if @" + arg[:singular] + ") || \"\")"
+        }.join(" + ")
       end
     end