pg_search 2.1.4 → 2.1.5

data/spec/lib/pg_search/normalizer_spec.rb

@@ -7,7 +7,7 @@ describe PgSearch::Normalizer do
     context "when config[:ignore] includes :accents" do
       context "when passed an Arel node" do
         it "wraps the expression in unaccent()" do
-          config = double("config", :ignore => [:accents])
+          config = double("config", ignore: [:accents])
           node = Arel::Nodes::NamedFunction.new("foo", [Arel::Nodes.build_quoted("bar")])
 
           normalizer = PgSearch::Normalizer.new(config)
@@ -19,7 +19,7 @@ describe PgSearch::Normalizer do
             allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
             node = Arel::Nodes::NamedFunction.new("foo", [Arel::Nodes.build_quoted("bar")])
 
-            config = double("config", :ignore => [:accents])
+            config = double("config", ignore: [:accents])
 
             normalizer = PgSearch::Normalizer.new(config)
             expect(normalizer.add_normalization(node)).to eq("my_unaccent(foo('bar'))")
@@ -29,7 +29,7 @@ describe PgSearch::Normalizer do
 
       context "when passed a String" do
         it "wraps the expression in unaccent()" do
-          config = double("config", :ignore => [:accents])
+          config = double("config", ignore: [:accents])
 
           normalizer = PgSearch::Normalizer.new(config)
           expect(normalizer.add_normalization("foo")).to eq("unaccent(foo)")
@@ -39,7 +39,7 @@ describe PgSearch::Normalizer do
           it "wraps the expression in that function" do
             allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
 
-            config = double("config", :ignore => [:accents])
+            config = double("config", ignore: [:accents])
 
             normalizer = PgSearch::Normalizer.new(config)
             expect(normalizer.add_normalization("foo")).to eq("my_unaccent(foo)")
@@ -50,7 +50,7 @@ describe PgSearch::Normalizer do
 
     context "when config[:ignore] does not include :accents" do
       it "passes the expression through" do
-        config = double("config", :ignore => [])
+        config = double("config", ignore: [])
 
         normalizer = PgSearch::Normalizer.new(config)
         expect(normalizer.add_normalization("foo")).to eq("foo")

data/spec/lib/pg_search_spec.rb

@@ -32,7 +32,7 @@ describe PgSearch do
     end
 
     context "with PgSearch.multisearch_options set to a Hash" do
-      before { allow(PgSearch).to receive(:multisearch_options).and_return(:using => :dmetaphone) }
+      before { allow(PgSearch).to receive(:multisearch_options).and_return(using: :dmetaphone) }
       subject do
         PgSearch::Document.clear_searchable_cache
         PgSearch.multisearch(query).map(&:searchable)
@@ -44,11 +44,11 @@ describe PgSearch do
         end
         model do
           include PgSearch
-          multisearchable :against => :title
+          multisearchable against: :title
         end
       end
 
-      let!(:soundalike_record) { MultisearchableModel.create!(:title => 'foning') }
+      let!(:soundalike_record) { MultisearchableModel.create!(title: 'foning') }
       let(:query) { "Phoning" }
       it { is_expected.to include(soundalike_record) }
     end
@@ -63,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
@@ -77,11 +77,11 @@ describe PgSearch do
         end
         model do
           include PgSearch
-          multisearchable :against => :title
+          multisearchable against: :title
         end
       end
 
-      let!(:soundalike_record) { MultisearchableModel.create!(:title => 'foning') }
+      let!(:soundalike_record) { MultisearchableModel.create!(title: 'foning') }
       let(:query) { "Phoning" }
 
       context "with soundalike true" do
@@ -107,7 +107,7 @@ describe PgSearch do
         before do
           searchable_subclass_model = Class.new(SuperclassModel) do
             include PgSearch
-            multisearchable :against => :content
+            multisearchable against: :content
           end
           stub_const("SearchableSubclassModel", searchable_subclass_model)
           stub_const("AnotherSearchableSubclassModel", searchable_subclass_model)
@@ -115,13 +115,13 @@ describe PgSearch do
         end
 
         it "returns only results for that subclass" do
-          included = SearchableSubclassModel.create!(:content => "foo bar")
+          included = SearchableSubclassModel.create!(content: "foo bar")
 
-          SearchableSubclassModel.create!(:content => "baz")
-          SuperclassModel.create!(:content => "foo bar")
-          SuperclassModel.create!(:content => "baz")
-          NonSearchableSubclassModel.create!(:content => "foo bar")
-          NonSearchableSubclassModel.create!(:content => "baz")
+          SearchableSubclassModel.create!(content: "baz")
+          SuperclassModel.create!(content: "foo bar")
+          SuperclassModel.create!(content: "baz")
+          NonSearchableSubclassModel.create!(content: "foo bar")
+          NonSearchableSubclassModel.create!(content: "baz")
 
           expect(SuperclassModel.count).to be 6
           expect(SearchableSubclassModel.count).to be 2
@@ -134,7 +134,7 @@ describe PgSearch do
         end
 
         it "updates an existing STI model does not create a new pg_search document" do
-          model = SearchableSubclassModel.create!(:content => "foo bar")
+          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.
@@ -146,12 +146,12 @@ describe PgSearch do
         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")
+          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
@@ -168,8 +168,8 @@ describe PgSearch do
         end
 
         it "reindexing searchable STI doesn't clobber other related STI models" do
-          SearchableSubclassModel.create!(:content => "baz")
-          AnotherSearchableSubclassModel.create!(:content => "baz")
+          SearchableSubclassModel.create!(content: "baz")
+          AnotherSearchableSubclassModel.create!(content: "baz")
 
           expect(PgSearch::Document.count).to be 2
           PgSearch::Multisearch.rebuild(SearchableSubclassModel)
@@ -197,7 +197,7 @@ describe PgSearch do
         before do
           searchable_subclass_model = Class.new(SuperclassModel) do
             include PgSearch
-            multisearchable :against => :content
+            multisearchable against: :content
           end
           stub_const("SearchableSubclassModel", searchable_subclass_model)
           stub_const("AnotherSearchableSubclassModel", searchable_subclass_model)
@@ -205,13 +205,13 @@ describe PgSearch do
         end
 
         it "returns only results for that subclass" do
-          included = SearchableSubclassModel.create!(:content => "foo bar")
+          included = SearchableSubclassModel.create!(content: "foo bar")
 
-          SearchableSubclassModel.create!(:content => "baz")
-          SuperclassModel.create!(:content => "foo bar")
-          SuperclassModel.create!(:content => "baz")
-          NonSearchableSubclassModel.create!(:content => "foo bar")
-          NonSearchableSubclassModel.create!(:content => "baz")
+          SearchableSubclassModel.create!(content: "baz")
+          SuperclassModel.create!(content: "foo bar")
+          SuperclassModel.create!(content: "baz")
+          NonSearchableSubclassModel.create!(content: "foo bar")
+          NonSearchableSubclassModel.create!(content: "baz")
 
           expect(SuperclassModel.count).to be 6
           expect(SearchableSubclassModel.count).to be 2

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ require 'support/database'
 require 'support/with_model'
 
 DOCUMENTS_SCHEMA = lambda do |t|
-  t.belongs_to :searchable, :polymorphic => true, :index => true
+  t.belongs_to :searchable, polymorphic: true, index: true
   t.text :content
   t.timestamps null: false
 end

data/spec/support/database.rb

@@ -1,29 +1,22 @@
 # frozen_string_literal: true
 
-if defined? JRUBY_VERSION
+case RUBY_PLATFORM
+when "java"
   require "activerecord-jdbc-adapter"
-  error_classes = [ActiveRecord::JDBCError]
+  ERROR_CLASS = ActiveRecord::JDBCError
 else
   require "pg"
-  error_classes = [PG::Error]
+  ERROR_CLASS = PG::Error
 end
 
-error_classes << ActiveRecord::NoDatabaseError if defined? ActiveRecord::NoDatabaseError
-
 begin
-  database_user = if ENV["TRAVIS"]
-                    "postgres"
-                  else
-                    ENV["USER"]
-                  end
-
-  ActiveRecord::Base.establish_connection(:adapter => 'postgresql',
-                                          :database => 'pg_search_test',
-                                          :username => database_user,
-                                          :min_messages => 'warning')
+  ActiveRecord::Base.establish_connection(adapter: 'postgresql',
+                                          database: 'pg_search_test',
+                                          username: (ENV["TRAVIS"] ? "postgres" : ENV["USER"]),
+                                          min_messages: 'warning')
   connection = ActiveRecord::Base.connection
   connection.execute("SELECT 1")
-rescue *error_classes => exception
+rescue ERROR_CLASS, ActiveRecord::NoDatabaseError => e
   at_exit do
     puts "-" * 80
     puts "Unable to connect to database.  Please run:"
@@ -31,7 +24,7 @@ rescue *error_classes => exception
     puts "    createdb pg_search_test"
     puts "-" * 80
   end
-  raise exception
+  raise e
 end
 
 if ENV["LOGGER"]
@@ -45,13 +38,13 @@ def install_extension(name)
   return unless extension.none?
 
   connection.execute "CREATE EXTENSION #{name};"
-rescue StandardError => exception
+rescue StandardError => e
   at_exit do
     puts "-" * 80
     puts "Please install the #{name} extension"
     puts "-" * 80
   end
-  raise exception
+  raise e
 end
 
 def install_extension_if_missing(name, query, expected_result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2019-04-08 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: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -217,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's