rest_framework 0.8.10 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213a37736ca78073859451dcc69b9dc7b17210087cb4250b454812c6de7c1a7c
-  data.tar.gz: 5392170651a45a187730ad8bf1355226569644c2732ef78c0919e778a927f323
+  metadata.gz: 39af19a8d4f904490f8080fad81cb42705b3ba324e41727b271b8287fe79fcf8
+  data.tar.gz: 59c16881e824d3ea3c9290c8fc180236b53fe78b899c20642c930d39f27214f5
 SHA512:
-  metadata.gz: b00876f3c2ca1fdb6beeb290c38774b13fe0b1549d19f00084537f0e8b42c43b6d716f79a3a60835172b59479756b3c9ffd6c17895be6be4fd16ebf3296c4f8c
-  data.tar.gz: f24eaf37f5da6a5abf340e63d1a3cd9514b5f4bc610563c27040b14a9b2698a8110955a1bb7ce58f6f52df23e632408e4c4194d37a84c8f385f4bc9facbf395d
+  metadata.gz: 2829f419f59f8b0f9e04509403962890e36abba2cf75807f0e0fe04670904fd0741c4895d31e77377bd3a115a77cf12c85f827aa301c4a42ce88b8daee7259c5
+  data.tar.gz: d8ae7cf13d751e437b6e9de839ba64b8c874f3399d3dfa331fe00168945c97c7ea106371e17bae69d4834425cc8ea59b64a7cef407e4c6396cc4530e989947b8

data/VERSION

@@ -1 +1 @@
-0.8.10
+0.8.12

data/lib/rest_framework/controller_mixins/base.rb

@@ -156,8 +156,8 @@ module RESTFramework::BaseControllerMixin
 
     # Alias `extra_actions` to `extra_collection_actions`.
     unless base.respond_to?(:extra_collection_actions)
-      base.alias_method(:extra_collection_actions, :extra_actions)
-      base.alias_method(:extra_collection_actions=, :extra_actions=)
+      base.singleton_class.alias_method(:extra_collection_actions, :extra_actions)
+      base.singleton_class.alias_method(:extra_collection_actions=, :extra_actions=)
     end
 
     # Skip CSRF since this is an API.

data/lib/rest_framework/controller_mixins/models.rb

@@ -91,9 +91,10 @@ module RESTFramework::BaseModelControllerMixin
 
     # Get the available fields. Returning `nil` indicates that anything should be accepted. If
     # `fallback` is true, then we should fallback to this controller's model columns, or an empty
-    # array.
+    # array. This should always return an array of strings, no symbols, and possibly `nil` (only if
+    # `fallback` is false).
     def get_fields(input_fields: nil, fallback: true)
-      input_fields ||= self.fields if fallback
+      input_fields ||= self.fields&.map(&:to_s) if fallback
 
       # If fields is a hash, then parse it.
       if input_fields.is_a?(Hash)

data/lib/rest_framework/filters.rb

@@ -14,14 +14,12 @@ class RESTFramework::ModelFilter < RESTFramework::BaseFilter
   # Get a list of filterset fields for the current action. Fallback to columns because we don't want
   # to try filtering by any query parameter because that could clash with other query parameters.
   def _get_fields
-    return (
-      @controller.class.filterset_fields || @controller.get_fields(fallback: true)
-    ).map(&:to_s)
+    # Always return a list of strings; `@controller.get_fields` already does this.
+    return @controller.class.filterset_fields&.map(&:to_s) || @controller.get_fields(fallback: true)
   end
 
   # Filter params for keys allowed by the current action's filterset_fields/fields config.
   def _get_filter_params
-    # Map filterset fields to strings because query parameter keys are strings.
     fields = self._get_fields
 
     return @controller.request.query_parameters.select { |p, _|
@@ -69,7 +67,7 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
   # Get a list of ordering fields for the current action. Do not fallback to columns in case the
   # user wants to order by a virtual column.
   def _get_fields
-    return (@controller.class.ordering_fields || @controller.get_fields)&.map(&:to_s)
+    return @controller.class.ordering_fields&.map(&:to_s) || @controller.get_fields
   end
 
   # Convert ordering string to an ordering configuration.
@@ -119,10 +117,10 @@ class RESTFramework::ModelSearchFilter < RESTFramework::BaseFilter
   # common string-like columns by default.
   def _get_fields
     if search_fields = @controller.class.search_fields
-      return search_fields
+      return search_fields&.map(&:to_s)
     end
 
-    columns = @controller.class.get_model.columns_hash.keys
+    columns = @controller.class.get_model.column_names
     return @controller.get_fields(fallback: true).select { |f|
       f.in?(RESTFramework.config.search_columns) && f.in?(columns)
     }

data/lib/rest_framework/utils.rb

@@ -150,11 +150,13 @@ module RESTFramework::Utils
       Rails.logger.warn("RRF: Unknown key in fields hash: #{k}")
     end
 
-    return parsed_fields
+    # We should always return strings, not symbols.
+    return parsed_fields.map(&:to_s)
   end
 
   # Get the fields for a given model, including not just columns (which includes
-  # foreign keys), but also associations.
+  # foreign keys), but also associations. Note that we always return an array of
+  # strings, not symbols.
   def self.fields_for(model, exclude_associations: nil)
     foreign_keys = model.reflect_on_all_associations(:belongs_to).map(&:foreign_key)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.12
 platform: ruby
 authors:
 - Gregory N. Schmit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails