pg_search 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 253c1319e785dfac16b15e9ffc72d7d37b60eda5
-  data.tar.gz: 78931e1fac31befac51f12b5ae2c26c13a11994a
+  metadata.gz: 39a86d998120bf6ec9643f8f8b549b08956576ff
+  data.tar.gz: fd3a0e7c1aea025553e4c1747d009a9911628d37
 SHA512:
-  metadata.gz: 53f22f8135d1992271bae14aa8b77cc76fd75d625b60c01075157383f9716c3aee9e1bf6e404e79b21cdbb0a7e611c9b820e3553a05485ba485f3b404a2afa28
-  data.tar.gz: 768c5c7a66b4875cce05f12b4e0bbe50ddd8dc8a6bd3afdcb2acf9db2334ffe1ad1d04d99814a0bf38876a7829320faeda5227886a13b5c81720a33d7438223b
+  metadata.gz: 84aa3f0816a2aca1523b9bd418abb4445b2290eb5a3177870e43a52e1ca341271e9211042496198b8e2d9ba7c39c6b53afd2f10bc272544478976bafde763265
+  data.tar.gz: e4657a3efc304b264cb0640c1755be9f9cbbc01afb1804f5625dfea24498f5ab21b1e707801cf3c22df63e462bb7add5e737060a6f9b67ddbfbae600d53a3a5c

data/.rubocop.yml

@@ -45,3 +45,8 @@ Bundler/DuplicatedGem:
 
 Style/EmptyMethod:
   EnforcedStyle: expanded
+
+# Waiting on false positives to go away with:
+# https://github.com/bbatsov/rubocop/pull/5230
+Style/FormatStringToken:
+  Enabled: false

data/.travis.yml

@@ -6,13 +6,14 @@ rvm:
   - "2.3.4"
   - "2.2.7"
   - "2.1.10"
-  - jruby-9.1.9.0
+  - jruby-9.1.14.0
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
   - ACTIVE_RECORD_BRANCH="5-1-stable"
   - ACTIVE_RECORD_BRANCH="5-0-stable"
   - ACTIVE_RECORD_BRANCH="4-2-stable"
+  - ACTIVE_RECORD_VERSION="~> 5.2.0.beta2"
   - ACTIVE_RECORD_VERSION="~> 5.1.0"
   - ACTIVE_RECORD_VERSION="~> 5.0.0"
   - ACTIVE_RECORD_VERSION="~> 4.2.9"
@@ -23,6 +24,7 @@ matrix:
     - env: ACTIVE_RECORD_BRANCH="5-1-stable"
     - env: ACTIVE_RECORD_BRANCH="5-0-stable"
     - env: ACTIVE_RECORD_BRANCH="4-2-stable"
+    - rvm: jruby-9.1.14.0
   exclude:
     - rvm: "2.1.10"
       env: ACTIVE_RECORD_BRANCH="master"
@@ -34,15 +36,17 @@ matrix:
       env: ACTIVE_RECORD_VERSION="~> 5.1.0"
     - rvm: "2.1.10"
       env: ACTIVE_RECORD_VERSION="~> 5.0.0"
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.1.14.0
       env: ACTIVE_RECORD_BRANCH="master"
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.1.14.0
       env: ACTIVE_RECORD_BRANCH="5-1-stable"
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.1.14.0
       env: ACTIVE_RECORD_BRANCH="5-0-stable"
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.1.14.0
+      env: ACTIVE_RECORD_VERSION="~> 5.2.0.beta2"
+    - rvm: jruby-9.1.14.0
       env: ACTIVE_RECORD_VERSION="~> 5.1.0"
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.1.14.0
       env: ACTIVE_RECORD_VERSION="~> 5.0.0"
 
 before_script:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # pg_search changelog
 
+## 2.1.2
+
+*   Silence warnings in Rails 5.2.0.beta2 (Kevin Deisz)
+
 ## 2.1.1
 
 *   Support snake_case ts_headline options again (with deprecation warning)

data/lib/pg_search.rb

@@ -25,9 +25,7 @@ module PgSearch
       options_proc = if options.respond_to?(:call)
                        options
                      else
-                       unless options.respond_to?(:merge)
-                         raise ArgumentError, "pg_search_scope expects a Hash or Proc"
-                       end
+                       raise ArgumentError, "pg_search_scope expects a Hash or Proc" unless options.respond_to?(:merge)
                        ->(query) { {:query => query}.merge(options) }
                      end
 
@@ -39,7 +37,7 @@ module PgSearch
     end
 
     def multisearchable(options = {})
-      include PgSearch::Multisearchable
+      include PgSearch::Multisearchable # rubocop:disable Style/MixinUsage
       class_attribute :pg_search_multisearchable_options
       self.pg_search_multisearchable_options = options
     end
@@ -92,14 +90,15 @@ module PgSearch
 
   class PgSearchRankNotSelected < StandardError
     def message
-      "You must chain .with_pg_search_rank after the pg_search_scope to access the pg_search_rank attribute on returned records" # rubocop:disable Metrics/LineLength
+      "You must chain .with_pg_search_rank after the pg_search_scope " \
+      "to access the pg_search_rank attribute on returned records"
     end
   end
 
   class PgSearchHighlightNotSelected < StandardError
-    # rubocop:disable Metrics/LineLength
     def message
-      "You must chain .with_pg_search_highlight after the pg_search_scope to access the pg_search_highlight attribute on returned records"
+      "You must chain .with_pg_search_highlight after the pg_search_scope " \
+      "to access the pg_search_highlight attribute on returned records"
     end
   end
 end

data/lib/pg_search/configuration.rb

@@ -96,9 +96,7 @@ module PgSearch
 
       VALID_VALUES.each do |key, values_for_key|
         Array(options[key]).each do |value|
-          unless values_for_key.include?(value)
-            raise ArgumentError, ":#{key} cannot accept #{value}"
-          end
+          raise ArgumentError, ":#{key} cannot accept #{value}" unless values_for_key.include?(value)
         end
       end
     end

data/lib/pg_search/multisearch/rebuilder.rb

@@ -2,9 +2,7 @@ module PgSearch
   module Multisearch
     class Rebuilder
       def initialize(model, time_source = Time.method(:now))
-        unless model.respond_to?(:pg_search_multisearchable_options)
-          raise ModelNotMultisearchable.new(model)
-        end
+        raise ModelNotMultisearchable.new(model) unless model.respond_to?(:pg_search_multisearchable_options)
 
         @model = model
         @time_source = time_source
@@ -65,9 +63,7 @@ module PgSearch
         clause = ""
         if model.column_names.include? model.inheritance_column
           clause = "WHERE"
-          if model.base_class == model
-            clause = "#{clause} #{model.inheritance_column} IS NULL OR"
-          end
+          clause = "#{clause} #{model.inheritance_column} IS NULL OR" if model.base_class == model
           clause = "#{clause} #{model.inheritance_column} = #{model_name}"
         end
         clause

data/lib/pg_search/scope_options.rb

@@ -16,7 +16,7 @@ module PgSearch
 
       scope
         .joins(rank_join(rank_table_alias))
-        .order("#{rank_table_alias}.rank DESC, #{order_within_rank}")
+        .order(Arel.sql("#{rank_table_alias}.rank DESC, #{order_within_rank}"))
         .extend(DisableEagerLoading)
         .extend(WithPgSearchRank)
         .extend(WithPgSearchHighlight[feature_for(:tsearch)])

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "2.1.1".freeze
+  VERSION = "2.1.2".freeze
 end

data/pg_search.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 4.2'
   s.add_dependency 'arel', '>= 6'
 
-  s.add_development_dependency 'rake'
+  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 'with_model', '>= 1.2'
   s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'codeclimate-test-reporter'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'with_model', '>= 1.2'
 
   s.required_ruby_version = '>= 2.1'
 end

data/spec/integration/associations_spec.rb

@@ -131,7 +131,7 @@ describe PgSearch do
 
         results = ModelWithHasMany
                   .limit(1)
-                  .order("#{ModelWithHasMany.quoted_table_name}.id ASC")
+                  .order(Arel.sql("#{ModelWithHasMany.quoted_table_name}.id ASC"))
                   .with_associated('foo bar')
 
         expect(results.map(&:title)).to match_array(included.map(&:title))

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

@@ -100,10 +100,10 @@ describe PgSearch::Multisearch::Rebuilder do
           end
 
           it "should execute the default SQL" do
-            time = DateTime.parse("2001-01-01")
+            time = Time.utc(2001, 1, 1, 0, 0, 0)
             rebuilder = PgSearch::Multisearch::Rebuilder.new(Model, -> { time })
 
-            # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
+            # Handle change in precision of Time objects in SQL in Active Record 4.0.1
             # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
             expected_timestamp = has_microsecond_precision? ? "2001-01-01 00:00:00.000000" : "2001-01-01 00:00:00"
 
@@ -145,10 +145,10 @@ describe PgSearch::Multisearch::Rebuilder do
             end
 
             it "generates SQL with the correct primary key" do
-              time = DateTime.parse("2001-01-01")
+              time = Time.utc(2001, 1, 1, 0, 0, 0)
               rebuilder = PgSearch::Multisearch::Rebuilder.new(ModelWithNonStandardPrimaryKey, -> { time })
 
-              # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
+              # Handle change in precision of Time objects in SQL in Active Record 4.0.1
               # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
               expected_timestamp = has_microsecond_precision? ? "2001-01-01 00:00:00.000000" : "2001-01-01 00:00:00"
 

data/spec/lib/pg_search_spec.rb

@@ -1,5 +1,18 @@
 require "spec_helper"
 
+# For AR 5 and greater, the association reflection's cache needs be cleared
+# because we're stubbing the related constants.
+class << PgSearch::Document
+  if ActiveRecord::VERSION::MAJOR >= 5
+    def clear_searchable_cache
+      reflect_on_association(:searchable).clear_association_scope_cache
+    end
+  else
+    def clear_searchable_cache
+    end
+  end
+end
+
 describe PgSearch do
   describe ".multisearch" do
     with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
@@ -18,7 +31,10 @@ describe PgSearch do
 
     context "with PgSearch.multisearch_options set to a Hash" do
       before { allow(PgSearch).to receive(:multisearch_options).and_return(:using => :dmetaphone) }
-      subject { PgSearch.multisearch(query).map(&:searchable) }
+      subject do
+        PgSearch::Document.clear_searchable_cache
+        PgSearch.multisearch(query).map(&:searchable)
+      end
 
       with_model :MultisearchableModel do
         table do |t|
@@ -36,7 +52,10 @@ describe PgSearch do
     end
 
     context "with PgSearch.multisearch_options set to a Proc" do
-      subject { PgSearch.multisearch(query, soundalike).map(&:searchable) }
+      subject do
+        PgSearch::Document.clear_searchable_cache
+        PgSearch.multisearch(query, soundalike).map(&:searchable)
+      end
 
       before do
         allow(PgSearch).to receive(:multisearch_options) do
@@ -140,6 +159,7 @@ describe PgSearch do
 
           PgSearch::Multisearch.rebuild(SearchableSubclassModel)
 
+          PgSearch::Document.clear_searchable_cache
           expect(PgSearch::Document.count).to be 1
           expect(PgSearch::Document.first.searchable.class).to be SearchableSubclassModel
           expect(PgSearch::Document.first.searchable).to eq expected
@@ -153,6 +173,7 @@ describe PgSearch do
           PgSearch::Multisearch.rebuild(SearchableSubclassModel)
           expect(PgSearch::Document.count).to be 2
 
+          PgSearch::Document.clear_searchable_cache
           classes = PgSearch::Document.all.collect {|d| d.searchable.class }
           expect(classes).to include SearchableSubclassModel
           expect(classes).to include AnotherSearchableSubclassModel
@@ -223,7 +244,7 @@ describe PgSearch do
           @multisearch_enabled_inside = PgSearch.multisearch_enabled?
           raise
         end
-      rescue # rubocop:disable Lint/RescueWithoutErrorClass
+      rescue StandardError
       end
 
       @multisearch_enabled_after = PgSearch.multisearch_enabled?

data/spec/support/database.rb

@@ -42,7 +42,7 @@ def install_extension(name)
   extension = connection.execute "SELECT * FROM pg_catalog.pg_extension WHERE extname = '#{name}';"
   return unless extension.none?
   connection.execute "CREATE EXTENSION #{name};"
-rescue => exception # rubocop:disable Lint/RescueWithoutErrorClass
+rescue StandardError => exception
   at_exit do
     puts "-" * 80
     puts "Please install the #{name} extension"
@@ -54,7 +54,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
-rescue # rubocop:disable Lint/RescueWithoutErrorClass
+rescue StandardError
   install_extension(name)
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,33 +82,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: with_model
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,19 +138,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: with_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 description: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's
   full text search
 email:
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's