forest_liana 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42211f7fdd6d6bf42f56b919a8f6d935bd9626c1
-  data.tar.gz: 792780e77690ec9532bde36a69ce26db608f5ac2
+  metadata.gz: ab20200b70356fc864e92fa629cee986a8f5bc35
+  data.tar.gz: e0cc7b3e3a71162b03dd8fc807c26c90fb59987d
 SHA512:
-  metadata.gz: 191cf390e2fd3d5c536e0dc7c93b57a5b8ce333268703373c61650a2b6c70b08f6496dc4665317287218ce6fe9628bff75da32067611833ad1a9223706d495a9
-  data.tar.gz: 78e90aa5449cebb4c8ce274cebfb8a8e8176d0ecbe193d9007bc8c0e21d2778ac230c8cbb14724c5a440049e02e0e308f26d1f4121f16a17dd97a4c196d57dfa
+  metadata.gz: b855d0f833f4172e2c711316d9423ce46738965bc97fa47d577b3aee91c16ec1d4aecaa01707ca3796d1e22b1be00f5bed42a0e3ada08b97d11b9bdcb145277d
+  data.tar.gz: 7b339c923eea4c3febcd22c1cc08497e487d142648eb9304485c71d7882df68e59fd280248c74ea8664c7f4554fd3952d07142f2cda70831472a1c8d7041ea55

data/app/services/forest_liana/resources_getter.rb

@@ -6,16 +6,16 @@ module ForestLiana
     end
 
     def perform
-      @records = search_query
+      @records_without_sort = @records = search_query
       @records = sort_query
     end
 
     def records
-      @records.offset(offset).limit(limit)
+      @records.offset(offset).limit(limit).to_a
     end
 
     def count
-      @records.count
+      @records_without_sort.count
     end
 
     private
@@ -25,25 +25,57 @@ module ForestLiana
     end
 
     def sort_query
-      query = nil
-
       if @params[:sort]
         @params[:sort].split(',').each do |field|
           order = detect_sort_order(@params[:sort])
           field.slice!(0) if order == :desc
           field = detect_reference(field)
 
-          query = "#{field} #{order.upcase}"
+          association = @resource.reflections[field.to_sym]
+          if association.try(:macro) == :has_many
+            @records = has_many_sort(association, order)
+          elsif association.try(:macro) == :has_and_belongs_to_many
+            @records = has_and_belongs_to_many(association, order)
+          else
+            @records = @records.order("#{field} #{order.upcase}")
+          end
         end
       elsif @resource.column_names.include?('created_at')
-        query = 'created_at DESC'
+        @records = @records.order('created_at DESC')
       elsif @resource.column_names.include?('id')
-        query = 'id DESC'
+        @records = @records.order('id DESC')
       else
-        return @records
+        @records
       end
 
-      @records.order(query)
+      @records
+    end
+
+    def has_many_sort(association, order)
+      @records
+        .select("#{@resource.table_name}.*,
+                COUNT(#{association.klass.table_name}.id) has_many_count")
+        .joins("LEFT JOIN #{association.klass.table_name}
+               ON #{@resource.table_name}.id =
+                 #{association.klass.table_name}.#{association.foreign_key}")
+      .group("#{@resource.table_name}.id")
+      .order("has_many_count #{order.upcase}")
+    end
+
+    def has_and_belongs_to_many(association, order)
+      @records
+        .select("#{@resource.table_name}.*,
+                COUNT(#{association.klass.table_name}.id) has_many_count")
+        .joins("LEFT JOIN #{association.options[:join_table]}
+               ON #{@resource.table_name}.id =
+                 #{association.options[:join_table]}.
+                   #{association.foreign_key}")
+        .joins("LEFT JOIN #{association.klass.table_name}
+               ON #{association.klass.table_name}.id =
+                 #{association.options[:join_table]}.
+                   #{association.klass.name.foreign_key}")
+      .group("#{@resource.table_name}.id")
+      .order("has_many_count #{order.upcase}")
     end
 
     def detect_sort_order(field)
@@ -58,7 +90,7 @@ module ForestLiana
           .find {|a| a.name == ref.to_sym }
 
         if association
-          "#{association.class_name.to_s.underscore.pluralize}.#{field}"
+          "#{association.table_name}.#{field}"
         else
           param
         end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails