croods 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abd8dafdfb10c2b936a894dcb6da1057c6bfe3646f6e6d5af0f58d59d0be7bab
-  data.tar.gz: 8da5a9b8c82bacefae7d736610d7ba4e0e3305ecf832a602dd61cff0edc1b53c
+  metadata.gz: b9fa939ee66088adb051cc63ee6f9cfc1206da7674dd6f2c48c524ea0ca8b931
+  data.tar.gz: 9e9722e961a8b24760106965a385a5aad1a89d9b85369243d3497c2c3fc33784
 SHA512:
-  metadata.gz: deac1ff6c8763d738b8ccd20149632df9be2425690a1550d57172e3a922a1b685f484d848f39fa5f3a8a29b3bd596c4c8c27e6f7356dbd4d56d40ff0abf879a2
-  data.tar.gz: 7a7342dba26327dc7e1422b26adf56b08747a20a3062d1c1090b941c6d3cf4030f2953975fceb770fb1127cc15097e7398ee35ec0ca017c1a4a6b18ba3a78a4a
+  metadata.gz: 65565603371e3e5d46d3c8f412af157bd4e50ca2c1f6afc57a3577f4dd77f294bd63624c7f02585973214ff978d7312367d520916f7497c4f29f49f582b28f1b
+  data.tar.gz: 3d0f2872653a07a3edb49cdb3cc368e34eb153826a5066099ed250400000613ea128bbbf5dac4cc3563fffe87f67b94ac82d2854a8a30004010d4f6d200b9be5

data/lib/croods/controller/collection.rb

@@ -13,11 +13,17 @@ module Croods
         paginate(list.send(resource.page_method_name, page_param))
       end
 
-      def collection
-        list = resource
-          .apply_filters(policy_scope(model), params)
-          .order(resource.sort_by)
+      def sort(list)
+        if list.respond_to? resource.sort_by
+          list.public_send(resource.sort_by, params[:order_by], params[:order])
+        else
+          list.order(resource.sort_by)
+        end
+      end
 
+      def collection
+        list = resource.apply_filters(policy_scope(model), params)
+        list = sort(list)
         list = paginate_collection(list) if page_param.present?
 
         list

data/lib/croods/resource/json_schema/links/collection.rb

@@ -36,7 +36,9 @@ module Croods
             def properties(resource)
               properties = {}
 
-              resource.pagination_params.each do |attribute|
+              params = resource.pagination_params + resource.order_params
+
+              params.each do |attribute|
                 properties[attribute.name] = definition(attribute)
               end
 

data/lib/croods/resource/sorting.rb

@@ -3,10 +3,26 @@
 module Croods
   module Resource
     module Sorting
+      def order_by_attribute
+        @order_by_attribute ||= Croods::Attribute.new(
+          'order_by', :string, null: true
+        )
+      end
+
+      def order_attribute
+        @order_attribute ||= Croods::Attribute.new(
+          'order', :string, null: true
+        )
+      end
+
+      def order_params
+        @order_params ||= [order_by_attribute, order_attribute]
+      end
+
       def sort_by(attribute = nil)
         return @sort_by ||= :created_at unless attribute
 
-        @sort_by = attribute
+        @sort_by ||= attribute
       end
     end
   end

data/lib/croods/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Croods
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: croods
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Daniel Weinmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-pagination