rest_framework 0.7.8 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c7efedb6af2b7a589a2b3f7cedd600f9851bb4ba6be334465285f052e961ed
-  data.tar.gz: e14be403f25acf8e17ba54e324ec7b13e838a28b171e4866fcbb287b4f15a4dd
+  metadata.gz: 71c34ceb6bb68b3b9ea023e62fa2fc5d6ea3382fad38a94d32c235d66fe87281
+  data.tar.gz: d4300ef78a151d25f0d67b74df5d1d6584e0452e3ff3e719ddae41ece6aa3cf7
 SHA512:
-  metadata.gz: 730bb926137c31d86215cb433c97ea2d5252c24d8b38f8ce78596296a30cfc3786a5b69664b927323dbf9598385ed9b5a79cb931821ee9dad9aa9e7c7d08e111
-  data.tar.gz: 12af341b9c75a9c63b9a48a5ca71aab3dcb521f03862a74acd595d732df1e55ee9d8f16eb34485ad8b640439c4ab28dde08db20f8e598c583c66df3a3a58d121
+  metadata.gz: ce6946077715c32b8e7f5d08c8df1b1d1ae9f7b714c5ed8411a4086ba5fe8a96328179fdf7685c26b7fce7d8d208dba1045d499952b4980c0a3cfac71364cc07
+  data.tar.gz: a4da9fd65a971ddad1e596927d95ff7088fbd6429df007941ef2c990ab08df19d8891abb22166a5cc13ae155438cfc04aa63868060ea4f2c647023a707f45a71

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.7.10

data/lib/rest_framework/controller_mixins/base.rb

@@ -170,6 +170,10 @@ module RESTFramework::BaseControllerMixin
     # Handle some common exceptions.
     unless RESTFramework.config.disable_rescue_from
       base.rescue_from(
+        ActionController::ParameterMissing,
+        ActionController::UnpermittedParameters,
+        ActiveRecord::AssociationTypeMismatch,
+        ActiveRecord::NotNullViolation,
         ActiveRecord::RecordNotFound,
         ActiveRecord::RecordInvalid,
         ActiveRecord::RecordNotSaved,

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
@@ -386,10 +386,39 @@ module RESTFramework::BaseModelControllerMixin
   # Get a list of parameters allowed for the current action. By default we do not fallback to
   # columns so arbitrary fields can be submitted if no fields are defined.
   def get_allowed_parameters
-    return _get_specific_action_config(
+    return @allowed_parameters if defined?(@allowed_parameters)
+
+    @allowed_parameters = self._get_specific_action_config(
       :allowed_action_parameters,
       :allowed_parameters,
-    ) || self.get_fields
+    )
+    return @allowed_parameters if @allowed_parameters
+    return @allowed_parameters = nil unless fields = self.get_fields
+
+    # For fields, automatically add `_id`/`_ids` and `_attributes` variations for associations.
+    id_variations = []
+    variations = {}
+    @allowed_parameters = fields.map { |f|
+      f = f.to_s
+      next f unless ref = self.class.get_model.reflections[f]
+
+      if self.class.permit_id_assignment
+        if ref.collection?
+          variations["#{f.singularize}_ids"] = []
+        elsif ref.belongs_to?
+          id_variations << "#{f}_id"
+        end
+      end
+
+      if self.class.permit_nested_attributes_assignment
+        variations["#{f}_attributes"] = self.class.get_field_config(f)[:sub_fields] || {}
+      end
+
+      next f
+    }.flatten
+    @allowed_parameters += id_variations
+    @allowed_parameters << variations
+    return @allowed_parameters
   end
 
   # Get the configured serializer class, or `NativeSerializer` as a default.
@@ -404,25 +433,15 @@ module RESTFramework::BaseModelControllerMixin
     ]
   end
 
-  # Filter the request body for keys in current action's allowed_parameters/fields config.
+  # Use strong parameters to filter the request body using the configured allowed parameters.
   def get_body_params(data: nil)
     data ||= request.request_parameters
 
     # Filter the request body and map to strings. Return all params if we cannot resolve a list of
     # allowed parameters or fields.
-    allowed_params = self.get_allowed_parameters&.map(&:to_s)
-    body_params = if allowed_params
-      data.select { |p|
-        p.in?(allowed_params) || (
-          self.class.permit_id_assignment && (
-            p.chomp("_id").in?(allowed_params) || p.chomp("_ids").pluralize.in?(allowed_params)
-          )
-        ) || (
-          self.class.permit_nested_attributes_assignment &&
-            p.chomp("_attributes").in?(allowed_params)
-
-        )
-      }
+    body_params = if allowed_parameters = self.get_allowed_parameters
+      data = ActionController::Parameters.new(data)
+      data.permit(*allowed_parameters)
     else
       data
     end

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
 

data/lib/rest_framework/utils.rb

@@ -79,6 +79,7 @@ module RESTFramework::Utils
   def self.get_routes(application_routes, request, current_route: nil)
     current_route ||= self.get_request_route(application_routes, request)
     current_path = current_route.path.spec.to_s.gsub("(.:format)", "")
+    current_path = "" if current_path == "/"
     current_levels = current_path.count("/")
     current_comparable_path = %r{^#{Regexp.quote(self.comparable_path(current_path))}(/|$)}
 
@@ -112,7 +113,7 @@ module RESTFramework::Utils
         verb: r.verb,
         path: path,
         # Starts at the number of levels in current path, and removes the `(.:format)` at the end.
-        relative_path: path.split("/")[current_levels..]&.join("/"),
+        relative_path: path.split("/")[current_levels..]&.join("/").presence || "/",
         controller: r.defaults[:controller].presence,
         action: r.defaults[:action].presence,
         matches_path: matches_path,
@@ -125,8 +126,8 @@ module RESTFramework::Utils
       # by the path, and finally by the HTTP verb.
       [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 depth, then alphanumerically.
-      [request.params[:controller] == c ? 0 : 1, c.count("/"), c]
+      # Sort the controller groups by current controller first, then alphanumerically.
+      [request.params[:controller] == c ? 0 : 1, c]
     }.to_h
   end
 

metadata

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