rest_framework 0.8.11 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076db67d932800e57d2c166d757b60ea6e0d77df03da2385eddff8fd25886f76
-  data.tar.gz: d8b0fd131b50978e65b767d95a076f9592c8948a2708adff97e7971f84b0fbca
+  metadata.gz: 1e6db6727ad85819540fc9d5977205f553523fe2f1f4431c985193ffd47f27bc
+  data.tar.gz: cddc4ff0d75aa6d2856d1c6bde681d38f955675a9c11b3853eef617e1abfad8b
 SHA512:
-  metadata.gz: f23d1835c49628c2b2f02521df2373438aabdb8ccb4fb12c3bd008cc757e3b660521c1eecf6d54fc92ad4f9b7c04881122acc9931c4d8847253cc78408e1e70d
-  data.tar.gz: 23dbfba94daee299e86a1e542d17b8b25bccd04989e569fee71731fac79c3996ac987a8ee28a58d4f489ddf1cf3a02d4774f45b022cbfaaeb9d796ddc6e71cb3
+  metadata.gz: 86384e43ffa97406feb6a9760cb9ca425cbc725cb41324fe21a688216cf075ccdf2e27b682231dd11d4d7507740a8645eb66c4076df165d69da4a56d87d11efd
+  data.tar.gz: 7b22d9730b039452065db1e27d580ee1db4105861f323bd2800906a8c5197ed4d8cf76bb532c193dd3ab3255d491faeb04cbf47a677acbb1dbb46bfc0b6f2fc3

data/VERSION

@@ -1 +1 @@
-0.8.11
+0.8.13

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

@@ -121,7 +121,7 @@ module RESTFramework::Utils
     }.sort_by { |r|
       # Sort by levels first, so the routes matching closely with current request show first, then
       # by the path, and finally by the HTTP verb.
-      [r[:_levels], r[:_path], HTTP_METHOD_ORDERING.index(r[:verb]) || 99]
+      [r[:_levels], r[:path], HTTP_METHOD_ORDERING.index(r[:verb]) || 99]
     }.group_by { |r| r[:controller] }.sort_by { |c, _r|
       # Sort the controller groups by current controller first, then alphanumerically.
       [request.params[:controller] == c ? 0 : 1, c]
@@ -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.11
+  version: 0.8.13
 platform: ruby
 authors:
 - Gregory N. Schmit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails