pg_search_multiple_highlight 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513c09da1edb45a90f08b99b0363e309e3ccd7c825ee45171057cd123d16f4ea
-  data.tar.gz: 1ee17e8f55e968b068f42207aa4f95f18161f37471e90a7fe1b365c7292d7fa3
+  metadata.gz: 1102e138d69bc59b4fbcb29b470530af8ffb8111e9bc2035cb80bea3c4909333
+  data.tar.gz: d6b092296fc0ecdae01cbb5308dce5a77915643d4d75ca0a385311873564b922
 SHA512:
-  metadata.gz: e6189fefdcd3b89c358ccde3d7fe4eb14ea7b681dcaa961923bb92fb7b5ee0b4d4c40210e8b6d30ee4f402b8344dc0d7fc3613a8916886712249b0312f212804
-  data.tar.gz: 18978a57b1370ded738dc5ca49c6f35da12cb2a17475bf64ce07ebf71ad745df9f06d72371ebd6eb697136b54fc23d57ed3badfcb48635778eb4f9741dc5a140
+  metadata.gz: 936c9289a3ee0752e306a5c63c7ee4bf4e10fe7c9153d6314175a7724f6c17fb56cd14cfe4c22e0d89ab8b84146536b6188bf78ae35aa422d380f8aff8cb832b
+  data.tar.gz: f63fb8d7697b3dc76be7a1db7561681cb2dcf4a7dd7fcbf90acb3478488cf84d8bfdeeca4382c3b18a73e4b62c8fb9e0cb9564d1e4711f0160f8f46181a44797

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## [Released]
 
+## [0.3.0] - 2024-01-28
+- Fix N+1 issue in highlighting results
 ## [0.2.0] - 2023-08-17
 - Improve integration with scope options
 ## [0.1.0] - 2023-08-08

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    pg_search_multiple_highlight (0.2.0)
+    pg_search_multiple_highlight (0.3.0)
       pg_search (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.6)
-      activesupport (= 7.0.6)
-    activerecord (7.0.6)
-      activemodel (= 7.0.6)
-      activesupport (= 7.0.6)
-    activesupport (7.0.6)
+    activemodel (7.0.7.1)
+      activesupport (= 7.0.7.1)
+    activerecord (7.0.7.1)
+      activemodel (= 7.0.7.1)
+      activesupport (= 7.0.7.1)
+    activesupport (7.0.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -24,7 +24,7 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
@@ -39,7 +39,7 @@ GEM
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
-    minitest (5.19.0)
+    minitest (5.21.2)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)

data/lib/pg_search_multiple_highlight/tsearch.rb

@@ -27,24 +27,11 @@ module PgSearch
       end
 
       def highlight_multiple_fields(text, query)
-        tsquery = ActiveRecord::Base.connection.quote(query)
+        split_words = query.split(/\s+/).map { |word| Regexp.escape(word) }
 
-        dictionary = @options[:dictionary] || "simple"
+        regex = Regexp.new("\\b(#{split_words.join("|")})\\b", Regexp::IGNORECASE)
 
-        raw_options = @options[:multiple_highlight]
-
-        scope_options = raw_options.map { |key, value| "#{key}=#{value}" }.join(", ")
-
-        sanitized_sql = ActiveRecord::Base.send(
-          :sanitize_sql_array, [
-            "SELECT ts_headline(
-              ?, to_tsquery('#{dictionary}', ?),
-              '#{scope_options}'
-              ) AS highlighted_text",
-            text, tsquery
-          ]
-        )
-        ActiveRecord::Base.connection.execute(sanitized_sql).first["highlighted_text"]
+        text.gsub(regex) { |match| "<mark>#{match}</mark>" }
       end
     end
   end

data/lib/pg_search_multiple_highlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgSearchMultipleHighlight
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_search_multiple_highlight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Suleyman Musayev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2024-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_search