propel_api 0.3.1.6 → 0.3.2

data/lib/generators/propel_api/resource/resource_generator.rb

@@ -80,47 +80,11 @@ module PropelApi
     initialize_propel_api_settings
     
     if behavior == :revoke
-      # Find the migration file
-      migration_files = Dir[File.join(destination_root, "db/migrate/*_create_#{table_name}.rb")]
+      # Check for critical dependencies before destroying
+      check_for_critical_dependencies
       
-      if migration_files.any?
-        migration_file = migration_files.first
-        migration_version = File.basename(migration_file).split('_').first
-        
-        # Check if migration was executed
-        if migration_was_executed?(migration_version)
-          say "\n" + "="*80, :red
-          say "⚠️  MIGRATION ALREADY EXECUTED!", :red
-          say "="*80, :red
-          say "\n📋 Migration #{migration_version} (create_#{table_name}) has been executed.", :yellow
-          say "\n🚨 Rails does not automatically rollback migrations for safety reasons.", :yellow
-          say "\n✅ To safely destroy this resource:", :green
-          say "   1. First rollback: rails db:rollback", :green
-          say "   2. Then destroy:   rails destroy propel_api #{class_name}", :green
-          say "\n💡 Alternative approaches:", :cyan
-          say "   • Check migration status: rails db:migrate:status"
-          say "   • Rollback specific:     rails db:migrate:down VERSION=#{migration_version}"
-          say "\n" + "="*80, :red
-          raise Thor::Error, "Please rollback the migration first, then re-run destroy command."
-        else
-          # Migration not executed, check if safe to delete
-          if safe_to_delete_migration?(migration_version)
-            say "Removing migration: #{File.basename(migration_file)}", :red
-            File.delete(migration_file)
-          else
-            say "\n" + "="*80, :yellow
-            say "⚠️  MIGRATION CLEANUP REQUIRED", :yellow
-            say "="*80, :yellow
-            say "\n📋 Found unexecuted migration: #{File.basename(migration_file)}", :cyan
-            say "\n🚨 Cannot auto-delete due to intervening migrations.", :yellow
-            say "💡 Please manually remove when safe:", :green
-            say "   rm #{migration_file}"
-            say "\n" + "="*80, :yellow
-          end
-        end
-      else
-        say "No migration file found for #{table_name}", :yellow
-      end
+      # Generate proper removal migration following Rails conventions
+      generate_removal_migration
     else
       # Check for tenancy and warn if missing (unless warnings are disabled)
       check_tenancy_attributes_and_warn unless options[:skip_tenancy]
@@ -154,32 +118,49 @@ module PropelApi
       validate_attributes_exist
     end
     
-    case @adapter
-    when 'propel_facets'
-      template "scaffold/facet_model_template.rb.tt", "app/models/#{file_name}.rb"
-    when 'graphiti'
-      template "scaffold/graphiti_model_template.rb.tt", "app/models/#{file_name}.rb"
-    else
-      raise "Unknown adapter: #{@adapter}. Run 'rails generate propel_api:install' first."
+    # Note: Relationship cleanup is now handled by the comprehensive dependency auto-fix system
+    # No need for separate inverse relationship logic here
+    
+    # Direct template call - Rails can reverse this automatically (unless skipped)!
+    unless behavior == :revoke && options[:skip_model]
+      case @adapter
+      when 'propel_facets'
+        template "scaffold/facet_model_template.rb.tt", "app/models/#{file_name}.rb"
+      when 'graphiti'
+        template "scaffold/graphiti_model_template.rb.tt", "app/models/#{file_name}.rb"
+      else
+        raise "Unknown adapter: #{@adapter}. Run 'rails generate propel_api:install' first."
+      end
     end
 
-    # Apply inverse relationships to existing parent models
-    apply_inverse_relationships
+    # Apply inverse relationships AFTER template creation
+    if behavior != :revoke
+      apply_inverse_relationships
+    end
   end
 
   def create_controller
-    # Use shared method from Base class
-    create_propel_controller
+    create_propel_controller_template
   end
 
-  def create_routes
-    # Use shared method from Base class  
+  def add_routes
     create_propel_routes
   end
 
-  def create_tests
-    # Use shared method from Base class with all test types
-    create_propel_tests(test_types: [:model, :controller, :integration, :fixtures])
+  def create_model_test
+    create_propel_model_test unless behavior == :revoke && options[:skip_tests]
+  end
+
+  def create_controller_test
+    create_propel_controller_test unless behavior == :revoke && options[:skip_tests]
+  end
+
+  def create_integration_test
+    create_propel_integration_test unless behavior == :revoke && options[:skip_tests]
+  end
+
+  def create_fixtures
+    create_propel_fixtures unless behavior == :revoke && options[:skip_tests]
   end
 
   def create_seeds
@@ -288,13 +269,20 @@ module PropelApi
       next_steps << "Customize facets in: app/models/#{file_name}.rb"
     end
     
-    show_propel_completion_message(
-      resource_type: "Resource",
-      generated_files: generated_files,
-      next_steps: next_steps
-    )
+    if behavior == :revoke
+      # Use shared destroy completion message from named_base
+      show_destroy_completion_message
+    else
+      show_propel_completion_message(
+        resource_type: "Resource",
+        generated_files: generated_files,
+        next_steps: next_steps
+      )
+    end
   end
 
