rad_core_rails 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20894cdcbbc09b23a7271f946adefd95783ba644190aed1d5a8589b3f2f3c8ad
-  data.tar.gz: 36cfbec37c2e80c9ce756122269349718dae958928e9eac1eb469900de312873
+  metadata.gz: 19eb34cf021bf71626e4dffbf85549af5d4f1a66c6e04690e7652a6b716d185b
+  data.tar.gz: 2c5a597b5884b9a8d6cd8ac11eba03e31eeab05f67e04d300542a3fca6f51872
 SHA512:
-  metadata.gz: a09c99c1805728bb164a4676d3877ed571686d062bb46bdd787df242f1dc03861371a28d01796079549c36c29666598f587896aa14e0070bc805fe5f09e3faa1
-  data.tar.gz: 5d0a8c6cda29036a9ea0403bc16a3e7b8ecbe57b3bcc0ecc3da8e378d418900506f9cd394e98cd3bd8b58cd6f0b11c588fd563395ce370a3d368a2bd4ea57a7c
+  metadata.gz: 39a39f01993527ae34221b035cd864a4dd35bb6240b54c6e71dded4793f7a098aee0c47a744e72d7a361214a05fc64ee79d2664e8303cf4262c8f36f7dae701c
+  data.tar.gz: ef0ec46b1c1bf8563cdef0747cac98cc95e0c12bc114f0e3d2d76271927f18d6621f53f77a55ecded26351fb59ecf05547cc82261ef16b0d44921948dcd09f48

data/lib/rad_core_rails/query_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RadCoreRails
   module QueryGenerator
     extend ActiveSupport::Concern
@@ -5,7 +7,7 @@ module RadCoreRails
     class_methods do
       attr_reader :searchable_columns
 
-      def searchable(columns=[])
+      def searchable(columns = [])
         @searchable_columns = handle_columns(columns)
       end
 
@@ -43,7 +45,7 @@ module RadCoreRails
           search.split(' ').each do |term|
             columns = []
             searchable_columns.each do |col|
-              columns.push("(REPLACE(LOWER(#{col}), ' ', '') ILIKE ?)")
+              columns.push("(LOWER(#{col}) ILIKE ?)")
               args.push '%' + term.downcase.strip + '%'
             end
             clause.push '(' + columns.join(' OR ') + ')'
@@ -64,25 +66,29 @@ module RadCoreRails
       end
 
       def generate_model_clause(column_name, filter)
-        str = "(#{column_name} = ANY(?))"
-        args = []
-        args << '{' + filter[:values].join(', ') + '}'
+        str = "(#{column_name} = ANY(ARRAY[?]))"
+        args = [filter[:values]]
 
         [str, args]
       end
 
       def generate_array_clause(column_name, filter)
-        str = "(#{column_name} && (?))"
-        args = []
-        args << '{' + filter[:values].join(', ') + '}'
+        str = "(#{column_name} && ARRAY[?])"
+        args = [filter[:values]]
 
         [str, args]
       end
 
       def generate_reference_link_clause(link_out_type, filter)
         str = "(reference_links.link_out_type = '#{link_out_type}' AND reference_links.link_out_id = ANY(?))"
-        args = []
-        args << '{' + filter[:values].join(', ') + '}'
+        args = [filter[:values]]
+
+        [str, args]
+      end
+
+      def generate_jsonb_array_clause(unique_filter_key, column_name, filter)
+        str = "(#{column_name}  ?| ARRAY[:#{unique_filter_key}])"
+        args = [{ "#{unique_filter_key}": filter[:values] }]
 
         [str, args]
       end
@@ -143,14 +149,14 @@ module RadCoreRails
 
       def handle_columns(columns)
         if columns.empty?
-          return self.columns.select{|c| c.type == :string}.map{|c| "#{self.table_name}.#{c.name}"}
+          return self.columns.select { |c| c.type == :string }.map { |c| "#{table_name}.#{c.name}" }
         end
 
         columns.map do |c|
-          splitted_c = c.split(".")
+          splitted_c = c.split('.')
 
-          if splitted_c.size == 1 && splitted_c.first != self.table_name
-            "#{self.table_name}.#{c}"
+          if splitted_c.size == 1 && splitted_c.first != table_name
+            "#{table_name}.#{c}"
           else
             c
           end
@@ -158,4 +164,4 @@ module RadCoreRails
       end
     end
   end
-end
+end

data/lib/rad_core_rails/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RadCoreRails
-  VERSION = "0.4.1"
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport