Reorganize generators to follow Rails conventions

- Move each generator into its own subdirectory
- Update source paths to work from new locations
- Add table_name_for helper to handle namespaced models
- Fix chat_ui generator to properly handle namespaced model table names
- Place private methods in conventional location at end of class

Author: crmne

lib/generators/ruby_llm/chat_ui/chat_ui_generator.rb

@@ -38,35 +38,39 @@ def parse_model_mappings
           @model_names ||= parse_model_mappings
           @model_names[type]
         end
+
+        define_method("#{type}_table_name") do
+          table_name_for(send("#{type}_model_name"))
+        end
       end
 
       def create_views
         # Chat views
-        template 'views/chats/index.html.erb', "app/views/#{chat_model_name.tableize}/index.html.erb"
-        template 'views/chats/new.html.erb', "app/views/#{chat_model_name.tableize}/new.html.erb"
-        template 'views/chats/show.html.erb', "app/views/#{chat_model_name.tableize}/show.html.erb"
+        template 'views/chats/index.html.erb', "app/views/#{chat_table_name}/index.html.erb"
+        template 'views/chats/new.html.erb', "app/views/#{chat_table_name}/new.html.erb"
+        template 'views/chats/show.html.erb', "app/views/#{chat_table_name}/show.html.erb"
         template 'views/chats/_chat.html.erb',
-                 "app/views/#{chat_model_name.tableize}/_#{chat_model_name.underscore}.html.erb"
-        template 'views/chats/_form.html.erb', "app/views/#{chat_model_name.tableize}/_form.html.erb"
+                 "app/views/#{chat_table_name}/_#{chat_model_name.underscore}.html.erb"
+        template 'views/chats/_form.html.erb', "app/views/#{chat_table_name}/_form.html.erb"
 
         # Message views
         template 'views/messages/_message.html.erb',
-                 "app/views/#{message_model_name.tableize}/_#{message_model_name.underscore}.html.erb"
-        template 'views/messages/_form.html.erb', "app/views/#{message_model_name.tableize}/_form.html.erb"
+                 "app/views/#{message_table_name}/_#{message_model_name.underscore}.html.erb"
+        template 'views/messages/_form.html.erb', "app/views/#{message_table_name}/_form.html.erb"
         template 'views/messages/create.turbo_stream.erb',
-                 "app/views/#{message_model_name.tableize}/create.turbo_stream.erb"
+                 "app/views/#{message_table_name}/create.turbo_stream.erb"
 
         # Model views
-        template 'views/models/index.html.erb', "app/views/#{model_model_name.tableize}/index.html.erb"
-        template 'views/models/show.html.erb', "app/views/#{model_model_name.tableize}/show.html.erb"
+        template 'views/models/index.html.erb', "app/views/#{model_table_name}/index.html.erb"
+        template 'views/models/show.html.erb', "app/views/#{model_table_name}/show.html.erb"
         template 'views/models/_model.html.erb',
-                 "app/views/#{model_model_name.tableize}/_#{model_model_name.underscore}.html.erb"
+                 "app/views/#{model_table_name}/_#{model_model_name.underscore}.html.erb"
       end
 
       def create_controllers
-        template 'controllers/chats_controller.rb', "app/controllers/#{chat_model_name.tableize}_controller.rb"
-        template 'controllers/messages_controller.rb', "app/controllers/#{message_model_name.tableize}_controller.rb"
-        template 'controllers/models_controller.rb', "app/controllers/#{model_model_name.tableize}_controller.rb"
+        template 'controllers/chats_controller.rb', "app/controllers/#{chat_table_name}_controller.rb"
+        template 'controllers/messages_controller.rb', "app/controllers/#{message_table_name}_controller.rb"
+        template 'controllers/models_controller.rb', "app/controllers/#{model_table_name}_controller.rb"
       end
 
       def create_jobs
@@ -75,16 +79,16 @@ def create_jobs
 
       def add_routes
         model_routes = <<~ROUTES.strip
-          resources :#{model_model_name.tableize}, only: [:index, :show] do
+          resources :#{model_table_name}, only: [:index, :show] do
             collection do
               post :refresh
             end
           end
         ROUTES
         route model_routes
         chat_routes = <<~ROUTES.strip
-          resources :#{chat_model_name.tableize} do
-            resources :#{message_model_name.tableize}, only: [:create]
+          resources :#{chat_table_name} do
+            resources :#{message_table_name}, only: [:create]
           end
         ROUTES
         route chat_routes
@@ -107,9 +111,17 @@ def display_post_install_message
         return unless behavior == :invoke
 
         say "\n  ✅ Chat UI installed!", :green
-        say "\n  Start your server and visit http://localhost:3000/#{chat_model_name.tableize}", :cyan
+        say "\n  Start your server and visit http://localhost:3000/#{chat_table_name}", :cyan
         say "\n"
       end
+
+      private
+
+      def table_name_for(model_name)
+        # Convert namespaced model names to proper table names
+        # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
+        model_name.underscore.pluralize.tr('/', '_')
+      end
     end
   end
 end

lib/generators/ruby_llm/install_generator.rb renamed to lib/generators/ruby_llm/install/install_generator.rb

@@ -10,7 +10,7 @@ class InstallGenerator < Rails::Generators::Base
 
     namespace 'ruby_llm:install'
 
-    source_root File.expand_path('install/templates', __dir__)
+    source_root File.expand_path('templates', __dir__)
 
     argument :model_mappings, type: :array, default: [], banner: 'chat:ChatName message:MessageName ...'
 

lib/generators/ruby_llm/upgrade_to_v1_7_generator.rb renamed to lib/generators/ruby_llm/upgrade_to_v1_7/upgrade_to_v1_7_generator.rb

@@ -8,13 +8,13 @@ class UpgradeToV17Generator < Rails::Generators::Base # rubocop:disable Style/Do
     include Rails::Generators::Migration
 
     namespace 'ruby_llm:upgrade_to_v1_7'
-    source_root File.expand_path('upgrade_to_v1_7/templates', __dir__)
+    source_root File.expand_path('templates', __dir__)
 
     # Override source_paths to include install templates
     def self.source_paths
       [
-        File.expand_path('upgrade_to_v1_7/templates', __dir__),
-        File.expand_path('install/templates', __dir__)
+        File.expand_path('templates', __dir__),
+        File.expand_path('../install/templates', __dir__)
       ]
     end
 
@@ -45,12 +45,6 @@ def parse_model_mappings
       @model_names
     end
 
-    def table_name_for(model_name)
-      # Convert namespaced model names to proper table names
-      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
-      model_name.underscore.pluralize.tr('/', '_')
-    end
-
     %i[chat message tool_call model].each do |type|
       define_method("#{type}_model_name") do
         @model_names ||= parse_model_mappings
@@ -155,6 +149,12 @@ def migration_version
       "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
     end
 
+    def table_name_for(model_name)
+      # Convert namespaced model names to proper table names
+      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
+      model_name.underscore.pluralize.tr('/', '_')
+    end
+
     def table_exists?(table_name)
       ::ActiveRecord::Base.connection.table_exists?(table_name)
     rescue StandardError

spec/lib/generators/ruby_llm/install_generator_spec.rb

@@ -2,12 +2,12 @@
 
 require 'rails_helper'
 require 'fileutils'
-require 'generators/ruby_llm/install_generator'
+require 'generators/ruby_llm/install/install_generator'
 
 RSpec.describe RubyLLM::InstallGenerator, type: :generator do
   # Use the actual template directory
   let(:template_dir) { File.join(__dir__, '../../../../lib/generators/ruby_llm/install/templates') }
-  let(:generator_file) { File.join(__dir__, '../../../../lib/generators/ruby_llm/install_generator.rb') }
+  let(:generator_file) { File.join(__dir__, '../../../../lib/generators/ruby_llm/install/install_generator.rb') }
 
   describe 'migration templates' do
     let(:expected_migration_files) do