+
+
   private
 
   def relationship_inferrer
@@ -419,6 +407,130 @@ module PropelApi
     end
   end
 
+  def remove_inverse_relationships
+    # Use Rails model reflection - much cleaner approach!
+    begin
+      model_class = class_name.constantize
+      
+      # Get all belongs_to associations using Rails reflection
+      belongs_to_associations = model_class.reflect_on_all_associations(:belongs_to)
+      
+      belongs_to_associations.each do |association|
+        # Skip polymorphic associations (they don't get inverse relationships)
+        next if association.polymorphic?
+        
+        parent_class_name = association.class_name
+        parent_model_file = "app/models/#{parent_class_name.underscore}.rb"
+        full_path = File.join(destination_root, parent_model_file)
+        
+        # Skip if parent model doesn't exist
+        next unless File.exist?(full_path)
+        
+        # The inverse relationship we need to remove
+        inverse_relationship = "has_many :#{table_name}, dependent: :destroy"
+        
+        begin
+          remove_specific_relationship(full_path, inverse_relationship, parent_class_name)
+        rescue => e
+          say "Warning: Could not remove relationship from #{parent_model_file}: #{e.message}", :yellow
+        end
+      end
+      
+    rescue NameError => e
+      # Fallback: Parse attributes from migration file if model class doesn't exist
+      migration_attributes = get_attributes_from_migration
+      belongs_to_attributes = migration_attributes.select { |attr| attr[:type] == :references }
+      
+      belongs_to_attributes.each do |attr|
+        # Skip polymorphic references
+        next if attr[:polymorphic]
+        
+        parent_class_name = attr[:name].classify
+        parent_model_file = "app/models/#{parent_class_name.underscore}.rb"
+        full_path = File.join(destination_root, parent_model_file)
+        
+        # Skip if parent model doesn't exist
+        next unless File.exist?(full_path)
+        
+        inverse_relationship = "has_many :#{table_name}, dependent: :destroy"
+        
+        begin
+          remove_specific_relationship(full_path, inverse_relationship, parent_class_name)
+        rescue => e
+          say "Warning: Could not remove relationship from #{parent_model_file}: #{e.message}", :yellow
+        end
+      end
+    end
+  end
+
+  def get_attributes_from_migration
+    # Find the migration file (using same pattern as create_migration)
+    migration_files = Dir[File.join(destination_root, "db/migrate/*_create_#{table_name}.rb")]
+    return [] unless migration_files.any?
+    
+    migration_file = migration_files.first
+    migration_content = File.read(migration_file)
+    
+    # Parse t.references and t.string, t.text, etc. lines
+    parsed_attributes = []
+    
+    # Match references with polymorphic option
+    migration_content.scan(/t\.references\s+:(\w+).*?(polymorphic:\s*true)?/) do |name, polymorphic|
+      parsed_attributes << {
+        name: name,
+        type: :references,
+        polymorphic: !polymorphic.nil?
+      }
+    end
+    
+    # Match other attribute types
+    %w[string text integer decimal boolean datetime date json jsonb].each do |type|
+      migration_content.scan(/t\.#{type}\s+:(\w+)/) do |name|
+        parsed_attributes << {
+          name: name.first,
+          type: type.to_sym,
+          polymorphic: false
+        }
+      end
+    end
+    
+    parsed_attributes
+  end
+
+  def remove_specific_relationship(model_file_path, relationship, parent_class_name)
+    content = File.read(model_file_path)
+    original_content = content.dup
+    
+    # Remove the relationship line if it exists
+    relationship_pattern = /^\s*#{Regexp.escape(relationship)}\s*\n/
+    if content.match?(relationship_pattern)
+      content = content.gsub(relationship_pattern, '')
+      File.write(model_file_path, content)
+      say "  ❌ Removed from #{parent_class_name}: #{relationship}", :red
+    else
+      say "  ⚠️  Relationship not found in #{parent_class_name}: #{relationship}", :yellow
+    end
+  end
+
+  def remove_from_parent_model(model_file_path, relationships, parent_class_name)
+    content = File.read(model_file_path)
+    original_content = content.dup
+    
+    relationships.each do |relationship|
+      # Remove the relationship line if it exists
+      relationship_pattern = /^\s*#{Regexp.escape(relationship)}\s*\n/
+      if content.match?(relationship_pattern)
+        content = content.gsub(relationship_pattern, '')
+        say "  ❌ Removed from #{parent_class_name}: #{relationship}", :red
+      end
+    end
+    
+    # Only write if content changed
+    if content != original_content
+      File.write(model_file_path, content)
+    end
+  end
+
   def update_parent_model(model_file_path, relationships, parent_class_name)
     content = File.read(model_file_path)
     original_content = content.dup

data/lib/propel_api.rb

@@ -1,3 +1,3 @@
 module PropelApi
-  VERSION = "0.3.1.6"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propel_api
 version: !ruby/object:Gem::Version
-  version: 0.3.1.6
+  version: 0.3.2
 platform: ruby
 authors:
 - Ryan Martin, Rafael Pivato, Chi Putera
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-13 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails