ransack_predicate_cont_any_word 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 71bd49fe276bb879faf9d9d900f13e0c39779379
-  data.tar.gz: 848433e80ae0a0fbb53c533961c9b22111e03bbc
+SHA256:
+  metadata.gz: d0fc1ff8953bb4d195e40d129267b30ce21f27ef7ba017a72d39fdd8f6a2e8d1
+  data.tar.gz: a1c25e479c2047fbb5d0d43c1c73a1c52104a26075375666e21e20f288443500
 SHA512:
-  metadata.gz: 50c2a70de0b2ecf2a76ec8718378dd11992d727388d0be285d17781f6215007ea5540f84454ebd0d381d3098c35d36870e5e3b00388d53f74b71cae8af843fee
-  data.tar.gz: cdab942e968781b997d6dd4f3d7af45710dc9ef91732a2916d4e425b32ecca0d807a7aff052fe06c171855dd97363e6dd3d901550b8e1b41f197c8901483d2cb
+  metadata.gz: 4401c31ca5a0a5443408fe00ba6871b342a54321727267f6908fc660bb7ac3b739cc75dca3eacba43c974ac7cae80e47b4da7724fe7e090a46ad0efcb5863419
+  data.tar.gz: 132a4e3bb2ad27ac867bd8185bb70361c31a8164d1f84419d7b48b7d235b110e50216b273ca9c876c76ed9e3fee04b84ea968e437e930a9f221319a4962d77fa

data/README.md

@@ -13,6 +13,12 @@ It is also possible to search for whole sentences
 User.ransack(encrypted_password_cont_any_word: '"yeah this is my password" password some').result.to_sql #=> SELECT "users".* FROM "users" WHERE ("users"."encrypted_password" LIKE '%yeah this is my password%' AND "users"."encrypted_password" LIKE '%password%' AND "users"."encrypted_password" LIKE '%some%')
 ```
 
+For OR-combined attributes, each word may match in different columns:
+```ruby
+User.ransack(email_or_encrypted_password_cont_any_word: "@example.com encrypted_password").result.to_sql
+#=> SELECT "users".* FROM "users" WHERE (("users"."email" LIKE '%@example.com%' OR "users"."encrypted_password" LIKE '%@example.com%') AND ("users"."email" LIKE '%encrypted_password%' OR "users"."encrypted_password" LIKE '%encrypted_password%'))
+```
+
 ## Installation
 Add this line to your application's Gemfile:
 

data/Rakefile

@@ -29,3 +29,4 @@ task default: :test
 
 require "best_practice_project"
 BestPracticeProject.load_tasks
+Dir["lib/tasks/**/*.rake"].sort.each { |file| import file }

data/lib/ransack_predicate_cont_any_word/version.rb

@@ -1,3 +1,3 @@
 module RansackPredicateContAnyWord
-  VERSION = "0.0.0".freeze
+  VERSION = "0.0.1".freeze
 end

data/lib/ransack_predicate_cont_any_word.rb

@@ -3,9 +3,43 @@ module RansackPredicateContAnyWord; end
 require "ransack"
 
 Ransack.configure do |config|
-  config.add_predicate "cont_any_word",
+  config.add_predicate(
+    "cont_any_word",
     arel_predicate: "matches_all",
-    formatter: proc { |v| v.scan(/\"(.*?)\"|(\S+)/).flatten.compact.map { |t| "%#{t}%" } },
+    formatter: proc { |v| v.scan(/"(.*?)"|(\S+)/).flatten.compact.map { |t| "%#{t}%" } },
     validator: proc { |v| v.present? },
     type: :string
+  )
 end
+
+module RansackPredicateContAnyWord::CrossColumnContAnyWordPatch
+  def arel_predicate
+    return super unless cross_column_cont_any_word?
+
+    grouped_predicates = cont_any_word_tokens.map do |token|
+      attributes
+        .map { |attribute| attr_value_for_attribute(attribute).matches(Arel::Nodes.build_quoted(token)) }
+        .reduce(:or)
+    end
+
+    grouped_predicates.reduce(:and)
+  end
+
+private
+
+  def cross_column_cont_any_word?
+    predicate_name == "cont_any_word" &&
+      combinator == Ransack::Constants::OR &&
+      attributes.length > 1 &&
+      cont_any_word_tokens.length > 1
+  end
+
+  def cont_any_word_tokens
+    @cont_any_word_tokens ||= validated_values
+      .map { |value| value.cast(predicate.type).to_s }
+      .flat_map { |value| Array(predicate.format(value)) }
+      .compact
+  end
+end
+
+Ransack::Nodes::Condition.prepend(RansackPredicateContAnyWord::CrossColumnContAnyWordPatch)

data/lib/tasks/release_tasks.rake

@@ -0,0 +1,88 @@
+require "English"
+require "pty"
+require_relative "../ransack_predicate_cont_any_word/version"
+
+task :environment unless Rake::Task.task_defined?(:environment)
+
+module ReleaseTasks
+module_function
+
+  VERSION_FILE = File.expand_path("../ransack_predicate_cont_any_word/version.rb", __dir__)
+  GEMSPEC_FILE = "ransack_predicate_cont_any_word.gemspec".freeze
+
+  def run_patch_release
+    current_version = Gem::Version.new(RansackPredicateContAnyWord::VERSION)
+    new_version = next_patch_version(current_version)
+
+    bump_version!(current_version, new_version)
+    build_gem!
+    push_gem!(new_version)
+  end
+
+  def next_patch_version(current_version)
+    major, minor, patch = current_version.segments.fill(0, current_version.segments.length...3)
+    [major, minor, patch + 1].join(".")
+  end
+
+  def bump_version!(current_version, new_version)
+    version_source = File.read(VERSION_FILE)
+    updated_version_source = version_source.sub(
+      /VERSION = "[^"]+"\.freeze/,
+      "VERSION = \"#{new_version}\".freeze"
+    )
+    abort "Could not update version in #{VERSION_FILE}" if version_source == updated_version_source
+
+    File.write(VERSION_FILE, updated_version_source)
+    puts "Bumped version: #{current_version} -> #{new_version}"
+  end
+
+  def build_gem!
+    abort "gem build failed" unless system("gem", "build", GEMSPEC_FILE)
+  end
+
+  def push_gem!(new_version)
+    gem_file = "ransack_predicate_cont_any_word-#{new_version}.gem"
+    abort "Built gem file not found: #{gem_file}" unless File.exist?(gem_file)
+
+    status = push_gem_via_pty(gem_file)
+    abort "gem push failed" unless status&.zero?
+  end
+
+  def push_gem_via_pty(gem_file)
+    status = nil
+    PTY.spawn("gem", "push", gem_file) do |stdout, stdin, pid|
+      output_thread = Thread.new { stream_output(stdout) }
+      input_thread = Thread.new { stream_input(stdin) }
+
+      Process.wait(pid)
+      status = $CHILD_STATUS.exitstatus
+      output_thread.join
+      input_thread.kill
+    end
+    status
+  end
+
+  def stream_output(stdout)
+    loop do
+      print stdout.readpartial(1024)
+    end
+  rescue EOFError, Errno::EIO => e
+    warn e.message if ENV["DEBUG_RELEASE_PATCH"]
+  end
+
+  def stream_input(stdin)
+    loop do
+      stdin.write($stdin.readpartial(1024))
+    end
+  rescue EOFError, Errno::EIO => e
+    warn e.message if ENV["DEBUG_RELEASE_PATCH"]
+    stdin.close unless stdin.closed?
+  end
+end
+
+namespace :release do
+  desc "Bump patch version, build gem, and push gem to RubyGems"
+  task patch: :environment do
+    ReleaseTasks.run_patch_release
+  end
+end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ransack_predicate_cont_any_word
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - kaspernj
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2026-02-18 00:00:00.000000000 Z
 dependencies: []
 description: "'cont_any_word' predicate for Ransack."
 email:
-- kaspernj@gmail.com
+- k@spernj.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -22,12 +22,13 @@ files:
 - Rakefile
 - lib/ransack_predicate_cont_any_word.rb
 - lib/ransack_predicate_cont_any_word/version.rb
-- lib/tasks/ransack_predicate_cont_any_word_tasks.rake
+- lib/tasks/release_tasks.rake
 homepage: https://www.github.com/kaspernj/ransack_predicate_cont_any_word
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -35,16 +36,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: "'cont_any_word' predicate for Ransack."
 test_files: []

data/lib/tasks/ransack_predicate_cont_any_word_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :ransack_predicate_cont_any_word do
-#   # Task goes here
-# end