textacular 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4265ce68e4f181daae87f7bd5ddeafd3b6319b74
-  data.tar.gz: 01747846949f1a3ceef279a62f1e4587cea23a7a
+  metadata.gz: 0c424e3436f89ec19e61d9f932a17fb2b4eaafae
+  data.tar.gz: 7d53e4d8a74f6948943a7db4c6e5dd4fce49ba30
 SHA512:
-  metadata.gz: 9cd720c7b946da4ec997dff477eae5ccc4133a086784bdd1a9521ba53c5b0683698c5daa6d445acf48b9eb600bfe2d805a60a5410ddcdaac7fd22259ad0040d2
-  data.tar.gz: 5978ac5a4a59eeaf656b09dcadb36f0034e8e9190d5d8c800e5525471b738c9fde8187676a130d0c2e9ebd160cbe9b448b808b16e3a1a3b5d10201df54ea0164
+  metadata.gz: b931560f6e448f9bd3c391641780816e130b3e48a9f5255bf6fdf19e1f4ba0e9994291d826908b5d5f910c543130613d48cb8120bdc7db7e932442c3bcb45821
+  data.tar.gz: 03b42bb0a6ee835d797596bb770de66881b759c43aa1c477b77080cb8d0c733bedd1185c2a3a0f8ab9d3a7d27aef769c9809d6ead794a9e18f89bca281a4d77b

data/CHANGELOG.md

@@ -2,8 +2,18 @@
 
 ## Unreleased
 
+## 3.2.2
+
+* Fallback to zero similarity when trying to match null values
+* Fix search term escaping
+* Trigram installation migration only install extension if not installed yet.
+* Update the README to illustrate how to change the similarity threshold.
+
+## 3.2.1
+
 * Fix trigram installation migration reversed filename and content.
 * Rewrite all tests using RSpec.
+* We're ActiveRecord 4.2+ compatible until tests prove otherwise.
 
 ## 3.2.0
 

data/README.md

@@ -91,6 +91,12 @@ Comic.fuzzy_search(title: 'Pearls') # matches Pearls Before Swine
 Comic.fuzzy_search(title: 'Pear') # does not match Pearls Before Swine
 ```
 
+The similarity threshold is hardcoded in PostgreSQL and can be modified on a per-connection basis, for example:
+
+```ruby
+ActiveRecord::Base.connection.execute("SELECT set_limit(0.9);")
+```
+
 For more info, view the `pg_trgm` documentation, specifically [F.35.2. Functions and Operators](http://www.postgresql.org/docs/9.1/static/pgtrgm.html).
 
 Searches are also chainable:
@@ -155,23 +161,14 @@ $ gem install textacular
 
 ## Contributing
 
-Help is gladly welcomed. If you have a feature you'd like to add, it's much more
-likely to get in (or get in faster) the closer you stick to these steps:
-
-1. Open an Issue to talk about it. We can discuss whether it's the right
-  direction or maybe help track down a bug, etc.
-1. Fork the project, and make a branch to work on your feature/fix. Master is
-  where you'll want to start from.
-1. Write a test for the feature you are about to add
-1. Run the tests
-1. Turn the Issue into a Pull Request. There are several ways to do this, but
-  [hub](https://github.com/defunkt/hub) is probably the easiest.
-1. Bonus points if your Pull Request updates `CHANGES.md` to include a summary
-   of your changes and your name like the other entries. If the last entry is
-   the last release, add a new `## Unreleased` heading.
-
-If you don't know how to fix something, even just a Pull Request that includes a
-failing test can be helpful. If in doubt, make an Issue to discuss.
+If you'd like to contribute, please see the [contribution guidelines](CONTRIBUTING.md).
+
+
+## Releasing
+
+Maintainers: Please make sure to follow the [release steps](RELEASING.md) when
+it's time to cut a new release.
+
 
 ## LICENSE:
 

data/lib/textacular.rb

@@ -141,7 +141,7 @@ module Textacular
   end
 
   def fuzzy_similarity_string(table_name, column, search_term)
-    "similarity(#{table_name}.#{column}, #{search_term})"
+    "COALESCE(similarity(#{table_name}.#{column}, #{search_term}), 0)"
   end
 
   def fuzzy_condition_string(table_name, column, search_term)
@@ -179,7 +179,7 @@ module Textacular
   module Helper
     class << self
       def normalize(query)
-        query.to_s.gsub(' ', '\\\\ ')
+        query.to_s.gsub(/\s(?![\&|\!|\|])/, '\\\\ ')
       end
 
       def method_name_regex

data/lib/textacular/trigram_installer.rb

@@ -3,7 +3,7 @@ class Textacular::TrigramInstaller
     content = <<-MIGRATION
 class InstallTrigram < ActiveRecord::Migration
   def self.up
-    ActiveRecord::Base.connection.execute("CREATE EXTENSION pg_trgm;")
+    ActiveRecord::Base.connection.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm;")
   end
 
   def self.down

data/lib/textacular/version.rb

@@ -1,5 +1,5 @@
 module Textacular
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 
   def self.version
     VERSION

data/spec/textacular/searchable_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe "Searchable" do
       let!(:questionable_content) do
         WebComicWithSearchableName.create(
           name: 'Questionable Content',
-          author: 'Jeph Jaques',
+          author: nil,
         )
       end
 
@@ -108,6 +108,9 @@ RSpec.describe "Searchable" do
             }.to raise_error(ActiveRecord::StatementInvalid)
           end
         end
+        it "searches with negation" do
+          expect(WebComicWithSearchableName.advanced_search('foo & ! bar')).to be_empty
+        end
       end
 
       it "does fuzzy searching" do
@@ -116,6 +119,13 @@ RSpec.describe "Searchable" do
         ).to eq([questionable_content])
       end
 
+      it "return a valid rank when fuzzy searching on NULL columns" do
+        qcont_with_author = questionable_content.becomes(WebComicWithSearchableNameAndAuthor)
+        search_result = WebComicWithSearchableNameAndAuthor.fuzzy_search('Questio')
+        expect([qcont_with_author]).to eq(search_result)
+        expect(search_result.first.attributes.find { |k, _| k[0..3] == 'rank' }.last).to be_truthy
+      end
+
       it "defines :searchable_columns as private" do
         expect { WebComicWithSearchableName.searchable_columns }.to raise_error(NoMethodError)
 

data/spec/textacular/trigram_installer_spec.rb

@@ -3,7 +3,7 @@ RSpec.describe "Textacular::TrigramInstaller" do
     <<-MIGRATION
 class InstallTrigram < ActiveRecord::Migration
   def self.up
-    ActiveRecord::Base.connection.execute("CREATE EXTENSION pg_trgm;")
+    ActiveRecord::Base.connection.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm;")
   end
 
   def self.down

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: textacular
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Ben Hamill
 - ecin
 - Aaron Patterson
+- Greg Molnar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Textacular exposes full text search capabilities from PostgreSQL