croods 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c99f117704edaa49eb759248b862eb75611b3cf97d0d539a70b946c94478fe
-  data.tar.gz: 377f6b1e1ba4619fb1004b31c9c23339fbaa47144f76dde57f58a6a09d4cf06e
+  metadata.gz: 9b91328083ded875d3426c54dc559f88244325ef94b858e9f5c3f7e023074e3e
+  data.tar.gz: 19c5a896ecd8b90656cbd5a8ce13404e8d97fdcd464ced2635cc54ec440e1b79
 SHA512:
-  metadata.gz: 7e16d6d4fdbab8d49a19f24561dc8018c91244373c5bd89de7667147c3186f55c29f183c90beb9a92164ef76392a2be1315db3f4ac0f4d7ef7d513f6c43b65d7
-  data.tar.gz: a01538c937bec85378379476e9d7948dfc87af86f5d952980875dea965e4352e2f14a0a94eae92145ed7730157523b544f12fefc16e44f5607407abfd3a305f7
+  metadata.gz: 3bd8d3bb1ad81a579b28117a9b438db8183e618840f238870ac8cf775138da8a066418dfe2e71085ad6f9c2495cb2de7b62e733c3508df57e568094114dbb8e0
+  data.tar.gz: 737e22753cc7354b386ebcbf74096a87f212d23c06871dd1054236b76464560e99ab6d77e02cdd3bcad69cc58e9fbab86d868d2a3a2ac14706727237753532d6

data/lib/croods/controller/collection.rb

@@ -27,9 +27,31 @@ module Croods
         end
       end
 
+      def order_by
+        params[:order_by].presence
+      end
+
+      def order
+        params[:order].presence
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      def sort_by_method(list)
+        if order_by && order
+          list.public_send(resource.sort_by, order_by, order)
+        elsif order_by
+          list.public_send(resource.sort_by, order_by)
+        elsif order
+          list.public_send(resource.sort_by, order)
+        else
+          list.public_send(resource.sort_by)
+        end
+      end
+      # rubocop:enable Metrics/AbcSize
+
       def sort(list)
-        if list.respond_to? resource.sort_by
-          list.public_send(resource.sort_by, params[:order_by], params[:order])
+        if resource.sort_by_method?
+          sort_by_method(list)
         else
           list.order(resource.sort_by)
         end

data/lib/croods/resource/attributes.rb

@@ -43,6 +43,10 @@ module Croods
         merged_attributes(self, model.columns_hash)
       end
 
+      def attribute_names
+        attributes.map { |key, _| key }
+      end
+
       def definitions
         attributes
           .merge(request_instance.additional_attributes)

data/lib/croods/resource/sorting.rb

@@ -19,10 +19,15 @@ module Croods
         @order_params ||= [order_by_attribute, order_attribute]
       end
 
-      def sort_by(attribute = nil)
-        return @sort_by ||= :created_at unless attribute
+      def sort_by_method?
+        sort_by.is_a?(Symbol) && !sort_by.to_s.in?(attribute_names) &&
+          model.respond_to?(sort_by)
+      end
+
+      def sort_by(sort = nil)
+        return @sort_by ||= :created_at unless sort
 
-        @sort_by ||= attribute
+        @sort_by ||= sort
       end
     end
   end

data/lib/croods/version.rb

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

metadata

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