incline 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33433684e0ddf6d5ea692b73352df41cf6515f0c
-  data.tar.gz: 8d5c29273d9ca46fdd18facdca7585621543541d
+  metadata.gz: f450825492e9998e61730273f23eece45027fa0a
+  data.tar.gz: 65c8d04ee7f53deed946071c433c4c4dd00a3637
 SHA512:
-  metadata.gz: cddbe4ec1264f5d36ce6d4bb5e93e90d8b7a3cab3aad95b10e292874ed991196b6e8f5c4fe7d88c411e11e9256191870e6bcdadf536e2f20f7896b4bbede8dcc
-  data.tar.gz: 2c7f96f42acc17a18227478ce2099903f2f35c137ab700e8caa38b7595502a41b5d6a3912b4c63a7c9ed6c44dea04a3f71286fc99653e9bb137fa30018e4f928
+  metadata.gz: 00c007bdc0c21cc51f28d0eb267ade695f70f8e29a70eaf8cde1e33ccea72fd14e8d0add429b1e568fa52df7f034a4b012c4d863aa0f6b5c594c814fc3fdd139
+  data.tar.gz: e8989b1486b14dcc7edb05ce44cafbc5bf98e96b20cbb9e56e5a70ef53d573118f75b7949108f089c6f6814c27c09d06bb98c8cb075ea204d60ed120a0a62ad5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.2.25)
+    incline (0.2.26)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass

data/lib/incline/data_tables_request.rb

@@ -260,7 +260,10 @@ module Incline
                     columns.reject {|c| !c[:searchable] || relation.model.column_names.include?(c[:name].to_s) }.any?
                 )
 
-        Incline::Log::debug "Filtering will be done #{filter_local ? 'application' : 'database'}-side."
+        order_local = ordering.blank? || ordering.reject{|k,_| relation.model.column_names.include?(k.to_s)}.any?
+
+        Incline::Log::debug "Filtering will be done #{(filter_local || order_local) ? 'application' : 'database'}-side."
+        Incline::Log::debug "Ordering will be done #{order_local ? 'application' : 'database'}-side."
 
         unless filter_local
           ###  Database Side Individual Filtering  (AND) ###
@@ -282,19 +285,23 @@ module Incline
         end
 
         ###  Database Side Ordering  ###
-        if ordering.blank?
-          relation = relation.order(id: :asc)
-        else
+        unless order_local
           relation = relation.order(ordering)
         end
 
-        # Now we have two paths, if we are filtering locally, we need to return everything up to this point and
+        # Now we have two paths, if we are filtering/ordering locally, we need to return everything up to this point and
         # perform our filters before limiting the results.
-        # If we filtered at the database, then we can limit the results there as well.
-        if filter_local
+        # If we filtered and ordered at the database, then we can limit the results there as well.
+        if filter_local || order_local
           # execute the query
           relation = relation.to_a
 
+          ###  Application Side Ordering  ###
+          if order_local
+            ordering_list = ordering.to_a
+            relation.sort{|a,b| local_sort(a, b, ordering_list) }
+          end
+
           ###  Local Individual Filtering   (AND) ###
           columns.reject{|c| c[:search].blank? || c[:name].blank?}.each do |col|
             name = col[:name].to_s
@@ -351,5 +358,26 @@ module Incline
       end
     end
 
+    private
+
+    def local_sort(a, b, attribs, index = 0)
+      if index >= attribs.count
+        0
+      else
+        attr, dir = attribs[index]
+        val_a = a.send(attr)
+        val_b = b.send(attr)
+        if val_a == val_b
+          local_sort a, b, attribs, index + 1
+        else
+          if dir.to_s.downcase == 'desc'
+            val_b <=> val_a
+          else
+            val_a <=> val_b
+          end
+        end
+      end
+    end
+
   end
 end

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.25"
+  VERSION = "0.2.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -610,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A gem designed to get off to an even quicker start with Rails.