pg_search 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f13cb418b0d27e5136ca3f62d70e67e43ca8c9917ec35415fb142096f415ef0
-  data.tar.gz: 31d34f5408bdda3131920bf1daa9e8f3204c47ba1edfc867d8926d4f32bc5800
+  metadata.gz: 4c16f0c4421b4d6d6f4c247f556c4eb2fdb01242617a1e960fdd15785be84dbf
+  data.tar.gz: f580e760db34c55abf2401176681f8053500e3d249dd51edf8dce0dfb251f641
 SHA512:
-  metadata.gz: 794064f36a7a6ebbea348273fb64fcf429a9d0ab44e0da83338858925ba8f311da348b259a3b447bbdc63ebf7da40dd87ee1bc8ef7e1b637aa3f77b264444099
-  data.tar.gz: 4b5b80dc6964fede4e29e22ec34c0bdf20db9719e7f9ca8d094de11d60eb5b2937163a0d466de9c103e454bfc1cbf886ba62269cd240eed1d2b8469154e76b09
+  metadata.gz: f649091265d7b174c6b826a38e1f80f5eb57851184d2af4720926982d42c41ee1a4bc9399ca0cb1031c31f9a40313215cced168cb99d0a1cf65000fd7c4c6be9
+  data.tar.gz: 42c651d0689300bd1328089814562fe575a43d3cf522365b51f2de828eb33cc55d7eab69d242d525228e62d46bc99f74391e0569c4ef4cd39f27bbaec5deb073

data/.travis.yml

@@ -3,6 +3,7 @@ bundler_args: --binstubs
 cache: bundler
 
 rvm:
+  - 2.7.0
   - 2.6.5
   - 2.5.7
   - 2.4.9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # pg_search changelog
 
+## 2.3.2
+
+* Autoload PgSearch::Document to prevent it from being loaded in projects that are not using multi-search.
+* Rebuilder should use update_pg_search_document if additional_attributes is set (David Ramalho)
+
 ## 2.3.1
 
 * Drop support for Active Record < 5.2

data/lib/pg_search.rb

@@ -15,6 +15,8 @@ require "pg_search/scope_options"
 require "pg_search/version"
 
 module PgSearch
+  autoload :Document, "pg_search/document"
+
   def self.included(base)
     ActiveSupport::Deprecation.warn <<-MESSAGE.strip_heredoc
       Directly including `PgSearch` into an Active Record model is deprecated and will be removed in pg_search 3.0.
@@ -67,8 +69,4 @@ module PgSearch
   end
 end
 
-ActiveSupport.on_load(:active_record) do
-  require "pg_search/document"
-end
-
 require "pg_search/railtie" if defined?(Rails::Railtie)

data/lib/pg_search/multisearch/rebuilder.rb

@@ -13,7 +13,7 @@ module PgSearch
       def rebuild
         if model.respond_to?(:rebuild_pg_search_documents)
           model.rebuild_pg_search_documents
-        elsif conditional? || dynamic?
+        elsif conditional? || dynamic? || additional_attributes?
           model.find_each(&:update_pg_search_document)
         else
           model.connection.execute(rebuild_sql)
@@ -33,6 +33,10 @@ module PgSearch
         columns.any? { |column| !column_names.include?(column.to_s) }
       end
 
+      def additional_attributes?
+        model.pg_search_multisearchable_options.key?(:additional_attributes)
+      end
+
       def connection
         model.connection
       end

data/lib/pg_search/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgSearch
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

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

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe PgSearch::Multisearch::Rebuilder do
-  with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
+  with_table "pg_search_documents", &DOCUMENTS_SCHEMA
 
   describe 'when initialized with a model that is not multisearchable' do
     with_model :not_multisearchable
@@ -223,6 +223,33 @@ describe PgSearch::Multisearch::Rebuilder do
             expect(record.pg_search_document).to be_present
           end
         end
+
+        context "when only additional_attributes is set" do
+          with_model :Model do
+            table do |t|
+              t.string :name
+            end
+
+            model do
+              include PgSearch::Model
+              multisearchable against: :name,
+                              additional_attributes: ->(obj) { { additional_attribute_column: "#{obj.class}::#{obj.id}" } }
+            end
+          end
+
+          it "calls update_pg_search_document on each record" do
+            record_1 = Model.create!(name: "record_1", id: 1)
+            record_2 = Model.create!(name: "record_2", id: 2)
+
+            PgSearch::Document.delete_all
+
+            rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
+            rebuilder.rebuild
+
+            expect(record_1.reload.pg_search_document.additional_attribute_column).to eq("Model::1")
+            expect(record_2.reload.pg_search_document.additional_attribute_column).to eq("Model::2")
+          end
+        end
       end
 
       context "and multisearchable is conditional" do

data/spec/lib/pg_search/multisearch_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe PgSearch::Multisearch do
-  with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
+  with_table "pg_search_documents", &DOCUMENTS_SCHEMA
 
   with_model :MultisearchableModel do
     table do |t|

data/spec/lib/pg_search/multisearchable_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe PgSearch::Multisearchable do
-  with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
+  with_table "pg_search_documents", &DOCUMENTS_SCHEMA
 
   describe "a model that is multisearchable" do
     with_model :ModelThatIsMultisearchable do

data/spec/lib/pg_search_spec.rb

@@ -17,7 +17,7 @@ end
 
 describe PgSearch do
   describe ".multisearch" do
-    with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
+    with_table "pg_search_documents", &DOCUMENTS_SCHEMA
 
     describe "delegation to PgSearch::Document.search" do
       subject { PgSearch.multisearch(query) }

data/spec/spec_helper.rb

@@ -25,4 +25,7 @@ DOCUMENTS_SCHEMA = lambda do |t|
   t.belongs_to :searchable, polymorphic: true, index: true
   t.text :content
   t.timestamps null: false
+
+  # Used to test additional_attributes setup
+  t.text :additional_attribute_column
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's