psql_autocomplete 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98170622f62b893280f5754ef14820a2e8c9a8d4
-  data.tar.gz: e3cd2c447ecd7d5a1f8793823aa9cad62cb41d95
+  metadata.gz: 610efb95add64e7302adbb746e7012bd0b80b47e
+  data.tar.gz: 19b7befff50ba4fb43d0e7c3c99706be75739bcb
 SHA512:
-  metadata.gz: cc0d195a03210121f0213f8c19b413890f7977163ab67d59ef0e0c4c00f32aea5d242a27efe02ec9b9ea919ffccf11faf5f3075adc80a62c0c9b525ddde1fa59
-  data.tar.gz: 76d5ce05dfb75316959c93109ba88a7b2f130dddada5b38f2863ca7e8c8c8c8e5e184c82f48ce32575a99eb1350e540fc19a87e86c563210316e85dfc7f52a9e
+  metadata.gz: 899817802739de3f29196b0d96ec6bf23a1e8cf4b9bcb51669fba09d58bb7ac5ae98d6518e09431c5eff73bf56e2463f8107bfc64e15ef80dd055fe851f6d077
+  data.tar.gz: 8a08c76f956c0026f159d5424186f0d56c581c1172ef237a0c4e1633da37eae39f88cc67e3310bec21d964382ed7c757f820545dd8f55f6d6c3019b865b2eb44

data/README.md

@@ -31,8 +31,13 @@ class Contact < ActiveRecord::Base
   extend PsqlAutocomplete
 end
 
-# > Contact.autocomplete_query('John', [:first_name, :last_name])
-# => "to_tsvector('simple', coalesce(first_name,'') || ' ' || coalesce(last_name,'')) @@ to_tsquery('simple', 'John:*')"
+Contact.autocomplete_query('John', [:first_name, :last_name])
+# => "(coalesce(lower(regexp_replace(first_name, '[:'']', '', 'g')), '') || ' ' || coalesce(lower(regexp_replace(last_name, '[:'']', '', 'g')), ''))::tsvector @@ $$'john':*$$::tsquery"
+
+Contact.autocomplete_query('John', [:first_name, :last_name], unaccent: true)
+# => => "(unaccent(coalesce(lower(regexp_replace(first_name, '[:'']', '', 'g')), '')) || ' ' || unaccent(coalesce(lower(regexp_replace(last_name, '[:'']', '', 'g')), '')))::tsvector @@ unaccent($$'john':*$$)::tsquery"
+
+# You will need to `create extension unaccent` for this option to work
 
 # Actual search
 class Contact < ActiveRecord::Base
@@ -43,7 +48,7 @@ class Contact < ActiveRecord::Base
   end
 end
 
-# > Contact.autocomplete('Jules')
+Contact.autocomplete('Jules')
 # => [#<Contact:0x0x007fd2be761220>, #<Contact:0x007fd2be760938>, ...]
 ```
 

data/lib/psql_autocomplete/version.rb

@@ -1,3 +1,3 @@
 module PsqlAutocomplete
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/psql_autocomplete.rb

@@ -4,27 +4,39 @@ require 'psql_autocomplete/version'
 # on the postgresql full text search engine
 module PsqlAutocomplete
   # Returns a postgres FTS query injectable in a where clause
-  def autocomplete_query(sentence, fields)
-    "(#{tsvector(fields)})::tsvector @@ $$#{tsquery(sentence)}$$::tsquery"
+  def autocomplete_query(sentence, fields, unaccent: false)
+    "(#{tsvector(fields, unaccent)})::tsvector @@ " \
+      "#{tsquery(sentence, unaccent)}::tsquery"
   end
 
   private
 
-  def tsvector(fields)
-    fields.map(&method(:sql_sanitize_column)).join(" || ' ' || ")
+  def tsvector(fields, unaccent)
+    sanitize = method(:sql_sanitize_column).curry[unaccent]
+    fields.map(&sanitize).join(" || ' ' || ")
   end
 
-  def sql_sanitize_column(field)
-    "coalesce(lower(regexp_replace(#{field}, '[:'']', '', 'g')), '')"
+  def sql_sanitize_column(unaccent, field)
+    res = "coalesce(lower(regexp_replace(#{field}, '[:'']', '', 'g')), '')"
+
+    return res unless unaccent
+
+    "unaccent(#{res})"
   end
 
-  def tsquery(sentence)
-    sentence.
+  def tsquery(sentence, unaccent)
+    query = sentence.
       downcase.
       split(' ').
       map(&:strip).
       compact.
       map { |q| "'#{q.gsub("'", "''")}':*" }.
       join(' & ')
+
+    query = "$$#{query}$$"
+
+    return query unless unaccent
+
+    "unaccent(#{query})"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psql_autocomplete
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - JobTeaser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler