pg_search 2.1.3 → 2.1.4

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -17,7 +17,7 @@ Read the blog post introducing PgSearch at https://content.pivotal.io/blog/pg-se
 
 ## REQUIREMENTS
 
-*   Ruby 2.2+
+*   Ruby 2.3+
 *   ActiveRecord 4.2+
 *   PostgreSQL 9.2+
 *   [PostgreSQL extensions](https://github.com/Casecommons/pg_search/wiki/Installing-PostgreSQL-Extensions) for certain features

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/pg_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record"
 require "active_support/concern"
 require "active_support/core_ext/module/attribute_accessors"
@@ -25,7 +27,7 @@ module PgSearch
       options_proc = if options.respond_to?(:call)
                        options
                      elsif options.respond_to?(:merge)
-                       ->(query) { {:query => query}.merge(options) }
+                       ->(query) { { :query => query }.merge(options) }
                      else
                        raise ArgumentError, 'pg_search_scope expects a Hash or Proc'
                      end
@@ -68,11 +70,11 @@ module PgSearch
   def method_missing(symbol, *args)
     case symbol
     when :pg_search_rank
-      raise PgSearchRankNotSelected.new unless respond_to?(:pg_search_rank)
+      raise PgSearchRankNotSelected 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)
+      raise PgSearchHighlightNotSelected unless respond_to?(:pg_search_highlight)
 
       read_attribute(:pg_search_highlight)
     else

data/lib/pg_search/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pg_search/configuration/association"
 require "pg_search/configuration/column"
 require "pg_search/configuration/foreign_column"
@@ -17,7 +19,7 @@ module PgSearch
       def alias(*strings)
         name = Array(strings).compact.join("_")
         # By default, PostgreSQL limits names to 32 characters, so we hash and limit to 32 characters.
-        "pg_search_#{Digest::SHA2.hexdigest(name)}"[0,32]
+        "pg_search_#{Digest::SHA2.hexdigest(name)}".first(32)
       end
     end
 
@@ -78,7 +80,7 @@ module PgSearch
     attr_reader :options
 
     def default_options
-      {:using => :tsearch}
+      { :using => :tsearch }
     end
 
     VALID_KEYS = %w[
@@ -87,7 +89,7 @@ module PgSearch
 
     VALID_VALUES = {
       :ignoring => [:accents]
-    }
+    }.freeze
 
     def assert_valid_options(options)
       unless options[:against] || options[:associated_against]

data/lib/pg_search/configuration/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "digest"
 
 module PgSearch

data/lib/pg_search/configuration/column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 
 module PgSearch

data/lib/pg_search/configuration/foreign_column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 
 module PgSearch

data/lib/pg_search/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module PgSearch
@@ -17,10 +19,10 @@ module PgSearch
       options = if PgSearch.multisearch_options.respond_to?(:call)
                   PgSearch.multisearch_options.call(*args)
                 else
-                  {:query => args.first}.merge(PgSearch.multisearch_options)
+                  { :query => args.first }.merge(PgSearch.multisearch_options)
                 end
 
-      {:against => :content}.merge(options)
+      { :against => :content }.merge(options)
     }
   end
 end

data/lib/pg_search/features.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pg_search/features/feature"
 
 require "pg_search/features/dmetaphone"

data/lib/pg_search/features/dmetaphone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgSearch
   module Features
     class DMetaphone

data/lib/pg_search/features/feature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/hash/keys"
 
@@ -23,7 +25,7 @@ module PgSearch
       attr_reader :query, :options, :all_columns, :model, :normalizer
 
       def document
-        columns.map { |column| column.to_sql }.join(" || ' ' || ")
+        columns.map(&:to_sql).join(" || ' ' || ")
       end
 
       def columns

data/lib/pg_search/features/trigram.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgSearch
   module Features
     class Trigram < Feature

data/lib/pg_search/features/tsearch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/module/delegation"
 require 'active_support/deprecation'
 

data/lib/pg_search/migration/dmetaphone_generator.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'pg_search/migration/generator'
 
 module PgSearch
   module Migration
     class DmetaphoneGenerator < Generator
       def migration_name
-        'add_pg_search_dmetaphone_support_functions'.freeze
+        'add_pg_search_dmetaphone_support_functions'
       end
     end
   end

data/lib/pg_search/migration/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'rails/generators/base'
 

data/lib/pg_search/migration/multisearch_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pg_search/migration/generator'
 
 module PgSearch
@@ -9,4 +11,3 @@ module PgSearch
     end
   end
 end
-

data/lib/pg_search/multisearch.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "pg_search/multisearch/rebuilder"
 
 module PgSearch
   module Multisearch
     class << self
-      def rebuild(model, clean_up=true)
+      def rebuild(model, clean_up = true)
         model.transaction do
           PgSearch::Document.where(:searchable_type => model.base_class.name).delete_all if clean_up
           Rebuilder.new(model).rebuild
@@ -22,5 +24,3 @@ module PgSearch
     end
   end
 end
-
-

data/lib/pg_search/multisearch/rebuilder.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module PgSearch
   module Multisearch
     class Rebuilder
       def initialize(model, time_source = Time.method(:now))
-        raise ModelNotMultisearchable.new(model) unless model.respond_to?(:pg_search_multisearchable_options)
+        raise ModelNotMultisearchable, model unless model.respond_to?(:pg_search_multisearchable_options)
 
         @model = model
         @time_source = time_source
@@ -12,7 +14,7 @@ module PgSearch
         if model.respond_to?(:rebuild_pg_search_documents)
           model.rebuild_pg_search_documents
         elsif conditional? || dynamic?
-          model.find_each { |record| record.update_pg_search_document }
+          model.find_each(&:update_pg_search_document)
         else
           model.connection.execute(rebuild_sql)
         end

data/lib/pg_search/multisearchable.rb

@@ -50,7 +50,7 @@ module PgSearch
       if should_have_document
         create_or_update_pg_search_document
       else
-        pg_search_document.destroy if pg_search_document
+        pg_search_document&.destroy
       end
     end
 
@@ -58,7 +58,7 @@ module PgSearch
       if !pg_search_document
         create_pg_search_document(pg_search_document_attrs)
       elsif should_update_pg_search_document?
-        pg_search_document.update_attributes(pg_search_document_attrs)
+        pg_search_document.update(pg_search_document_attrs)
       end
     end
   end

data/lib/pg_search/normalizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgSearch
   class Normalizer
     def initialize(config)

data/lib/pg_search/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgSearch
   class Railtie < Rails::Railtie
     rake_tasks do

data/lib/pg_search/scope_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/module/delegation"
 
 module PgSearch
@@ -25,7 +27,7 @@ module PgSearch
     # workaround for https://github.com/Casecommons/pg_search/issues/14
     module DisableEagerLoading
       def eager_loading?
-        return false
+        false
       end
     end
 
@@ -38,7 +40,7 @@ module PgSearch
       end
 
       def tsearch
-        raise TypeError.new("You need to instantiate this module with []")
+        raise TypeError, "You need to instantiate this module with []"
       end
 
       def with_pg_search_highlight
@@ -140,13 +142,13 @@ module PgSearch
       :dmetaphone => Features::DMetaphone,
       :tsearch => Features::TSearch,
       :trigram => Features::Trigram
-    }
+    }.freeze
 
-    def feature_for(feature_name) # rubocop:disable Metrics/AbcSize
+    def feature_for(feature_name)
       feature_name = feature_name.to_sym
       feature_class = FEATURE_CLASSES[feature_name]
 
-      raise ArgumentError.new("Unknown feature: #{feature_name}") unless feature_class
+      raise ArgumentError, "Unknown feature: #{feature_name}" unless feature_class
 
       normalizer = Normalizer.new(config)
 
@@ -161,7 +163,7 @@ module PgSearch
 
     def rank
       (config.ranking_sql || ":tsearch").gsub(/:(\w*)/) do
-        feature_for($1).rank.to_sql
+        feature_for(Regexp.last_match(1)).rank.to_sql
       end
     end
 

data/lib/pg_search/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'pg_search'
 

data/lib/pg_search/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgSearch
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'
 end

data/pg_search.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'pg_search/version'
 
@@ -8,8 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Grant Hutchins', 'Case Commons, LLC']
   s.email       = %w[gems@nertzy.com casecommons-dev@googlegroups.com]
   s.homepage    = 'https://github.com/Casecommons/pg_search'
-  s.summary     = %q(PgSearch builds Active Record named scopes that take advantage of PostgreSQL's full text search)
-  s.description = %q(PgSearch builds Active Record named scopes that take advantage of PostgreSQL's full text search)
+  s.summary     = "PgSearch builds Active Record named scopes that take advantage of PostgreSQL's full text search"
+  s.description = "PgSearch builds Active Record named scopes that take advantage of PostgreSQL's full text search"
   s.licenses    = ['MIT']
 
   s.files         = `git ls-files`.split("\n")
@@ -18,15 +20,14 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord', '>= 4.2'
   s.add_dependency 'activesupport', '>= 4.2'
-  s.add_dependency 'arel', '>= 6'
 
   s.add_development_dependency 'codeclimate-test-reporter'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '>= 3.3'
-  s.add_development_dependency 'rubocop', '>= 0.54.0'
+  s.add_development_dependency 'rubocop', '>= 0.63.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'with_model', '>= 1.2'
 
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.3'
 end

data/spec/integration/associations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PgSearch do
@@ -19,7 +21,7 @@ describe PgSearch do
           include PgSearch
           belongs_to :another_model, :class_name => 'AssociatedModel'
 
-          pg_search_scope :with_another, :associated_against => {:another_model => :title}
+          pg_search_scope :with_another, :associated_against => { :another_model => :title }
         end
       end
 
@@ -56,7 +58,7 @@ describe PgSearch do
           include PgSearch
           belongs_to :another_model, :class_name => 'AssociatedModel'
 
-          pg_search_scope :with_associated, :against => :title, :associated_against => {:another_model => :title}
+          pg_search_scope :with_associated, :against => :title, :associated_against => { :another_model => :title }
         end
       end
 
@@ -92,7 +94,7 @@ describe PgSearch do
           include PgSearch
           has_many :other_models, :class_name => 'AssociatedModelWithHasMany', :foreign_key => 'ModelWithHasMany_id'
 
-          pg_search_scope :with_associated, :against => [:title], :associated_against => {:other_models => :title}
+          pg_search_scope :with_associated, :against => [:title], :associated_against => { :other_models => :title }
         end
       end
 
@@ -172,7 +174,7 @@ describe PgSearch do
 
             pg_search_scope :with_associated,
               :against => :title,
-              :associated_against => {:models_of_first_type => :title, :model_of_second_type => :title}
+              :associated_against => { :models_of_first_type => :title, :model_of_second_type => :title }
           end
         end
 
@@ -231,7 +233,7 @@ describe PgSearch do
               :foreign_key => 'ModelWithDoubleAssociation_again_id'
 
             pg_search_scope :with_associated, :against => :title,
-                                              :associated_against => {:things => :title, :thingamabobs => :title}
+                                              :associated_against => { :things => :title, :thingamabobs => :title }
           end
         end
 
@@ -283,7 +285,7 @@ describe PgSearch do
           include PgSearch
           belongs_to :another_model, :class_name => 'AssociatedModel'
 
-          pg_search_scope :with_associated, :associated_against => {:another_model => %i[title author]}
+          pg_search_scope :with_associated, :associated_against => { :another_model => %i[title author] }
         end
       end
 
@@ -336,7 +338,7 @@ describe PgSearch do
           include PgSearch
           belongs_to :another_model, class_name: 'AssociatedModel'
 
-          pg_search_scope :with_associated, associated_against: {another_model: :number}
+          pg_search_scope :with_associated, associated_against: { another_model: :number }
         end
       end
 

data/spec/integration/pagination_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe "pagination" do

data/spec/integration/pg_search_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe "an Active Record model which includes PgSearch" do
@@ -65,7 +67,7 @@ describe "an Active Record model which includes PgSearch" do
       context "dynamically" do
         it "raises an exception when invoked" do
           ModelWithPgSearch.pg_search_scope :with_unknown_option,
-            ->(*) { {:against => :content, :foo => :bar} }
+            ->(*) { { :against => :content, :foo => :bar } }
 
           expect {
             ModelWithPgSearch.with_unknown_option("foo")
@@ -88,7 +90,7 @@ describe "an Active Record model which includes PgSearch" do
       context "dynamically" do
         it "raises an exception when invoked" do
           ModelWithPgSearch.pg_search_scope :with_unknown_using,
-            ->(*) { {:against => :content, :using => :foo} }
+            ->(*) { { :against => :content, :using => :foo } }
 
           expect {
             ModelWithPgSearch.with_unknown_using("foo")
@@ -111,7 +113,7 @@ describe "an Active Record model which includes PgSearch" do
       context "dynamically" do
         it "raises an exception when invoked" do
           ModelWithPgSearch.pg_search_scope :with_unknown_ignoring,
-            ->(*) { {:against => :content, :ignoring => :foo} }
+            ->(*) { { :against => :content, :ignoring => :foo } }
 
           expect {
             ModelWithPgSearch.with_unknown_ignoring("foo")
@@ -130,7 +132,7 @@ describe "an Active Record model which includes PgSearch" do
 
         context "dynamically" do
           it "raises an exception when invoked" do
-            ModelWithPgSearch.pg_search_scope :with_unknown_ignoring, ->(*){ {} }
+            ModelWithPgSearch.pg_search_scope :with_unknown_ignoring, ->(*) { {} }
 
             expect {
               ModelWithPgSearch.with_unknown_ignoring("foo")
@@ -222,7 +224,7 @@ describe "an Active Record model which includes PgSearch" do
             has_many :houses
             pg_search_scope :named, against: [:name]
             scope :with_house_in_city, lambda { |city|
-              joins(:houses).where(House.table_name.to_sym => {city: city})
+              joins(:houses).where(House.table_name.to_sym => { city: city })
             }
             scope :house_search_city, lambda { |query|
               joins(:houses).merge(House.search_city(query))
@@ -342,7 +344,7 @@ describe "an Active Record model which includes PgSearch" do
         twice = ModelWithPgSearch.create!(:content => 'foo foo')
 
         records = ModelWithPgSearch.search_content('foo')
-                  .where("#{PgSearch::Configuration.alias(ModelWithPgSearch.table_name)}.rank > 0.07")
+                                   .where("#{PgSearch::Configuration.alias(ModelWithPgSearch.table_name)}.rank > 0.07")
 
         expect(records).to eq [twice]
       end
@@ -537,8 +539,8 @@ describe "an Active Record model which includes PgSearch" do
 
       context "when a threshold is specified" do
         before do
-          ModelWithPgSearch.pg_search_scope :with_strict_trigrams, :against => %i[title content], :using => {trigram: {threshold: 0.5}}
-          ModelWithPgSearch.pg_search_scope :with_permissive_trigrams, :against => %i[title content], :using => {trigram: {threshold: 0.1}}
+          ModelWithPgSearch.pg_search_scope :with_strict_trigrams, :against => %i[title content], :using => { trigram: { threshold: 0.5 } }
+          ModelWithPgSearch.pg_search_scope :with_permissive_trigrams, :against => %i[title content], :using => { trigram: { threshold: 0.1 } }
         end
 
         it "uses the threshold in the trigram expression" do
@@ -565,7 +567,7 @@ describe "an Active Record model which includes PgSearch" do
         ModelWithPgSearch.pg_search_scope :search_title_with_prefixes,
           :against => :title,
           :using => {
-            :tsearch => {:prefix => true}
+            :tsearch => { :prefix => true }
           }
       end
 
@@ -594,7 +596,7 @@ describe "an Active Record model which includes PgSearch" do
           ModelWithPgSearch.pg_search_scope :search_content_with_english,
             :against => :content,
             :using => {
-              :tsearch => {:dictionary => :english}
+              :tsearch => { :dictionary => :english }
             }
         end
 
@@ -682,7 +684,7 @@ describe "an Active Record model which includes PgSearch" do
             ModelWithPgSearch.pg_search_scope :search_content_with_normalization,
               :against => :content,
               :using => {
-                :tsearch => {:normalization => 2}
+                :tsearch => { :normalization => 2 }
               }
           end
 
@@ -729,7 +731,7 @@ describe "an Active Record model which includes PgSearch" do
       context "against columns ranked with a hash" do
         before do
           ModelWithPgSearch.pg_search_scope :search_weighted_by_hash,
-            :against => {:content => 'B', :title => 'A'}
+            :against => { :content => 'B', :title => 'A' }
         end
 
         it "returns results sorted by weighted rank" do
@@ -763,7 +765,7 @@ describe "an Active Record model which includes PgSearch" do
           ModelWithPgSearch.pg_search_scope :search_title_with_any_word,
             :against => :title,
             :using => {
-              :tsearch => {:any_word => true}
+              :tsearch => { :any_word => true }
             }
 
           ModelWithPgSearch.pg_search_scope :search_title_with_all_words,
@@ -788,7 +790,7 @@ describe "an Active Record model which includes PgSearch" do
           ModelWithPgSearch.pg_search_scope :search_with_negation,
             :against => :title,
             :using => {
-              :tsearch => {:negation => true}
+              :tsearch => { :negation => true }
             }
         end
 
@@ -880,7 +882,7 @@ describe "an Active Record model which includes PgSearch" do
         ModelWithPgSearch.pg_search_scope :with_tsearch,
           :against => :title,
           :using => [
-            [:tsearch, {:dictionary => 'english'}]
+            [:tsearch, { :dictionary => 'english' }]
           ]
 
         ModelWithPgSearch.pg_search_scope :with_trigram,
@@ -895,7 +897,7 @@ describe "an Active Record model which includes PgSearch" do
         ModelWithPgSearch.pg_search_scope :with_tsearch_and_trigram,
           :against => :title,
           :using => [
-            [:tsearch, {:dictionary => 'english'}],
+            [:tsearch, { :dictionary => 'english' }],
             :trigram
           ]
 
@@ -903,7 +905,7 @@ describe "an Active Record model which includes PgSearch" do
           :against => %i[content title],
           :ignoring => :accents,
           :using => {
-            :tsearch => {:dictionary => 'english'},
+            :tsearch => { :dictionary => 'english' },
             :dmetaphone => {},
             :trigram => {}
           }
@@ -949,8 +951,8 @@ describe "an Active Record model which includes PgSearch" do
 
       context "with feature-specific configuration" do
         before do
-          @tsearch_config = tsearch_config = {:dictionary => 'english'}
-          @trigram_config = trigram_config = {:foo => 'bar'}
+          @tsearch_config = tsearch_config = { :dictionary => 'english' }
+          @trigram_config = trigram_config = { :foo => 'bar' }
 
           ModelWithPgSearch.pg_search_scope :with_tsearch_and_trigram_using_hash,
             :against => :title,
@@ -1011,7 +1013,7 @@ describe "an Active Record model which includes PgSearch" do
         unexpected.comments.create(body: 'commentwo')
 
         Post.pg_search_scope :search_by_content_with_tsvector,
-          :associated_against => {comments: [:body]},
+          :associated_against => { comments: [:body] },
           :using => {
             :tsearch => {
               :tsvector_column => 'content_tsvector',
@@ -1171,8 +1173,8 @@ describe "an Active Record model which includes PgSearch" do
 
         multiplied_result =
           ModelWithPgSearch.search_content_with_importance_as_rank_multiplier("foo")
-            .with_pg_search_rank
-            .first
+                           .with_pg_search_rank
+                           .first
 
         multiplied_rank = multiplied_result.pg_search_rank
 
@@ -1280,8 +1282,8 @@ describe "an Active Record model which includes PgSearch" do
         ModelWithPgSearch.pg_search_scope :search_content_ranked_by_dmetaphone,
           :against => :content,
           :using => {
-            :tsearch => {:any_word => true, :prefix => true},
-            :dmetaphone => {:any_word => true, :prefix => true, :sort_only => true}
+            :tsearch => { :any_word => true, :prefix => true },
+            :dmetaphone => { :any_word => true, :prefix => true, :sort_only => true }
           },
           :ranked_by => ":tsearch + (0.5 * :dmetaphone)"