balaclava 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 927fc1691b7cc79944f1cbd4f9c73c451daa7604054c4269e7f3448f43e8e823
-  data.tar.gz: 8341d445e3b5e7c49ea79cdd5fa68c19b1bbfd96df0293c71f45b8d7794d394f
+  metadata.gz: 615a1a59eb68a74aebbc7149a5031fcb484a028fd3f0ad6484656ba4b27f2d28
+  data.tar.gz: 6418767ed946a5bfcd6ac90b75e96e063fa1aa203a2a284570fb19a5612eeb22
 SHA512:
-  metadata.gz: fc3f635b1e407d538cd506fabb00e521d52f0eb9b9e9de67beaf05fd28d68c9e17a7bbd18b1bee0ecbff849985584db5b1d26aa10afcecbcf7bb75960869a0f8
-  data.tar.gz: ea523bacf09065e621cbd42eb4bb32f6bf790910354a82ced3e7f1c3c18f6c841ac0e1b208e075c0eb186941765cedc0763c90c7bfc81a9ec17ad614452db128
+  metadata.gz: 4fc67434b1f8d510735819dc4bfbe850043444c45d018df9b9f3e0b1f1f339754de2f3675c08e3a437ffe766ee71f69d5e859ec8101b3aa7f90899cb0e926eb1
+  data.tar.gz: 31f3c1771641fa2c01eb699efd427d785b1b4d6d0b722853e863d2c3eb69c5e8b0205756f3d15ff9200882338fd0a3050271a490154dae1afe25f8eaafb0a70d

data/lib/balaclava/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Balaclava
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/generators/balaclava/install_generator.rb

@@ -1,47 +1,61 @@
-require 'rails/generators/active_record'
-require 'rails/generators/named_base'
 require 'rails/generators/base'
 require 'thor/shell'
 
 module Balaclava
   module Generators
-    # InstallGenerator sets up Balaclava within a Rails application by generating
-    # necessary configuration files, models, migrations, and mailers.
-    class InstallGenerator < Rails::Generators::NamedBase
+    class InstallGenerator < Rails::Generators::Base
       include Thor::Shell
+
       source_root File.expand_path('templates', __dir__)
 
       desc "Generates Balaclava configuration files, models, and migrations."
 
-      # Prompts the user for the model name and sets a default if blank.
+      def install
+        ensure_active_record_loaded
+        ask_for_user_model_name
+        create_initializer_file
+        create_model_file
+        create_migration
+        create_mailer
+      end
+
+      private
+
+      # Ensures ActiveRecord is loaded before proceeding with generator tasks.
+      def ensure_active_record_loaded
+        unless defined?(ActiveRecord)
+          require 'active_record'
+        end
+        puts "ActiveRecord loaded: #{defined?(ActiveRecord)}"
+      end
+
       def ask_for_user_model_name
-        @user_model_name = ask("What is the name of your user model? [Default: User]") || 'User'
-        @user_model_name = 'User' if @user_model_name.blank?
+        answer = ask("What is the name of your user model? [Leave blank for Default: User]")
+        @user_model_name = answer.blank? ? 'User' : answer
       end
 
-      # Creates an initializer file for Balaclava.
       def create_initializer_file
         template 'initializer.rb', 'config/initializers/balaclava.rb'
       end
 
-      # Generates a model file within the application's models directory.
       def create_model_file
-        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+        @class_name = @user_model_name.camelize  # Convert the model name to CamelCase
+        template 'model.rb', File.join('app/models', "#{@user_model_name.underscore}.rb")
       end
 
-      # Creates a migration file for Balaclava users.
       def create_migration
-        migration_template 'migration.rb', 'db/migrate/create_balaclava_users.rb', migration_version: migration_version
+        timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
+        @migration_filename = "#{timestamp}_create_#{ @user_model_name.underscore.pluralize}.rb"
+        @table_name = @user_model_name.underscore.pluralize
+        @migration_class_name = "Create#{ @user_model_name.camelize.pluralize}"
+
+        template 'migration.rb', File.join('db/migrate', @migration_filename)
       end
 
-      # Generates a mailer file for Balaclava.
       def create_mailer
         template 'mailer.rb', 'app/mailers/balaclava_mailer.rb'
       end
 
-      private
-
-      # Determines the Rails migration version syntax based on the Rails version.
       def migration_version
         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
       end

data/lib/generators/balaclava/templates/migration.rb

@@ -1,12 +1,10 @@
-# db/migrate/<%= migration_timestamp %>_create_balaclava_users.rb
-
-class CreateBalaclavaUsers < ActiveRecord::Migration<%= migration_version %>
+class <%= @migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :balaclava_users do |t|
+    create_table :<%= @table_name %> do |t|
       t.string :email
       t.timestamps
     end
 
-    add_index :balaclava_users, :email, unique: true
+    add_index :<%= @table_name %>, :email, unique: true
   end
 end

data/lib/generators/balaclava/templates/model.rb

@@ -1,3 +1,3 @@
-class <%= class_name %> < ApplicationRecord
+class <%= @class_name %> < ApplicationRecord
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balaclava
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sante
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail