forest_liana 1.0.0.pre.beta.1 → 1.0.0.pre.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16861dd6d242cdecc96ac42cb8fab520733de0bc
-  data.tar.gz: df978d7c4b3cf406df199b505f921a292a6547aa
+  metadata.gz: 96387ca6684d93d492164c89a8047c8a1c856868
+  data.tar.gz: e8b02d496b3fc2fcc1912cb4046bb4a9f3cda639
 SHA512:
-  metadata.gz: 0937c17604b57f0322ea6de6b3e40e225ed01c71d333dd295c6682540e1e82b63efccb656af2890714dde69cdfe7801dc25fef36f707a1f337394f5e31fc9d9d
-  data.tar.gz: 055a857986359b2d69bb4886290956edd8e710bafec46421b47151f3ae8ca16d410accbb6e19ce80244b7f4e4efea59ab99ea9eff3535c078e13d5dcdf49ae7f
+  metadata.gz: 100ec457f01ffc78b7805244522740730a9fb96e3fd46bbd039f5dc579fdb635a07f6e76dac6d10853cc0ec062cb07d5bdef74623532d07bad3409c0c8453805
+  data.tar.gz: 84c3823fc6e4554f533f2fa3744354ee6ab2301eed00bfe9766a85eabb7b8a75fb1e81c6e90afe4cea520a4a0199663846b7d23181443ee5eb9765942104369b

data/app/services/forest_liana/resources_getter.rb

@@ -21,31 +21,52 @@ module ForestLiana
     private
 
     def search_query
-      SearchQueryBuilder.new(@resource.includes(includes), @params).perform
+      SearchQueryBuilder.new(@resource.joins(includes), @params).perform
     end
 
     def sort_query
-      query = {}
+      query = nil
 
       if @params[:sort]
         @params[:sort].split(',').each do |field|
-          order = :asc
-          if field[0] === '-'
-            order = :desc
-            field.slice!(0)
-          end
+          order = detect_sort_order(@params[:sort])
+          field.slice!(0) if order == :desc
+          field = detect_reference(field)
 
-          query[field] = order
+          query = "#{field} #{order.upcase}"
         end
       elsif @resource.column_names.include?('created_at')
-        query[:created_at] = :desc
+        query = 'created_at DESC'
       elsif @resource.column_names.include?('id')
-        query[:id] = :desc
+        query = 'id DESC'
+      else
+        return @records
       end
 
       @records.order(query)
     end
 
+    def detect_sort_order(field)
+      return (if field[0] == '-' then :desc else :asc end)
+    end
+
+    def detect_reference(param)
+      ref, field = param.split('.')
+
+      if ref && field
+        association = @resource.reflect_on_all_associations
+          .find {|a| a.name == ref.to_sym }
+
+        if association
+          "#{association.class_name.to_s.underscore.pluralize}.#{field}"
+        else
+          param
+        end
+      else
+        param
+      end
+    end
+
     def includes
       @resource
         .reflect_on_all_associations

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.0.0-beta.1"
+  VERSION = "1.0.0-beta.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.1
+  version: 1.0.0.pre.beta.2
 platform: ruby
 authors:
 - Sandro Munda