grid_table 1.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0f68c331f3af5023c4259e67dd20e1a54e5679
-  data.tar.gz: 2cf32700cc72c621f88e8d0fb94f76094c638021
+  metadata.gz: d6037e9f180243d42182c4eb6a5739fc457d256d
+  data.tar.gz: 34ddfabfae33383f69c46f4f4d1920d78d1ab495
 SHA512:
-  metadata.gz: a164408606bd8da871a3e434b5896bad3aba26cb666df8e19a22ef0215b6ee1dc40c7f892083f55f87805f4b6940192e87c5dd9a3b8dff849c1f57700ac87fca
-  data.tar.gz: 12f2edc524f24d218b0ec301a1d59de22853c7a87c146156491b2c593547433573fea095507d05cc49c6c581f7588cd22bd5352e92cac2afeb3c68acc4a07523
+  metadata.gz: 9b74ed307fb917880bad85c2f519f962c6370cc9fdf1f9515a1b0ba4ed828a1f37f28ed65fd8f525d3d7ff21753796bf91c13e41c8250f0482c1d6560b469e5f
+  data.tar.gz: 83537aac94772bf820c8650a246eccc7171c51eecac5215b91b1b4053e36db27b455faf288f32b2d0b09913853194fa3ef82b21c64321186dae180aaeb54b1f5

data/lib/grid_table/control.rb

@@ -34,27 +34,27 @@ class GridTable::Control
     false
   end
 
-  attr_writer :model, :attribute, :source, :source_class, :source_column, :source_alias, :filter, :polymorphic
+  attr_writer :model, :attribute, :source, :source_class, :source_column, :source_sql, :filter, :polymorphic
 
   def filter(param_filter_value, records)
-    return if @filter.nil?
+    return records if @filter == false
 
     arel_query = nil
     strategy_map = {
-      exact_match: ->(col) { col.eq(param_filter_value) },
-      prefix:      ->(col) { col.matches("#{param_filter_value}%") },
-      suffix:      ->(col) { col.matches("%#{param_filter_value}") },
-      fuzzy:       ->(col) { col.matches("%#{param_filter_value}%") },
-      array:       ->(_col) { "#{column} @> ARRAY[#{[param_filter_value].flatten.join(',')}]" },
-      date_range:  ->(_col) { "#{source_table.name}.#{column} BETWEEN #{param_filter_value}" }
+      exact_match: ->(col) { "(#{col}) = #{param_filter_value}" },
+      prefix:      ->(col) { "(#{col}) ILIKE '#{param_filter_value}%'" },
+      suffix:      ->(col) { "(#{col}) ILIKE '%#{param_filter_value}'" },
+      fuzzy:       ->(col) { "(#{col}) ILIKE '%#{param_filter_value}%'" },
+      array:       ->(col) { "(#{col}) @> ARRAY[#{[param_filter_value].flatten.join(',')}]" },
+      date_range:  ->(_col) { "(#{col}) BETWEEN #{param_filter_value}" }
     }
 
     polymorphic_models.each_with_index do |klass, i|
       # TODO: implement array filtering
-      arel_query = i.zero? ? strategy_map[strategy].call(klass.arel_table[column]) : arel_query.or(strategy_map[strategy].call(klass.arel_table[column]))
+      arel_query = i.zero? ? strategy_map[strategy].call(polymorphic_table_with_column(klass)) : arel_query.or(strategy_map[strategy].call(polymorphic_table_with_column(klass)))
     end
 
-    arel_query ||= strategy_map[strategy].call(source_table[column])
+    arel_query ||= strategy_map[strategy].call(table_with_column)
     prepared_records(records).where(arel_query)
   end
 
@@ -113,7 +113,11 @@ class GridTable::Control
   end
 
   def table_with_column
-    @source_alias || "#{source_table.name}.#{column}"
+    @source_sql || "#{source_table.name}.#{column}"
+  end
+
+  def polymorphic_table_with_column(klass)
+    @source_sql || "#{klass.arel_table.name}.#{klass.arel_table[column].name}"
   end
 
   def model_fk

data/lib/grid_table/table.rb

@@ -12,7 +12,7 @@ class GridTable::Table
       source: options[:source],
       source_class: options[:source_class],
       source_column: options[:source_column],
-      source_alias: options[:source_alias],
+      source_sql: options[:source_sql],
       filter: options[:filter],
       polymorphic: options[:polymorphic]
     )

data/lib/grid_table/version.rb

@@ -1,3 +1,3 @@
 module GridTable
-  VERSION = '1.4'.freeze
+  VERSION = '1.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_table
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.1
 platform: ruby
 authors:
 - Jon Principe