backframe 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c0d24ab06f49de1e0896bfbb425d52178e8acfd
-  data.tar.gz: f52fdfa058db885a75eb55e98f374190a0b6407a
+  metadata.gz: 0ba1e52c321642997db0b9688fe95319d6cda0c8
+  data.tar.gz: 1aad76b7e76e089e362f6da0c523a4b0109713e0
 SHA512:
-  metadata.gz: 540f5dd53eaed8e5d1281ba0bc7000061e2e7d31ba10d971c310198f57b9b905b66059d7a795d44d231461ab016b445688e27706c0cb9514a8d329e98cb936fa
-  data.tar.gz: 45fa7b20bb8deba3a1f8e9f8f5c86faf272fbd65cbcfaac94aab730c0b7e652634abcdad9eb14f804adb8cd917fa1ca7ea1674eb7a43284b5db388cf392d01a2
+  metadata.gz: c5996128d3b7f7660dffd109a555ec315ddfadbd84b934ecf770a0e551551430239fa70ccf47a75003e7ad8c4e3086cf09a1e954480aa62ad0b19648f21533a9
+  data.tar.gz: c1fbeb7c121da645bd4535aa1f2d8c1874bd7142c9c5288df2f85f1eec8c3a36d74e9b5f7348595e863faee1b265b54d53fb73fb565fd391b6d15775339ba5c3

data/lib/backframe/activerecord/filter_sort.rb

@@ -49,16 +49,26 @@ module Backframe
 
       def _sort(relation, key, order, default_key = 'created_at', default_order = 'desc', included = nil)
         sortfields = {}
-        included ||= [self]
-        included.each do |model|
-          model.columns.each do |column|
-            sortkey = (model == self) ? column.name : "#{model.table_name.singularize}.#{column.name}"
-            sortfields[sortkey] = "\"#{model.table_name}\".\"#{column.name}\""
+        sortjoins = {}
+        self.columns.each do |column|
+          sortfields[column.name] = "\"#{self.table_name}\".\"#{column.name}\""
+        end
+        model_table = self.table_name
+        associations = self.reflect_on_all_associations(:belongs_to)
+        associations.each do |association|
+          association_name = association.name
+          association_table = association.class_name.constantize.table_name
+          association_foreign_key = association.foreign_key
+          sortjoins["#{association.name}"] = "LEFT OUTER JOIN \"#{association_table}\" #{association_name} ON (\"#{association_name}\".\"id\" = \"#{model_table}\".\"#{association_foreign_key}\")"
+          association.class_name.constantize.columns.each do |column|
+            sortfields["#{association_name}.#{column.name}"] = "\"#{association_name}\".\"#{column.name}\""
           end
         end
-
-        key = (key.present? && sortfields.has_key?(key)) ? key : default_key
-        order = (order.present?) ? order : default_order
+        key = (key.present? && sortfields.has_key?(key)) ? key : 'created_at'
+        order = (order.present?) ? order : 'desc'
+        if parts = key.match(/(\w*)\.(\w*)/)
+          relation = relation.joins(sortjoins[parts[1]])
+        end
         relation.order("#{sortfields[key]} #{order}")
       end
     end

data/lib/backframe/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backframe
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backframe
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Greg Kops
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: write_xlsx