textacular 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f44e73cb226a66719aca4bdfb54732d7fc4bb2fe7af548b49aad5c81d97cfe
-  data.tar.gz: 7d43ad7e191607aef9c521d5218afd98df5bc5cfa98d84cb8189db9026cc44de
+  metadata.gz: 974b8a8209d44a134f421db20f9ae6338c03057d8bcf26ce1e0c40778a29d6bf
+  data.tar.gz: 422c096f881919e53eaaab5f530e26e0e5aeffe33a4c8646bcb7f3b367dc9084
 SHA512:
-  metadata.gz: 0f8ba724deeb6e82160fea018b012592fd0a407231b81467ba6c52e6f921e9792aeb6653a8adbcf5c6618a5559e434ffd717e13174e21dd04eca8c2fece472fb
-  data.tar.gz: b84dfe00f5fd93a8735e3ce37847056fb82fa1ec583b59fa03cfbb411993fc33430e05ffe57986cded34c165261615edc3c524203da2a326d20fd0e3c9dcbc0a
+  metadata.gz: ab93dff1128025cc4615d29c819d104a9300bdbb0a88d9cc588940a1f630922a201b9f11449d610ba5cadc5ae85c2e761c0ad3ff5b8cb7a85f1fd3dd15acf744
+  data.tar.gz: 2102ea9936a087f18ed4945ddb4213e93acb70dc4bc8d3281489664fda2968b635e024636f0f2112f0fa8fc7a13b5d2b7e728aa200ac7663b681ae287b7e6b5d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 5.5.0
+
+* ActiveRecord 7.0 compatibility
+
 ## 5.4.0
 
 * ActiveRecord 6.1 compatibility

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-git 'git://github.com/rails/rails.git', branch: 'master' do
+git 'git://github.com/rails/rails.git', branch: 'main' do
   gem 'activerecord'
 end
 

data/README.md

@@ -25,20 +25,18 @@ extending ActiveRecord with scopes making search easy and fun!
 
 ### Quick Start
 
-#### Rails 3, Rails 4
-
 In the project's Gemfile add
 
 ```ruby
-gem 'textacular', '~> 4.0'
+gem 'textacular', '~> 5.0'
 ```
 
-#### Rails > 5.0
+#### Rails 3, Rails 4
 
 In the project's Gemfile add
 
 ```ruby
-gem 'textacular', '~> 5.0'
+gem 'textacular', '~> 4.0'
 ```
 
 #### ActiveRecord outside of Rails
@@ -164,29 +162,20 @@ migration add code like the following:
 
 #### For basic_search
 ```ruby
-execute "
-    create index on email_logs using gin(to_tsvector('english', subject));
-    create index on email_logs using gin(to_tsvector('english', email_address));"
+add_index :email_logs, %{to_tsvector('english', subject)}, using: :gin
+add_index :email_logs, %{to_tsvector('english', email_address)}, using: :gin
 ```
 
 #### For fuzzy_search
 ```ruby
-execute "
-    CREATE INDEX trgm_subject_indx ON users USING gist (subject gist_trgm_ops);
-    CREATE INDEX trgm_email_address_indx ON users USING gist (email_address gist_trgm_ops);
+add_index :email_logs, :subject, using: :gist, opclass: :gist_trgm_ops
+add_index :email_logs, :email_address, using: :gist, opclass: :gist_trgm_ops
 ```
 
 In the above example, the table email_logs has two text columns that we search against, subject and email_address.
 You will need to add an index for every text/string column you query against, or else Postgresql will revert to a
 full table scan instead of using the indexes.
 
-If you create these indexes, you should also switch to sql for your schema_format in `config/application.rb`:
-
-```ruby
-config.active_record.schema_format = :sql
-```
-
-
 ## REQUIREMENTS:
 
 * ActiveRecord

data/lib/textacular/version.rb

@@ -1,5 +1,5 @@
 module Textacular
-  VERSION = '5.4.0'
+  VERSION = '5.5.0'
 
   def self.version
     VERSION

data/lib/textacular.rb

@@ -124,7 +124,11 @@ module Textacular
   end
 
   def fuzzy_condition_string(table_name, column, search_term)
-    "(#{table_name}.#{column}::text % #{search_term})"
+    # At this point, search_term is already quoted and query ready. Insert % between the quotes and the actual string.
+    search_term = search_term.gsub(/^(['"])/, '\1%')
+    search_term = search_term.gsub(/(['"])$/, '%\1')
+
+    "(#{table_name}.#{column}::text ILIKE #{search_term})"
   end
 
 

data/spec/textacular_spec.rb

@@ -289,6 +289,12 @@ RSpec.describe Textacular do
           end
         end
       end
+
+      describe "#fuzzy_search" do
+        it "works if column contains multiple space delimited strings" do
+          expect(GameExtendedWithTextacular.fuzzy_search(title: 'mar')).to eq([mario])
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textacular
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Ben Hamill
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -120,7 +120,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 description: |-
   Textacular exposes full text search capabilities from PostgreSQL, extending
       ActiveRecord with scopes making search easy and fun!
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Textacular exposes full text search capabilities from PostgreSQL