rokaki 0.13.0 → 0.15.0

data/lib/rokaki/filter_model/basic_filter.rb

@@ -40,6 +40,8 @@ module Rokaki
           'LIKE BINARY'
         elsif db == :sqlserver
           'LIKE'
+        elsif db == :oracle
+          'LIKE'
         else
           'LIKE'
         end
@@ -52,6 +54,9 @@ module Rokaki
           'LIKE'
         elsif db == :sqlserver
           'LIKE'
+        elsif db == :oracle
+          # Use 'ILIKE' as a signal; oracle_like will translate to UPPER(column) LIKE UPPER(:q)
+          'ILIKE'
         else
           'LIKE'
         end
@@ -105,6 +110,9 @@ module Rokaki
         elsif db == :sqlserver
           # Delegate to helper that supports arrays and escaping with ESCAPE
           query = "sqlserver_like(@model, \"#{key}\", \"#{type}\", #{filter}, :#{mode})"
+        elsif db == :oracle
+          # Oracle helper handles case-insensitive via UPPER() when type is 'ILIKE'
+          query = "oracle_like(@model, \"#{key}\", \"#{type}\", #{filter}, :#{mode})"
         else
           query = "@model.where(\"#{key} #{type} :query\", "
           query += "query: \"%\#{#{filter}}%\")" if mode == :circumfix

data/lib/rokaki/filter_model/nested_filter.rb

@@ -139,10 +139,11 @@ module Rokaki
         where = where.join
 
         if search_mode
-          if db == :sqlserver
+          if db == :sqlserver || db == :oracle
             key_leaf = "#{keys.last.to_s.pluralize}.#{leaf}"
+            helper = db == :sqlserver ? 'sqlserver_like' : 'oracle_like'
             @filter_methods << "def #{prefix}filter#{infix}#{name};"\
-              "sqlserver_like(@model.joins(#{joins}), \"#{key_leaf}\", \"#{type}\", #{prefix}#{name}, :#{search_mode}); end;"
+              "#{helper}(@model.joins(#{joins}), \"#{key_leaf}\", \"#{type}\", #{prefix}#{name}, :#{search_mode}); end;"
 
             @filter_templates << "@model = #{prefix}filter#{infix}#{name} if #{prefix}#{name};"
           else

data/lib/rokaki/filter_model/nested_like_filters.rb

@@ -197,7 +197,7 @@ module Rokaki
         # Compute key_leaf (qualified column) like other branches
         key_leaf = keys.last ? "#{keys.last.to_s.pluralize}.#{leaf}" : leaf
 
-        if db == :sqlserver
+        if db == :sqlserver || db == :oracle
           # Build relation base with joins
           if join_map.empty?
             rel_expr = "@model"
@@ -207,7 +207,11 @@ module Rokaki
             rel_expr = "@model.joins(**#{join_map})"
           end
 
-          filter_query = "sqlserver_like(#{rel_expr}, \"#{key_leaf}\", \"#{type.to_s.upcase}\", #{filter_name}, :#{search_mode})"
+          if db == :sqlserver
+            filter_query = "sqlserver_like(#{rel_expr}, \"#{key_leaf}\", \"#{type.to_s.upcase}\", #{filter_name}, :#{search_mode})"
+          else
+            filter_query = "oracle_like(#{rel_expr}, \"#{key_leaf}\", \"#{type.to_s.upcase}\", #{filter_name}, :#{search_mode})"
+          end
         else
           query = build_like_query(
             type: type,
@@ -218,12 +222,25 @@ module Rokaki
             leaf: leaf
           )
 
-          if join_map.empty?
-            filter_query = "@model.#{query}"
-          elsif join_map.is_a?(Array)
-            filter_query = "@model.joins(*#{join_map}).#{query}"
+          # Compose filter_query based on adapter; for generic adapters use generic_like to support array values
+          if db == :postgres || db == :mysql
+            if join_map.empty?
+              filter_query = "@model.#{query}"
+            elsif join_map.is_a?(Array)
+              filter_query = "@model.joins(*#{join_map}).#{query}"
+            else
+              filter_query = "@model.joins(**#{join_map}).#{query}"
+            end
           else
-            filter_query = "@model.joins(**#{join_map}).#{query}"
+            # Generic (e.g., SQLite)
+            if join_map.empty?
+              rel_expr = "@model"
+            elsif join_map.is_a?(Array)
+              rel_expr = "@model.joins(*#{join_map})"
+            else
+              rel_expr = "@model.joins(**#{join_map})"
+            end
+            filter_query = "generic_like(#{rel_expr}, \"#{key_leaf}\", \"#{type.to_s.upcase}\", #{filter_name}, :#{search_mode})"
           end
         end
 
@@ -243,17 +260,9 @@ module Rokaki
         elsif db == :mysql
           query = "where(\"#{key_leaf} #{type.to_s.upcase} :query\", "
           query += "query: prepare_regex_terms(#{filter}, :#{search_mode}))"
-        else # :sqlserver and others
-          query = "where(\"#{key_leaf} #{type.to_s.upcase} :query\", "
-          if search_mode == :circumfix
-            query += "query: \"%\#{#{filter}}%\")"
-          elsif search_mode == :prefix
-            query += "query: \"%\#{#{filter}}\")"
-          elsif search_mode == :suffix
-            query += "query: \"\#{#{filter}}%\")"
-          else
-            query += "query: \"%\#{#{filter}}%\")"
-          end
+        else # generic adapters (e.g., SQLite): delegate to generic_like to support array values via OR
+          # We return a marker here; the caller (build_query) will assemble the full expression with joins
+          query = nil
         end
 
         query

data/lib/rokaki/filter_model.rb

@@ -69,6 +69,45 @@ module Rokaki
       end
     end
 
+    # Compose an Oracle LIKE relation supporting arrays of terms and case-insensitive path via UPPER()
+    # type_signal: 'LIKE' for case-sensitive semantics; 'ILIKE' to indicate case-insensitive (we will translate)
+    def oracle_like(model, column, type_signal, value, mode)
+      terms = prepare_like_terms(value, mode)
+      ci = (type_signal.to_s.upcase == 'ILIKE')
+      col_expr = ci ? "UPPER(#{column})" : column
+      build_term = proc { |t| ci ? t.to_s.upcase : t }
+
+      if terms.is_a?(Array)
+        return model.none if terms.empty?
+        first = build_term.call(terms[0])
+        rel = model.where("#{col_expr} LIKE :q0 ESCAPE '\\'", q0: first)
+        terms[1..-1]&.each_with_index do |t, i|
+          rel = rel.or(model.where("#{col_expr} LIKE :q#{i + 1} ESCAPE '\\'", "q#{i + 1}".to_sym => build_term.call(t)))
+        end
+        rel
+      else
+        model.where("#{col_expr} LIKE :q ESCAPE '\\'", q: build_term.call(terms))
+      end
+    end
+
+    # Compose a generic LIKE relation supporting arrays of terms (OR chained)
+    # Used for adapters without special handling (e.g., SQLite)
+    def generic_like(model, column, type, value, mode)
+      terms = prepare_terms(value, mode)
+      return model.none if terms.nil?
+      if terms.is_a?(Array)
+        return model.none if terms.empty?
+        rel = model.where("#{column} #{type} :q0", q0: terms[0])
+        terms[1..-1]&.each_with_index do |t, i|
+          rel = rel.or(model.where("#{column} #{type} :q#{i + 1}", "q#{i + 1}".to_sym => t))
+        end
+        rel
+      else
+        # prepare_terms returns arrays for scalar input, so this branch is rarely used
+        model.where("#{column} #{type} :q", q: terms)
+      end
+    end
+
     def prepare_regex_terms(param, mode)
       if Array === param
         param_map = param.map { |term| ".*#{term}.*" } if mode == :circumfix
@@ -327,6 +366,8 @@ module Rokaki
           'REGEXP'
         elsif @_filter_db == :sqlserver
           'LIKE'
+        elsif @_filter_db == :oracle
+          'LIKE'
         else
           'LIKE'
         end
@@ -340,6 +381,9 @@ module Rokaki
           'REGEXP'
         elsif @_filter_db == :sqlserver
           'LIKE'
+        elsif @_filter_db == :oracle
+          # Use 'ILIKE' as a signal for case-insensitive; oracle_like will translate to UPPER(column) LIKE UPPER(:q)
+          'ILIKE'
         else
           'LIKE'
         end

data/lib/rokaki/filterable.rb

@@ -77,7 +77,7 @@ module Rokaki
         @filter_key_prefix ||= prefix
       end
 
-      def filter_key_infix(infix = :_)
+      def filter_key_infix(infix = :__)
         @filter_key_infix ||= infix
       end
 
@@ -170,6 +170,8 @@ module Rokaki
       # Enhance `filters` to support block mode accumulation
       def filters(*filter_keys)
         if instance_variable_defined?(:@__in_filterable_block) && @__in_filterable_block
+          @__block_filters ||= []
+          @__ctx_stack ||= []
           filter_keys.each do |fk|
             @__block_filters << wrap_in_context(fk)
           end

data/lib/rokaki/version.rb

@@ -1,3 +1,3 @@
 module Rokaki
-  VERSION = "0.13.0"
+  VERSION = "0.15.0"
 end

data/rokaki.gemspec

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+  # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'activerecord', '>= 7.1', '< 9.0'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
@@ -50,5 +50,8 @@ Gem::Specification.new do |spec|
   # For SQL Server testing
   spec.add_development_dependency 'tiny_tds'
   spec.add_development_dependency 'activerecord-sqlserver-adapter'
+  # For Oracle testing (optional). Enable by setting WITH_ORACLE=1 before bundling.
+  spec.add_development_dependency 'ruby-oci8'
+  spec.add_development_dependency 'activerecord-oracle_enhanced-adapter', '~> 8.0.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rokaki
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Steve Martin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-25 00:00:00.000000000 Z
+date: 2025-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +240,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-oci8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-oracle_enhanced-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 description: A dsl for filtering data in web requests
 email:
 - steve@martian.media
@@ -253,6 +287,7 @@ files:
 - Gemfile.lock
 - Guardfile
 - LICENSE.txt
+- README.legacy.md
 - README.md
 - Rakefile
 - bin/console