propel_api 0.1.4 → 0.2.0

data/lib/generators/propel_api/templates/tests/model_test_template.rb.tt

@@ -5,9 +5,18 @@ require "test_helper"
 class <%= class_name %>Test < ActiveSupport::TestCase
   
   def setup
-    @organization = organizations(:one)
-    @user = users(:one)
+    @organization = organizations(:acme_org)
+    @user = users(:john_user)
+    @agency = agencies(:marketing_agency)
+<% if singular_table_name == 'organization' -%>
+    @<%= singular_table_name %> = <%= table_name %>(:acme_org)
+<% elsif singular_table_name == 'user' -%>
+    @<%= singular_table_name %> = <%= table_name %>(:john_user)
+<% elsif singular_table_name == 'agency' -%>
+    @<%= singular_table_name %> = <%= table_name %>(:marketing_agency)
+<% else -%>
     @<%= singular_table_name %> = <%= table_name %>(:one)
+<% end -%>
   end
 
   # === ASSOCIATION TESTS ===
@@ -158,16 +167,25 @@ class <%= class_name %>Test < ActiveSupport::TestCase
 <% end -%>
   end
   
+<%
+  # Only generate test when model has large content fields that should be excluded from short facet
+  large_content_attributes = attributes.select { |attr| 
+    attr.name.to_s.match?(/\A(description|content|body|notes|comment|bio|about|summary|text|html|markdown)\z/i) 
+  }
+-%>
+<% if large_content_attributes.any? -%>
   test "short facet should not include large content fields" do
     short_json = @<%= singular_table_name %>.as_json(facet: :short)
     
-    # Should not include large content fields in short facet
-<% attributes.each do |attribute| -%>
-<% if attribute.name.to_s.match?(/\A(description|content|body|notes|comment|bio|about|summary)\z/i) -%>
-    assert_not_includes short_json.keys, '<%= attribute.name %>', "Short facet should not include <%= attribute.name %>"
-<% end -%>
+    # Short facets should exclude large content fields for performance and API efficiency
+<% large_content_attributes.each do |attribute| -%>
+    assert_not_includes short_json.keys, '<%= attribute.name %>', "Short facet should not include <%= attribute.name %> (large content field)"
 <% end -%>
+    
+    # Verify short facet still includes essential fields
+    assert_includes short_json.keys, 'id', "Short facet should always include ID field"
   end
+<% end -%>
 
   # === BUSINESS LOGIC TESTS ===
   

data/lib/generators/propel_api/unpack/unpack_generator.rb

@@ -16,7 +16,7 @@
 #
 module PropelApi
   class UnpackGenerator < Rails::Generators::Base
-    source_root File.expand_path("../../templates", __dir__)
+    source_root File.expand_path("../templates", __dir__)
     
     desc "Extract PropelApi generator code from gem to lib/generators/propel_api/ for full customization"
 
@@ -98,7 +98,7 @@ module PropelApi
       if options[:controllers_only]
         return %w[controllers]
       elsif options[:scaffolds_only]
-        return %w[scaffolds]
+        return %w[scaffold]
       elsif options[:tests_only]
         return %w[tests]
       elsif options[:seeds_only]
@@ -108,10 +108,10 @@ module PropelApi
       elsif options[:generator_only]
         return %w[generator_logic]
       elsif options[:templates_only]
-        return %w[controllers scaffolds tests seeds config]
+        return %w[controllers scaffold tests seeds config]
       else
         # Default: everything including generator logic
-        return %w[controllers scaffolds tests seeds config generator_logic]
+        return %w[controllers scaffold tests seeds config generator_logic]
       end
     end
 
@@ -127,7 +127,7 @@ module PropelApi
       case component
       when 'controllers'
         copy_controller_templates(destination_path)
-      when 'scaffolds'
+      when 'scaffold'
         copy_scaffold_templates(destination_path)
       when 'tests'
         copy_test_templates(destination_path)
@@ -185,48 +185,66 @@ module PropelApi
     def copy_generator_logic(destination_path)
       say "📂 Extracting generator logic code...", :blue
       
-      # Copy the main generator files with proper Rails registration
+      # Map of source files to destination paths (relative to the generator base directory)
       generator_files = {
-        'install_generator.rb' => 'install_generator.rb',
-        'propel_api_generator.rb' => 'propel_api_generator.rb', 
-        'relationship_inferrer.rb' => 'relationship_inferrer.rb'
+        'install/install_generator.rb' => 'install_generator.rb',
+        'controller/controller_generator.rb' => 'controller_generator.rb',
+        'resource/resource_generator.rb' => 'resource_generator.rb',
+        'core/base.rb' => 'core/base.rb',
+        'core/configuration_methods.rb' => 'core/configuration_methods.rb',
+        'core/named_base.rb' => 'core/named_base.rb',
+        'core/path_generation_methods.rb' => 'core/path_generation_methods.rb',
+        'core/relationship_inferrer.rb' => 'core/relationship_inferrer.rb'
       }
       
       copied_count = 0
-      generator_files.each do |source_name, dest_name|
-        source_file = File.join(File.dirname(__dir__), source_name)
-        dest_file = File.join(destination_path, dest_name)
+      generator_base_dir = File.dirname(__dir__)  # Points to propel_api/lib/generators/propel_api/
+      
+      generator_files.each do |source_path, dest_path|
+        source_file = File.join(generator_base_dir, source_path)
+        dest_file = File.join(destination_path, dest_path)
         
         if File.exist?(source_file)
-          if source_name == 'install_generator.rb'
+          # Ensure destination directory exists
+          FileUtils.mkdir_p(File.dirname(dest_file))
+          
+          if source_path == 'install/install_generator.rb'
             # Copy install generator with proper Rails namespace for host app
             source_content = File.read(source_file)
             
             # Ensure proper module structure for Rails generator registration
             modified_content = source_content.gsub(
-              /^class PropelApi::InstallGenerator/,
+              /^module PropelApi\s*\n\s*class InstallGenerator/,
               "module PropelApi\n  class InstallGenerator"
             )
             
-            # Add module end if we added module start
-            if modified_content != source_content
-              modified_content += "\nend" unless modified_content.end_with?("end\n") || modified_content.end_with?("end")
+            # Also handle the case where it's already a class without module wrapper
+            if !modified_content.include?("module PropelApi")
+              modified_content = modified_content.gsub(
+                /^class PropelApi::InstallGenerator/,
+                "module PropelApi\n  class InstallGenerator"
+              )
+              
+              # Add module end if we added module start
+              if !modified_content.end_with?("end\n") && !modified_content.end_with?("end")
+                modified_content += "\nend"
+              end
             end
             
-            FileUtils.mkdir_p(File.dirname(dest_file))
             File.write(dest_file, modified_content)
           else
             # Copy other files normally
-          FileUtils.cp(source_file, dest_file)
+            FileUtils.cp(source_file, dest_file)
           end
           copied_count += 1
+          say "   ✅ #{source_path} → #{dest_path}", :cyan
         else
-          say "   ⚠️  Generator file not found: #{source_name}", :yellow
+          say "   ⚠️  Generator file not found: #{source_path}", :yellow
         end
       end
       
       if copied_count > 0
-        say "   ✅ Generator logic code extracted with proper Rails registration (#{copied_count} files)", :green
+        say "   ✅ Generator logic extracted (#{copied_count} files)", :green
       else
         say "   ⚠️  No generator logic files found", :yellow
       end
@@ -267,13 +285,15 @@ module PropelApi
       
       say "🔧 GENERATOR customization guide:", :bold
       say "   ⚙️  Install generator: #{destination_path}/install_generator.rb"
-      say "   🏗️  Main generator: #{destination_path}/propel_api_generator.rb"
-      say "   🔗 Relationship logic: #{destination_path}/relationship_inferrer.rb"
-      say "   🎮 Controller templates: #{destination_path}/templates/controllers/"
-      say "   🚀 Scaffold templates: #{destination_path}/templates/scaffold/"
-      say "   �� Test templates: #{destination_path}/templates/tests/"
-      say "   🌱 Seed templates: #{destination_path}/templates/seeds/"
-      say "   ⚙️  Config templates: #{destination_path}/templates/config/"
+      say "   🎮 Controller generator: #{destination_path}/controller_generator.rb"
+      say "   🏗️  Resource generator: #{destination_path}/resource_generator.rb"
+      say "   🔗 Core logic: #{destination_path}/core/"
+      say "   📋 Templates: #{destination_path}/templates/"
+      say "      🎮 Controllers: #{destination_path}/templates/controllers/"
+      say "      🚀 Scaffold: #{destination_path}/templates/scaffold/"
+      say "      🧪 Tests: #{destination_path}/templates/tests/"
+      say "      🌱 Seeds: #{destination_path}/templates/seeds/"
+      say "      ⚙️  Config: #{destination_path}/templates/config/"
       say ""
       
       say "⚠️  Important: You now have a LOCAL GENERATOR, not gem generator:", :yellow
@@ -286,7 +306,8 @@ module PropelApi
       say "💡 Test your customized generator:", :blue
       say "   # Your local generator will be used instead of the gem:"
       say "   rails generate propel_api:install"
-      say "   rails generate propel_api User name:string email:string"
+      say "   rails generate propel_api:controller User"
+      say "   rails generate propel_api:resource User name:string email:string"
       say ""
       
       say "🔄 To use gem generator again:", :cyan
@@ -297,7 +318,8 @@ module PropelApi
       say "   • Modify API controller templates for your organization's standards"
       say "   • Customize scaffold generation logic and output"
       say "   • Add new serialization adapters beyond propel_facets/graphiti"
-      say "   • Change relationship inference rules in relationship_inferrer.rb"
+      say "   • Change relationship inference rules in core/relationship_inferrer.rb"
+      say "   • Modify controller and resource generation logic"
       say "   • Create company-specific API patterns and conventions"
     end
   end

data/lib/propel_api.rb

@@ -1,3 +1,3 @@
 module PropelApi
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

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