rokaki 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231b27e39d8bc7c95a1b3d217bd28cf9129fa9463e949b7d8626ea5213fefdbc
-  data.tar.gz: b533f1aae5281fbf5403b81dd81d2ac483a231eb419510abb3df7348017b24a5
+  metadata.gz: 5dac3a2881b83e34f6e0ee5717c4103212b3c4606b0ca05420338544a56cdffd
+  data.tar.gz: 594b1e1ff90e0a86674ed06e0de962a3cf622814cc87f02317a1da4ddcceb437
 SHA512:
-  metadata.gz: 726dd3cea7f2f9e6c83c1456503bd16d2b71a844514a7740873b86f0122602a598ca059ebb1a6609104e029ab913723d812e9ea041b9fcd280cf48cea87c42cb
-  data.tar.gz: c3b130ad1a46c837e932868f57372b794e7cd1ed6d1c5d1aaf852391fb7cf4a82b228306a2c710a88b6ecd0d2f85697c4c019e769f50beec3bad4c1bd6dc6ff3
+  metadata.gz: 1246c456cd8c613d8288a5d6bc69c65eedd67545b854b2185f512b071a04e1341c9bffe9f86a713ab9106842a8b015a73b0f8f55e9d0fecf8741b47e824c015b
+  data.tar.gz: 2429fb0148ca0705edcf02bb434541968db87a7bda6cd26a0945d1ccec660b6a9ca45ff9f5798aeeedfd4f89371f3c1575f2d0f79d1914a695b4f898d35bf4b4

data/.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

data/.github/workflows/spec.yml

@@ -0,0 +1,39 @@
+name: Run RSpec tests
+on: [push]
+jobs:
+  run-rspec-tests:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:9.4
+        env:
+          MYSQL_DATABASE: rokaki
+          MYSQL_USER: rokaki
+          MYSQL_PASSWORD: rokaki
+          MYSQL_ROOT_PASSWORD: rokaki
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+      postgres:
+        image: postgres:13
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: "postgres"
+          POSTGRES_DB: rokaki
+        ports:
+        - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+      - uses: actions/checkout@v2
+      - 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
+      - name: Run tests
+        run: |
+          ./spec/ordered_run.sh

data/Gemfile.lock

@@ -1,50 +1,66 @@
 PATH
   remote: .
   specs:
-    rokaki (0.9.0)
+    rokaki (0.10.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activerecord (8.0.3)
+      activemodel (= 8.0.3)
+      activesupport (= 8.0.3)
       timeout (>= 0.4.0)
-    activesupport (7.1.3.2)
+    activesupport (8.0.3)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.7)
-    byebug (11.1.3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
+    byebug (12.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    database_cleaner-active_record (2.1.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
-    diff-lcs (1.5.1)
-    drb (2.2.1)
-    factory_bot (6.4.6)
-      activesupport (>= 5.0.0)
-    ffi (1.16.3)
-    formatador (1.1.0)
-    guard (2.18.1)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    factory_bot (6.5.5)
+      activesupport (>= 6.1.0)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86-linux-gnu)
+    ffi (1.17.2-x86-linux-musl)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
+    formatador (1.2.1)
+      reline
+    guard (2.19.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
+      ostruct (~> 0.6)
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
@@ -53,60 +69,75 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.14.4)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    io-console (0.8.1)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.10)
+    logger (1.7.0)
+    lumberjack (1.4.2)
     method_source (1.1.0)
-    minitest (5.22.3)
-    mutex_m (0.2.0)
+    minitest (5.25.5)
+    mysql2 (0.5.7)
+      bigdecimal
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pg (1.5.6)
-    pry (0.14.2)
+    ostruct (0.6.3)
+    pg (1.6.2)
+    pg (1.6.2-aarch64-linux)
+    pg (1.6.2-aarch64-linux-musl)
+    pg (1.6.2-arm64-darwin)
+    pg (1.6.2-x86_64-darwin)
+    pg (1.6.2-x86_64-linux)
+    pg (1.6.2-x86_64-linux-musl)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    rake (13.2.1)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rspec (3.13.0)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+    rspec-support (3.13.6)
+    securerandom (0.4.1)
     shellany (0.0.1)
-    sqlite3 (2.0.1-aarch64-linux-gnu)
-    sqlite3 (2.0.1-aarch64-linux-musl)
-    sqlite3 (2.0.1-arm-linux-gnu)
-    sqlite3 (2.0.1-arm-linux-musl)
-    sqlite3 (2.0.1-arm64-darwin)
-    sqlite3 (2.0.1-x86-linux-gnu)
-    sqlite3 (2.0.1-x86-linux-musl)
-    sqlite3 (2.0.1-x86_64-darwin)
-    sqlite3 (2.0.1-x86_64-linux-gnu)
-    sqlite3 (2.0.1-x86_64-linux-musl)
-    thor (1.3.1)
-    timeout (0.4.1)
+    sqlite3 (2.7.4-aarch64-linux-gnu)
+    sqlite3 (2.7.4-aarch64-linux-musl)
+    sqlite3 (2.7.4-arm-linux-gnu)
+    sqlite3 (2.7.4-arm-linux-musl)
+    sqlite3 (2.7.4-arm64-darwin)
+    sqlite3 (2.7.4-x86-linux-gnu)
+    sqlite3 (2.7.4-x86-linux-musl)
+    sqlite3 (2.7.4-x86_64-darwin)
+    sqlite3 (2.7.4-x86_64-linux-gnu)
+    sqlite3 (2.7.4-x86_64-linux-musl)
+    thor (1.4.0)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.0.3)
 
 PLATFORMS
+  aarch64-linux
   aarch64-linux-gnu
   aarch64-linux-musl
   arm-linux-gnu
@@ -115,6 +146,7 @@ PLATFORMS
   x86-linux-gnu
   x86-linux-musl
   x86_64-darwin
+  x86_64-linux
   x86_64-linux-gnu
   x86_64-linux-musl
 
@@ -125,6 +157,7 @@ DEPENDENCIES
   factory_bot
   guard
   guard-rspec
+  mysql2
   pg
   pry
   pry-byebug

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Steve Martin
+Copyright (c) 2025 Steve Martin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -422,13 +422,20 @@ filterable.results
 ### Ruby setup
 After checking out the repo, run `bin/setup` to install dependencies.
 
-### Setting up the test database
+### Setting up the test databases
 
+#### Postgres
 ```
 docker pull postgres
 docker run --name rokaki-postgres -e POSTGRES_USER=rokaki -e POSTGRES_PASSWORD=rokaki -d -p 5432:5432 postgres
 ```
 
+#### Mysql
+```
+docker pull mysql
+docker run --name rokaki-mysql -e MYSQL_ROOT_PASSWORD=rokaki -e MYSQL_PASSWORD=rokaki -e MYSQL_DATABASE=rokaki -e MYSQL_USER=rokaki -d -p 3306:3306 mysql:latest mysqld
+```
+
 Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/lib/rokaki/filter_model/basic_filter.rb

@@ -33,13 +33,29 @@ module Rokaki
         @filter_template = "@model = #{prefix}filter_#{name} if #{filter};"
       end
 
+      def case_sensitive
+        if db == :postgres
+          'LIKE'
+        elsif db == :mysql
+          'LIKE BINARY'
+        end
+      end
+
+      def case_insensitive
+        if db == :postgres
+          'ILIKE'
+        elsif db == :mysql
+          'LIKE'
+        end
+      end
+
       def _chain_filter_type(key)
         filter = "#{prefix}#{key}"
         query  = ''
 
         if like_semantics && mode = like_semantics[key]
           query = build_like_query(
-            type: 'LIKE',
+            type: case_sensitive,
             query: query,
             filter: filter,
             mode: mode,
@@ -47,7 +63,7 @@ module Rokaki
           )
         elsif i_like_semantics && mode = i_like_semantics[key]
           query = build_like_query(
-            type: 'ILIKE',
+            type: case_insensitive,
             query: query,
             filter: filter,
             mode: mode,
@@ -60,6 +76,20 @@ module Rokaki
         @filter_query = query
       end
 
+      # # @model.where('`authors`.`first_name` LIKE BINARY :query', query: "%teev%").or(@model.where('`authors`.`first_name` LIKE BINARY :query', query: "%imi%"))
+      # if Array == filter
+      #     first_term = filter.unshift
+      #     query = "@model.where(\"#{key} #{type} ANY (ARRAY[?])\", "
+      #     query += "prepare_terms(#{first_term}, :#{mode}))"
+      #     filter.each { |term|
+      #       query += ".or(@model.where(\"#{key} #{type} ANY (ARRAY[?])\", "
+      #       query += "prepare_terms(#{first_term}, :#{mode})))"
+      #     }
+      # else
+      #   query = "@model.where(\"#{key.to_s.split(".").map { |item| "`#{item}`" }.join(".")} #{type.to_s.upcase} :query\", "
+      #   query += "query: prepare_terms(#{filter}, \"#{type.to_s.upcase}\", :#{search_mode}))"
+      # end
+
       def build_like_query(type:, query:, filter:, mode:, key:)
         if db == :postgres
           query = "@model.where(\"#{key} #{type} ANY (ARRAY[?])\", "

data/lib/rokaki/filter_model/nested_filter.rb

@@ -65,6 +65,22 @@ module Rokaki
         current_like_key
       end
 
+      def case_sensitive
+        if db == :postgres
+          'LIKE'
+        elsif db == :mysql
+          'LIKE BINARY'
+        end
+      end
+
+      def case_insensitive
+        if db == :postgres
+          'ILIKE'
+        elsif db == :mysql
+          'LIKE'
+        end
+      end
+
       def _build_deep_chain(keys)
         name    = ''
         count   = keys.size - 1
@@ -80,9 +96,9 @@ module Rokaki
         leaf = nil
 
         if search_mode = find_like_key(keys)
-          type = 'LIKE'
+          type = case_sensitive
         elsif search_mode = find_i_like_key(keys)
-          type = 'ILIKE'
+          type = case_insensitive
         end
         leaf = keys.pop
 
@@ -144,7 +160,6 @@ module Rokaki
           query = "where(\"#{key}.#{leaf} #{type} :query\", "
           query += "query: \"%\#{#{filter}}%\")" if search_mode == :circumfix
           query += "query: \"%\#{#{filter}}\")" if search_mode == :prefix
-          query += "query: \"\#{#{filter}}%\")" if search_mode == :suffix
         end
 
         query

data/lib/rokaki/filter_model/nested_like_filters.rb

@@ -227,9 +227,7 @@ module Rokaki
           query += "prepare_terms(#{filter}, :#{search_mode}))"
         else
           query = "where(\"#{key_leaf} #{type.to_s.upcase} :query\", "
-          query += "query: \"%\#{#{filter}}%\")" if search_mode == :circumfix
-          query += "query: \"%\#{#{filter}}\")" if search_mode == :prefix
-          query += "query: \"\#{#{filter}}%\")" if search_mode == :suffix
+          query += "query: prepare_regex_terms(#{filter}, :#{search_mode}))"
         end
 
         query

data/lib/rokaki/filter_model.rb

@@ -19,6 +19,34 @@ module Rokaki
       end
     end
 
+    def prepare_regex_terms(param, mode)
+      if Array === param
+        param_map = param.map { |term| ".*#{term}.*" } if mode == :circumfix
+        param_map = param.map { |term| ".*#{term}" } if mode == :prefix
+        param_map = param.map { |term| "#{term}.*" } if mode == :suffix
+        return param_map.join("|")
+      else
+        return [".*#{param}.*"] if mode == :circumfix
+        return [".*#{param}"] if mode == :prefix
+        return ["#{param}.*"] if mode == :suffix
+      end
+    end
+
+    # "SELECT `articles`.* FROM `articles` INNER JOIN `authors` ON `authors`.`id` = `articles`.`author_id` WHERE (`authors`.`first_name` LIKE BINARY '%teev%' OR `authors`.`first_name` LIKE BINARY '%arv%')"
+    def prepare_or_terms(param, type, mode)
+      if Array === param
+        param_map = param.map { |term| "%#{term}%" } if mode == :circumfix
+        param_map = param.map { |term| "%#{term}" } if mode == :prefix
+        param_map = param.map { |term| "#{term}%" } if mode == :suffix
+
+        return param_map.join(" OR #{type} ")
+      else
+        return ["%#{param}%"] if mode == :circumfix
+        return ["%#{param}"] if mode == :prefix
+        return ["#{param}%"] if mode == :suffix
+      end
+    end
+
 
     module ClassMethods
       include Filterable::ClassMethods
@@ -143,17 +171,40 @@ module Rokaki
         end
       end
 
-      def filter_model(model_class)
+      def filter_db(db)
+        @_filter_db = db
+      end
+
+      def filter_model(model_class, db: nil)
+        @_filter_db = db if db
         @model = (model_class.is_a?(Class) ? model_class : Object.const_get(model_class.capitalize))
         class_eval "def set_model; @model ||= #{@model}; end;"
       end
 
+      def case_sensitive
+        if @_filter_db == :postgres
+          'LIKE'
+        elsif @_filter_db == :mysql
+          # 'LIKE BINARY'
+          'REGEXP'
+        end
+      end
+
+      def case_insensitive
+        if @_filter_db == :postgres
+          'ILIKE'
+        elsif @_filter_db == :mysql
+          # 'LIKE'
+          'REGEXP'
+        end
+      end
+
       def like(args)
         raise ArgumentError, 'argument mush be a hash' unless args.is_a? Hash
         @_like_semantics = (@_like_semantics || {}).merge(args)
 
         like_keys = LikeKeys.new(args)
-        like_filters(like_keys, term_type: :like)
+        like_filters(like_keys, term_type: case_sensitive)
       end
 
       def ilike(args)
@@ -161,7 +212,7 @@ module Rokaki
         @i_like_semantics = (@i_like_semantics || {}).merge(args)
 
         like_keys = LikeKeys.new(args)
-        like_filters(like_keys, term_type: :ilike)
+        like_filters(like_keys, term_type: case_insensitive)
       end
 
       # the model method is called to instatiate @model from the

data/lib/rokaki/version.rb

@@ -1,3 +1,3 @@
 module Rokaki
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/rokaki.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'factory_bot'
 
   spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'database_cleaner-active_record'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rokaki
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Steve Martin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2025-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +214,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/codeql-analysis.yml"
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"