istox 0.1.97.pre.1 → 0.1.97.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321fc95249c26a00d4b85d4069621ee0cb5b67b2ad175f9858ee27f5a7fc4b8a
-  data.tar.gz: '0739da512f7f81b020075e3e5087d590638a230684a149e4be90c742b3e03b96'
+  metadata.gz: b29fc5db8791ba9b260193329c9c59f579f95f85d449c15e522844f286558cf4
+  data.tar.gz: 3badd880747485fc2d39c990f8cdd3492ae634d1498c89c713dd706476d4dff8
 SHA512:
-  metadata.gz: 3f3b13d166f18bf4e10f22442c043e6210d02fc78970356db61a97cdd6ea592067cfca8ee6830b63a7d6108081a5be7fb530ccc92eec0ed16d387662c386aafd
-  data.tar.gz: d1af245f236104a0dbdc2cac529f1045bd342e90d09cecbb07ae591591dac31a4a8f7aef112a8e8373da067bb3f8164ed1e42837f773687543d8d7156c96da97
+  metadata.gz: f5ca3cb5955dcbe3da72b55347ea4c8c688d2affe7e7eb37acccfaa2845ad0dfa2024e7598082358143fcc5c7ae974ed16558db9b70a28717423b5dae01e5b7d
+  data.tar.gz: e4da8e2c6a11282b72e9d5e9478de1d35098223265aa5cdd5c813374a548f35ee9280fb6db2f19974c307a8ce2b52d83b9354a5f8069041ce9586e193356da18

data/lib/istox/helpers/filter.rb

@@ -1,13 +1,13 @@
 module Istox
   module Filter
-    def self.order_data(query:, filters:)
+    def self.order(query:, filters:)
       filters&.sort&.each do |x|
         query = query.order("#{x.field.downcase} #{x.order.upcase}")
       end
       query
     end
 
-    def self.paginate_data(query:, filters:)
+    def self.paginate(query:, filters:)
       current_page = filters.page
       offset = (current_page - 1) * filters.limit
       total = query.count
@@ -28,5 +28,10 @@ module Istox
         }
       }
     end
+
+    def self.order_and_paginate(query:, filters:)
+      query = order(query: query, filters: filters)
+      paginate(query: query, filters: filters)
+    end
   end
 end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.97-1'.freeze
+  VERSION = '0.1.97-2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.97.pre.1
+  version: 0.1.97.pre.2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny