generic_search 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ea1f7c8f6d0091ee267fecfc54a5bbf4aaea91
-  data.tar.gz: 3594824bb78a70db17620bfffbd0347fd7c9173e
+  metadata.gz: 686efd907cbea7e5870848642937708699c938c3
+  data.tar.gz: 8c80156de86a165d1b2bc8c6d617693173985369
 SHA512:
-  metadata.gz: 00762261f46fd12bb1fe00aaaa9c21247c8846c9948e8b2e773a8b3928df63b1be0e7b9b55a0d6250630d0f05da9d90bd46b0bfee54440825984f4d44a9a1d59
-  data.tar.gz: f8bc639f68cedc7aac59fde4d5da387ddc62cf5c611fc22a7446511673c20b41e87644057efdacd6b3c1c07f2253ee90837a6f84baa4c78abb707a2811bab117
+  metadata.gz: 1f83bfb0218639c89fd785e262616f52b7d8250d106c7fc46670864e89e96c0710b0e8e725432bcf741b80a7fc3281186971bf4df36aca4c14f2d91039358593
+  data.tar.gz: f1912676db4fc02ea50e620d94cdd7ef4e527b1aaff586895cb72c157a48819fae15725695c2088322edb4106c725134de21f8144993888189dfebd5312b69dd

data/lib/generic_search.rb

@@ -27,7 +27,7 @@ module GenericSearch
     include GenericSearch::BuildMethods
 
     # Clause attributes
-    attr_accessor :where, :includes, :joins, :select, :group, :limit, :start, :sort_order, :options
+    attr_accessor :where, :includes, :joins, :select, :group, :having, :limit, :start, :sort_order, :options
 
     # Utility attributes
     attr_accessor :base_class, :base_table, :grouped_results, :params
@@ -71,6 +71,7 @@ module GenericSearch
       self.build_where(params[:query])
       self.build_results(params[:results])
       self.build_group(params[:group])
+      self.build_having(params[:having])
       self.build_options(params[:options])
       self.build_limit(params[:limit])
       self.build_start(params[:start])
@@ -110,9 +111,8 @@ module GenericSearch
       #    selected_fields << attrs[:include]
       #  end
       #end
-      #
 
-      self.results = self.base_class.where(self.where).joins(self.joins).includes(self.includes).order(self.sort_order)
+      self.results = self.base_class.where(self.where).joins(self.joins).includes(self.includes).reorder(self.sort_order)
 
       #result_list = @model_class.joins(@joins).includes(includes).where(@where_clause).distinct
 
@@ -136,8 +136,19 @@ module GenericSearch
       end
 
       # TODO: Test required
-      if self.group
-        group_result_counts = self.results.group(self.group).count
+
+      if self.options[:no_grouped_results]
+        if self.group
+          self.results = self.results.group(self.group)
+        end
+
+        if self.having
+          self.results = self.results.having(self.having)
+        end
+      else
+        if self.group
+          group_result_counts = self.results.group(self.group).count
+        end
       end
 
       # ============== Group result processing
@@ -168,7 +179,6 @@ module GenericSearch
           }
         end
       else
-
         results = if self.options[:no_results]
                     []
                   else
@@ -179,7 +189,6 @@ module GenericSearch
                   end
 
         group_hsh = [{:num_results => self.results.length, :results => results}]
-
       end
 
       self.grouped_results = group_hsh

data/lib/generic_search/build_methods.rb

@@ -122,15 +122,18 @@ module GenericSearch
                                                  "= '#{value}'"
                                                end
                                     "\"#{table}\".\"#{config[:field]}\" #{subQuery}"
-                                  elsif operator == '=' and value.include?(',') or value.include?('|')
+                                  elsif operator == '=' and value.include?('|')
 
-                                    value = value.gsub(/\s*,\s*/, ' AND ').gsub(/\s*\|\s*/, ' OR ').split(/(AND|OR)/)
+                                    value = value.gsub(/\s*\|\s*/, ' OR ').split(/(AND|OR)/)
                                     .collect do |val|
                                       val.match(/(AND|OR)/) ? val : "\"#{table}\".\"#{key}\" #{operator} '#{val.strip}'"
                                     end.join(' ')
 
                                     "(#{value})"
 
+                                  elsif operator == '=' and value.include?(',')
+                                    # AND Support should be handled in a different way
+                                    # using group=user.id, having='ARRAY_AGG(users.id) @> ARRAY[23, 34, 45]::integer[]'
                                   else
                                     "\"#{table}\".\"#{key}\" #{operator} '#{value}'"
                                   end
@@ -138,7 +141,7 @@ module GenericSearch
             column_names << key
           end
 
-          query_per_table << single_search_param
+          query_per_table << single_search_param if single_search_param
         end
 
         self.validate_columns(table, column_names, :query)
@@ -221,6 +224,14 @@ module GenericSearch
 
     end
 
+    def build_having(having)
+      if having.blank?
+        return
+      end
+
+      self.having = having.gsub(/(^"|"$)/, '').strip
+    end
+
     def build_sort_order(sort_order)
       self.sort_order = if sort_order.nil?
                           "\"#{self.base_table}\".\"id\" ASC"
@@ -269,6 +280,10 @@ module GenericSearch
         self.options[:distinct] = true
       end
 
+      if options.include? 'no_grouped_results'
+        self.options[:no_grouped_results] = true
+      end
+
     end
 
     def build_response

data/lib/generic_search/version.rb

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

metadata

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