rest_framework 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb9085823972b6991c739761eb1ec47ce012e9b0c40e0215199b1cc1f2e681c0
-  data.tar.gz: 7c211b54982077d586d35cd0c04401f1e7ec54cd5363234f5832651f605aee5d
+  metadata.gz: 3c2cd61ac79fb24303888d0595f53816562ee4377703dca5e6e43842db66153d
+  data.tar.gz: 195627f1816895b657b1e796ffb81d70781c009aa8f7266cda8a7b28cde33bc2
 SHA512:
-  metadata.gz: a92b41406fa3d2723fe29e53ff38c129453b3357e6d21f51fb79de797812a2d20ea0dd5936ace48834084d00887658daf7be63bbb65e98d7cb7eee21fbe2fd89
-  data.tar.gz: 652d9e6c68f1688202d7ee52617bb73491f358afffcd99960bda6edc3acf2a6dd2942e278bcfeb7e86876754f16d9b8911af716b61eb179f021188ecd61e9dc8
+  metadata.gz: f3dac5f9515f8797c3d2789ccdbc2e623bafa18124b81999c1959884f14449315c574c88ff7ecdfc8766b4816067b188634d381ee2e00b9e1eff91b71a347f6f
+  data.tar.gz: c883ab665f21b36d7d6838ef154eec4cd2072505fc1a21626e9b56f3a4287a5d85aa5fc090d4e780259ddfe77b4993db7e44157c7aac673138f5deb24a1c438b

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/rest_framework/controller_mixins/models.rb

@@ -37,6 +37,7 @@ module RESTFramework::BaseModelControllerMixin
         filterset_fields: nil,
         ordering_fields: nil,
         ordering_query_param: 'ordering',
+        ordering_no_reorder: false,
         search_fields: nil,
         search_query_param: 'search',
         search_case_sensitive: false,

data/lib/rest_framework/filters.rb

@@ -38,8 +38,8 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
   def _get_ordering
     return nil if @controller.class.ordering_query_param.blank?
     ordering_fields = @controller.send(:get_ordering_fields)
-
     order_string = @controller.params[@controller.class.ordering_query_param]
+
     unless order_string.blank?
       ordering = {}
       order_string.split(',').each do |field|
@@ -63,9 +63,12 @@ class RESTFramework::ModelOrderingFilter < RESTFramework::BaseFilter
   # Order data according to the request query parameters.
   def get_filtered_data(data)
     ordering = self._get_ordering
+    reorder = !@controller.send(:ordering_no_reorder)
+
     if ordering && !ordering.empty?
-      return data.order(_get_ordering)
+      return data.send(reorder ? :reorder : :order, _get_ordering)
     end
+
     return data
   end
 end

metadata

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