pg_search 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d79889dbc874d312da8be0d1770875df5048975
-  data.tar.gz: d29022a5e3c1bcfd6668637e7f1c436d65140b63
+  metadata.gz: e2af7110ee0301accace6b1a5143605fdddaf59b
+  data.tar.gz: ae0a9e2e5da80e29afd0449057685d64f20cb08c
 SHA512:
-  metadata.gz: 64adadba491dc22693215cb70ff4ee1d006336d4c1619f554755a50bd8a53f81601c7accd29d84fc1d787a291920f71f11bd450af6ded9ec341269325af3c248
-  data.tar.gz: 51a38eecd6feef873c613d1bf57cf2de36beeeca59e899f1d2ddb1919fec5c8de24c337445f012af118289f57d1a28eca3244fda45a7979e51599edcb89e7527
+  metadata.gz: 6d5b4e6084872eac490fa2e7e923a3c9e53bd5acf77596a6a2a42547ecf90cee8f75a9c1d9a5819bcf4bc3546fc2dcc8f1ba46848dd5561c62172235d8ffff6b
+  data.tar.gz: baf8e2bcf8fd110c8db6f1bd68acdb62af2510ec5eab40bfd607494f83c202282238db599b95c30e44b64d7a13338b894b2dd074d7104779512fd0efac7b5ad0

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_from: .rubocop_todo.yml
+
+Style/StringLiterals:
+  Enabled: false
+
+# # Offense count: 2
+# Lint/HandleExceptions:
+  # Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,273 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-12-12 15:10:11 -0600 using RuboCop version 0.28.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 11
+# Cop supports --auto-correct.
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+# Offense count: 12
+Lint/UselessAssignment:
+  Enabled: false
+
+# Offense count: 6
+Metrics/AbcSize:
+  Max: 27
+
+# Offense count: 347
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 304
+
+# Offense count: 9
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 21
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/Alias:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+Style/AlignHash:
+  Enabled: false
+
+# Offense count: 42
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/AlignParameters:
+  Enabled: false
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/BarePercentLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/BlockEndNewline:
+  Enabled: false
+
+# Offense count: 14
+# Cop supports --auto-correct.
+Style/Blocks:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+# Offense count: 27
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/DotPosition:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ElseAlignment:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLines:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundClassBody:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 521
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/HashSyntax:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Offense count: 23
+# Cop supports --auto-correct.
+Style/IndentArray:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/IndentationConsistency:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Enabled: false
+
+# Offense count: 10
+Style/Lambda:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MethodDefParentheses:
+  Enabled: false
+
+# Offense count: 2
+Style/MultilineBlockChain:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MultilineBlockLayout:
+  Enabled: false
+
+# Offense count: 16
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 6
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/PercentQLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/Proc:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/RaiseArgs:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Enabled: false
+
+# Offense count: 2
+Style/RegexpLiteral:
+  MaxSlashes: 0
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SignalException:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SpaceAfterComma:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+Style/SpaceInsideBlockBraces:
+  Enabled: false
+
+# Offense count: 76
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SpaceInsideParens:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/SpecialGlobalVars:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+Style/SymbolProc:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/TrailingBlankLines:
+  Enabled: false
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+Style/TrailingComma:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+Style/WordArray:
+  MinSize: 2

data/.travis.yml

@@ -1,16 +1,19 @@
 language: ruby
+sudo: false
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - "1.9"
+  - "2.0"
+  - "2.1"
+  - "2.2"
   - jruby-19mode
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
+  - ACTIVE_RECORD_BRANCH="4-2-stable"
   - ACTIVE_RECORD_BRANCH="4-1-stable"
   - ACTIVE_RECORD_BRANCH="4-0-stable"
-  - ACTIVE_RECORD_VERSION="~> 4.2.0.beta1"
+  - ACTIVE_RECORD_VERSION="~> 4.2.0"
   - ACTIVE_RECORD_VERSION="~> 4.1.0"
   - ACTIVE_RECORD_VERSION="~> 4.0.0"
   - ACTIVE_RECORD_VERSION="~> 3.2.0"
@@ -20,11 +23,20 @@ matrix:
   allow_failures:
     - rvm: jruby-19mode
     - env: ACTIVE_RECORD_BRANCH="master"
+    - env: ACTIVE_RECORD_BRANCH="4-2-stable"
     - env: ACTIVE_RECORD_BRANCH="4-1-stable"
     - env: ACTIVE_RECORD_BRANCH="4-0-stable"
-    - env: ACTIVE_RECORD_VERSION="~> 4.2.0.beta1"
+  exclude:
+    - rvm: "1.9"
+      env: ACTIVE_RECORD_BRANCH="master"
+    - rvm: "2.0"
+      env: ACTIVE_RECORD_BRANCH="master"
+    - rvm: "2.1"
+      env: ACTIVE_RECORD_BRANCH="master"
+    - rvm: jruby-19mode
+      env: ACTIVE_RECORD_BRANCH="master"
 
 before_script:
   - "psql -c 'create database pg_search_test;' -U postgres >/dev/null"
 
-script: "bundle exec rspec spec"
+script: "bin/rake"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # pg_search changelog
 
+## 0.7.9
+
+*   Improve support for single table inheritance (STI) models (Ewan McDougall)
+
 ## 0.7.8
 
 *   Stop inadvertently including binstubs for guard and rspec.

data/Gemfile

@@ -5,11 +5,13 @@ gemspec
 gem 'pg', :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.1", :platform => :jruby
 
-gem "activerecord", ENV["ACTIVE_RECORD_VERSION"] if ENV["ACTIVE_RECORD_VERSION"]
-gem "activerecord", :github => "rails", :branch => ENV["ACTIVE_RECORD_BRANCH"] if ENV["ACTIVE_RECORD_BRANCH"]
+if ENV['ACTIVE_RECORD_BRANCH']
+  gem 'activerecord', :git => 'https://github.com/rails/rails.git', :branch => ENV['ACTIVE_RECORD_BRANCH']
+  gem 'arel', :git => 'https://github.com/rails/arel.git' if ENV['ACTIVE_RECORD_BRANCH'] == 'master'
+end
 
-if ENV["TRAVIS"]
-  gem 'coveralls', :require => false, :platform => :mri_20
+if ENV['ACTIVE_RECORD_VERSION']
+  gem 'activerecord', ENV['ACTIVE_RECORD_VERSION']
 end
 
 group :development do

data/README.md

@@ -1,10 +1,10 @@
 # [pg_search](http://github.com/Casecommons/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)](https://codeclimate.com/github/Casecommons/pg_search)
-[![Coverage Status](https://img.shields.io/coveralls/Casecommons/pg_search/master.svg)](https://coveralls.io/r/Casecommons/pg_search)
-[![Gem Version](https://badge.fury.io/rb/pg_search.svg)](https://rubygems.org/gems/pg_search)
-[![Dependency Status](https://gemnasium.com/Casecommons/pg_search.svg)](https://gemnasium.com/Casecommons/pg_search)
+[![Code Climate](https://img.shields.io/codeclimate/github/Casecommons/pg_search.svg?style=flat)](https://codeclimate.com/github/Casecommons/pg_search)
+[![Gem Version](https://img.shields.io/gem/v/pg_search.svg?style=flat)](https://rubygems.org/gems/pg_search)
+[![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)
 
 ## DESCRIPTION
 
@@ -562,6 +562,36 @@ robin = Superhero.create :name => 'Robin'
 
 Superhero.whose_name_starts_with("Bat") # => [batman, batgirl]
 ```
+##### :negation
+
+PostgreSQL's full text search matches all search terms by default. If you want
+to exclude certain words, you can set :negation to true. Then any term that begins with
+an exclamation point `!` will be excluded from the results. Since this
+is a :tsearch-specific option, you should pass it to :tsearch directly, as
+shown in the following example.
+
+Note that combining this with other search features can have unexpected results. For
+example, :trigram searches don't have a concept of excluded terms, and thus if you
+use both :tsearch and :trigram in tandem, you may still find results that contain the
+term that you were trying to exclude.
+
+```ruby
+class Animal < ActiveRecord::Base
+  include PgSearch
+  pg_search_scope :with_name_matching,
+                  :against => :name,
+                  :using => {
+                    :tsearch => {:negation => true}
+                  }
+end
+
+one_fish = Animal.create(:name => "one fish")
+two_fish = Animal.create(:name => "two fish")
+red_fish = Animal.create(:name => "red fish")
+blue_fish = Animal.create(:name => "blue fish")
+
+Animal.with_name_matching("fish !red !blue") # => [one_fish, two_fish]
+```
 
 ##### :dictionary
 
@@ -879,19 +909,20 @@ To use this functionality you'll need to do a few things:
     function uses.
 *   Add the option to pg_search_scope, e.g:
 
-        pg_search_scope :fast_content_search,
-                        :against => :content,
-                        :using => {
-                          dmetaphone: {
-                            tsvector_column: 'tsvector_content_dmetaphone'
-                          },
-                          tsearch: {
-                            dictionary: 'english',
-                            tsvector_column: 'tsvector_content_tsearch'
-                          }
-                          trigram: {} # trigram does not use tsvectors
-                        }
-
+    ```ruby
+    pg_search_scope :fast_content_search,
+                    :against => :content,
+                    :using => {
+                      dmetaphone: {
+                        tsvector_column: 'tsvector_content_dmetaphone'
+                      },
+                      tsearch: {
+                        dictionary: 'english',
+                        tsvector_column: 'tsvector_content_tsearch'
+                      }
+                      trigram: {} # trigram does not use tsvectors
+                    }
+    ```
 *   You cannot dump a `tsvector` column to `schema.rb`. Instead, you need to switch to using the native PostgreSQL SQL format schema dump.
     In your `config/application.rb` you should set
 
@@ -903,6 +934,36 @@ To use this functionality you'll need to do a few things:
 Please note that the :against column is only used when the tsvector_column is
 not present for the search type.
 
+#### Combining multiple tsvectors
+
+It's possible to search against more than one tsvector at a time. This could be useful if you want to maintain multiple search scopes but do not want to maintain separate tsvectors for each scope. For example:
+
+```ruby
+pg_search_scope :search_title,
+                :against => :title,
+                :using => {
+                  :tsearch => {
+                    :tsvector_column => "title_tsvector"
+                  }
+                }
+
+pg_search_scope :search_body,
+                :against => :body,
+                :using => {
+                  :tsearch => {
+                    :tsvector_column => "body_tsvector"
+                  }
+                }
+
+pg_search_scope :search_title_and_body,
+                :against => [:title, :body],
+                :using => {
+                  :tsearch => {
+                    :tsvector_column => ["title_tsvector", "body_tsvector"]
+                  }
+                }
+```
+
 ### Configuring ranking and ordering
 
 #### :ranked_by (Choosing a ranking algorithm)

data/Rakefile

@@ -1,13 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-task :default => :spec
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-def bundle_exec(command)
-  sh %Q{bundle update && bundle exec #{command}}
-end
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
 
-desc "Run all specs"
-task "spec" do
-  bundle_exec("rspec spec")
-end
+task :default => %w[ spec rubocop ]

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/lib/pg_search/document.rb

@@ -18,10 +18,10 @@ module PgSearch
 
     pg_search_scope :search, lambda { |*args|
       options = if PgSearch.multisearch_options.respond_to?(:call)
-        PgSearch.multisearch_options.call(*args)
-      else
-        {:query => args.first}.merge(PgSearch.multisearch_options)
-      end
+                  PgSearch.multisearch_options.call(*args)
+                else
+                  {:query => args.first}.merge(PgSearch.multisearch_options)
+                end
 
       {:against => :content}.merge(options)
     }

data/lib/pg_search/features/tsearch.rb

@@ -29,13 +29,20 @@ module PgSearch
       DISALLOWED_TSQUERY_CHARACTERS = /['?\\:]/
 
       def tsquery_for_term(unsanitized_term)
+        if options[:negation] && unsanitized_term.start_with?("!")
+          unsanitized_term[0] = ''
+          negated = true
+        end
+
         sanitized_term = unsanitized_term.gsub(DISALLOWED_TSQUERY_CHARACTERS, " ")
 
         term_sql = Arel.sql(normalize(connection.quote(sanitized_term)))
 
         # After this, the SQL expression evaluates to a string containing the term surrounded by single-quotes.
-        # If :prefix is true, then the term will also have :* appended to the end.
+        # If :prefix is true, then the term will have :* appended to the end.
+        # If :negated is true, then the term will have ! prepended to the front.
         terms = [
+          (Compatibility.build_quoted('!') if negated),
           Compatibility.build_quoted("' "),
           term_sql,
           Compatibility.build_quoted(" '"),
@@ -65,8 +72,13 @@ module PgSearch
         end
 
         if options[:tsvector_column]
-          column_name = connection.quote_column_name(options[:tsvector_column])
-          tsdocument_terms << "#{quoted_table_name}.#{column_name}"
+          tsvector_columns = Array.wrap(options[:tsvector_column])
+
+          tsdocument_terms << tsvector_columns.map do |tsvector_column|
+            column_name = connection.quote_column_name(tsvector_column)
+
+            "#{quoted_table_name}.#{column_name}"
+          end
         end
 
         tsdocument_terms.join(' || ')

data/lib/pg_search/multisearch.rb

@@ -6,7 +6,7 @@ module PgSearch
     class << self
       def rebuild(model, clean_up=true)
         model.transaction do
-          PgSearch::Document.where(:searchable_type => model.name).delete_all if clean_up
+          PgSearch::Document.where(:searchable_type => model.base_class.name).delete_all if clean_up
           Rebuilder.new(model).rebuild
         end
       end

data/lib/pg_search/multisearch/rebuilder.rb

@@ -35,14 +35,14 @@ module PgSearch
       def rebuild_sql_template
          <<-SQL.strip_heredoc
           INSERT INTO :documents_table (searchable_type, searchable_id, content, created_at, updated_at)
-            SELECT :model_name AS searchable_type,
+            SELECT :base_model_name AS searchable_type,
                    :model_table.#{primary_key} AS searchable_id,
                    (
                      :content_expressions
                    ) AS content,
                    :current_time AS created_at,
                    :current_time AS updated_at
-            FROM :model_table
+            FROM :model_table :sti_clause
         SQL
       end
 
@@ -52,8 +52,20 @@ module PgSearch
         end
       end
 
+      def sti_clause
+        clause = ""
+        if model.column_names.include? 'type'
+          clause = "WHERE"
+          if model.base_class == model
+            clause = "#{clause} type IS NULL OR"
+          end
+          clause = "#{clause} type = #{model_name}"
+        end
+        clause
+      end
+
       def replacements
-        %w[content_expressions model_name model_table documents_table current_time]
+        %w[content_expressions base_model_name model_name model_table documents_table current_time sti_clause]
       end
 
       def content_expressions
@@ -70,6 +82,10 @@ module PgSearch
         connection.quote(model.name)
       end
 
+      def base_model_name
+        connection.quote(model.base_class.name)
+      end
+
       def model_table
         model.quoted_table_name
       end

data/lib/pg_search/multisearchable.rb

@@ -23,10 +23,7 @@ module PgSearch
         unless_conditions.all? { |condition| !condition.to_proc.call(self) }
 
       if should_have_document
-        unless pg_search_document.present?
-          build_pg_search_document.searchable_type = self.class.name
-        end
-        pg_search_document.save
+        pg_search_document ? pg_search_document.save : create_pg_search_document
       else
         pg_search_document.destroy if pg_search_document
       end

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.7.8".freeze
+  VERSION = "0.7.9".freeze
 end

data/pg_search.gemspec

@@ -17,14 +17,15 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord', '>=3.1'
-  s.add_dependency 'activesupport', '>=3.1'
+  s.add_dependency 'activerecord', '>= 3.1'
+  s.add_dependency 'activesupport', '>= 3.1'
   s.add_dependency 'arel'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'with_model'
+  s.add_development_dependency 'with_model', '>= 1.2'
+  s.add_development_dependency 'rubocop'
 
   s.required_ruby_version = ">= 1.9.2"
 end

data/spec/integration/pg_search_spec.rb

@@ -536,6 +536,58 @@ describe "an Active Record model which includes PgSearch" do
           expect(results.map(&:title)).to eq([])
         end
       end
+
+      context "with :negation" do
+        before do
+          ModelWithPgSearch.pg_search_scope :search_with_negation,
+            :against => :title,
+            :using => {
+              :tsearch => {:negation => true}
+            }
+        end
+
+        it "doesn't return results that contain terms prepended with '!'" do
+          included = [
+            ModelWithPgSearch.create!(:title => "one fish"),
+            ModelWithPgSearch.create!(:title => "two fish")
+          ]
+
+          excluded = [
+            ModelWithPgSearch.create!(:title => "red fish"),
+            ModelWithPgSearch.create!(:title => "blue fish")
+          ]
+
+          results = ModelWithPgSearch.search_with_negation("fish !red !blue")
+
+          expect(results).to include(*included)
+          expect(results).not_to include(*excluded)
+        end
+      end
+
+      context "without :negation" do
+        before do
+          ModelWithPgSearch.pg_search_scope :search_without_negation,
+            :against => :title,
+            :using => {
+              :tsearch => {}
+            }
+        end
+
+        it "return results that contain terms prepended with '!'" do
+          included = [
+            ModelWithPgSearch.create!(:title => "!bang")
+          ]
+
+          excluded = [
+            ModelWithPgSearch.create!(:title => "?question")
+          ]
+
+          results = ModelWithPgSearch.search_without_negation("!bang")
+
+          expect(results).to include(*included)
+          expect(results).not_to include(*excluded)
+        end
+      end
     end
 
     context "using dmetaphone" do
@@ -735,6 +787,30 @@ describe "an Active Record model which includes PgSearch" do
       end
     end
 
+    context 'using multiple tsvector columns' do
+      with_model :ModelWithTsvector do
+        model do
+          include PgSearch
+
+          pg_search_scope :search_by_multiple_tsvector_columns,
+            :against => ['content', 'message'],
+            :using => {
+              :tsearch => {
+                :tsvector_column => ['content_tsvector', 'message_tsvector'],
+                :dictionary => 'english'
+              }
+            }
+        end
+      end
+
+      it 'concats tsvector columns' do
+        expected = "#{ModelWithTsvector.quoted_table_name}.\"content_tsvector\" || "\
+                   "#{ModelWithTsvector.quoted_table_name}.\"message_tsvector\""
+
+        expect(ModelWithTsvector.search_by_multiple_tsvector_columns("something").to_sql).to include(expected)
+      end
+    end
+
     context "using a tsvector column with" do
       with_model :ModelWithTsvector do
         table do |t|
@@ -937,29 +1013,29 @@ describe "an Active Record model which includes PgSearch" do
       before do
         SuperclassModel.pg_search_scope :search_content, :against => :content
 
-        class SubclassModel < SuperclassModel
+        class SearchableSubclassModel < SuperclassModel
         end
 
-        class AnotherSubclassModel < SuperclassModel
+        class AnotherSearchableSubclassModel < SuperclassModel
         end
       end
 
       it "returns only results for that subclass" do
         included = [
-          SubclassModel.create!(:content => "foo bar")
+          SearchableSubclassModel.create!(:content => "foo bar")
         ]
         excluded = [
-          SubclassModel.create!(:content => "baz"),
+          SearchableSubclassModel.create!(:content => "baz"),
           SuperclassModel.create!(:content => "foo bar"),
           SuperclassModel.create!(:content => "baz"),
-          AnotherSubclassModel.create!(:content => "foo bar"),
-          AnotherSubclassModel.create!(:content => "baz")
+          AnotherSearchableSubclassModel.create!(:content => "foo bar"),
+          AnotherSearchableSubclassModel.create!(:content => "baz")
         ]
 
         expect(SuperclassModel.count).to eq(6)
-        expect(SubclassModel.count).to eq(2)
+        expect(SearchableSubclassModel.count).to eq(2)
 
-        results = SubclassModel.search_content("foo bar")
+        results = SearchableSubclassModel.search_content("foo bar")
 
         expect(results).to include(*included)
         expect(results).not_to include(*excluded)
@@ -1074,7 +1150,7 @@ describe "an Active Record model which includes PgSearch" do
     end
 
     context "on an STI subclass" do
-      with_model :ASuperclassModel do
+      with_model :SuperclassModel do
         table do |t|
           t.text 'content'
           t.string 'type'
@@ -1082,14 +1158,13 @@ describe "an Active Record model which includes PgSearch" do
       end
 
       before do
-
-        class SearchableSubclassModel < ASuperclassModel
+        searchable_subclass_model = Class.new(SuperclassModel) do
           include PgSearch
           multisearchable :against => :content
         end
-
-        class NonSearchableSubclassModel < ASuperclassModel
-        end
+        stub_const("SearchableSubclassModel", searchable_subclass_model)
+        stub_const("AnotherSearchableSubclassModel", searchable_subclass_model)
+        stub_const("NonSearchableSubclassModel", Class.new(SuperclassModel))
       end
 
       it "returns only results for that subclass" do
@@ -1098,21 +1173,68 @@ describe "an Active Record model which includes PgSearch" do
         ]
         excluded = [
           SearchableSubclassModel.create!(:content => "baz"),
-          ASuperclassModel.create!(:content => "foo bar"),
-          ASuperclassModel.create!(:content => "baz"),
+          SuperclassModel.create!(:content => "foo bar"),
+          SuperclassModel.create!(:content => "baz"),
           NonSearchableSubclassModel.create!(:content => "foo bar"),
           NonSearchableSubclassModel.create!(:content => "baz")
         ]
 
-        expect(ASuperclassModel.count).to be 6
+        expect(SuperclassModel.count).to be 6
         expect(SearchableSubclassModel.count).to be 2
 
+        expect(PgSearch::Document.count).to be 2
+
         results = PgSearch.multisearch("foo bar")
 
-        expect(results.map(&:searchable_id)).to include(*included.map(&:id))
-        expect(results.map(&:searchable_id)).not_to include(*excluded.map(&:id))
-        expect(results.map(&:searchable_type)).to include(*%w[SearchableSubclassModel])
-        expect(results.map(&:searchable_type)).not_to include(*%w[ASuperclassModel NonSearchableSubclassModel])
+        expect(results.length).to be 1
+        expect(results.first.searchable.class).to be SearchableSubclassModel
+        expect(results.first.searchable).to eq included.first
+      end
+
+      it "updates an existing STI model does not create a new pg_search document" do
+        model = SearchableSubclassModel.create!(:content => "foo bar")
+        expect(SearchableSubclassModel.count).to eq(1)
+        # We fetch the model from the database again otherwise
+        # the pg_search_document from the cache is used.
+        model = SearchableSubclassModel.find(model.id)
+        model.content = "foo"
+        model.save!
+        results = PgSearch.multisearch("foo")
+        expect(results.size).to eq(SearchableSubclassModel.count)
+      end
+
+      it "reindexing works" do
+        NonSearchableSubclassModel.create!(:content => "foo bar")
+        NonSearchableSubclassModel.create!(:content => "baz")
+        expected = SearchableSubclassModel.create!(:content => "baz")
+        SuperclassModel.create!(:content => "foo bar")
+        SuperclassModel.create!(:content => "baz")
+        SuperclassModel.create!(:content => "baz2")
+
+        expect(SuperclassModel.count).to be 6
+        expect(NonSearchableSubclassModel.count).to be 2
+        expect(SearchableSubclassModel.count).to be 1
+
+        expect(PgSearch::Document.count).to be 1
+
+        PgSearch::Multisearch.rebuild(SearchableSubclassModel)
+
+        expect(PgSearch::Document.count).to be 1
+        expect(PgSearch::Document.first.searchable.class).to be SearchableSubclassModel
+        expect(PgSearch::Document.first.searchable).to eq expected
+      end
+
+      it "reindexing searchable STI doesn't clobber other related STI models" do
+        searchable_s = SearchableSubclassModel.create!(:content => "baz")
+        searchable_a = AnotherSearchableSubclassModel.create!(:content => "baz")
+
+        expect(PgSearch::Document.count).to be 2
+        PgSearch::Multisearch.rebuild(SearchableSubclassModel)
+        expect(PgSearch::Document.count).to be 2
+
+        classes = PgSearch::Document.all.collect {|d| d.searchable.class }
+        expect(classes).to include SearchableSubclassModel
+        expect(classes).to include AnotherSearchableSubclassModel
       end
     end
   end
@@ -1137,7 +1259,7 @@ describe "an Active Record model which includes PgSearch" do
           @multisearch_enabled_inside = PgSearch.multisearch_enabled?
           raise
         end
-      rescue
+      rescue # rubocop:disable Lint/HandleExceptions
       end
 
       @multisearch_enabled_after = PgSearch.multisearch_enabled?

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

@@ -49,5 +49,77 @@ describe PgSearch::Features::TSearch do
         %Q{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
       )
     end
+
+    context "when options[:negation] is true" do
+      it "returns a negated expression when a query is prepended with !" do
+        query = "!query"
+        columns = [
+          PgSearch::Configuration::Column.new(:name, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model),
+        ]
+        options = {:negation => true}
+        config = double(:config, :ignore => [])
+        normalizer = PgSearch::Normalizer.new(config)
+
+        feature = described_class.new(query, options, columns, Model, normalizer)
+        expect(feature.conditions.to_sql).to eq(
+          %Q{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', '!' || ''' ' || 'query' || ' ''')))}
+        )
+      end
+    end
+
+    context "when options[:negation] is false" do
+      it "does not return a negated expression when a query is prepended with !" do
+        query = "!query"
+        columns = [
+          PgSearch::Configuration::Column.new(:name, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model),
+        ]
+        options = {:negation => false}
+        config = double(:config, :ignore => [])
+        normalizer = PgSearch::Normalizer.new(config)
+
+        feature = described_class.new(query, options, columns, Model, normalizer)
+        expect(feature.conditions.to_sql).to eq(
+          %Q{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || '!query' || ' ''')))}
+        )
+      end
+    end
+
+    context "when options[:tsvector_column] is a string" do
+      it 'uses the tsvector column' do
+        query = "query"
+        columns = [
+          PgSearch::Configuration::Column.new(:name, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model),
+        ]
+        options = { tsvector_column: "my_tsvector" }
+        config = double(:config, :ignore => [])
+        normalizer = PgSearch::Normalizer.new(config)
+
+        feature = described_class.new(query, options, columns, Model, normalizer)
+        expect(feature.conditions.to_sql).to eq(
+          %Q{((#{Model.quoted_table_name}.\"my_tsvector\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+        )
+      end
+    end
+
+    context "when options[:tsvector_column] is an array of strings" do
+      it 'uses the tsvector column' do
+        query = "query"
+        columns = [
+          PgSearch::Configuration::Column.new(:name, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model),
+        ]
+        options = { tsvector_column: ["tsvector1", "tsvector2"] }
+        config = double(:config, :ignore => [])
+        normalizer = PgSearch::Normalizer.new(config)
+
+        feature = described_class.new(query, options, columns, Model, normalizer)
+        expect(feature.conditions.to_sql).to eq(
+          %Q{((#{Model.quoted_table_name}.\"tsvector1\" || #{Model.quoted_table_name}.\"tsvector2\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+        )
+      end
+    end
   end
 end

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

@@ -121,7 +121,7 @@ describe PgSearch::Multisearch::Rebuilder do
           ActiveSupport::Notifications.unsubscribe(notifier)
 
           expect(executed_sql.length).to eq(1)
-          expect(executed_sql.first).to eq(expected_sql)
+          expect(executed_sql.first.strip).to eq(expected_sql.strip)
         end
 
         context "for a model with a non-standard primary key" do
@@ -177,7 +177,7 @@ describe PgSearch::Multisearch::Rebuilder do
             ActiveSupport::Notifications.unsubscribe(notifier)
 
             expect(executed_sql.length).to eq(1)
-            expect(executed_sql.first).to eq(expected_sql)
+            expect(executed_sql.first.strip).to eq(expected_sql.strip)
           end
         end
       end

data/spec/lib/pg_search/multisearch_spec.rb

@@ -129,11 +129,11 @@ describe PgSearch::Multisearch do
           SQL
 
           statements = []
-          allow(connection).to receive(:execute) { |sql| statements << sql }
+          allow(connection).to receive(:execute) { |sql| statements << sql.strip }
 
           PgSearch::Multisearch.rebuild(model)
 
-          expect(statements).to include(expected_sql)
+          expect(statements).to include(expected_sql.strip)
         end
       end
 
@@ -156,11 +156,11 @@ describe PgSearch::Multisearch do
           SQL
 
           statements = []
-          allow(connection).to receive(:execute) { |sql| statements << sql }
+          allow(connection).to receive(:execute) { |sql| statements << sql.strip }
 
           PgSearch::Multisearch.rebuild(model)
 
-          expect(statements).to include(expected_sql)
+          expect(statements).to include(expected_sql.strip)
         end
       end
     end

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ RSpec.configure do |config|
   end
 end
 
-require 'support/coveralls'
 require 'support/database'
 require 'support/with_model'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -97,6 +97,20 @@ dependencies:
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: with_model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,6 +135,8 @@ files:
 - ".autotest"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -130,6 +146,7 @@ files:
 - README.md
 - Rakefile
 - bin/guard
+- bin/rake
 - bin/rspec
 - lib/pg_search.rb
 - lib/pg_search/compatibility.rb
@@ -175,7 +192,6 @@ files:
 - spec/lib/pg_search/multisearchable_spec.rb
 - spec/lib/pg_search/normalizer_spec.rb
 - spec/spec_helper.rb
-- spec/support/coveralls.rb
 - spec/support/database.rb
 - spec/support/with_model.rb
 - sql/array_agg.sql
@@ -204,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's
@@ -225,6 +241,5 @@ test_files:
 - spec/lib/pg_search/multisearchable_spec.rb
 - spec/lib/pg_search/normalizer_spec.rb
 - spec/spec_helper.rb
-- spec/support/coveralls.rb
 - spec/support/database.rb
 - spec/support/with_model.rb

data/spec/support/coveralls.rb

@@ -1,7 +0,0 @@
-if ENV["TRAVIS"]
-  begin
-    require 'coveralls'
-    Coveralls.wear!
-  rescue LoadError
-  end
-end