From e816eb55a03721d8960d6fe65120a57daec5a722 Mon Sep 17 00:00:00 2001 From: Edwin Wills Date: Thu, 20 Jan 2022 14:47:31 +0000 Subject: [PATCH] Use `camelize` rather than `classify` for the namespace `classify` will singularise a namespace, that feels like unintended behaviour. E.g. if I use `--namespace=operations`, with `classify`, the generated module name is `Operation`, but I would expect this to be `Operations`. Swapping `classify` for `camelize` solves this issue. --- .../administrate/dashboard/templates/controller.rb.erb | 4 ++-- .../install/templates/application_controller.rb.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generators/administrate/dashboard/templates/controller.rb.erb b/lib/generators/administrate/dashboard/templates/controller.rb.erb index 691645aa6d..72e179024d 100644 --- a/lib/generators/administrate/dashboard/templates/controller.rb.erb +++ b/lib/generators/administrate/dashboard/templates/controller.rb.erb @@ -1,5 +1,5 @@ -module <%= namespace.to_s.classify %> - class <%= class_name.pluralize %>Controller < <%= namespace.to_s.classify %>::ApplicationController +module <%= namespace.to_s.camelize %> + class <%= class_name.pluralize %>Controller < <%= namespace.to_s.camelize %>::ApplicationController # Overwrite any of the RESTful controller actions to implement custom behavior # For example, you may want to send an email after a foo is updated. # diff --git a/lib/generators/administrate/install/templates/application_controller.rb.erb b/lib/generators/administrate/install/templates/application_controller.rb.erb index 5bca2a1507..1dea583825 100644 --- a/lib/generators/administrate/install/templates/application_controller.rb.erb +++ b/lib/generators/administrate/install/templates/application_controller.rb.erb @@ -4,7 +4,7 @@ # # If you want to add pagination or other controller-level concerns, # you're free to overwrite the RESTful controller actions. -module <%= namespace.classify %> +module <%= namespace.camelize %> class ApplicationController < Administrate::ApplicationController before_action :authenticate_admin