tabulatr2 0.9.39 → 0.9.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1706d3a41110804765176f50317e42e25df7a08f8c0834591ea042b72ab2366f
-  data.tar.gz: ec5fb3df2608a5997e81366c3cc8bbe0694703a49d38e130de6ae69ba3905304
+  metadata.gz: ae1a361564e5e09da6f27ce3803f2e45b980b958a7716798372da8f0c6f609cd
+  data.tar.gz: b1484c767ee360602179fd08ccfd499988d455a570d6fb589101e180c4e41c7f
 SHA512:
-  metadata.gz: d77e36296a6aa444ae874dfe67748db7fcbe57bfc1ebd2f2db4629f7c4a65d501aa89c0ac62888dd2c621701983ee5119893107ad89e8fa0f2580387dacafc4e
-  data.tar.gz: 9d2ecd814d67f2bb64d59492f3460ff0a959fcf5326c9de4df32e6c6e7b20026b40e676115d9069e6be6fbb42a196906ca2b13ad97466b404b82e70bb2a0018a
+  metadata.gz: 23b19980985effeceab7e1a677823e7e19909b86bb63a7e5a86848652dd2ea6ec8faee21f365c5e4844ed23830fbc2cf7f3f64e94de4c296226af74a769991b0
+  data.tar.gz: c01ab2d6f7973ebdaaca99671d67d842f3010377db6a323468c5b19e6d7bf1aa48963cb976447573032a350324b6556e98970d9cddcca0fa8bf6c89b234890e3

data/lib/tabulatr/data/sorting.rb

@@ -41,9 +41,13 @@ module Tabulatr::Data::Sorting
       end
       sort_by(column, orientation)
     elsif @default_order.present?
-      @relation = @relation.reorder(@default_order)
+      if @default_order.is_a? String
+        @relation = @relation.reorder(Arel.sql @default_order)
+      else
+        @relation = @relation.reorder(@default_order)
+      end
     else
-      @relation = @relation.reorder("#{@table_name}.#{@base.primary_key} desc")
+      @relation = @relation.reorder(Arel.sql "#{@table_name}.#{@base.primary_key} desc")
     end
   end
 
@@ -52,7 +56,7 @@ module Tabulatr::Data::Sorting
       if sort_sql.respond_to? :call
         @relation = sort_sql.call(@relation, orientation, "#{@table_name}.#{@base.primary_key}", @base)
       else
-        @relation = @relation.reorder("#{sort_sql} #{orientation}")
+        @relation = @relation.reorder(Arel.sql "#{sort_sql} #{orientation}, #{@table_name}.id desc")
       end
   end
 

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.39"
+  VERSION = "0.9.40"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.39
+  version: 0.9.40
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails