rokaki 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcbf82920cbfeff8466f6ccd583f1a66652082e087c2d6641806be8720dd8d6c
-  data.tar.gz: 4165d387e1fba3820fc302ef414f0019077067a1dca7d307943030f0aec99207
+  metadata.gz: ed3b16c71be49df063699af31b64190d9aa2db724bd5f6310e458aa33f63025a
+  data.tar.gz: c81607decccf33f1e9a71b1e68c3bd478428b22a1f375f9e5554b39ddfc0d8d6
 SHA512:
-  metadata.gz: 8e5d866b175e0799ad9bff2cbb8660e8ebca48785e508223e7583452eb7e95e56c1c35f15ff8625fc456365651b82efff40636579f90469d9909f650f6ee2b1d
-  data.tar.gz: e974f32a7626a94fb618295ea9600e9747af73bd35986f9e843a81b4bc6168c98180ef85d150fc1ad96ff4fa4700daae5d16d75596bc2d3dd9279ba8d6a98c64
+  metadata.gz: 18d022ef801a2a978f01d1f142c34fb95171131d30f8f8cbe8837a60fc9ea44c162d48e9f672380a965f578de65b568124686399974918497141e0eca549b29a
+  data.tar.gz: 77f547a998d588d4128f6df533ae0e555c8561b402e496b53b66c7daee87e42a7ed3b2152ef5101930abd568ee2b0b268aeb71bb75d841feabb102238d776f49

data/.github/workflows/spec.yml

@@ -35,21 +35,67 @@ jobs:
           - 1433:1433
         # No built-in healthcheck; we'll wait in a step using nc
 
+      oracle:
+        image: gvenzl/oracle-free:23-slim
+        env:
+          ORACLE_PASSWORD: "oracle"
+          APP_USER: ROKAKI
+          APP_USER_PASSWORD: rokaki
+        ports:
+          - 1521:1521
+
     steps:
       - uses: actions/checkout@v2
 
       - name: Install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential libpq-dev default-libmysqlclient-dev freetds-dev netcat-openbsd
+          sudo apt-get install -y build-essential libpq-dev default-libmysqlclient-dev freetds-dev netcat-openbsd unzip curl libaio1t64 libaio-dev
+          sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          # Not needed with a .ruby-version file
           ruby-version: 3.3.0
-          # runs 'bundle install' and caches installed gems automatically
-          bundler-cache: true
+          bundler-cache: false # we'll run bundle after Instant Client is present
+
+      - name: Install Oracle Instant Client (ZIP Basic Lite + SDK)
+        run: |
+          set -e
+          sudo mkdir -p /opt/oracle && cd /opt/oracle
+          # Download current 23.5 ZIPs directly from Oracle
+          curl -fL -o ic-basic.zip https://download.oracle.com/otn_software/linux/instantclient/2326000/instantclient-basic-linux.x64-23.26.0.0.0.zip
+          curl -fL -o ic-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2326000/instantclient-sdk-linux.x64-23.26.0.0.0.zip
+          sudo unzip -q -o ic-basic.zip
+          sudo unzip -q -o ic-sdk.zip
+          ls /opt/oracle
+          cd /opt/oracle/instantclient_23_26 && sudo ln -s ../instantclient_23_26 lib
+          cd /opt/oracle/instantclient_23_26 && sudo ln -s sdk/include include
+          IC_DIR=/opt/oracle/instantclient_23_26
+          echo "OCI_DIR=$IC_DIR" | sudo tee -a $GITHUB_ENV
+          echo "OCI_LIB_DIR=$IC_DIR" | sudo tee -a $GITHUB_ENV
+          echo "OCI_INC_DIR=$IC_DIR/sdk/include" | sudo tee -a $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=$IC_DIR:$LD_LIBRARY_PATH" | sudo tee -a $GITHUB_ENV
+
+      - name: Bundle install (after Instant Client)
+        id: bundleInstallAfterInstantClient
+        env:
+          ORACLE_HOME: /opt/oracle/instantclient_23_26
+          OCI_DIR: ${{ env.OCI_DIR }}
+          OCI_LIB_DIR: ${{ env.OCI_LIB_DIR }}
+          OCI_INC_DIR: ${{ env.OCI_INC_DIR }}
+          LD_LIBRARY_PATH: ${{ env.LD_LIBRARY_PATH }}
+        run: |
+          ls /opt/oracle/instantclient_23_26
+          bundle config set build.ruby-oci8 "--with-instant-client-dir=/opt/oracle/instantclient_23_26 --with-instant-client-include=/opt/oracle/instantclient_23_26/sdk/include --with-instant-client-lib=/opt/oracle/instantclient_23_26"
+          bundle install --jobs 4 --retry 3
+
+      - name: Archive Build Artifact
+        if: failure() && steps.bundleInstallAfterInstantClient.outcome == 'failure'
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-mkmf-log
+          path: /opt/hostedtoolcache/Ruby/3.3.0/x64/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/ruby-oci8-2.2.14/mkmf.log
 
       - name: Wait for databases to be ready
         shell: bash
@@ -63,7 +109,24 @@ jobs:
           for i in {1..120}; do
             nc -z 127.0.0.1 1433 && echo "SQL Server up" && break || sleep 1
           done
+          for i in {1..180}; do
+            nc -z 127.0.0.1 1521 && echo "Oracle up" && break || sleep 1
+          done
 
       - name: Run tests
+        env:
+          POSTGRES_HOST: 127.0.0.1
+          POSTGRES_USERNAME: postgres
+          POSTGRES_PASSWORD: postgres
+          SQLSERVER_HOST: 127.0.0.1
+          SQLSERVER_PORT: 1433
+          SQLSERVER_USERNAME: sa
+          SQLSERVER_PASSWORD: 5QL5£rv£r
+          ORACLE_HOST: 127.0.0.1
+          ORACLE_PORT: 1521
+          ORACLE_DATABASE: /freepdb1
+          ORACLE_USERNAME: ROKAKI
+          ORACLE_PASSWORD: rokaki
+          LD_LIBRARY_PATH: ${{ env.LD_LIBRARY_PATH }}
         run: |
           ./spec/ordered_run.sh

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+### 0.13.0 — 2025-10-25
+- Add block-form DSL parity across both FilterModel and Filterable (`filter_map do ... end` with `like`, `ilike`, `nested`, and `filters`).
+- Support circumfix affix synonyms: `:parafix`, `:confix`, `:ambifix` (treated as `:circumfix`).
+- Improve docs with block-form examples and adapter behavior notes.
+- Keep SQL Server support (introduced earlier) covered in CI; add shared tests for affix synonyms to all adapter-aware specs.
+- Allow ENV overrides for all adapters in test DatabaseManager (Postgres/MySQL/SQL Server).
+
+### 0.12.0 — 2025-10-25
+- Introduce block-form DSL for FilterModel (`filter_map do ... end`) with `like` and `nested`.
+- Update docs site and GitHub Pages build.
+
+### 0.11.0 — 2025-10-25
+- Add first-class SQL Server support.
+- CI updates to run tests against SQL Server, alongside PostgreSQL and MySQL.
+
+### 0.10.0 and earlier
+- Core DSL: Filterable and FilterModel modes, LIKE matching with prefix/suffix/circumfix, nested filters, and adapter-aware SQL for Postgres/MySQL.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rokaki (0.12.0)
+    rokaki (0.14.0)
       activesupport
 
 GEM
@@ -13,6 +13,10 @@ GEM
       activemodel (= 8.0.3)
       activesupport (= 8.0.3)
       timeout (>= 0.4.0)
+    activerecord-oracle_enhanced-adapter (8.0.0)
+      activerecord (~> 8.0.0)
+      ruby-oci8
+      ruby-plsql (>= 0.6.0)
     activerecord-sqlserver-adapter (8.0.9)
       activerecord (~> 8.0.0)
       tiny_tds
@@ -30,8 +34,8 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.3)
+    benchmark (0.5.0)
+    bigdecimal (3.3.1)
     byebug (12.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
@@ -42,7 +46,7 @@ GEM
     database_cleaner-core (2.0.1)
     diff-lcs (1.6.2)
     drb (2.2.3)
-    factory_bot (6.5.5)
+    factory_bot (6.5.6)
       activesupport (>= 6.1.0)
     ffi (1.17.2-aarch64-linux-gnu)
     ffi (1.17.2-aarch64-linux-musl)
@@ -81,7 +85,7 @@ GEM
     logger (1.7.0)
     lumberjack (1.4.2)
     method_source (1.1.0)
-    minitest (5.25.5)
+    minitest (5.26.0)
     mysql2 (0.5.7)
       bigdecimal
     nenv (0.3.0)
@@ -108,19 +112,21 @@ GEM
       ffi (~> 1.0)
     reline (0.6.2)
       io-console (~> 0.5)
-    rspec (3.13.1)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
+    ruby-oci8 (2.2.14)
+    ruby-plsql (0.8.0)
     securerandom (0.4.1)
     shellany (0.0.1)
     sqlite3 (2.7.4-aarch64-linux-gnu)
@@ -147,7 +153,7 @@ GEM
       bigdecimal (~> 3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.3)
+    uri (1.0.4)
 
 PLATFORMS
   aarch64-linux
@@ -164,7 +170,8 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  activerecord
+  activerecord (>= 7.1, < 9.0)
+  activerecord-oracle_enhanced-adapter (~> 8.0.0)
   activerecord-sqlserver-adapter
   bundler (~> 2.0)
   database_cleaner-active_record
@@ -178,6 +185,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rokaki!
   rspec (~> 3.0)
+  ruby-oci8
   sqlite3
   tiny_tds
 

data/docs/adapters.md

@@ -4,7 +4,7 @@ title: Database adapters
 permalink: /adapters
 ---
 
-Rokaki generates adapter‑aware SQL for PostgreSQL, MySQL, and SQL Server.
+Rokaki generates adapter‑aware SQL for PostgreSQL, MySQL, SQL Server, and Oracle.
 
 ## Overview
 

data/docs/index.md

@@ -21,7 +21,7 @@ Get started below or jump to:
 Add to your application's Gemfile:
 
 ```ruby
-gem "rokaki", "~> 0.11"
+gem "rokaki", "~> 0.13"
 ```
 
 Then:
@@ -32,7 +32,9 @@ bundle install
 
 ## Quick start
 
-Use `Rokaki::FilterModel` and declare mappings with method arguments (no block DSL).
+You can declare mappings in two ways: argument-based (original) or block-form DSL. Both are equivalent.
+
+Argument-based form:
 
 ```ruby
 class ArticleQuery
@@ -58,6 +60,34 @@ end
 filtered = ArticleQuery.new(filters: params).results
 ```
 
+Block-form DSL (same behavior):
+
+```ruby
+class ArticleQuery
+  include Rokaki::FilterModel
+
+  filter_model :article, db: :postgres # or :mysql, :sqlserver
+  define_query_key :q
+
+  filter_map do
+    like title: :circumfix, content: :circumfix
+    nested :author do
+      like first_name: :prefix, last_name: :suffix
+      # You can also declare equality filters inside nested contexts
+      filters :id
+    end
+  end
+
+  attr_accessor :filters
+  def initialize(filters: {})
+    @filters = filters
+  end
+end
+
+# In a controller/service:
+filtered = ArticleQuery.new(filters: params).results
+```
+
 Where `params` can include keys like `q`, `author_first_name`, `author_last_name`, etc. The LIKE mode for each key is defined in your `like` mapping (e.g., `title: :circumfix`), and Rokaki builds the appropriate `WHERE` clauses safely and adapter‑aware.
 
 ## Matching modes
@@ -68,6 +98,14 @@ Where `params` can include keys like `q`, `author_first_name`, `author_last_name
 
 All modes accept either a single string or an array of terms.
 
+## What’s new in 0.13.0
+
+- Block-form DSL parity across both FilterModel and Filterable
+- Circumfix affix synonyms supported: :parafix, :confix, :ambifix
+- SQL Server adapter support and CI coverage
+- ENV overrides for all adapters in test helpers; improved DB bootstrap in specs
+- Documentation site via GitHub Pages
+
 ## Next steps
 
 - Learn the full DSL and examples in [Usage](./usage)

data/docs/usage.md

@@ -11,7 +11,7 @@ This page shows how to use Rokaki to define filters and apply them to ActiveReco
 Add the gem to your Gemfile and bundle:
 
 ```ruby
-gem "rokaki", "~> 0.11"
+gem "rokaki", "~> 0.13"
 ```
 
 ```bash
@@ -38,7 +38,7 @@ class ArticleQuery
   define_query_key :q
   like title: :circumfix, content: :circumfix
 
-  # Nested LIKEs via hash mapping (no block DSL)
+  # Nested LIKEs via hash mapping
   like author: { first_name: :prefix, last_name: :suffix }
 end
 ```
@@ -98,3 +98,91 @@ Params would include `author_first`, `author_first_prefix`, etc.
 - Use `key:` to map a filter to a different params key.
 - Combine multiple filters; Rokaki composes them with `AND` by default.
 - For advanced cases, write custom filters in your app by extending the DSL (see source for `BasicFilter`/`NestedFilter`).
+
+
+## Block-form DSL
+
+Note: The block-form DSL is available starting in Rokaki 0.13.0.
+
+Rokaki also supports a block-form DSL that is equivalent to the argument-based form. Use it when you prefer grouping your mappings in a single block.
+
+### FilterModel block form
+
+```ruby
+class ArticleQuery
+  include Rokaki::FilterModel
+
+  # Choose model and adapter
+  filter_model :article, db: :postgres # or :mysql, :sqlserver
+
+  # Declare a single query key used by all LIKE/equality filters below
+  define_query_key :q
+
+  # Declare mappings inside a block
+  filter_map do
+    # LIKE mappings on the base model
+    like title: :circumfix, content: :circumfix
+
+    # Nested mappings on associations
+    nested :author do
+      like first_name: :prefix, last_name: :suffix
+
+      # You can also declare equality filters in block form
+      filters :id
+    end
+  end
+
+  attr_accessor :filters
+  def initialize(filters: {})
+    @filters = filters
+  end
+end
+
+# Usage
+ArticleQuery.new(filters: { q: ["Intro", "Guide"] }).results
+```
+
+Notes:
+- Modes are declared by the values in your `like` mapping (`:prefix`, `:suffix`, `:circumfix`). Synonyms `:parafix`, `:confix`, `:ambifix` behave like `:circumfix`.
+- Arrays for `q` are supported across adapters. PostgreSQL uses `ANY (ARRAY[...])`, MySQL/SQL Server expand to OR chains as appropriate.
+
+### Filterable block form
+
+Use the block form to define simple key accessors (no SQL). Useful for plain Ruby objects or when building a mapping layer.
+
+```ruby
+class ArticleFilters
+  include Rokaki::Filterable
+  filter_key_prefix :__
+
+  filter_map do
+    filters :date, author: [:first_name, :last_name]
+
+    nested :author do
+      nested :location do
+        filters :city
+      end
+    end
+  end
+
+  # Expect a #filters method that returns a hash
+  attr_reader :filters
+  def initialize(filters: {})
+    @filters = filters
+  end
+end
+
+f = ArticleFilters.new(filters: {
+  date: '2025-01-01',
+  author: { first_name: 'Ada', last_name: 'Lovelace', location: { city: 'London' } }
+})
+
+f.__date                        # => '2025-01-01'
+f.__author__first_name          # => 'Ada'
+f.__author__last_name           # => 'Lovelace'
+f.__author__location__city      # => 'London'
+```
+
+Tips:
+- `filter_key_prefix` and `filter_key_infix` control the generated accessor names.
+- Inside the block, `nested :association` affects all `filters` declared within it.

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,

data/lib/rokaki/filter_model.rb

@@ -69,6 +69,27 @@ 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
+
     def prepare_regex_terms(param, mode)
       if Array === param
         param_map = param.map { |term| ".*#{term}.*" } if mode == :circumfix
@@ -120,7 +141,72 @@ module Rokaki
         end
       end
 
-      def filter_map(model, query_key, options)
+      # Merge two nested like/ilike mappings
+      def deep_merge_like(a, b)
+        return b if a.nil? || a == {}
+        return a if b.nil? || b == {}
+        a.merge(b) do |_, v1, v2|
+          if v1.is_a?(Hash) && v2.is_a?(Hash)
+            deep_merge_like(v1, v2)
+          else
+            # Prefer later definitions
+            v2
+          end
+        end
+      end
+
+      # Wrap a normalized mapping with current nested context stack
+      def wrap_in_context(mapping)
+        return mapping if !@__ctx_stack || @__ctx_stack.empty?
+        @__ctx_stack.reverse.inject(mapping) { |acc, key| { key => acc } }
+      end
+
+      # Block DSL: nested context for like/ilike within filter_map block
+      def nested(name, &blk)
+        if instance_variable_defined?(:@__in_filter_map_block) && @__in_filter_map_block
+          raise ArgumentError, 'nested requires a symbol name' unless name.is_a?(Symbol)
+          @__ctx_stack << name
+          instance_eval(&blk) if blk
+          @__ctx_stack.pop
+        else
+          raise NoMethodError, 'nested can only be used inside filter_map block'
+        end
+      end
+
+      def filter_map(*args, &block)
+        # Block form: requires prior calls to filter_model and define_query_key
+        if block_given? && args.empty?
+          raise ArgumentError, 'define_query_key must be called before block filter_map' unless @filter_map_query_key
+          raise ArgumentError, 'filter_model must be called before block filter_map' unless @model
+          @_filter_db ||= :postgres
+
+          # Enter block-collection mode
+          @__in_filter_map_block = true
+          @__block_like_accumulator = {}
+          @__block_ilike_accumulator = {}
+          @__ctx_stack = []
+
+          instance_eval(&block)
+
+          # Exit and materialize definitions
+          @__in_filter_map_block = false
+          unless @__block_like_accumulator.empty?
+            like(@__block_like_accumulator)
+          end
+          unless @__block_ilike_accumulator.empty?
+            ilike(@__block_ilike_accumulator)
+          end
+
+          # cleanup
+          @__block_like_accumulator = nil
+          @__block_ilike_accumulator = nil
+          @__ctx_stack = nil
+
+          return
+        end
+
+        # Positional/legacy form
+        model, query_key, options = args
         filter_model(model)
         @filter_map_query_key = query_key
 
@@ -143,6 +229,12 @@ module Rokaki
       end
 
       def filters(*filter_keys)
+        # In block form for FilterModel, allow equality filters inside nested contexts
+        if instance_variable_defined?(:@__in_filter_map_block) && @__in_filter_map_block
+          wrapped_keys = filter_keys.map { |fk| wrap_in_context(fk) }
+          filter_keys = wrapped_keys
+        end
+
         if @filter_map_query_key
           define_filter_map(@filter_map_query_key, *filter_keys)
         else
@@ -256,6 +348,8 @@ module Rokaki
           'REGEXP'
         elsif @_filter_db == :sqlserver
           'LIKE'
+        elsif @_filter_db == :oracle
+          'LIKE'
         else
           'LIKE'
         end
@@ -269,6 +363,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
@@ -276,6 +373,12 @@ module Rokaki
 
       def like(args)
         raise ArgumentError, 'argument mush be a hash' unless args.is_a? Hash
+        if instance_variable_defined?(:@__in_filter_map_block) && @__in_filter_map_block
+          normalized = normalize_like_modes(args)
+          @__block_like_accumulator = deep_merge_like(@__block_like_accumulator, wrap_in_context(normalized))
+          return
+        end
+
         normalized = normalize_like_modes(args)
         @_like_semantics = (@_like_semantics || {}).merge(normalized)
 
@@ -285,6 +388,12 @@ module Rokaki
 
       def ilike(args)
         raise ArgumentError, 'argument mush be a hash' unless args.is_a? Hash
+        if instance_variable_defined?(:@__in_filter_map_block) && @__in_filter_map_block
+          normalized = normalize_like_modes(args)
+          @__block_ilike_accumulator = deep_merge_like(@__block_ilike_accumulator, wrap_in_context(normalized))
+          return
+        end
+
         normalized = normalize_like_modes(args)
         @i_like_semantics = (@i_like_semantics || {}).merge(normalized)
 

data/lib/rokaki/filterable.rb

@@ -13,6 +13,48 @@ module Rokaki
     module ClassMethods
       private
 
+      # --- Block DSL support (Filterable mode) ---
+      def nested(name, &blk)
+        if instance_variable_defined?(:@__in_filterable_block) && @__in_filterable_block
+          raise ArgumentError, 'nested requires a symbol name' unless name.is_a?(Symbol)
+          @__ctx_stack << name
+          instance_eval(&blk) if blk
+          @__ctx_stack.pop
+        else
+          raise NoMethodError, 'nested can only be used inside filter_map block'
+        end
+      end
+
+      # In Filterable, `filter_map` without args opens a block to declare `filters` with optional nesting
+      # For backward compatibility, if args are provided, delegate to define_filter_map
+      def filter_map(*args, &block)
+        if block_given? && args.empty?
+          # Enter block-collection mode
+          @__in_filterable_block = true
+          @__ctx_stack = []
+          @__block_filters = []
+
+          instance_eval(&block)
+
+          # Materialize collected filters
+          unless @__block_filters.empty?
+            define_filter_keys(*@__block_filters)
+          end
+
+          # cleanup
+          @__in_filterable_block = false
+          @__ctx_stack = nil
+          @__block_filters = nil
+          return
+        end
+
+        # Positional/legacy map form (delegates to define_filter_map)
+        if args.any?
+          query_field, *filter_keys = args
+          define_filter_map(query_field, *filter_keys)
+        end
+      end
+
       def define_filter_keys(*filter_keys)
         filter_keys.each do |filter_key|
           _build_filter([filter_key]) unless Hash === filter_key
@@ -35,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
 
@@ -96,8 +138,8 @@ module Rokaki
         if value.is_a? Array
           value.each do |av|
             if av.is_a? Symbol
-            _keys = keys.dup << av
-            yield _keys
+              _keys = keys.dup << av
+              yield _keys
             else
               deep_map(keys, av, &block)
             end
@@ -110,6 +152,35 @@ module Rokaki
         end
       end
 
+      # Helper: wrap a Symbol/Hash filter key in current nested context
+      def wrap_in_context(filter_key)
+        return filter_key unless instance_variable_defined?(:@__ctx_stack) && @__ctx_stack && !@__ctx_stack.empty?
+        ctx = @__ctx_stack.dup
+        if filter_key.is_a?(Hash)
+          # Nest the entire hash under the context chain
+          ctx.reverse.inject(filter_key) { |acc, k| { k => acc } }
+        else
+          # Symbol → build a hash with leaf
+          ctx.reverse.inject(filter_key) { |acc, k| { k => acc } }
+        end
+      end
+
+      public
+
+      # 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
+          return
+        end
+
+        define_filter_keys(*filter_keys)
+      end
+
     end
 
     def filters

data/lib/rokaki/version.rb

@@ -1,3 +1,3 @@
 module Rokaki
-  VERSION = "0.12.0"
+  VERSION = "0.14.0"
 end

data/rokaki.gemspec

@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rokaki
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Steve Martin
@@ -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
@@ -248,6 +282,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile