pg_search 2.1.4 → 2.1.5

data/spec/integration/single_table_inheritance_spec.rb

@@ -12,7 +12,7 @@ describe "a pg_search_scope on an STI subclass" do
 
       model do
         include PgSearch
-        pg_search_scope :search_content, :against => :content
+        pg_search_scope :search_content, against: :content
       end
     end
 
@@ -23,14 +23,14 @@ describe "a pg_search_scope on an STI subclass" do
 
     it "returns only results for that subclass" do
       included = [
-        SearchableSubclassModel.create!(:content => "foo bar")
+        SearchableSubclassModel.create!(content: "foo bar")
       ]
       excluded = [
-        SearchableSubclassModel.create!(:content => "baz"),
-        SuperclassModel.create!(:content => "foo bar"),
-        SuperclassModel.create!(:content => "baz"),
-        AnotherSearchableSubclassModel.create!(:content => "foo bar"),
-        AnotherSearchableSubclassModel.create!(:content => "baz")
+        SearchableSubclassModel.create!(content: "baz"),
+        SuperclassModel.create!(content: "foo bar"),
+        SuperclassModel.create!(content: "baz"),
+        AnotherSearchableSubclassModel.create!(content: "foo bar"),
+        AnotherSearchableSubclassModel.create!(content: "baz")
       ]
 
       expect(SuperclassModel.count).to eq(6)
@@ -53,7 +53,7 @@ describe "a pg_search_scope on an STI subclass" do
       model do
         include PgSearch
         self.inheritance_column = 'custom_type'
-        pg_search_scope :search_content, :against => :content
+        pg_search_scope :search_content, against: :content
       end
     end
 
@@ -64,14 +64,14 @@ describe "a pg_search_scope on an STI subclass" do
 
     it "returns only results for that subclass" do
       included = [
-        SearchableSubclassModel.create!(:content => "foo bar")
+        SearchableSubclassModel.create!(content: "foo bar")
       ]
       excluded = [
-        SearchableSubclassModel.create!(:content => "baz"),
-        SuperclassModel.create!(:content => "foo bar"),
-        SuperclassModel.create!(:content => "baz"),
-        AnotherSearchableSubclassModel.create!(:content => "foo bar"),
-        AnotherSearchableSubclassModel.create!(:content => "baz")
+        SearchableSubclassModel.create!(content: "baz"),
+        SuperclassModel.create!(content: "foo bar"),
+        SuperclassModel.create!(content: "baz"),
+        AnotherSearchableSubclassModel.create!(content: "foo bar"),
+        AnotherSearchableSubclassModel.create!(content: "baz")
       ]
 
       expect(SuperclassModel.count).to eq(6)

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

@@ -18,11 +18,11 @@ describe PgSearch::Configuration::Association do
 
     model do
       include PgSearch
-      has_one :avatar, :class_name => "Avatar"
+      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,9 +33,9 @@ describe PgSearch::Configuration::Association do
 
     model do
       include PgSearch
-      has_many :users, :class_name => "User"
+      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/foreign_column_spec.rb

@@ -20,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

@@ -18,7 +18,7 @@ describe PgSearch::Features::DMetaphone do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = double(:config, :ignore => [])
+      config = double(:config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
@@ -43,7 +43,7 @@ describe PgSearch::Features::DMetaphone do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = double(:config, :ignore => [])
+      config = double(:config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)

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

@@ -14,7 +14,7 @@ describe PgSearch::Features::Trigram do
     ]
   }
   let(:normalizer) { PgSearch::Normalizer.new(config) }
-  let(:config) { OpenStruct.new(:ignore => []) }
+  let(:config) { OpenStruct.new(ignore: []) }
 
   let(:coalesced_columns) do
     <<-SQL.strip_heredoc.chomp

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

@@ -19,7 +19,7 @@ describe PgSearch::Features::TSearch do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = double(:config, :ignore => [])
+      config = double(:config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
@@ -44,7 +44,7 @@ describe PgSearch::Features::TSearch do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = double(:config, :ignore => [])
+      config = double(:config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
@@ -60,8 +60,8 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = { :negation => true }
-        config = double(:config, :ignore => [])
+        options = { negation: true }
+        config = double(:config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
@@ -78,8 +78,8 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = { :negation => false }
-        config = double(:config, :ignore => [])
+        options = { negation: false }
+        config = double(:config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
@@ -97,7 +97,7 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
         options = { tsvector_column: "my_tsvector" }
-        config = double(:config, :ignore => [])
+        config = double(:config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
@@ -115,7 +115,7 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
         options = { tsvector_column: ["tsvector1", "tsvector2"] }
-        config = double(:config, :ignore => [])
+        config = double(:config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
@@ -141,7 +141,7 @@ describe PgSearch::Features::TSearch do
       ]
       options = {}
 
-      config = double(:config, :ignore => [])
+      config = double(:config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
@@ -165,7 +165,7 @@ describe PgSearch::Features::TSearch do
           }
         }
 
-        config = double(:config, :ignore => [])
+        config = double(:config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
@@ -195,7 +195,7 @@ describe PgSearch::Features::TSearch do
           }
         }
 
-        config = double(:config, :ignore => [])
+        config = double(:config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
@@ -223,7 +223,7 @@ describe PgSearch::Features::TSearch do
           }
         }
 
-        config = double(:config, :ignore => [])
+        config = double(:config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)

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

@@ -10,7 +10,7 @@ end
 describe PgSearch::Multisearch::Rebuilder do
   with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
 
-  describe 'when intialized with a model that is not multisearchable' do
+  describe 'when initialized with a model that is not multisearchable' do
     with_model :not_multisearchable
 
     it 'raises an exception' do
@@ -80,7 +80,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
             model do
               include PgSearch
-              multisearchable :against => :name
+              multisearchable against: :name
             end
           end
 
@@ -142,7 +142,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
               model do
                 include PgSearch
-                multisearchable :against => :name
+                multisearchable against: :name
               end
             end
 
@@ -161,7 +161,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
               model do
                 include PgSearch
-                multisearchable :against => :name
+                multisearchable against: :name
               end
             end
 
@@ -247,13 +247,13 @@ describe PgSearch::Multisearch::Rebuilder do
 
             model do
               include PgSearch
-              multisearchable :if => :active?
+              multisearchable if: :active?
             end
           end
 
           it "calls update_pg_search_document on each record" do
-            record_1 = Model.create!(:active => true)
-            record_2 = Model.create!(:active => false)
+            record_1 = Model.create!(active: true)
+            record_2 = Model.create!(active: false)
 
             rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
 
@@ -283,13 +283,13 @@ describe PgSearch::Multisearch::Rebuilder do
 
             model do
               include PgSearch
-              multisearchable :unless => :inactive?
+              multisearchable unless: :inactive?
             end
           end
 
           it "calls update_pg_search_document on each record" do
-            record_1 = Model.create!(:inactive => true)
-            record_2 = Model.create!(:inactive => false)
+            record_1 = Model.create!(inactive: true)
+            record_2 = Model.create!(inactive: false)
 
             rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
 

data/spec/lib/pg_search/multisearch_spec.rb

@@ -22,7 +22,7 @@ describe PgSearch::Multisearch do
 
   describe ".rebuild" do
     before do
-      model.multisearchable :against => :title
+      model.multisearchable against: :title
     end
 
     it "should operate inside a transaction" do
@@ -98,8 +98,8 @@ describe PgSearch::Multisearch do
     describe "inserting the new documents" do
       let!(:new_models) { [] }
       before do
-        new_models << model.create!(:title => "Foo", :content => "Bar")
-        new_models << model.create!(:title => "Baz", :content => "Bar")
+        new_models << model.create!(title: "Foo", content: "Bar")
+        new_models << model.create!(title: "Baz", content: "Bar")
       end
 
       it "should create new documents for the two models" do
@@ -114,7 +114,7 @@ describe PgSearch::Multisearch do
 
       context "with one attribute" do
         before do
-          model.multisearchable :against => [:title]
+          model.multisearchable against: [:title]
         end
 
         it "should generate the proper SQL code" do
@@ -141,7 +141,7 @@ describe PgSearch::Multisearch do
 
       context "with multiple attributes" do
         before do
-          model.multisearchable :against => %i[title content]
+          model.multisearchable against: %i[title content]
         end
 
         it "should generate the proper SQL code" do

data/spec/lib/pg_search/multisearchable_spec.rb

@@ -22,7 +22,7 @@ describe PgSearch::Multisearchable do
         include PgSearch
         multisearchable
 
-        has_many :multisearchable_children, :dependent => :destroy
+        has_many :multisearchable_children, dependent: :destroy
       end
     end
 
@@ -145,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 }
@@ -159,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' }
@@ -182,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 }
@@ -196,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' }
@@ -212,7 +212,7 @@ describe PgSearch::Multisearchable do
       context "with additional_attributes" do
         let(:multisearchable_options) do
           {
-            :additional_attributes => lambda do |record|
+            additional_attributes: lambda do |record|
               { foo: record.bar }
             end
           }
@@ -231,7 +231,7 @@ describe PgSearch::Multisearchable do
       context "when selectively updating" do
         let(:multisearchable_options) do
           {
-            :update_if => lambda do |record|
+            update_if: lambda do |record|
               record.bar?
             end
           }
@@ -288,7 +288,7 @@ describe PgSearch::Multisearchable do
 
         model do
           include PgSearch
-          multisearchable :if => ->(record) { record.multisearchable? }
+          multisearchable if: ->(record) { record.multisearchable? }
         end
       end
 
@@ -296,7 +296,7 @@ describe PgSearch::Multisearchable do
         describe "after_create" do
           describe "saving the record" do
             context "when the condition is true" do
-              let(:record) { ModelThatIsMultisearchable.new(:multisearchable => true) }
+              let(:record) { ModelThatIsMultisearchable.new(multisearchable: true) }
 
               it "should create a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
@@ -312,7 +312,7 @@ describe PgSearch::Multisearchable do
             end
 
             context "when the condition is false" do
-              let(:record) { ModelThatIsMultisearchable.new(:multisearchable => false) }
+              let(:record) { ModelThatIsMultisearchable.new(multisearchable: false) }
 
               it "should not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -322,7 +322,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_update" do
-          let(:record) { ModelThatIsMultisearchable.create!(:multisearchable => true) }
+          let(:record) { ModelThatIsMultisearchable.create!(multisearchable: true) }
 
           context "when the document is present" do
             before { expect(record.pg_search_document).to be_present }
@@ -397,7 +397,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_destroy" do
-          let(:record) { ModelThatIsMultisearchable.create!(:multisearchable => true) }
+          let(:record) { ModelThatIsMultisearchable.create!(multisearchable: true) }
 
           it "should remove its document" do
             document = record.pg_search_document
@@ -416,7 +416,7 @@ describe PgSearch::Multisearchable do
 
         model do
           include PgSearch
-          multisearchable :unless => ->(record) { record.not_multisearchable? }
+          multisearchable unless: ->(record) { record.not_multisearchable? }
         end
       end
 
@@ -424,7 +424,7 @@ describe PgSearch::Multisearchable do
         describe "after_create" do
           describe "saving the record" do
             context "when the condition is false" do
-              let(:record) { ModelThatIsMultisearchable.new(:not_multisearchable => false) }
+              let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: false) }
 
               it "should create a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
@@ -440,7 +440,7 @@ describe PgSearch::Multisearchable do
             end
 
             context "when the condition is true" do
-              let(:record) { ModelThatIsMultisearchable.new(:not_multisearchable => true) }
+              let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: true) }
 
               it "should not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -450,7 +450,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_update" do
-          let!(:record) { ModelThatIsMultisearchable.create!(:not_multisearchable => false) }
+          let!(:record) { ModelThatIsMultisearchable.create!(not_multisearchable: false) }
 
           context "when the document is present" do
             before { expect(record.pg_search_document).to be_present }
@@ -545,7 +545,7 @@ describe PgSearch::Multisearchable do
 
         model do
           include PgSearch
-          multisearchable :if => :multisearchable?
+          multisearchable if: :multisearchable?
         end
       end
 
@@ -553,7 +553,7 @@ describe PgSearch::Multisearchable do
         describe "after_create" do
           describe "saving the record" do
             context "when the condition is true" do
-              let(:record) { ModelThatIsMultisearchable.new(:multisearchable => true) }
+              let(:record) { ModelThatIsMultisearchable.new(multisearchable: true) }
 
               it "should create a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
@@ -569,7 +569,7 @@ describe PgSearch::Multisearchable do
             end
 
             context "when the condition is false" do
-              let(:record) { ModelThatIsMultisearchable.new(:multisearchable => false) }
+              let(:record) { ModelThatIsMultisearchable.new(multisearchable: false) }
 
               it "should not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -579,7 +579,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_update" do
-          let!(:record) { ModelThatIsMultisearchable.create!(:multisearchable => true) }
+          let!(:record) { ModelThatIsMultisearchable.create!(multisearchable: true) }
 
           context "when the document is present" do
             before { expect(record.pg_search_document).to be_present }
@@ -658,7 +658,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_destroy" do
-          let(:record) { ModelThatIsMultisearchable.create!(:multisearchable => true) }
+          let(:record) { ModelThatIsMultisearchable.create!(multisearchable: true) }
 
           it "should remove its document" do
             document = record.pg_search_document
@@ -677,7 +677,7 @@ describe PgSearch::Multisearchable do
 
         model do
           include PgSearch
-          multisearchable :unless => :not_multisearchable?
+          multisearchable unless: :not_multisearchable?
         end
       end
 
@@ -685,7 +685,7 @@ describe PgSearch::Multisearchable do
         describe "after_create" do
           describe "saving the record" do
             context "when the condition is true" do
-              let(:record) { ModelThatIsMultisearchable.new(:not_multisearchable => true) }
+              let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: true) }
 
               it "should not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -693,7 +693,7 @@ describe PgSearch::Multisearchable do
             end
 
             context "when the condition is false" do
-              let(:record) { ModelThatIsMultisearchable.new(:not_multisearchable => false) }
+              let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: false) }
 
               it "should create a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
@@ -711,7 +711,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_update" do
-          let!(:record) { ModelThatIsMultisearchable.create!(:not_multisearchable => false) }
+          let!(:record) { ModelThatIsMultisearchable.create!(not_multisearchable: false) }
 
           context "when the document is present" do
             before { expect(record.pg_search_document).to be_present }
@@ -790,7 +790,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_destroy" do
-          let(:record) { ModelThatIsMultisearchable.create!(:not_multisearchable => false) }
+          let(:record) { ModelThatIsMultisearchable.create!(not_multisearchable: false) }
 
           it "should remove its document" do
             document = record.pg_search_document