pg_search 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39a86d998120bf6ec9643f8f8b549b08956576ff
-  data.tar.gz: fd3a0e7c1aea025553e4c1747d009a9911628d37
+SHA256:
+  metadata.gz: 490019a491cda1e15a0ab4fd68f89a1cc7c6d7371ff098a452a84c4c83314f7d
+  data.tar.gz: 5dc3c3bc842f669630cbf283af324ae9972cae624e3b15fe2d83ca354211ef8c
 SHA512:
-  metadata.gz: 84aa3f0816a2aca1523b9bd418abb4445b2290eb5a3177870e43a52e1ca341271e9211042496198b8e2d9ba7c39c6b53afd2f10bc272544478976bafde763265
-  data.tar.gz: e4657a3efc304b264cb0640c1755be9f9cbbc01afb1804f5625dfea24498f5ab21b1e707801cf3c22df63e462bb7add5e737060a6f9b67ddbfbae600d53a3a5c
+  metadata.gz: 3c1f7f8f87d7d23b39b405a8c196016bba6f3c9c873931263072f6c0b4e5faae3d548fd69278daaa138d13ddbc741c83a2d04eb57e218c2f8e87539833c5a747
+  data.tar.gz: c8d5728f08af5f146b63b9999e782c46294aa078d853481702758a5f528a31f295b7f9822ed0a53abfc76b11b898229b503685eff4fd86c3595a4f1c4dc62d4c

data/.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.2
   Exclude:
     - bin/**/*
 

data/.rubocop_todo.yml

@@ -138,16 +138,6 @@ Style/SymbolProc:
     - 'lib/pg_search/features/feature.rb'
     - 'lib/pg_search/multisearch/rebuilder.rb'
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInLiteral:
-  Exclude:
-    - 'spec/integration/pg_search_spec.rb'
-    - 'spec/lib/pg_search/features/dmetaphone_spec.rb'
-    - 'spec/lib/pg_search/features/tsearch_spec.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/UnneededPercentQ:

data/.travis.yml

@@ -1,19 +1,18 @@
 language: ruby
 sudo: false
+bundler_args: --binstubs
+before_install: gem install bundler
 
 rvm:
-  - "2.4.1"
-  - "2.3.4"
-  - "2.2.7"
-  - "2.1.10"
-  - jruby-9.1.14.0
+  - "2.5.3"
+  - "2.4.5"
+  - "2.3.8"
+  - "jruby-9.2.0.0"
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
-  - ACTIVE_RECORD_BRANCH="5-1-stable"
-  - ACTIVE_RECORD_BRANCH="5-0-stable"
-  - ACTIVE_RECORD_BRANCH="4-2-stable"
-  - ACTIVE_RECORD_VERSION="~> 5.2.0.beta2"
+  - ACTIVE_RECORD_BRANCH="5-2-stable"
+  - ACTIVE_RECORD_VERSION="~> 5.2.0"
   - ACTIVE_RECORD_VERSION="~> 5.1.0"
   - ACTIVE_RECORD_VERSION="~> 5.0.0"
   - ACTIVE_RECORD_VERSION="~> 4.2.9"
@@ -21,39 +20,20 @@ env:
 matrix:
   allow_failures:
     - env: ACTIVE_RECORD_BRANCH="master"
-    - env: ACTIVE_RECORD_BRANCH="5-1-stable"
-    - env: ACTIVE_RECORD_BRANCH="5-0-stable"
-    - env: ACTIVE_RECORD_BRANCH="4-2-stable"
-    - rvm: jruby-9.1.14.0
+    - env: ACTIVE_RECORD_BRANCH="5-2-stable"
   exclude:
-    - rvm: "2.1.10"
+    - rvm: 2.3.8
       env: ACTIVE_RECORD_BRANCH="master"
-    - rvm: "2.1.10"
-      env: ACTIVE_RECORD_BRANCH="5-1-stable"
-    - rvm: "2.1.10"
-      env: ACTIVE_RECORD_BRANCH="5-0-stable"
-    - rvm: "2.1.10"
-      env: ACTIVE_RECORD_VERSION="~> 5.1.0"
-    - rvm: "2.1.10"
-      env: ACTIVE_RECORD_VERSION="~> 5.0.0"
-    - rvm: jruby-9.1.14.0
-      env: ACTIVE_RECORD_BRANCH="master"
-    - rvm: jruby-9.1.14.0
-      env: ACTIVE_RECORD_BRANCH="5-1-stable"
-    - rvm: jruby-9.1.14.0
-      env: ACTIVE_RECORD_BRANCH="5-0-stable"
-    - rvm: jruby-9.1.14.0
-      env: ACTIVE_RECORD_VERSION="~> 5.2.0.beta2"
-    - rvm: jruby-9.1.14.0
-      env: ACTIVE_RECORD_VERSION="~> 5.1.0"
-    - rvm: jruby-9.1.14.0
-      env: ACTIVE_RECORD_VERSION="~> 5.0.0"
+    - rvm: jruby-9.2.0.0
+      env: ACTIVE_RECORD_VERSION="~> 4.2.9"
 
 before_script:
+  - "psql --version"
   - "psql -c 'create database pg_search_test;' -U postgres >/dev/null"
 
 script: "bin/rake"
 
 addons:
+  postgresql: "9.6"
   code_climate:
     repo_token: 0a0e3e45118bc447e677d52c21d056a5471c4921d54f96ed7b2550d9fc5043ea

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # pg_search changelog
 
+## 2.1.3
+
+*   Remove support for unsupported Ruby 2.1
+*   Disallow left/right single quotation marks in tsquery (Fabian Schwahn) (#382)
+*   Do not attempt to save an already-destroy PgSearch::Document (Oleg Dashevskii, Vokhmin Aleksei V) (#353)
+*   Quote column name when rebuilding (Jed Levin) (#379)
+
 ## 2.1.2
 
 *   Silence warnings in Rails 5.2.0.beta2 (Kevin Deisz)

data/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 First off, if you experience a bug, we welcome you to report it. Please provide a minimal test case showing the code that you ran, its output, and what you expected the output to be instead. If you are able to fix the bug and make a pull request, we are much more likely to get it resolved quickly, but don't feel bad to just report an issue if you don't know how to fix it.
 
-pg_search supports Ruby 1.9.2 and higher, Active Record 3.1 and higher, and PostgreSQL 8.0 and higher. It can be hard to test against all of those versions, but please do your best to avoid features that are only available in newer versions. For example, don't use Ruby 2.0's `prepend` keyword.
+View the [README](./README.md) to see which versions of Ruby, Active Record, and PostgreSQL are supported by pg_search. It can be hard to test against all of the various versions, but please do your best to avoid coding practices that only work in newer versions.
 
 If you have a substantial feature to add, you might want to discuss it first on the [mailing list](https://groups.google.com/forum/#!forum/casecommons-dev). We might have thought hard about it already, and can sometimes help with tips and tricks.
 
@@ -10,8 +10,10 @@ When in doubt, go ahead and make a pull request. If something needs tweaking or
 
 Don't be discouraged if the maintainers ask you to change your code. We are always appreciative when people work hard to modify our code, but we also have a lot of opinions about coding style and object design.
 
-Run the tests by running rake. It will update all gems to their latest version. This is by design, because we want to be proactive about compatibility with other libraries. To test against a specific version of Active Record, you can set the `ACTIVE_RECORD_VERSION` environment variable.
+Our automated tests start by updating all gems to their latest version. This is by design, because we want to be proactive about compatibility with other libraries. You can do the same by running `bundle update` at any time. To test against a specific version of Active Record, you can set the `ACTIVE_RECORD_VERSION` environment variable.
 
-    $ ACTIVE_RECORD_VERSION=3.1 rake
+    $ ACTIVE_RECORD_VERSION=5.0 bundle update
+
+Run the tests by running `bundle exec rake`, or `bin/rake` if you use Bundler binstubs. 
 
 Last, but not least, have fun! pg_search is a labor of love.

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'pg', '>= 0.21.0', :platform => :ruby
+gem 'pg', '>= 0.21.0', '< 1.0.0', :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.1", :platform => :jruby
 
 if ENV['ACTIVE_RECORD_BRANCH']

data/README.md

@@ -2,9 +2,8 @@
 
 [![Gem Version](https://img.shields.io/gem/v/pg_search.svg?style=flat)](https://rubygems.org/gems/pg_search)
 [![Build Status](https://secure.travis-ci.org/Casecommons/pg_search.svg?branch=master)](https://travis-ci.org/Casecommons/pg_search)
-[![Code Climate](https://img.shields.io/codeclimate/github/Casecommons/pg_search.svg?style=flat)](https://codeclimate.com/github/Casecommons/pg_search)
+[![Maintainability](https://api.codeclimate.com/v1/badges/ae1a7c021e473e9b2486/maintainability)](https://codeclimate.com/github/Casecommons/pg_search/maintainability)
 [![Test Coverage](https://codeclimate.com/github/Casecommons/pg_search/badges/coverage.svg)](https://codeclimate.com/github/Casecommons/pg_search/coverage)
-[![Dependency Status](https://img.shields.io/gemnasium/Casecommons/pg_search.svg?style=flat)](https://gemnasium.com/Casecommons/pg_search)
 [![Inline docs](http://inch-ci.org/github/Casecommons/pg_search.svg?branch=master&style=flat)](http://inch-ci.org/github/Casecommons/pg_search)
 [![Join the chat at https://gitter.im/Casecommons/pg_search](https://img.shields.io/badge/gitter-join%20chat-blue.svg)](https://gitter.im/Casecommons/pg_search?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Stories in Ready](https://img.shields.io/waffle/label/Casecommons/pg_search/in%20progress.svg)](https://waffle.io/Casecommons/pg_search)
@@ -18,7 +17,7 @@ Read the blog post introducing PgSearch at https://content.pivotal.io/blog/pg-se
 
 ## REQUIREMENTS
 
-*   Ruby 2.1+
+*   Ruby 2.2+
 *   ActiveRecord 4.2+
 *   PostgreSQL 9.2+
 *   [PostgreSQL extensions](https://github.com/Casecommons/pg_search/wiki/Installing-PostgreSQL-Extensions) for certain features
@@ -384,13 +383,13 @@ value if you wanted.
 ```ruby
 class Person < ActiveRecord::Base
   include PgSearch
-  pg_search_scope :search_by_name, lambda do |name_part, query|
+  pg_search_scope :search_by_name, lambda { |name_part, query|
     raise ArgumentError unless [:first, :last].include?(name_part)
     {
       :against => name_part,
       :query => query
     }
-  end
+  }
 end
 
 person_1 = Person.create!(:first_name => "Grant", :last_name => "Hill")

data/lib/pg_search.rb

@@ -24,9 +24,10 @@ module PgSearch
     def pg_search_scope(name, options)
       options_proc = if options.respond_to?(:call)
                        options
-                     else
-                       raise ArgumentError, "pg_search_scope expects a Hash or Proc" unless options.respond_to?(:merge)
+                     elsif options.respond_to?(:merge)
                        ->(query) { {:query => query}.merge(options) }
+                     else
+                       raise ArgumentError, 'pg_search_scope expects a Hash or Proc'
                      end
 
       define_singleton_method(name) do |*args|
@@ -37,7 +38,7 @@ module PgSearch
     end
 
     def multisearchable(options = {})
-      include PgSearch::Multisearchable # rubocop:disable Style/MixinUsage
+      include PgSearch::Multisearchable
       class_attribute :pg_search_multisearchable_options
       self.pg_search_multisearchable_options = options
     end
@@ -68,9 +69,11 @@ module PgSearch
     case symbol
     when :pg_search_rank
       raise PgSearchRankNotSelected.new unless respond_to?(:pg_search_rank)
+
       read_attribute(:pg_search_rank).to_f
     when :pg_search_highlight
       raise PgSearchHighlightNotSelected.new unless respond_to?(:pg_search_highlight)
+
       read_attribute(:pg_search_highlight)
     else
       super

data/lib/pg_search/configuration.rb

@@ -27,6 +27,7 @@ module PgSearch
 
     def regular_columns
       return [] unless options[:against]
+
       Array(options[:against]).map do |column_name, weight|
         Column.new(column_name, weight, model)
       end
@@ -34,6 +35,7 @@ module PgSearch
 
     def associations
       return [] unless options[:associated_against]
+
       options[:associated_against].map do |association, column_names|
         Association.new(model, association, column_names)
       end.flatten

data/lib/pg_search/features/tsearch.rb

@@ -93,7 +93,7 @@ module PgSearch
         end
       end
 
-      DISALLOWED_TSQUERY_CHARACTERS = /['?\\:]/
+      DISALLOWED_TSQUERY_CHARACTERS = /['?\\:‘’]/.freeze
 
       def tsquery_for_term(unsanitized_term) # rubocop:disable Metrics/AbcSize
         if options[:negation] && unsanitized_term.start_with?("!")
@@ -128,6 +128,7 @@ module PgSearch
 
       def tsquery
         return "''" if query.blank?
+
         query_terms = query.split(" ").compact
         tsquery_terms = query_terms.map { |term| tsquery_for_term(term) }
         tsquery_terms.join(options[:any_word] ? ' || ' : ' && ')

data/lib/pg_search/migration/generator.rb

@@ -8,7 +8,7 @@ module PgSearch
 
       def self.inherited(subclass)
         super
-        subclass.source_root File.expand_path('../templates', __FILE__)
+        subclass.source_root File.expand_path('templates', __dir__)
       end
 
       def create_migration
@@ -20,7 +20,7 @@ module PgSearch
       private
 
       def read_sql_file(filename)
-        sql_directory = File.expand_path('../../../../sql', __FILE__)
+        sql_directory = File.expand_path('../../../sql', __dir__)
         source_path = File.join(sql_directory, "#{filename}.sql")
         File.read(source_path).strip
       end

data/lib/pg_search/multisearch/rebuilder.rb

@@ -74,7 +74,9 @@ module PgSearch
       end
 
       def content_expressions
-        columns.map { |column| %{coalesce(:model_table.#{column}::text, '')} }.join(" || ' ' || ")
+        columns.map do |column|
+          %{coalesce(:model_table.#{connection.quote_column_name(column)}::text, '')}
+        end.join(" || ' ' || ")
       end
 
       def columns

data/lib/pg_search/multisearchable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/class/attribute"
 
 module PgSearch
@@ -31,6 +33,8 @@ module PgSearch
     end
 
     def should_update_pg_search_document?
+      return false if pg_search_document.destroyed?
+
       conditions = Array(pg_search_multisearchable_options[:update_if])
       conditions.all? { |condition| condition.to_proc.call(self) }
     end

data/lib/pg_search/scope_options.rb

@@ -171,6 +171,7 @@ module PgSearch
 
     def include_table_aliasing_for_rank(scope)
       return scope if scope.included_modules.include?(PgSearchRankTableAliasing)
+
       scope.all.spawn.tap do |new_scope|
         new_scope.class_eval { include PgSearchRankTableAliasing }
       end

data/lib/pg_search/tasks.rb

@@ -6,6 +6,7 @@ namespace :pg_search do
     desc "Rebuild PgSearch multisearch records for a given model"
     task :rebuild, %i[model schema] => :environment do |_task, args|
       raise ArgumentError, <<-MESSAGE.strip_heredoc unless args.model
+
         You must pass a model as an argument.
         Example: rake pg_search:multisearch:rebuild[BlogPost]
       MESSAGE

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "2.1.2".freeze
+  VERSION = '2.1.3'.freeze
 end

data/pg_search.gemspec

@@ -1,4 +1,4 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'pg_search/version'
 
 Gem::Specification.new do |s|
@@ -24,9 +24,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '>= 3.3'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop', '>= 0.54.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'with_model', '>= 1.2'
 
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.2'
 end

data/spec/integration/pg_search_spec.rb

@@ -428,7 +428,7 @@ describe "an Active Record model which includes PgSearch" do
         included = [
           ModelWithPgSearch.create!(:content => 'foo bar'),
           ModelWithPgSearch.create!(:content => 'bar foo'),
-          ModelWithPgSearch.create!(:content => 'bar foo baz'),
+          ModelWithPgSearch.create!(:content => 'bar foo baz')
         ]
         excluded = [
           ModelWithPgSearch.create!(:content => 'foo'),
@@ -1130,6 +1130,15 @@ describe "an Active Record model which includes PgSearch" do
         results = ModelWithPgSearch.search_title_without_accents("abcd\303\251f")
         expect(results).to eq([included])
       end
+
+      context "when the query includes accents" do
+        it "does not create an erroneous tsquery expression" do
+          included = ModelWithPgSearch.create!(:title => "Weird L‘Content")
+
+          results = ModelWithPgSearch.search_title_without_accents("L‘Content")
+          expect(results).to eq([included])
+        end
+      end
     end
 
     context "when passed a :ranked_by expression" do

data/spec/lib/pg_search/features/dmetaphone_spec.rb

@@ -13,7 +13,7 @@ describe PgSearch::Features::DMetaphone do
       query = "query"
       columns = [
         PgSearch::Configuration::Column.new(:name, nil, Model),
-        PgSearch::Configuration::Column.new(:content, nil, Model),
+        PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
       config = double(:config, :ignore => [])
@@ -38,7 +38,7 @@ describe PgSearch::Features::DMetaphone do
       query = "query"
       columns = [
         PgSearch::Configuration::Column.new(:name, nil, Model),
-        PgSearch::Configuration::Column.new(:content, nil, Model),
+        PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
       config = double(:config, :ignore => [])

data/spec/lib/pg_search/features/tsearch_spec.rb

@@ -14,7 +14,7 @@ describe PgSearch::Features::TSearch do
       query = "query"
       columns = [
         PgSearch::Configuration::Column.new(:name, nil, Model),
-        PgSearch::Configuration::Column.new(:content, nil, Model),
+        PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
       config = double(:config, :ignore => [])
@@ -39,7 +39,7 @@ describe PgSearch::Features::TSearch do
       query = "query"
       columns = [
         PgSearch::Configuration::Column.new(:name, nil, Model),
-        PgSearch::Configuration::Column.new(:content, nil, Model),
+        PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
       config = double(:config, :ignore => [])
@@ -56,7 +56,7 @@ describe PgSearch::Features::TSearch do
         query = "!query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
-          PgSearch::Configuration::Column.new(:content, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
         options = {:negation => true}
         config = double(:config, :ignore => [])
@@ -74,7 +74,7 @@ describe PgSearch::Features::TSearch do
         query = "!query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
-          PgSearch::Configuration::Column.new(:content, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
         options = {:negation => false}
         config = double(:config, :ignore => [])
@@ -92,7 +92,7 @@ describe PgSearch::Features::TSearch do
         query = "query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
-          PgSearch::Configuration::Column.new(:content, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
         options = {tsvector_column: "my_tsvector"}
         config = double(:config, :ignore => [])
@@ -110,7 +110,7 @@ describe PgSearch::Features::TSearch do
         query = "query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
-          PgSearch::Configuration::Column.new(:content, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
         options = {tsvector_column: ["tsvector1", "tsvector2"]}
         config = double(:config, :ignore => [])
@@ -153,7 +153,7 @@ describe PgSearch::Features::TSearch do
         query = "query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
-          PgSearch::Configuration::Column.new(:content, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
         options = {
           dictionary: "spanish",

data/spec/lib/pg_search/multisearch/rebuilder_spec.rb

@@ -112,7 +112,7 @@ describe PgSearch::Multisearch::Rebuilder do
               SELECT 'Model' AS searchable_type,
                      #{Model.quoted_table_name}.#{Model.primary_key} AS searchable_id,
                      (
-                       coalesce(#{Model.quoted_table_name}.name::text, '')
+                       coalesce(#{Model.quoted_table_name}."name"::text, '')
                      ) AS content,
                      '#{expected_timestamp}' AS created_at,
                      '#{expected_timestamp}' AS updated_at
@@ -132,6 +132,25 @@ describe PgSearch::Multisearch::Rebuilder do
             expect(executed_sql.first.strip).to eq(expected_sql.strip)
           end
 
+          context "for a model with a camel case column" do
+            with_model :ModelWithCamelCaseColumn do
+              table do |t|
+                t.string :camelName
+              end
+
+              model do
+                include PgSearch
+                multisearchable :against => :name
+              end
+            end
+
+            it "creates search document without PG error" do
+              time = Time.utc(2001, 1, 1, 0, 0, 0)
+              rebuilder = PgSearch::Multisearch::Rebuilder.new(Model, -> { time })
+              rebuilder.rebuild
+            end
+          end
+
           context "for a model with a non-standard primary key" do
             with_model :ModelWithNonStandardPrimaryKey do
               table primary_key: :non_standard_primary_key do |t|
@@ -157,7 +176,7 @@ describe PgSearch::Multisearch::Rebuilder do
                 SELECT 'ModelWithNonStandardPrimaryKey' AS searchable_type,
                        #{ModelWithNonStandardPrimaryKey.quoted_table_name}.non_standard_primary_key AS searchable_id,
                        (
-                         coalesce(#{ModelWithNonStandardPrimaryKey.quoted_table_name}.name::text, '')
+                         coalesce(#{ModelWithNonStandardPrimaryKey.quoted_table_name}."name"::text, '')
                        ) AS content,
                        '#{expected_timestamp}' AS created_at,
                        '#{expected_timestamp}' AS updated_at

data/spec/lib/pg_search/multisearch_spec.rb

@@ -121,7 +121,7 @@ describe PgSearch::Multisearch do
               SELECT #{connection.quote(model.name)} AS searchable_type,
                      #{model.quoted_table_name}.id AS searchable_id,
                      (
-                       coalesce(#{model.quoted_table_name}.title::text, '')
+                       coalesce(#{model.quoted_table_name}."title"::text, '')
                      ) AS content,
                      #{connection.quote(connection.quoted_date(now))} AS created_at,
                      #{connection.quote(connection.quoted_date(now))} AS updated_at
@@ -148,7 +148,7 @@ describe PgSearch::Multisearch do
               SELECT #{connection.quote(model.name)} AS searchable_type,
                      #{model.quoted_table_name}.id AS searchable_id,
                      (
-                       coalesce(#{model.quoted_table_name}.title::text, '') || ' ' || coalesce(#{model.quoted_table_name}.content::text, '')
+                       coalesce(#{model.quoted_table_name}."title"::text, '') || ' ' || coalesce(#{model.quoted_table_name}."content"::text, '')
                      ) AS content,
                      #{connection.quote(connection.quoted_date(now))} AS created_at,
                      #{connection.quote(connection.quoted_date(now))} AS updated_at

data/spec/lib/pg_search/multisearchable_spec.rb

@@ -11,6 +11,33 @@ describe PgSearch::Multisearchable do
       end
     end
 
+    with_model :MultisearchableParent do
+      table do |t|
+        t.string :secret
+      end
+
+      model do
+        include PgSearch
+        multisearchable
+
+        has_many :multisearchable_children, :dependent => :destroy
+      end
+    end
+
+    with_model :MultisearchableChild do
+      table do |t|
+        t.belongs_to :multisearchable_parent, index: false
+      end
+
+      model do
+        belongs_to :multisearchable_parent
+
+        after_destroy do
+          multisearchable_parent.update_attribute(:secret, rand(1000).to_s)
+        end
+      end
+    end
+
     describe "callbacks" do
       describe "after_create" do
         let(:record) { ModelThatIsMultisearchable.new }
@@ -92,6 +119,18 @@ describe PgSearch::Multisearchable do
           expect { record.destroy }.to change(PgSearch::Document, :count).by(-1)
           expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
         end
+
+        it "should remove its document in case of complex associations" do
+          parent = MultisearchableParent.create!
+
+          MultisearchableChild.create!(multisearchable_parent: parent)
+          MultisearchableChild.create!(multisearchable_parent: parent)
+
+          document = parent.pg_search_document
+
+          expect { parent.destroy }.to change(PgSearch::Document, :count).by(-1)
+          expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
+        end
       end
     end
 

data/spec/support/database.rb

@@ -41,6 +41,7 @@ def install_extension(name)
   connection = ActiveRecord::Base.connection
   extension = connection.execute "SELECT * FROM pg_catalog.pg_extension WHERE extname = '#{name}';"
   return unless extension.none?
+
   connection.execute "CREATE EXTENSION #{name};"
 rescue StandardError => exception
   at_exit do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -171,10 +171,10 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/rake
 - lib/pg_search.rb
 - lib/pg_search/configuration.rb
 - lib/pg_search/configuration/association.rb
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's

data/Guardfile

@@ -1,6 +0,0 @@
-guard 'rspec', cmd: "bin/rspec" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
-