propel_api 0.2.1 → 0.3.1

data/lib/generators/propel_api/templates/tests/fixtures_template.yml.tt

@@ -1,8 +1,29 @@
 # Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
+<% # Handle polymorphic associations first -%>
+<% polymorphic_associations.each do |poly_assoc| -%>
+<% parent_info = polymorphic_parent_for_fixture(poly_assoc[:field_name], 0) -%>
+  <%= poly_assoc[:field_name] %>: <%= parent_info[:fixture_name] %> (<%= parent_info[:parent_type] %>)
+<% end -%>
+<% # Handle regular references (excluding polymorphic ones) -%>
+<% polymorphic_field_names = polymorphic_associations.map { |assoc| assoc[:field_name].to_s } -%>
 <% attributes.each do |attribute| -%>
-<% if attribute.type == :references -%>
+<% # Skip polymorphic references - check both Rails detection and our field names -%>
+<% is_polymorphic = (attribute.respond_to?(:polymorphic?) && attribute.polymorphic?) || polymorphic_field_names.include?(attribute.name.to_s) -%>
+<% if attribute.type == :references && !is_polymorphic -%>
+<% if attribute.name == 'organization' -%>
+  <%= attribute.name %>: acme_org
+<% elsif attribute.name == 'user' -%>
+  <%= attribute.name %>: john_user
+<% elsif attribute.name == 'agency' -%>
+  <%= attribute.name %>: marketing_agency
+<% else -%>
+  <%= attribute.name %>: one
+<% end -%>
+<% elsif attribute.type == :references && is_polymorphic -%>
+<% # Polymorphic references are handled above, skip them here -%>
+<% elsif attribute.type == :string -%>
 <% if attribute.name == 'organization' -%>
   <%= attribute.name %>: acme_org
 <% elsif attribute.name == 'user' -%>
@@ -19,7 +40,7 @@ one:
   <%= attribute.name %>: test_user_1
 <% elsif attribute.name.to_s.match?(/\A(phone|phone_number)\z/i) -%>
   <%= attribute.name %>: "+1-555-0001"
-<% elsif attribute.name.to_s.match?(/\A(url|website|web_address)\z/i) -%>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
   <%= attribute.name %>: "https://example1.com"
 <% elsif attribute.name.to_s.match?(/\A(name|title|label)\z/i) -%>
   <%= attribute.name %>: "Test <%= attribute.name.humanize %> One"
@@ -80,11 +101,11 @@ one:
   <%= attribute.name %>: "2024-06-15 10:30:00"
 <% elsif attribute.type == :time -%>
   <%= attribute.name %>: "10:30:00"
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-  <%= attribute.name %>: { fixture_meta: "test_one", environment: "test", record_type: "<%= singular_table_name %>" }
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+  <%= attribute.name %>: { resource_type: "<%= singular_table_name %>", category: "test", tags: ["fixture", "one"], attributes: { priority: "high", status_info: { verified: true, active: true } } }
 <% elsif attribute.name == 'settings' -%>
-  <%= attribute.name %>: { dark_mode: false, money_format: "usd", language: "en", test_mode: true }
+  <%= attribute.name %>: { ui_preferences: { theme: "light", language: "en", notifications: { email: true, sms: false, push: true } }, feature_flags: { beta_features: false, analytics: true } }
 <% else -%>
   <%= attribute.name %>: { test_data: "fixture_one" }
 <% end -%>
@@ -94,8 +115,17 @@ one:
 <% end -%>
 
 two:
+<% # Handle polymorphic associations first -%>
+<% polymorphic_associations.each do |poly_assoc| -%>
+<% parent_info = polymorphic_parent_for_fixture(poly_assoc[:field_name], 1) -%>
+  <%= poly_assoc[:field_name] %>: <%= parent_info[:fixture_name] %> (<%= parent_info[:parent_type] %>)
+<% end -%>
+<% # Handle regular references (excluding polymorphic ones) -%>
+<% polymorphic_field_names = polymorphic_associations.map { |assoc| assoc[:field_name].to_s } -%>
 <% attributes.each do |attribute| -%>
-<% if attribute.type == :references -%>
+<% # Skip polymorphic references - check both Rails detection and our field names -%>
+<% is_polymorphic = (attribute.respond_to?(:polymorphic?) && attribute.polymorphic?) || polymorphic_field_names.include?(attribute.name.to_s) -%>
+<% if attribute.type == :references && !is_polymorphic -%>
 <% if attribute.name == 'organization' -%>
   <%= attribute.name %>: tech_startup
 <% elsif attribute.name == 'user' -%>
@@ -105,6 +135,8 @@ two:
 <% else -%>
   <%= attribute.name %>: one
 <% end -%>
+<% elsif attribute.type == :references && is_polymorphic -%>
+<% # Polymorphic references are handled above, skip them here -%>
 <% elsif attribute.type == :string -%>
 <% if attribute.name.to_s.match?(/\A(email|email_address)\z/i) -%>
   <%= attribute.name %>: test2@example.com
@@ -112,7 +144,7 @@ two:
   <%= attribute.name %>: test_user_2
 <% elsif attribute.name.to_s.match?(/\A(phone|phone_number)\z/i) -%>
   <%= attribute.name %>: "+1-555-0002"
-<% elsif attribute.name.to_s.match?(/\A(url|website|web_address)\z/i) -%>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
   <%= attribute.name %>: "https://example2.com"
 <% elsif attribute.name.to_s.match?(/\A(name|title|label)\z/i) -%>
   <%= attribute.name %>: "Test <%= attribute.name.humanize %> Two"
@@ -173,11 +205,11 @@ two:
   <%= attribute.name %>: "2023-12-25 15:45:00"
 <% elsif attribute.type == :time -%>
   <%= attribute.name %>: "15:45:00"
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-  <%= attribute.name %>: { fixture_meta: "test_two", environment: "test", record_type: "<%= singular_table_name %>" }
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+  <%= attribute.name %>: { resource_type: "<%= singular_table_name %>", category: "premium", tags: ["fixture", "two"], attributes: { priority: "medium", status_info: { verified: false, active: true } } }
 <% elsif attribute.name == 'settings' -%>
-  <%= attribute.name %>: { dark_mode: true, money_format: "eur", language: "fr", test_mode: true }
+  <%= attribute.name %>: { ui_preferences: { theme: "dark", language: "fr", notifications: { email: true, sms: true, push: false } }, feature_flags: { beta_features: true, analytics: false } }
 <% else -%>
   <%= attribute.name %>: { test_data: "fixture_two" }
 <% end -%>
@@ -187,8 +219,17 @@ two:
 <% end -%>
 
 three:
+<% # Handle polymorphic associations first -%>
+<% polymorphic_associations.each do |poly_assoc| -%>
+<% parent_info = polymorphic_parent_for_fixture(poly_assoc[:field_name], 2) -%>
+  <%= poly_assoc[:field_name] %>: <%= parent_info[:fixture_name] %> (<%= parent_info[:parent_type] %>)
+<% end -%>
+<% # Handle regular references (excluding polymorphic ones) -%>
+<% polymorphic_field_names = polymorphic_associations.map { |assoc| assoc[:field_name].to_s } -%>
 <% attributes.each do |attribute| -%>
-<% if attribute.type == :references -%>
+<% # Skip polymorphic references - check both Rails detection and our field names -%>
+<% is_polymorphic = (attribute.respond_to?(:polymorphic?) && attribute.polymorphic?) || polymorphic_field_names.include?(attribute.name.to_s) -%>
+<% if attribute.type == :references && !is_polymorphic -%>
 <% if attribute.name == 'organization' -%>
   <%= attribute.name %>: acme_org
 <% elsif attribute.name == 'user' -%>
@@ -198,6 +239,8 @@ three:
 <% else -%>
   <%= attribute.name %>: one
 <% end -%>
+<% elsif attribute.type == :references && is_polymorphic -%>
+<% # Polymorphic references are handled above, skip them here -%>
 <% elsif attribute.type == :string -%>
 <% if attribute.name.to_s.match?(/\A(email|email_address)\z/i) -%>
   <%= attribute.name %>: test3@example.com
@@ -205,7 +248,7 @@ three:
   <%= attribute.name %>: test_user_3
 <% elsif attribute.name.to_s.match?(/\A(phone|phone_number)\z/i) -%>
   <%= attribute.name %>: "+1-555-0003"
-<% elsif attribute.name.to_s.match?(/\A(url|website|web_address)\z/i) -%>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
   <%= attribute.name %>: "https://example3.com"
 <% elsif attribute.name.to_s.match?(/\A(name|title|label)\z/i) -%>
   <%= attribute.name %>: "Test <%= attribute.name.humanize %> Three"
@@ -266,11 +309,11 @@ three:
   <%= attribute.name %>: "2025-03-10 08:15:00"
 <% elsif attribute.type == :time -%>
   <%= attribute.name %>: "08:15:00"
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-  <%= attribute.name %>: { fixture_meta: "test_three", environment: "test", record_type: "<%= singular_table_name %>" }
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+  <%= attribute.name %>: { resource_type: "<%= singular_table_name %>", category: "basic", tags: ["fixture", "three"], attributes: { priority: "low", status_info: { verified: true, active: false } } }
 <% elsif attribute.name == 'settings' -%>
-  <%= attribute.name %>: { dark_mode: true, money_format: "gbp", language: "es", test_mode: true }
+  <%= attribute.name %>: { ui_preferences: { theme: "auto", language: "es", notifications: { email: false, sms: true, push: true } }, feature_flags: { beta_features: false, analytics: true } }
 <% else -%>
   <%= attribute.name %>: { test_data: "fixture_three" }
 <% end -%>

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

@@ -2,12 +2,28 @@
 
 require "test_helper"
 
+<%
+  # Check attributes directly instead of database columns (more reliable during generation)
+  has_agency_id = attributes.any? { |attr| attr.name == 'agency' && attr.type == :references }
+  has_user_id = attributes.any? { |attr| attr.name == 'user' && attr.type == :references }
+-%>
+
 class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
   
   def setup
     @organization = organizations(:acme_org)
     @user = users(:john_user)
     @agency = agencies(:marketing_agency)
+<% polymorphic_associations.each do |assoc| -%>
+<% assoc[:parent_types].each_with_index do |parent_type, index| -%>
+<% if index == 0 -%>
+    @<%= parent_type.underscore %> = <%= parent_type.underscore.pluralize %>(<%= case parent_type.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+    @<%= assoc[:field_name] %> = @<%= parent_type.underscore %>  # Default polymorphic parent for tests
+<% else -%>
+    @<%= parent_type.underscore %> = <%= parent_type.underscore.pluralize %>(<%= case parent_type.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+<% end -%>
+<% end -%>
+<% end -%>
 <% if singular_table_name == 'organization' -%>
     @<%= singular_table_name %> = <%= table_name %>(:acme_org)
 <% elsif singular_table_name == 'user' -%>
@@ -16,12 +32,27 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     @<%= singular_table_name %> = <%= table_name %>(:marketing_agency)
 <% else -%>
     @<%= singular_table_name %> = <%= table_name %>(:one)
+<% end -%>
+<% if has_user_reference? -%>
+    @user = users(:john_user)
+<% end -%>
+<% # Set up polymorphic associations using --parents specification -%>
+<% polymorphic_associations.each do |assoc| -%>
+<% if assoc[:parent_types] && assoc[:parent_types].any? -%>
+<% first_parent = assoc[:parent_types].first -%>
+    # Set up polymorphic association for <%= assoc[:field_name] %> using specified parents
+    @<%= first_parent.underscore %> = <%= first_parent.underscore.pluralize %>(<%= case first_parent.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+    @<%= assoc[:field_name] %> = @<%= first_parent.underscore %>  # Use first specified parent type
+<% assoc[:parent_types][1..-1].each do |parent_type| -%>
+    @<%= parent_type.underscore %> = <%= parent_type.underscore.pluralize %>(<%= case parent_type.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+<% end -%>
+<% end -%>
 <% end -%>
     @token = @user.generate_jwt_token
     @auth_headers = { 'Authorization' => "Bearer #{@token}" }
     
     # Ensure test <%= singular_table_name %> belongs to test user's organization
-<% unless singular_table_name == 'organization' -%>
+<% if has_organization_reference? -%>
     @<%= singular_table_name %>.update!(organization: @organization)
 <% end -%>
   end
@@ -45,12 +76,21 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
 
 <% attributes.each_with_index do |attribute, index| -%>
 <% if attribute.type == :references -%>
+<% if attribute.respond_to?(:polymorphic?) && attribute.polymorphic? -%>
+      <%= attribute.name %>_id: @<%= attribute.name %>.id,
+      <%= attribute.name %>_type: @<%= attribute.name %>.class.name<%= ',' if index < attributes.length - 1 %>
+<% else -%>
       <%= attribute.name %>_id: @<%= attribute.name %>.id<%= ',' if index < attributes.length - 1 %>
+<% end -%>
 <% elsif attribute.type == :string && !reference_names.include?(attribute.name) -%>
 <% if attribute.name.to_s.match?(/email/) -%>
       <%= attribute.name %>: "workflow@example.com"<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name.to_s.match?(/password/) -%>
       <%= attribute.name %>: "password123"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
+      <%= attribute.name %>: "https://workflow.example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.end_with?('_type') -%>
+      <%= attribute.name %>: @<%= attribute.name.gsub('_type', '') %>.class.name<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: "Workflow Test <%= attribute.name.humanize %>"<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -64,11 +104,18 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
       <%= attribute.name %>: 100.50<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.type == :datetime -%>
       <%= attribute.name %>: Time.current<%= ',' if index < attributes.length - 1 %>
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-      <%= attribute.name %>: { workflow_test_meta: "test_value", created_by: "integration_test", test_run_id: <%= rand(1000..9999) %> }<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+      <%= attribute.name %>: { resource_type: "<%= singular_table_name %>", category: "test", tags: ["integration", "auto_generated"], attributes: { priority: "medium", status_info: { verified: true, active: true } } }<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name == 'settings' -%>
-      <%= attribute.name %>: { dark_mode: true, money_format: "usd", language: "en", timezone: "UTC", notifications: { email: true, sms: false } }<%= ',' if index < attributes.length - 1 %>
+      <%= attribute.name %>: { 
+        ui_preferences: { 
+          theme: "dark", 
+          language: "en", 
+          notifications: { email: true, sms: false, push: true } 
+        }, 
+        feature_flags: { beta_features: false, analytics: true } 
+      }<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: {}<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -103,7 +150,7 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     
     # Verify created <%= singular_table_name %> data
     assert_equal @organization.id, created_<%= singular_table_name %>['organization']['id']
-<% unless singular_table_name == 'user' -%>
+<% if has_user_id && singular_table_name != 'user' -%>
     assert_equal @user.id, created_<%= singular_table_name %>['user']['id']
 <% end -%>
 <% attributes.each do |attribute| -%>
@@ -131,17 +178,28 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     if created_<%= singular_table_name %>['<%= attribute.name %>'].present?
       assert_match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/, created_<%= singular_table_name %>['<%= attribute.name %>'], "<%= attribute.name %> should be ISO timestamp format")
     end
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-    # Meta field should be a hash with test metadata
-    assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>'], "Meta should be a JSON object"
-    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "workflow_test_meta", "Meta should contain test metadata"
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+    # Metadata field should be a hash with generic structure
+    assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>'], "Metadata should be a JSON object"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "resource_type", "Metadata should contain resource_type"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "category", "Metadata should contain category"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "tags", "Metadata should contain tags array"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "attributes", "Metadata should contain attributes object"
+    assert_kind_of Array, created_<%= singular_table_name %>['<%= attribute.name %>']['tags'], "Tags should be an array"
+    assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>']['attributes'], "Attributes should be a hash"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>']['attributes'].keys, "priority", "Attributes should contain priority"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>']['attributes'].keys, "status_info", "Attributes should contain status_info"
 <% elsif attribute.name == 'settings' -%>
-    # Settings field should be a hash with user preferences 
+    # Settings field should be a hash with generic structure
     assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>'], "Settings should be a JSON object"
-    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "dark_mode", "Settings should contain UI preferences"
-    # Rails conventionally serializes booleans in JSON as strings  
-    assert_equal "true", created_<%= singular_table_name %>['<%= attribute.name %>']['dark_mode'], "Dark mode should be enabled in test settings"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "ui_preferences", "Settings should contain ui_preferences"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>'].keys, "feature_flags", "Settings should contain feature_flags"
+    assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>']['ui_preferences'], "UI preferences should be a hash"
+    assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>']['feature_flags'], "Feature flags should be a hash"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>']['ui_preferences'].keys, "theme", "UI preferences should contain theme"
+    assert_includes created_<%= singular_table_name %>['<%= attribute.name %>']['ui_preferences'].keys, "notifications", "UI preferences should contain notifications"
+    assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>']['ui_preferences']['notifications'], "Notifications should be a hash"
 <% else -%>
     assert_kind_of Hash, created_<%= singular_table_name %>['<%= attribute.name %>'], "<%= attribute.name %> should be a JSON object"
 <% end -%>
@@ -271,6 +329,10 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
         <%= attribute.name %>: "pagination#{i}@example.com"<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name.include?('email') -%>
         <%= attribute.name %>: "pagination#{i}@example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
+        <%= attribute.name %>: "https://pagination#{i}.example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.end_with?('_type') -%>
+        <%= attribute.name %>: @<%= attribute.name.gsub('_type', '') %>.class.name<%= ',' if index < attributes.length - 1 %>
 <% else -%>
         <%= attribute.name %>: "Pagination Test <%= attribute.name.humanize %> #{i}"<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -356,11 +418,6 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     # Test 4: Tenancy context behavior based on configuration
     require_org_id = PropelAuthentication.configuration.require_organization_id
     require_user_id = PropelAuthentication.configuration.require_user_id
-<%
-  # Check attributes directly instead of database columns (more reliable during generation)
-  has_agency_id = attributes.any? { |attr| attr.name == 'agency' && attr.type == :references }
-  has_user_id = attributes.any? { |attr| attr.name == 'user' && attr.type == :references }
--%>
     
 <% if has_agency_id -%>
     # Model with agency - provide agency_id but test missing organization_id 
@@ -368,7 +425,7 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     unique_id = "#{Time.current.to_i}_#{SecureRandom.hex(6)}"
     test_params = { email_address: "tenancy_test_#{unique_id}@example.com", username: "tenancy_test_#{unique_id}", password: "password123", agency_id: @agency.id }
 <% else -%>
-    test_params = { title: "Test <%= class_name %>", agency_id: @agency.id }
+    test_params = { title: "Test <%= class_name %>", agency_id: @agency.id<% polymorphic_associations.each do |assoc| -%>, <%= assoc[:field_name] %>_id: @<%= assoc[:field_name] %>.id, <%= assoc[:field_name] %>_type: @<%= assoc[:field_name] %>.class.name<% end -%> }
 <% end -%>
 <% else -%>
     # Model without agency - test missing organization_id only  
@@ -376,7 +433,7 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     unique_id = "#{Time.current.to_i}_#{SecureRandom.hex(6)}"
     test_params = { email_address: "tenancy_test_#{unique_id}@example.com", username: "tenancy_test_#{unique_id}", password: "password123" }
 <% else -%>
-    test_params = { title: "Test <%= class_name %>" }
+    test_params = { title: "Test <%= class_name %>"<% polymorphic_associations.each do |assoc| -%>, <%= assoc[:field_name] %>_id: @<%= assoc[:field_name] %>.id, <%= assoc[:field_name] %>_type: @<%= assoc[:field_name] %>.class.name<% end -%> }
 <% end -%>
 <% end -%>
     
@@ -386,7 +443,7 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     
     if require_org_id<% if has_agency_id %> || false<% end -%> # Agency models test organization_id behavior
       # Strict mode: Should return 422 when tenancy context is required but missing
-      assert_response :unprocessable_entity
+      assert_response :unprocessable_content
       
       error_response = JSON.parse(response.body)
       assert_includes error_response.keys, 'errors'
@@ -446,7 +503,7 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
          headers: @auth_headers
 <% else -%>
     post <%= api_route_helper %>_url,
-         params: { data: { organization_id: @organization.id, agency_id: 99999, title: "Test <%= class_name %>" } },
+         params: { data: { organization_id: @organization.id, agency_id: 99999, title: "Test <%= class_name %>"<% polymorphic_associations.each do |assoc| -%>, <%= assoc[:field_name] %>_id: @<%= assoc[:field_name] %>.id, <%= assoc[:field_name] %>_type: @<%= assoc[:field_name] %>.class.name<% end -%> } },
          headers: @auth_headers
 <% end -%>
     
@@ -465,7 +522,7 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
          headers: @auth_headers
 <% else -%>
     post <%= api_route_helper %>_url,
-         params: { data: { organization_id: 99999, title: "Test <%= class_name %>" } },
+         params: { data: { organization_id: 99999, title: "Test <%= class_name %>"<% polymorphic_associations.each do |assoc| -%>, <%= assoc[:field_name] %>_id: @<%= assoc[:field_name] %>.id, <%= assoc[:field_name] %>_type: @<%= assoc[:field_name] %>.class.name<% end -%> } },
          headers: @auth_headers
 <% end -%>
     
@@ -540,6 +597,10 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
       <%= attribute.name %>: "org1_<%= attribute.name %>@example.com"<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name.include?('password') -%>
       <%= attribute.name %>: "org1_secure_password"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
+      <%= attribute.name %>: "https://org1.example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.end_with?('_type') -%>
+      <%= attribute.name %>: @<%= attribute.name.gsub('_type', '') %>.class.name<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: "Org 1 <%= attribute.name.humanize %>"<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -551,11 +612,19 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
       <%= attribute.name %>: true<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.type == :decimal || attribute.type == :float -%>
       <%= attribute.name %>: 11.1<%= ',' if index < attributes.length - 1 %>
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-      <%= attribute.name %>: { org1_test_meta: "org1_value", tenant: "org1", test_scenario: "multi_tenancy" }<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+      <%= attribute.name %>: { 
+        resource_type: "<%= singular_table_name %>", 
+        category: "employee", 
+        tags: ["org1", "department_test"], 
+        attributes: { 
+          priority: "medium", 
+          status_info: { verified: true, active: true } 
+        } 
+      }<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name == 'settings' -%>
-      <%= attribute.name %>: { dark_mode: false, money_format: "usd", language: "en", org1_preference: true }<%= ',' if index < attributes.length - 1 %>
+      <%= attribute.name %>: { dark_mode: false, notifications: { email: true, sms: true } }<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: {}<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -578,6 +647,10 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
       <%= attribute.name %>: "org2_<%= attribute.name %>@example.com"<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name.include?('password') -%>
       <%= attribute.name %>: "org2_secure_password"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
+      <%= attribute.name %>: "https://org2.example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.end_with?('_type') -%>
+      <%= attribute.name %>: @<%= attribute.name.gsub('_type', '') %>.class.name<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: "Org 2 <%= attribute.name.humanize %>"<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -589,11 +662,19 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
       <%= attribute.name %>: false<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.type == :decimal || attribute.type == :float -%>
       <%= attribute.name %>: 22.2<%= ',' if index < attributes.length - 1 %>
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-      <%= attribute.name %>: { org2_test_meta: "org2_value", tenant: "org2", test_scenario: "multi_tenancy" }<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+      <%= attribute.name %>: { 
+        resource_type: "<%= singular_table_name %>", 
+        category: "manager", 
+        tags: ["org2", "department_test"], 
+        attributes: { 
+          priority: "high", 
+          status_info: { verified: true, active: true } 
+        } 
+      }<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name == 'settings' -%>
-      <%= attribute.name %>: { dark_mode: true, money_format: "eur", language: "fr", org2_preference: true }<%= ',' if index < attributes.length - 1 %>
+      <%= attribute.name %>: { dark_mode: true, notifications: { email: false, sms: true } }<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: {}<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -667,7 +748,7 @@ class <%= class_name %>ApiTest < ActionDispatch::IntegrationTest
     
     # Verify core fields are present
     assert_includes <%= singular_table_name %>_data.keys, 'id'
-<% unless options[:skip_tenancy] || class_name == 'Organization' -%>
+<% if has_organization_reference? -%>
     assert_includes <%= singular_table_name %>_data.keys, 'organization'
     
     # Verify associations are properly included
@@ -726,6 +807,10 @@ if attributes.any? { |attr| attr.type == :references && attr.name == 'user' } &&
       <%= attribute.name %>: "concurrent@example.com"<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name.include?('email') -%>
       <%= attribute.name %>: "concurrent@example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
+      <%= attribute.name %>: "https://concurrent.example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.end_with?('_type') -%>
+      <%= attribute.name %>: @<%= attribute.name.gsub('_type', '') %>.class.name<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: "Concurrent Test <%= attribute.name.humanize %>"<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -737,11 +822,26 @@ if attributes.any? { |attr| attr.type == :references && attr.name == 'user' } &&
       <%= attribute.name %>: true<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.type == :decimal || attribute.type == :float -%>
       <%= attribute.name %>: 50.5<%= ',' if index < attributes.length - 1 %>
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-      <%= attribute.name %>: { concurrent_test_meta: "concurrent_value", test_type: "concurrent", thread_id: 1 }<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+      <%= attribute.name %>: { 
+        resource_type: "<%= singular_table_name %>", 
+        category: "admin", 
+        tags: ["concurrent", "test"], 
+        attributes: { 
+          priority: "high", 
+          status_info: { verified: true, active: true } 
+        } 
+      }<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name == 'settings' -%>
-      <%= attribute.name %>: { dark_mode: true, money_format: "gbp", language: "en", concurrent_mode: true }<%= ',' if index < attributes.length - 1 %>
+      <%= attribute.name %>: { 
+        ui_preferences: { 
+          theme: "dark", 
+          language: "en", 
+          notifications: { email: true, sms: false, push: true } 
+        }, 
+        feature_flags: { beta_features: false, analytics: true } 
+      }<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: {}<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -826,6 +926,10 @@ if attributes.any? { |attr| attr.type == :references && attr.name == 'user' } &&
         <%= attribute.name %>: "bulk#{i}@example.com"<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name.include?('email') -%>
         <%= attribute.name %>: "bulk#{i}@example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
+        <%= attribute.name %>: "https://bulk#{i}.example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.end_with?('_type') -%>
+        <%= attribute.name %>: @<%= attribute.name.gsub('_type', '') %>.class.name<%= ',' if index < attributes.length - 1 %>
 <% else -%>
         <%= attribute.name %>: "Bulk Test <%= attribute.name.humanize %> #{i}"<%= ',' if index < attributes.length - 1 %>
 <% end -%>
@@ -837,11 +941,19 @@ if attributes.any? { |attr| attr.type == :references && attr.name == 'user' } &&
         <%= attribute.name %>: i.even?<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.type == :decimal || attribute.type == :float -%>
         <%= attribute.name %>: i * 10.5<%= ',' if index < attributes.length - 1 %>
-<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(meta|settings)$/) -%>
-<% if attribute.name == 'meta' -%>
-        <%= attribute.name %>: { bulk_test_meta: "bulk_#{i}", batch_number: i, test_type: "bulk_operations" }<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.type == :json || attribute.name.to_s.match?(/^(metadata|settings)$/) -%>
+<% if attribute.name == 'metadata' -%>
+        <%= attribute.name %>: { 
+          resource_type: "<%= singular_table_name %>", 
+          category: "employee", 
+          tags: ["bulk", "test_#{i}"], 
+          attributes: { 
+            priority: "medium", 
+            status_info: { verified: true, active: true } 
+          } 
+        }<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name == 'settings' -%>
-        <%= attribute.name %>: { dark_mode: i.even?, money_format: (i.even? ? "usd" : "eur"), language: "en", "bulk_preference_#{i}": true }<%= ',' if index < attributes.length - 1 %>
+        <%= attribute.name %>: { dark_mode: i.even?, notifications: { email: true, sms: i.even? } }<%= ',' if index < attributes.length - 1 %>
 <% else -%>
         <%= attribute.name %>: {}<%= ',' if index < attributes.length - 1 %>
 <% end -%>

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

@@ -8,6 +8,16 @@ class <%= class_name %>Test < ActiveSupport::TestCase
     @organization = organizations(:acme_org)
     @user = users(:john_user)
     @agency = agencies(:marketing_agency)
+<% polymorphic_associations.each do |assoc| -%>
+<% assoc[:parent_types].each_with_index do |parent_type, index| -%>
+<% if index == 0 -%>
+    @<%= parent_type.underscore %> = <%= parent_type.underscore.pluralize %>(<%= case parent_type.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+    @<%= assoc[:field_name] %> = @<%= parent_type.underscore %>  # Default polymorphic parent for tests
+<% else -%>
+    @<%= parent_type.underscore %> = <%= parent_type.underscore.pluralize %>(<%= case parent_type.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+<% end -%>
+<% end -%>
+<% end -%>
 <% if singular_table_name == 'organization' -%>
     @<%= singular_table_name %> = <%= table_name %>(:acme_org)
 <% elsif singular_table_name == 'user' -%>
@@ -24,7 +34,17 @@ class <%= class_name %>Test < ActiveSupport::TestCase
   
   test "should belong to <%= attribute.name %>" do
     assert_respond_to @<%= singular_table_name %>, :<%= attribute.name %>
+<% if attribute.respond_to?(:polymorphic?) && attribute.polymorphic? -%>
+    assert @<%= singular_table_name %>.<%= attribute.name %>.present?
+    # Polymorphic association - check against valid parent types
+<% polymorphic_associations.each do |assoc| -%>
+<% if assoc[:field_name] == attribute.name -%>
+    assert(<%= assoc[:parent_types].map { |type| "@#{singular_table_name}.#{attribute.name}.is_a?(#{type})" }.join(' || ') %>)
+<% end -%>
+<% end -%>
+<% else -%>
     assert_kind_of <%= attribute.name.camelize %>, @<%= singular_table_name %>.<%= attribute.name %>
+<% end -%>
   end
   
   test "should be invalid without <%= attribute.name %>" do

data/lib/propel_api.rb

@@ -1,3 +1,3 @@
 module PropelApi
-  VERSION = "0.2.1"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propel_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryan Martin, Rafael Pivato, Chi Putera
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-02 00:00:00.000000000 Z
+date: 2025-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
+- !ruby/object:Gem::Dependency
+  name: pagy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '8.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: A comprehensive Rails generator that creates complete API resources with
   models, controllers, tests, and realistic seed data. Supports both JSON Facet and
   Graphiti serialization engines.
@@ -53,9 +73,11 @@ files:
 - lib/generators/propel_api/install/install_generator.rb
 - lib/generators/propel_api/resource/resource_generator.rb
 - lib/generators/propel_api/templates/config/propel_api.rb.tt
+- lib/generators/propel_api/templates/controllers/api_base_controller.rb
 - lib/generators/propel_api/templates/controllers/api_controller_graphiti.rb
 - lib/generators/propel_api/templates/controllers/api_controller_propel_facets.rb
 - lib/generators/propel_api/templates/controllers/example_controller.rb.tt
+- lib/generators/propel_api/templates/errors/propel_api_csrf_error.rb
 - lib/generators/propel_api/templates/scaffold/facet_controller_template.rb.tt
 - lib/generators/propel_api/templates/scaffold/facet_model_template.rb.tt
 - lib/generators/propel_api/templates/scaffold/graphiti_controller_template.rb.tt