rest_framework 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a9bc78fae632a2c86426c523fbce432cb85904ea661219032d6e4352ab16ea
-  data.tar.gz: f202cd11931c54fada9e8dd1e3af1dd9344b2a883dd5cb00ebf45708afdd365c
+  metadata.gz: 71c34ceb6bb68b3b9ea023e62fa2fc5d6ea3382fad38a94d32c235d66fe87281
+  data.tar.gz: d4300ef78a151d25f0d67b74df5d1d6584e0452e3ff3e719ddae41ece6aa3cf7
 SHA512:
-  metadata.gz: 8759e8295bb59715cd8aab800bd6a158a17422bee4adea2fc5d77c8517d44a92b6ff4a771a2c10a021162f5c582b4853a9d1ebd2bb5cc4e29468f3a6b061460b
-  data.tar.gz: 46e0b4693c1166e774f00a25f0f9378f2702e0449f87b2e808ea16d395b1df98ae5e564fff198daf53b6d3e0ba3352a12232a2a7f6962a74ea578b0f9a77c09d
+  metadata.gz: ce6946077715c32b8e7f5d08c8df1b1d1ae9f7b714c5ed8411a4086ba5fe8a96328179fdf7685c26b7fce7d8d208dba1045d499952b4980c0a3cfac71364cc07
+  data.tar.gz: a4da9fd65a971ddad1e596927d95ff7088fbd6429df007941ef2c990ab08df19d8891abb22166a5cc13ae155438cfc04aa63868060ea4f2c647023a707f45a71

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.7.10

data/lib/rest_framework/controller_mixins/models.rb

@@ -127,7 +127,7 @@ module RESTFramework::BaseModelControllerMixin
       config = self.field_config&.dig(f.to_sym) || {}
 
       # Default sub-fields if field is an association.
-      if ref = self.get_model.reflections[f]
+      if ref = self.get_model.reflections[f.to_s]
         if ref.polymorphic?
           columns = {}
         else
@@ -218,7 +218,7 @@ module RESTFramework::BaseModelControllerMixin
           if self.permit_id_assignment
             if ref.collection?
               metadata[:id_field] = "#{f.singularize}_ids"
-            else
+            elsif ref.belongs_to?
               metadata[:id_field] = "#{f}_id"
             end
           end
@@ -396,26 +396,29 @@ module RESTFramework::BaseModelControllerMixin
     return @allowed_parameters = nil unless fields = self.get_fields
 
     # For fields, automatically add `_id`/`_ids` and `_attributes` variations for associations.
-    return @allowed_parameters = fields.map { |f|
+    id_variations = []
+    variations = {}
+    @allowed_parameters = fields.map { |f|
       f = f.to_s
       next f unless ref = self.class.get_model.reflections[f]
 
-      variations = [f]
-
       if self.class.permit_id_assignment
         if ref.collection?
-          variations << "#{f.singularize}_ids"
-        else
-          variations << "#{f}_id"
+          variations["#{f.singularize}_ids"] = []
+        elsif ref.belongs_to?
+          id_variations << "#{f}_id"
         end
       end
 
       if self.class.permit_nested_attributes_assignment
-        variations << "#{f}_attributes"
+        variations["#{f}_attributes"] = self.class.get_field_config(f)[:sub_fields] || {}
       end
 
-      next variations
+      next f
     }.flatten
+    @allowed_parameters += id_variations
+    @allowed_parameters << variations
+    return @allowed_parameters
   end
 
   # Get the configured serializer class, or `NativeSerializer` as a default.

data/lib/rest_framework/filters.rb

@@ -33,7 +33,7 @@ class RESTFramework::ModelFilter < RESTFramework::BaseFilter
         field, sub_field = match[1..2]
         next false unless field.in?(fields)
 
-        sub_fields = @controller.class.get_field_config(field)[:sub_fields]
+        sub_fields = @controller.class.get_field_config(field)[:sub_fields] || []
         next sub_field.in?(sub_fields)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Gregory N. Schmit