pg_search 2.1.3 → 2.1.4

data/spec/integration/single_table_inheritance_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe "a pg_search_scope on an STI subclass" do
@@ -82,4 +84,3 @@ describe "a pg_search_scope on an STI subclass" do
     end
   end
 end
-

data/spec/lib/pg_search/configuration/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PgSearch::Configuration::Association do
@@ -19,8 +21,8 @@ describe PgSearch::Configuration::Association do
       has_one :avatar, :class_name => "Avatar"
       belongs_to :site
 
-      pg_search_scope :with_avatar, :associated_against => {:avatar => :url}
-      pg_search_scope :with_site, :associated_against => {:site => :title}
+      pg_search_scope :with_avatar, :associated_against => { :avatar => :url }
+      pg_search_scope :with_site, :associated_against => { :site => :title }
     end
   end
 
@@ -33,7 +35,7 @@ describe PgSearch::Configuration::Association do
       include PgSearch
       has_many :users, :class_name => "User"
 
-      pg_search_scope :with_users, :associated_against => {:users => :name}
+      pg_search_scope :with_users, :associated_against => { :users => :name }
     end
   end
 

data/spec/lib/pg_search/configuration/column_spec.rb

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

data/spec/lib/pg_search/configuration/foreign_column_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PgSearch::Configuration::ForeignColumn do
@@ -18,7 +20,7 @@ describe PgSearch::Configuration::ForeignColumn 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
 

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ostruct'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "active_support/deprecation"
 
@@ -58,7 +60,7 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = {:negation => true}
+        options = { :negation => true }
         config = double(:config, :ignore => [])
         normalizer = PgSearch::Normalizer.new(config)
 
@@ -76,7 +78,7 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = {:negation => false}
+        options = { :negation => false }
         config = double(:config, :ignore => [])
         normalizer = PgSearch::Normalizer.new(config)
 
@@ -94,7 +96,7 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = {tsvector_column: "my_tsvector"}
+        options = { tsvector_column: "my_tsvector" }
         config = double(:config, :ignore => [])
         normalizer = PgSearch::Normalizer.new(config)
 
@@ -112,7 +114,7 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = {tsvector_column: ["tsvector1", "tsvector2"]}
+        options = { tsvector_column: ["tsvector1", "tsvector2"] }
         config = double(:config, :ignore => [])
         normalizer = PgSearch::Normalizer.new(config)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 def has_microsecond_precision?

data/spec/lib/pg_search/multisearch_spec.rb

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

data/spec/lib/pg_search/multisearchable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PgSearch::Multisearchable do
@@ -143,7 +145,7 @@ describe PgSearch::Multisearchable do
       end
 
       context "when searching against a single column" do
-        let(:multisearchable_options) { {:against => :some_content} }
+        let(:multisearchable_options) { { :against => :some_content } }
         let(:text) { "foo bar" }
         before do
           allow(record).to receive(:some_content) { text }
@@ -157,7 +159,7 @@ describe PgSearch::Multisearchable do
       end
 
       context "when searching against multiple columns" do
-        let(:multisearchable_options) { {:against => %i[attr1 attr2]} }
+        let(:multisearchable_options) { { :against => %i[attr1 attr2] } }
         before do
           allow(record).to receive(:attr1) { '1' }
           allow(record).to receive(:attr2) { '2' }
@@ -180,7 +182,7 @@ describe PgSearch::Multisearchable do
       end
 
       context "when searching against a single column" do
-        let(:multisearchable_options) { {:against => :some_content} }
+        let(:multisearchable_options) { { :against => :some_content } }
         let(:text) { "foo bar" }
         before do
           allow(record).to receive(:some_content) { text }
@@ -194,7 +196,7 @@ describe PgSearch::Multisearchable do
       end
 
       context "when searching against multiple columns" do
-        let(:multisearchable_options) { {:against => %i[attr1 attr2]} }
+        let(:multisearchable_options) { { :against => %i[attr1 attr2] } }
         before do
           allow(record).to receive(:attr1) { '1' }
           allow(record).to receive(:attr2) { '2' }
@@ -254,7 +256,7 @@ describe PgSearch::Multisearchable do
 
             it "does not update the document" do
               expect_any_instance_of(PgSearch::Document)
-                .to_not receive(:update_attributes)
+                .to_not receive(:update)
 
               record.save
             end
@@ -267,7 +269,7 @@ describe PgSearch::Multisearchable do
 
             it "updates the document" do
               expect_any_instance_of(PgSearch::Document)
-                .to receive(:update_attributes)
+                .to receive(:update)
 
               record.save
             end

data/spec/lib/pg_search/normalizer_spec.rb

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

data/spec/lib/pg_search_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 # For AR 5 and greater, the association reflection's cache needs be cleared
@@ -61,9 +63,9 @@ describe PgSearch do
         allow(PgSearch).to receive(:multisearch_options) do
           lambda do |query, soundalike|
             if soundalike
-              {:using => :dmetaphone, :query => query}
+              { :using => :dmetaphone, :query => query }
             else
-              {:query => query}
+              { :query => query }
             end
           end
         end
@@ -174,7 +176,7 @@ describe PgSearch do
           expect(PgSearch::Document.count).to be 2
 
           PgSearch::Document.clear_searchable_cache
-          classes = PgSearch::Document.all.collect {|d| d.searchable.class }
+          classes = PgSearch::Document.all.collect { |d| d.searchable.class }
           expect(classes).to include SearchableSubclassModel
           expect(classes).to include AnotherSearchableSubclassModel
         end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 SimpleCov.start
 

data/spec/support/database.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined? JRUBY_VERSION
   require "activerecord-jdbc-adapter"
   error_classes = [ActiveRecord::JDBCError]
@@ -54,7 +56,7 @@ end
 
 def install_extension_if_missing(name, query, expected_result)
   result = ActiveRecord::Base.connection.select_value(query)
-  raise "Unexpected output for #{query}: #{result.inspect}" unless result.downcase == expected_result.downcase
+  raise "Unexpected output for #{query}: #{result.inspect}" unless result.casecmp(expected_result).zero?
 rescue StandardError
   install_extension(name)
 end

data/spec/support/with_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "with_model"
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +101,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.63.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +152,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -174,7 +159,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/rake
 - lib/pg_search.rb
 - lib/pg_search/configuration.rb
 - lib/pg_search/configuration/association.rb
@@ -233,15 +217,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's

data/.rubocop_todo.yml

@@ -1,153 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-07-21 13:18:24 -0500 using RuboCop version 0.49.1.
-# 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: 26
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/IndentArray:
-  EnforcedStyle: consistent
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'spec/integration/pg_search_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/SpaceAfterComma:
-  Exclude:
-    - 'lib/pg_search/configuration.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: space, no_space
-Layout/SpaceAroundEqualsInParameterDefault:
-  Exclude:
-    - 'lib/pg_search/multisearch.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: space, no_space
-Layout/SpaceBeforeBlockBraces:
-  Exclude:
-    - 'lib/pg_search/features/tsearch.rb'
-    - 'spec/integration/pg_search_spec.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'lib/pg_search/features/tsearch.rb'
-    - 'spec/integration/pg_search_spec.rb'
-    - 'spec/lib/pg_search_spec.rb'
-
-# Offense count: 86
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  Exclude:
-    - 'lib/pg_search.rb'
-    - 'lib/pg_search/configuration.rb'
-    - 'lib/pg_search/document.rb'
-    - 'spec/integration/associations_spec.rb'
-    - 'spec/integration/pg_search_spec.rb'
-    - 'spec/lib/pg_search/configuration/association_spec.rb'
-    - 'spec/lib/pg_search/configuration/foreign_column_spec.rb'
-    - 'spec/lib/pg_search/features/tsearch_spec.rb'
-    - 'spec/lib/pg_search/multisearchable_spec.rb'
-    - 'spec/lib/pg_search_spec.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Exclude:
-    - 'Guardfile'
-    - 'lib/pg_search/migration/multisearch_generator.rb'
-    - 'lib/pg_search/multisearch.rb'
-    - 'spec/integration/single_table_inheritance_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/Casecmp:
-  Exclude:
-    - 'spec/support/database.rb'
-
-# Offense count: 27
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 1
-Style/IfInsideElse:
-  Exclude:
-    - 'lib/pg_search/multisearchable.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/MutableConstant:
-  Exclude:
-    - 'lib/pg_search/configuration.rb'
-    - 'lib/pg_search/scope_options.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'lib/pg_search/scope_options.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Exclude:
-    - 'lib/pg_search.rb'
-    - 'lib/pg_search/multisearch/rebuilder.rb'
-    - 'lib/pg_search/scope_options.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Exclude:
-    - 'lib/pg_search/scope_options.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to, define_method
-Style/SymbolProc:
-  Exclude:
-    - 'lib/pg_search/features/feature.rb'
-    - 'lib/pg_search/multisearch/rebuilder.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Exclude:
-    - 'pg_search.gemspec'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, WordRegex.
-# SupportedStyles: percent, brackets
-Style/WordArray:
-  EnforcedStyle: percent
-  MinSize: 3