bharat_filter_engine 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c1821308815c4d17986f4cfdf2eea0daeae04849d48fe688aa231891bdfb93
-  data.tar.gz: bb1a6ad5176d209fa37af14deb1dabdd756884eaab062db7d65ade69b0c4b3bb
+  metadata.gz: 45380eb2ba5afe790b2cbc8f0abe65cbab402d2489fb025bd2d2407c5700a57f
+  data.tar.gz: 8529dbb3f163c708c819ab166e1d946d23900ef685b9bb44b758f734c44c913b
 SHA512:
-  metadata.gz: 989674d80aeeaa3589f6a59d77a426acdd69886f780425100ddfe995aabf5096d03e80ec7958e51f66941b79e3ca14606b1b5e545afac0eddb3e9d9cbb87f048
-  data.tar.gz: 06d6923226a0b941075d7e7323f4eca428c493f7f22f625ff8d243962dff812eb1992ac0e7eb888e47341f1df1e430523931fac5a55f76b6c6cc360e31aa7c01
+  metadata.gz: 4ae9d8027f95b37c0f7f43235a56cc0b234ab444aa0079bfa1425b44ca408677def18f0f11216dced37321b68765a7e64fcd2217add708dc097a8da6e44c536e
+  data.tar.gz: a2ea4acb0d03be39e10d59b0c01b7da206489e95fbad43a7d60c1f04e83c9de7031de5d5779599b6c22348e684c17b326b2d9f3fa3b39a022e69b3ab429cd1be

data/Gemfile

@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
-gem "activerecord", ">= 6.1"
-gem "activemodel", ">= 6.1"
-gem "activesupport", ">= 6.1"
+gem 'activemodel', '>= 6.1'
+gem 'activerecord', '>= 6.1'
+gem 'activesupport', '>= 6.1'
 
 group :development, :test do
-  gem "sqlite3"
-  gem "rspec"
-  gem "rake"
+  gem 'rake'
+  gem 'rspec'
+  gem 'rubocop-rails-omakase', require: false
+  gem 'rubocop-rake', require: false
+  gem 'rubocop-rspec', require: false
+  gem 'sqlite3'
 end
 
 group :test do
-  gem "database_cleaner-active_record"
-end
+  gem 'database_cleaner-active_record'
+end

data/README.md

@@ -8,7 +8,7 @@ query string) into a filtered `ActiveRecord::Relation` — including
 filters on associated models, free-text search, and dynamically
 populated dropdown values.
 
-[![Gem Version](https://img.shields.io/badge/version-0.1.1-blue)](CHANGELOG.md)
+[![Gem Version](https://img.shields.io/badge/version-0.1.2-blue)](CHANGELOG.md)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
 ---

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: :spec

data/lib/bharat_filter_engine/association_resolver.rb

@@ -7,19 +7,14 @@ module BharatFilterEngine
     end
 
     def resolve(path)
-      parts = path.to_s.split("__").map(&:to_sym)
-
+      parts = path.to_s.split('__').map(&:to_sym)
       return nil if parts.empty?
 
       current_klass = @scope.klass
       reflections = []
 
       parts.each do |association_name|
-        reflection =
-          current_klass.reflect_on_association(
-            association_name
-          )
-
+        reflection = current_klass.reflect_on_association(association_name)
         return nil unless reflection
 
         reflections << reflection
@@ -36,11 +31,6 @@ module BharatFilterEngine
 
     def resolve_column(field)
       field = field.to_s
-
-      # ----------------------------------------
-      # Direct column
-      # ----------------------------------------
-
       if @scope.klass.column_names.include?(field)
         return {
           column: field,
@@ -50,41 +40,32 @@ module BharatFilterEngine
         }
       end
 
-      # ----------------------------------------
       # Nested column
-      #
       # lead__client__name
-      #
       # lead -> client -> name
-      # ----------------------------------------
-
-      parts = field.split("__")
-
-      column =
-        parts.pop
-
-      association_path =
-        parts.join("__")
-
-      result =
-        resolve(association_path)
+      parts = field.split('__')
+      column = parts.pop
+      association_path = parts.join('__')
+      result = resolve(association_path)
 
       return nil unless result
+      return nil unless result[:klass].column_names.include?(column)
 
-      return nil unless
-        result[:klass].column_names.include?(column)
-
-      result.merge(
-        column: column
-      )
+      result.merge(column: column)
     end
 
     def join(scope, associations)
       return scope if associations.blank?
 
-      scope.joins(
-        build_nested_join(associations)
-      )
+      scope.joins(build_nested_join(associations))
+    end
+
+    def subquery(associations)
+      klass = @scope.klass
+      relation = klass.unscoped.joins(build_nested_join(associations))
+      relation = yield(relation) if block_given?
+
+      relation.select(klass.arel_table[klass.primary_key])
     end
 
     private
@@ -99,4 +80,4 @@ module BharatFilterEngine
         end
     end
   end
-end
+end

data/lib/bharat_filter_engine/column_helper.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module BharatFilterEngine
+  module ColumnHelper
+    STRING_COLUMN_TYPES = %i[string text].freeze
+
+    module_function
+
+    def string_like?(klass, column)
+      db_column = klass&.columns_hash&.[](column.to_s)
+      db_column.nil? || STRING_COLUMN_TYPES.include?(db_column.type)
+    end
+
+    def present_predicate(arel_column, klass, column)
+      predicate = arel_column.not_eq(nil)
+      return predicate unless string_like?(klass, column)
+
+      predicate.and(arel_column.not_eq(''))
+    end
+
+    def blank_predicate(arel_column, klass, column)
+      predicate = arel_column.eq(nil)
+      return predicate unless string_like?(klass, column)
+
+      predicate.or(arel_column.eq(''))
+    end
+  end
+end

data/lib/bharat_filter_engine/dynamic_filter_values.rb

@@ -2,10 +2,14 @@
 
 module BharatFilterEngine
   class DynamicFilterValues
-    def initialize(scope:, model: nil, field:)
+    LIKE_ESCAPE_CHAR = '\\'
+
+    def initialize(scope:, field:, model: nil, term: nil, limit: nil)
       @scope = scope
       @model = model || scope.klass
       @field = field.to_s
+      @term = term.presence
+      @limit = limit.presence&.to_i
     end
 
     def call
@@ -14,26 +18,21 @@ module BharatFilterEngine
       result = resolver.resolve_column(@field)
       return nil unless result
 
-      scoped =
-        resolver.join(
-          @scope,
-          result[:associations]
-        )
-
-      column = result[:column]
-      nested = result[:associations].present?
+      scoped = resolver.join(@scope, result[:associations])
+      arel_column = result[:klass].arel_table[result[:column]]
+      scoped = scoped.where(ColumnHelper.present_predicate(arel_column, result[:klass], result[:column]))
+      scoped = apply_term(scoped, arel_column) if @term
+      scoped = scoped.distinct.order(arel_column)
+      scoped = scoped.limit(@limit) if @limit&.positive?
 
-      not_condition =
-        nested ? { result[:table_name] => { column => [nil, ""] } } : { column => [nil, ""] }
+      scoped.pluck(arel_column)
+    end
 
-      qualified_column =
-        nested ? Arel.sql("#{result[:table_name]}.#{column}") : column
+    private
 
-      scoped
-        .where.not(not_condition)
-        .distinct
-        .order(qualified_column)
-        .pluck(qualified_column)
+    def apply_term(scoped, arel_column)
+      escaped = @term.to_s.gsub(/[\\%_]/) { |char| "#{LIKE_ESCAPE_CHAR}#{char}" }
+      scoped.where(arel_column.matches("%#{escaped}%", LIKE_ESCAPE_CHAR))
     end
   end
 end