rest_framework 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edeb7963dbca0185ff384e628a185c83341e3154d6414c9d8f70a05115abd23a
-  data.tar.gz: 8d6bc94fea07e57c20625c8aa192ced88789e078bf3a4b29b71e6c80099f2436
+  metadata.gz: 829e2b04366870f6c4a7cad1c0bfdaf62c56c7085bdb52d028e1ec87c46b12ee
+  data.tar.gz: 739f019c64bdd79e9af321b3ccb8cd4db8c0ab13c8e7e01b116b78e9fe1a529a
 SHA512:
-  metadata.gz: 68ecf8a8a045c3e217c597f86b46573dc80bb931e20be45af01b939079f8cf2dd27d68e8bebd8d458726b04b8b55fb2dd65a60bcf4c847c30feb1257f7cfb9ea
-  data.tar.gz: 388478f7c8f2c51a96740f25043aa7d188b5e59731478f4bca2ce6171fadc5ba1e201b12ee051859386ce151c1114b9b6f207dbe840e732dec652d9639323825
+  metadata.gz: 64c8bf0286fbef571f76aeeb0679041f0844fccc3ae06aea1f1e09256ebbc973e073ffc47bca6cafa1b7ff4d72e955cfe44145dfe48aa0ba7ed56cbb089eed9c
+  data.tar.gz: 85d773111e1c1923b79181593ed963c8b5566dcb2ff35a71fa542809bf90616de7c8ff005d11d9acfd5ce78fcaa99096e4b5490beda9126712c5b6cbc588aa11

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/lib/rest_framework/controller_mixins/models.rb

@@ -430,11 +430,23 @@ module RESTFramework::BaseModelControllerMixin
     return @recordset = nil
   end
 
+  # Get the recordset but with any associations included to avoid N+1 queries.
+  def get_recordset_with_includes
+    reflections = self.class.get_model.reflections.keys
+    associations = self.get_fields(fallback: true).select { |f| f.in?(reflections) }
+
+    if associations.any?
+      return self.get_recordset.includes(associations)
+    end
+
+    return self.get_recordset
+  end
+
   # Get the records this controller has access to *after* any filtering is applied.
   def get_records
     return @records if instance_variable_defined?(:@records)
 
-    return @records = self.get_filtered_data(self.get_recordset)
+    return @records = self.get_filtered_data(self.get_recordset_with_includes)
   end
 
   # Get a single record by primary key or another column, if allowed. The return value is cached and

data/lib/rest_framework/filters.rb

@@ -23,25 +23,18 @@ class RESTFramework::ModelFilter < RESTFramework::BaseFilter
   def _get_filter_params
     # Map filterset fields to strings because query parameter keys are strings.
     fields = self._get_fields
-    @associations = []
 
     return @controller.request.query_parameters.select { |p, _|
       # Remove any trailing `__in` from the field name.
       field = p.chomp("__in")
 
-      # Remove any associations whose sub-fields are not filterable. Also populate `@associations`
-      # so the caller can include them.
+      # Remove any associations whose sub-fields are not filterable.
       if match = /(.*)\.(.*)/.match(field)
         field, sub_field = match[1..2]
         next false unless field.in?(fields)
 
         sub_fields = @controller.class.get_field_config(field)[:sub_fields]
-        if sub_field.in?(sub_fields)
-          @associations << field.to_sym
-          next true
-        end
-
-        next false
+        next sub_field.in?(sub_fields)
       end
 
       next field.in?(fields)
@@ -64,9 +57,6 @@ class RESTFramework::ModelFilter < RESTFramework::BaseFilter
   # Filter data according to the request query parameters.
   def get_filtered_data(data)
     if filter_params = self._get_filter_params.presence
-      # Include any associations.
-      data = data.includes(*@associations) unless @associations.empty?
-
       return data.where(**filter_params)
     end
 
@@ -88,8 +78,6 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
   def _get_ordering
     return nil if @controller.class.ordering_query_param.blank?
 
-    @associations = []
-
     # Ensure ordering_fields are strings since the split param will be strings.
     fields = self._get_fields
     order_string = @controller.params[@controller.class.ordering_query_param]
@@ -106,16 +94,6 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
         end
         next unless !fields || column.in?(fields)
 
-        # Populate any `@associations` so the caller can include them.
-        if match = /(.*)\.(.*)/.match(column)
-          association, sub_field = match[1..2]
-          @associations << association.to_sym
-
-          # Also, due to Rails weirdness, we need to convert the association name to the table name.
-          table_name = @controller.class.get_model.reflections[association].table_name
-          column = "#{table_name}.#{sub_field}"
-        end
-
         ordering[column] = direction
       end
       return ordering
@@ -130,9 +108,6 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
     reorder = !@controller.class.ordering_no_reorder
 
     if ordering && !ordering.empty?
-      # Include any associations.
-      data = data.includes(*@associations) unless @associations.empty?
-
       return data.send(reorder ? :reorder : :order, ordering)
     end
 

metadata

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