rest_framework 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 639dcc597e17e5148cde3f7511637913be7b431899f59a5cc7f504533969233e
-  data.tar.gz: 0c732ab6c80f9c06b29e4a30e29087ff4fa65206df15b7826ffd9f0d2781b774
+  metadata.gz: 7cedfa02dac90388b712f4e15e29d07a40e45df23847bebf5da02eea03862e75
+  data.tar.gz: 2de9c962810e9473dd5eb68c2ee42da764ed793e341049a49d9f4ca8d34fa48e
 SHA512:
-  metadata.gz: 656e302db2252a27a30508e1f5c1d2caf2d603288d4ca3e2ec0995355a4a6501b18bc8320463a17113568a562ead98c3896c949a00aa03cc83a6c71f2f62d738
-  data.tar.gz: f760d0140360ca1856dca0ab87b8de1903e09fd7cc442c1b40c9150b7abaf312f43ae67a52a5d0881af9e1f98489a074a82ebaef87b527c99e6e8f7175c67740
+  metadata.gz: f52b1b1075fef181d9e771df56f1c088c73601d600606411974febb1bb544facacc7d16d83c2b34929acc0d0f44a0e518098a3a121fcdf27f7e5f12be3a5d8ca
+  data.tar.gz: c08ffc3af87bb7d7337dd1a908c7c6199fa3e70328b06dbebd1a691a0c3f235224b0119026eda4274f555385254383d2a7a29719b339f5c487f0ee82a7b2bcd2

data/VERSION

@@ -1 +1 @@
-2.0.0.beta2
+2.0.0.beta3

data/lib/rest_framework/serializers/native_serializer.rb

@@ -184,6 +184,39 @@ class RESTFramework::Serializers::NativeSerializer < RESTFramework::Serializers:
       (ref.klass.method_defined?(field) && !ref.klass.reflect_on_association(field.to_sym))
   end
 
+  # Recursively translate an association's fields into a `serializable_hash` config
+  # (`only`/`methods`/`include`). Columns go to `only` and plain methods to `methods`; a field that
+  # is itself an association is recursed into (as a nested `include`) only when it has its own entry
+  # in `field_config[:field_config]`. Otherwise it falls through to a method and serializes as
+  # before (its full `as_json`), so deeper nesting is opt-in and never narrows the default output.
+  def _build_association_config(model, fields, field_config)
+    nested = field_config[:field_config] || {}
+    only = []
+    methods = []
+    includes = {}
+
+    fields.each do |sf|
+      sf = sf.to_s
+      sub_field_config = nested[sf.to_sym] || nested[sf]
+
+      if sf.in?(model.column_names)
+        only << sf
+      elsif sub_field_config && (ref = model.reflect_on_association(sf.to_sym)) && !ref.polymorphic?
+        sub_fields = sub_field_config[:fields]&.map(&:to_s) ||
+          RESTFramework::Utils.association_fields_for(ref)
+        includes[sf] = self._build_association_config(ref.klass, sub_fields, sub_field_config)
+      elsif model.method_defined?(sf)
+        methods << sf
+      else
+        only << sf
+      end
+    end
+
+    config = { only: only, methods: methods }
+    config[:include] = includes if includes.any?
+    config
+  end
+
   # Get a serializer configuration from the controller. `@controller` and `@model` must be set.
   def _get_controller_serializer_config
     columns = []
@@ -208,16 +241,13 @@ class RESTFramework::Serializers::NativeSerializer < RESTFramework::Serializers:
       if f.in?(column_names)
         columns << f
       elsif ref = reflections[f]
-        sub_columns = []
-        sub_methods = []
-        self._effective_association_fields(f, ref, field_config).each do |sf|
-          if !ref.polymorphic? && sf.in?(ref.klass.column_names)
-            sub_columns << sf
-          else
-            sub_methods << sf
-          end
+        effective_fields = self._effective_association_fields(f, ref, field_config)
+        sub_config = if ref.polymorphic?
+          # No single target class to introspect, so serialize every field as a method.
+          { only: [], methods: effective_fields }
+        else
+          self._build_association_config(ref.klass, effective_fields, field_config)
         end
-        sub_config = { only: sub_columns, methods: sub_methods }
 
         # Apply certain rules regarding collection associations.
         if ref.collection?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Gregory N. Schmit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-31 00:00:00.000000000 Z
+date: 2026-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails