search_redux 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86700938a5c434f1ce72e73c04abb6989fec09942fd298020dce5339cf301c60
-  data.tar.gz: 715e706619ed1f332137e3e10523b4a2b1c1602e3f101604003b3069781d35d9
+  metadata.gz: ce847ad403cbeee48d3b05f898e3dbe7546a7adc8c867bebabb4f2719b4195a9
+  data.tar.gz: cda46990f26ce3f3b81ff2f84476c1b1d9b7042475a6432b84b18d8bce918a35
 SHA512:
-  metadata.gz: 2bb28270a7d91abe411f90fa4756cc89ad4fae1cd914e9af89bb19edeb7a71a5b7e38e571316f5f7fdce29e47414acf4bf2ba6d1d668737506024af27e8ca618
-  data.tar.gz: 834408dbfe6ea11d5b9c1401126938aff038fa2203c1037a176867a98d64137116f3b225229a4b47909e363f382a8c5b59dbe1fe61b0403c8df6190cafa3368f
+  metadata.gz: 9bf739fb959eef39255ed45fb6db3c43df957c8cbc90ce6d870060f801d2928e576723bce508378c067017943871344d9fbe56933fd6c6e95cfe75c1f92ec341
+  data.tar.gz: 18f54b7457be50c66b89828343bcb3d38bd29b1488d7e1cd70bfbbf8ff776b4e18419ee4fab597f311a786b012ad479acbac7fd634012cdbd0171fb75d732e5d

data/lib/search_redux/rdbms/postgres.rb

@@ -4,20 +4,25 @@ module SearchRedux
       attr_accessor :sanitized_query
 
       def compatible_search(options)
-        query        = options[:query]
+        query        = to_ts_query(options[:query])
         rank_query   = rank_sql(options[:rank], query)
         search_query = search_sql(options[:columns])
 
         ->(obj) { obj.where(Arel.sql(search_query), q: Arel.sql(query)).order(Arel.sql(rank_query)) }
       end
 
+      def to_ts_query(query)
+        words = query.scan(/\s*("([^"]+)"|\w+)\s*/)&.flatten&.compact
+        words.map { |ts| "#{ts}:*" }.join(" & ")
+      end
+
       def rank_sql(rank_column, query)
-        "ts_rank(to_tsvector(#{rank_column}), plainto_tsquery('#{query}')) desc"
+        "ts_rank(to_tsvector(#{rank_column}), to_tsquery('#{query}')) desc"
       end
 
       def search_sql(columns)
         template = ->(column_name) {
-          return "to_tsvector('english', #{column_name}) @@ plainto_tsquery(:q)"
+          return "to_tsvector('english', #{column_name}) @@ to_tsquery(:q)"
         }
 
         columns.map { |c| template.call(c) }.join(' OR ')

data/lib/search_redux/version.rb

@@ -1,3 +1,3 @@
 module SearchRedux
-  VERSION = '1.0.1' unless defined? SearchRedux::VERSION
+  VERSION = '1.0.3' unless defined? SearchRedux::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_redux
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Marian Posaceanu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord