rest_framework 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9791b0cbb0a806afa00955abf151c7d04bd1820bdbe189f237badc9782f87d6b
-  data.tar.gz: 69e29341f8804fac7894c0065b0f5535d88b0e8d60577bc77677fe13d633f2d5
+  metadata.gz: 4670a5de96eba75413576ebb961297e0e45d3a95bb7e979ebb9b1a13cdaed46b
+  data.tar.gz: 807edfa466079b3a4031feb738b43eeb10cffacb8821fa54d4b02145dc86ab4d
 SHA512:
-  metadata.gz: f04bf8059e765db9e13a9729db43c2b26a914035063fe728e9ad0bcb1ab968bb8939a4d278e239a39f64b671d183bfdd7a2487248495cd7e5bd26b93ac49a103
-  data.tar.gz: '0908d43c8b2188e4dde5920a84eb621c0dea2dc170891e314d77d95b823a32af6681ae9a6028277f32282b88be03f8e95da55ec310f75e3c89ec8c3a09934f09'
+  metadata.gz: b75d14784e343ea98af7048c4ac7deb975b2090ace55bfbebba46f7cb7b59149d99349296faff7d7c746a8e1db757343ea8cc70c5297425b3f7463c088c8c3ae
+  data.tar.gz: 8a80fa46d1f1f68781fd0b13ea5586d7053e7cb62f8829c496e031f66f6492a05053b0812e68c9bf27f2a1852dd77b4b0e4526298ca0d62d11be2cae851f1172

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/rest_framework/serializers.rb

@@ -85,7 +85,7 @@ class RESTFramework::NativeSerializer < RESTFramework::BaseSerializer
 
   # Helper to filter (mutate) a single subconfig for specific keys.
   def self.filter_subconfig(subconfig, except, additive: false)
-    return subconfig unless subconfig
+    return subconfig if !subconfig && !additive
 
     if subconfig.is_a?(Array)
       subconfig = subconfig.map(&:to_sym)
@@ -96,8 +96,19 @@ class RESTFramework::NativeSerializer < RESTFramework::BaseSerializer
         subconfig -= except
       end
     elsif subconfig.is_a?(Hash)
-      subconfig.symbolize_keys!
-      subconfig.reject! { |k, _v| k.in?(except) }
+      # Additive doesn't make sense in a hash context since we wouldn't know the values.
+      unless additive
+        subconfig.symbolize_keys!
+        subconfig.reject! { |k, _v| k.in?(except) }
+      end
+    elsif !subconfig
+    else  # Subconfig is a single element (assume string/symbol).
+      subconfig = subconfig.to_sym
+      if subconfig.in?(except)
+        subconfig = [] unless additive
+      elsif additive
+        subconfig = [subconfig, *except]
+      end
     end
 
     return subconfig
@@ -108,7 +119,7 @@ class RESTFramework::NativeSerializer < RESTFramework::BaseSerializer
     return config unless @controller
 
     except_query_param = @controller.class.try(:native_serializer_except_query_param)
-    if except = @controller.request.query_parameters[except_query_param]
+    if except = @controller.request.query_parameters[except_query_param].presence
       except = except.split(",").map(&:strip).map(&:to_sym)
 
       unless except.empty?
@@ -116,10 +127,10 @@ class RESTFramework::NativeSerializer < RESTFramework::BaseSerializer
         config = config.deep_dup
 
         # Filter `only`, `except` (additive), `include`, and `methods`.
-        self.class.filter_subconfig(config[:only], except)
-        self.class.filter_subconfig(config[:except], except, additive: true)
-        self.class.filter_subconfig(config[:include], except)
-        self.class.filter_subconfig(config[:methods], except)
+        config[:only] = self.class.filter_subconfig(config[:only], except)
+        config[:except] = self.class.filter_subconfig(config[:except], except, additive: true)
+        config[:include] = self.class.filter_subconfig(config[:include], except)
+        config[:methods] = self.class.filter_subconfig(config[:methods], except)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gregory N. Schmit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails