pg_fulltext 0.2.3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f4f614bb0fa282ac0bb258122139efd64f81ac8f04eb3dd4fd2c0e80c9f9d5a
-  data.tar.gz: c4292d5984bf2e3774b7f73948173ea2b4f022d2d29989b3a57222b3b516b02a
+  metadata.gz: 176bed19822e89a050d214f8e7b077fa1082b7c5d46bad5686d4c122cdcf9947
+  data.tar.gz: a70d4baec8fde810854725dfadb101a7942a5e62e2d69de4861f8560cdec44ec
 SHA512:
-  metadata.gz: 1890385e76798f005d56c8005aa32b23badbd9ad770822b61962f37016cbe9997ebe9dc090d0948654c29a0178b939c6c472ed80b4c4fed671e0015781444ed5
-  data.tar.gz: af5b0b8d46c2a5ee73ee5de50cdc5c6b9f8e36bcb616830207db36cd32072a6a2fe7b173baf35da5fb9f938b80da14cda44cc9d70f966e6e3704a8b230ab0a2e
+  metadata.gz: 9c7652680618afe308366943bff2d55c87a54dbad8b5707758a0670942facf35c5f67100aebe23eb716e2ab02443494b4740f54862dc682ec1b8c42c178b44c0
+  data.tar.gz: 9ab936b7086175869500406f63778b31dd96ae734d28b13af1913f1c3ee80e91ca8e299eabb1d9e699e96c34cc2df067564978dec8cdc7a04743d54c7f4bc8ee

data/README.md

@@ -33,7 +33,7 @@ end
 You can then use the `search` method (configurable via the first parameter of the `add_search_scope` method):
 
 ```ruby
-MyModel.search('foo bar "include this phrase" !butnotthis !"and and also not this"')
+MyModel.search('foo bar "include this phrase" -butnotthis -"and and also not this phrase"')
 ```
 
 The defaults for this include support for negation, phrases, phrase negation, and prefix searches, but those can be 
@@ -46,24 +46,4 @@ configured per the following options:
 | `order`           | `true`   | Whether or not the `order` method should be applied against the generated `rank` for the fulltext query. If you just care about returning matches and not their respective rank, set this to `false`. |
 | `prefix`          | `true`   | Default search will match partial words as well as whole words. Set this to `false` if only whole words should be matched. |
 | `reorder`         | `false`  | If you already have `order` set on this relation, it will take precedence over the fulltext `rank`. `reorder` will call clear, effectively clearing the existing order and applying `rank`. |
-| `any_word`        | `false`  | Default search uses the `&` operator, ensuring that all terms are matched in the query.  If you want to match _any_ term in the query, set this to `true`. |
 | `ignore_accents`  | `false`  | By default, search queries with accents will be sent through as-is. Setting this to `true` will `unaccent()` the query, which helps match `tsv` columns that have also been unaccented.  Alternatively, you can have your `tsv` column be a combination of both, and this option will be unnecesary. Requires the `unaccent` Postgres extension. |
-
-## Standalone Configuration
-
-There's not much, here, but the `PgFulltext::Query.to_tsquery_string` method will generate a nice `tsvector`-compatible 
-string for you to use as you wish.  
-
-Something this should do the trick:
-
-```ruby
-db = PG.connect(dbname: 'mydb')
-search_string = 'foo bar "include this phrase" !butnotthis !"and and also not this"'
-tsv_query = db.escape_string(PgFulltext::Query.to_tsquery_string(search_string))
-sql = <<~SQL
-  SELECT *
-  FROM my_model
-  WHERE tsv @@ to_tsquery('portuguese', '#{tsv_query}')
-SQL
-db.exec(sql)
-```

data/lib/pg_fulltext/active_record.rb

@@ -23,7 +23,6 @@ module PgFulltext
         order: true,
         prefix: true,
         reorder: false,
-        any_word: false,
         ignore_accents: false
       )
         serial = SecureRandom.hex(4)
@@ -36,7 +35,6 @@ module PgFulltext
           query,
           tsvector_column: tsvector_column,
           search_type: search_type,
-          any_word: any_word,
           prefix: prefix,
           ignore_accents: ignore_accents,
         )
@@ -58,16 +56,15 @@ module PgFulltext
         query,
         tsvector_column: :tsv,
         search_type: nil,
-        any_word: false,
         prefix: true,
         ignore_accents: false
       )
-        tsquery_string_quoted = connection.quote(PgFulltext::Query.to_tsquery_string(query, operator: any_word ? '|' : '&', prefix: prefix))
+        tsquery_string_quoted = connection.quote(query)
         tsquery_string_quoted = "unaccent(#{tsquery_string_quoted})" if ignore_accents
         column_quoted = connection.quote_column_name(tsvector_column)
         fqc_quoted = "#{quoted_table_name}.#{column_quoted}"
-        tsquery = "to_tsquery(#{"#{connection.quote search_type}, " if search_type.present?}#{tsquery_string_quoted})"
-
+        tsquery = "websearch_to_tsquery(#{"#{connection.quote search_type}, " if search_type.present?}#{tsquery_string_quoted})"
+        tsquery = "regexp_replace(#{tsquery}::text, '''([a-z0-9\\-_@.]+)''', '''\\1'':*', 'g')::tsquery" if prefix
         relation
           .select(:id, "ts_rank_cd(#{fqc_quoted}, #{tsquery}) AS rank")
           .where("#{fqc_quoted} @@ #{tsquery}")

data/lib/pg_fulltext.rb

@@ -1,4 +1,3 @@
 module PgFulltext; end
 
 require 'pg_fulltext/active_record'
-require 'pg_fulltext/query'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_fulltext
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Robertson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rltk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +76,6 @@ files:
 - Rakefile
 - lib/pg_fulltext.rb
 - lib/pg_fulltext/active_record.rb
-- lib/pg_fulltext/query.rb
 homepage: https://github.com/arcreative/pg_fulltext
 licenses:
 - MIT
@@ -112,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: PostgreSQL fulltext search

data/lib/pg_fulltext/query.rb

@@ -1,58 +0,0 @@
-require 'rltk/lexer'
-
-module PgFulltext
-  module Query
-    class Lexer < RLTK::Lexer
-      rule(/!+/)
-      rule(/"+/)
-
-      rule(/(!?)[0-9\p{L}!]+/) { |v| [:WORD, v] }
-      rule(/"[\p{L}\s!]+"/) { |v| [:PHRASE, v[1..-2]] }
-      rule(/!"[\p{L}\s!]+"/) { |v| [:NOT_PHRASE, v[2..-2]] }
-
-      rule(/\s+/)
-      rule(/[^\p{L}\s"]+/)
-    end
-
-    def self.to_tsquery_string(query, prefix: true, operator: '&')
-      query = normalize_query(query)
-
-      terms = []
-      Lexer.lex(query).each do |token|
-        if token.type == :WORD
-          terms << format_term(token.value, prefix: prefix)
-        elsif %i[PHRASE NOT_PHRASE].include?(token.type)
-          phrase_terms = Lexer.lex(token.value).map do |phrase_term|
-            phrase_term.value.nil? ? nil : format_term(phrase_term.value, prefix: prefix)
-          end.compact
-          terms << "#{'!' if token.type == :NOT_PHRASE}(#{phrase_terms.join(' <-> ')})"
-        end
-      end
-
-      terms.join(" #{operator} ")
-    end
-
-    private
-
-    def self.normalize_query(query)
-      query
-        .gsub(/[.,]/, ' ')            # Replace all periods and commas with spaces (reasonable delimiters)
-        .gsub(/[^\s\p{L}0-9"!]/, '')  # Remove all non-unicode, whitespace, numbers, quotes ("), and bangs (!)
-        .gsub(/\s+/, ' ')             # Replace repeat whitespace occurrences with single spaces
-        .strip                        # Strip space from beginning and end of line
-    end
-
-    def self.format_term(term, prefix: true)
-      # Remove any ! that's not at the beginning of the term, as it will break the query
-      term.gsub!(/(?<!^)!/, '')
-
-      # Add the prefix if prefix is set
-      "#{term}#{':*' if prefix}"
-    end
-
-    def self.reject_falsy(terms)
-      false_values = [nil, '', '"', '!', ':*', '":*', '!:*']
-      terms.reject { |v| false_values.include?(v) }
-    end
-  end
-end