generic_search 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 686efd907cbea7e5870848642937708699c938c3
-  data.tar.gz: 8c80156de86a165d1b2bc8c6d617693173985369
+  metadata.gz: 13f75ac8a62eeedbb15e95dba04c9caefee742f2
+  data.tar.gz: 638d4c98405702a0c42362361a583b866932d6e5
 SHA512:
-  metadata.gz: 1f83bfb0218639c89fd785e262616f52b7d8250d106c7fc46670864e89e96c0710b0e8e725432bcf741b80a7fc3281186971bf4df36aca4c14f2d91039358593
-  data.tar.gz: f1912676db4fc02ea50e620d94cdd7ef4e527b1aaff586895cb72c157a48819fae15725695c2088322edb4106c725134de21f8144993888189dfebd5312b69dd
+  metadata.gz: 277a13f4e4cf31c5e67207f12f02d16eccd2b4a20df329c70625772a892b276272d21d9fa0760cfca76af7ea2d593171bfa4c7c681f5c09fe205a3459d2ee378
+  data.tar.gz: f6d55ce1a1426717613776b320296a7be38b155d033cf0165154c55fcddef4237ca381163fe8621e3f6236dc8f8fc656ece91c7d5b45a04dfe6852324579b349

data/lib/generic_search.rb

@@ -122,21 +122,7 @@ module GenericSearch
       end
 
       # ========== Limiting & Grouping =========
-      # TODO: If there is a limit then only following count query has to be executed otherwise use .length
-      if self.options[:no_limit_count]
-        # Note: If no limit or start, then .length will fire the query, from that length is calculated.
-        # Additional count query is not required
-        self.no_limit_count = (self.limit || self.start) ? self.results.count : self.results.length
-        #self.no_limit_count = self.results.count
-      end
-
       # TODO: Test required
-      unless self.options[:no_results]
-        self.results = self.results.limit(self.limit).offset(self.start)
-      end
-
-      # TODO: Test required
-
       if self.options[:no_grouped_results]
         if self.group
           self.results = self.results.group(self.group)
@@ -151,6 +137,19 @@ module GenericSearch
         end
       end
 
+      # TODO: If there is a limit then only following count query has to be executed otherwise use .length
+      if self.options[:no_limit_count]
+        # Note: If no limit or start, then .length will fire the query, from that length is calculated.
+        # Additional count query is not required
+        self.no_limit_count = (self.limit || self.start) ? self.results.count : self.results.length
+        #self.no_limit_count = self.results.count
+      end
+
+      # TODO: Test required
+      unless self.options[:no_results]
+        self.results = self.results.limit(self.limit).offset(self.start)
+      end
+
       # ============== Group result processing
       # TODO: Test required
       if group_result_counts

data/lib/generic_search/version.rb

@@ -1,3 +1,3 @@
 module GenericSearch
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generic_search
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Justin Hayes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler