hot-glue 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fbadc4071a06e16784758f6e235240633748cb4261c91fe54960311db08a24c
-  data.tar.gz: c9e8d53f5b94cf5890e4dc79648ee30e030b12c19ee9e1c70537aa2cc6a3a7a5
+  metadata.gz: afc68861e358b8c531dc375f1430773020b486019ea649e81fb428fcf1e16176
+  data.tar.gz: a1120fd066f8a36cccc5a2f909f9d7dd64e2e8bb1f2a20c4a7c8a88829b014b5
 SHA512:
-  metadata.gz: 07a355f3810b4cccbbab4c868e08e028c92ca39f363e0b7051582b7dece1c40acb5a59f0ecb284cf8c7688a5bdc122f20660a5435a21988e41820412d948c360
-  data.tar.gz: 431b04bf111bb990c5853a4b5bf9f5aaee316ec91aac833a0232ba15c2da33be41b1800aeb164d174da9431ad663ce96b63ee8f80c238e69f565fbb80152cb7e
+  metadata.gz: 0d7e6a3503778e7403af19cee81120a30a79b8463a34f6458919091d95531636f9c4251b7c0c4b25542855f718481960610d3d94d41691d0216c2ccac9b29cde
+  data.tar.gz: a5c32f698bd91486f7100b936e3eafd2333656de8bc2e1ddbcdf56351b9248aad1dd4934da8736d9c072c6bcac901af9d9043c6e9014bcd9beb3b700a28c3284

data/Gemfile.lock

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

data/README.md

@@ -623,6 +623,69 @@ You will need to build scaffolding with the same name for the related object as
 On the list view, the object you are currently building will be built with a sub-view list of the objects related from the given line.
 
 
+### `--alt-controller-name`
+
+Normally a controller a has a natural name based on the model (the Thing model produces a `ThingsController`).
+
+Within any given namespace, you can have only one natural controller for that model, of course, because all the controllers exist at the namespace directory even when they are nested.
+
+For example, let's say you have an Admin dashboard with User has_many :invoices
+
+Your routes file will nest your invoices within your users (for whatever namespace you are building)
+
+```
+namespace :admin do
+    resources :users do
+      resources :invoices 
+    end
+end
+```
+
+Therefore, your namespace can typically only view that model in one context. If that context is nested (using `--nest` exists at a nested route), it can only be used in the context of that nest (which probably requires one or more parent objects to be in the nested route of your URL).
+
+You should preserve this naming convention, and stay within those guides so your nested routes work when this object is nested within another object's view. (For the context of that or any namespace.)
+
+Alternative controller names let you specify a controller name that is nameed _something else_ but still edits the given object/table.
+
+In the example above, you'd add another top-level route in the same namespace called "all_X".
+
+For example, 
+
+**config/routes.rb**
+```
+namespace :admin do
+    resources :users do
+      resources :invoices 
+    end
+    resources :all_invoices
+end
+```
+
+Then you'd build normal nested scaffold like so: 
+
+```
+rails generate hot_glue:scaffold User --namespace=admin --gd
+
+rails generate hot_glue:scaffold Invoice --namespace=admin --nest=users --gd
+
+```
+You'd build another Invoices controller like this:
+
+```
+rails generate hot_glue:scaffold Invoice --namespace=admin --alt-controller-name=AllInvoices --gd
+```
+
+Note that all three builds here are in the `admin` namespace (so build controllers at `app/controllers/admin/`) and ALSO use Gd mode. 
+
+If you extend the example conceptually you build things like "UnpaidInvoices" or "RecentInvoices" which would, for example, build contextual views for the admin user. 
+
+The difference between the one kind of Invoices controller and the other is that, in this example, the InvoicesController (the natural one) is always nested to the user. So if you ever want to know about invoices in the context of a user, that's exactly what you use.
+
+The other one, `AllInvoicesController` or `UnpaidInvoicesController` will provide the admin a view of invoices **out of the context** of the user object. 
+
+
+
+
 
 
 ## FLAGS (Options with no values)
@@ -661,6 +724,11 @@ Omits pagination. (All list views have pagination by default.)
 
 Omits list action. Only makes sense to use this if you are create a view where you only want the create button you want to navigate to the update screen alternative ways.
 
+
+### `--no-list-labels`
+
+Omits list labels. (note that in the form the labels are rendered again anyway)
+
 ### `--no-create`
 
 Omits create action.
@@ -711,6 +779,8 @@ Obviously, the created controller will always have this base controller as its s
 
 # VERSION HISTORY
 
+#### 2022-01-11 - v0.4.5 - buttons on smarty layouts take up 1 bootstrap column each; fixes confirmation alert for delete buttons
+
 #### 2022-01-01 - v0.4.3 and 0.4.4 - adding fully email based license; no activation codes required
 
 #### 2022-12-30 - v0.4.2 -- Smart layouts introduced

data/lib/generators/hot_glue/layout/builder.rb

@@ -78,10 +78,10 @@ module HotGlue
           end
 
           # input control
-          user_layout_columns = options['include'].split(":")
+          user_layout_columns = @include_setting .split(":")
 
           if user_layout_columns.size > available_columns
-            raise "Your include statement #{options['include']}  has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
+            raise "Your include statement #{@include_setting }  has #{user_layout_columns.size} columns, but I can only construct up to #{available_columns}"
           end
           user_layout_columns.each_with_index  do |column,i|
             layout_object[:columns][:container][i] = column.split(",")

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

@@ -18,7 +18,7 @@ module  HotGlue
       small_buttons = args[0][:small_buttons]
 
       magic_buttons.collect{ |button_name|
-        "<%= 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| %>
+        "<%= 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? ), class: '#{singular}-button btn btn-primary #{"btn-sm" if small_buttons}' %>
     <% end %>"

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -69,7 +69,8 @@ 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 :no_list_labels, type: :boolean, default: false
+    class_option :alt_controller_name, type: :string, default: nil
 
     def initialize(*meta_args)
       super
@@ -140,14 +141,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
+
+
+      @alt_controller_name = options['alt_controller_name']
+      use_controller_name = @alt_controller_name || plural.titleize.gsub(" ", "")
+
+      @controller_build_name = (( @namespace.titleize + "::" if @namespace) || "") + use_controller_name + "Controller"
+      @controller_build_folder = use_controller_name.underscore
+
+      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
+
+      if @alt_controller_name
+        @controller_build_folder_singular = @controller_build_folder.gsub(/s$/,'')
+      else
+        @controller_build_folder_singular = singular
+      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
 
       @singular_class = @singular.titleize.gsub(" ", "")
       @exclude_fields = []
@@ -166,7 +187,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
 
@@ -179,13 +199,13 @@ 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"
 
+      @container_name = @layout == "hotglue" ? "scaffold-container" : "container-fluid"
       @downnest = options['downnest'] || false
 
       @downnest_children = []
@@ -243,6 +263,7 @@ module HotGlue
 
 
       @ujs_syntax = options['ujs_syntax']
+
       if !@ujs_syntax
         @ujs_syntax = !defined?(Turbo::Engine)
         puts "You did not specify ujs_syntax and so I default it to #{@ujs_syntax}"
@@ -273,23 +294,33 @@ 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
           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
+          exit_message = "*** Oops: Missing relationship from class #{singular_class} to :#{@object_owner_sym} \n
+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."
+
           if @god
-            exit_message= "*** Oops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
+            exit_message << "does #{singular_class} have a relOops: Gd mode could not find the association(#{@object_owner_sym}). Something is wrong."
           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."
+                exit_message <<  "...  your nesting chain does not have a association for #{arg}s on #{@auth_check}  something is wrong."
               end
             end
           end
-          puts exit_message
+          puts "\n" + exit_message
           raise(HotGlue::Error, exit_message)
         end
       end
@@ -369,7 +400,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)
@@ -473,10 +504,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
@@ -501,15 +529,15 @@ module HotGlue
 
     def path_helper_singular
       if @nest
-        "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
+        "#{@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"
+        "#{@namespace+"_" if @namespace}#{@controller_build_folder}_path"
       else
         "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
       end
@@ -524,19 +552,19 @@ module HotGlue
     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"
@@ -643,7 +671,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
@@ -657,7 +685,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
@@ -665,6 +693,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

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

@@ -2,30 +2,33 @@
   <div class="<%= @container_name %> scaffold-list">
     <% unless @no_list || @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
 
-    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><br /><% end %>
+    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  @controller_build_folder + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><br /><% end %>
 
-    <% unless @no_list  %>
-    <div class="row scaffold-heading-row">
-      <%= list_column_headings %>
-      <% if @downnest_children.any? %>
-        <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
-        <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width.to_s +  '%;' : "" %>
+    <% unless @no_list %>
+      <% unless @no_list_labels %>
+        <div class="row scaffold-heading-row">
+          <%= list_column_headings %>
+          <% if @downnest_children.any? %>
+            <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
+            <% downnest_column_style = @layout == "hotglue" ? 'style="flex-basis: ' + each_downnest_width.to_s +  '%;' : "" %>
 
-        <% @downnest_children.each_with_index do |downnest,i| %>
-        <div class=" scaffold-col-heading<%= " col-sm-#{ @layout_object[:portals][downnest][:size] }" if @layout=="bootstrap" %>" <%= downnest_column_style %>>
-          <strong>
-            <%=  downnest.titleize  %>
-          </strong>
-        </div>
-      <% end %>
-      <% end %>
+            <% @downnest_children.each_with_index do |downnest,i| %>
+            <div class=" scaffold-col-heading<%= " col-sm-#{ @layout_object[:portals][downnest][:size] }" if @layout=="bootstrap" %>" <%= downnest_column_style %>>
+              <strong>
+                <%=  downnest.titleize  %>
+              </strong>
+            </div>
+          <% end %>
+          <% end %>
 
-      <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
+          <% button_column_style = @layout == "hotglue" ? 'style="flex-basis: 150px' : ""  %>
 
-      <div class=' scaffold-col-heading scaffold-col-heading-buttons<%= " col-md-#{ @layout_object[:buttons][:size] }" if @layout=="bootstrap" %>' <%= button_column_style %>>
+          <div class=' scaffold-col-heading scaffold-col-heading-buttons<%= " col-md-#{ @layout_object[:buttons][:size] }" if @layout=="bootstrap" %>' <%= button_column_style %>>
+
+          </div>
+        </div>
+      <% end %>
 
-      </div>
-    </div>
       <\% if <%= plural %>.empty? %>
     <div>
         None

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

@@ -3,6 +3,6 @@
   New <%= singular.titlecase %>
   </h3>
   <\%= form_with model:  <%= singular %>, url: <%= path_helper_plural %>(<%= nested_objects_arity %>), method: "post" do  |f| %>
-    <\%=  render partial: "<%= namespace_with_slash + @plural %>/form", locals: { <%=  singular %>:  <%= singular %>, f: f} %>
+    <\%=  render partial: "<%= namespace_with_slash +  @controller_build_folder %>/form", locals: { <%=  singular %>:  <%= singular %>, f: f} %>
   <\% end %>
 <\% end %>

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails