pg_search 1.0.4 → 1.0.5

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

@@ -10,7 +10,7 @@ describe PgSearch::Configuration::Column do
 
     it "returns the fully-qualified table and column name" do
       column = described_class.new("name", nil, Model)
-      expect(column.full_name).to eq(%Q{#{Model.quoted_table_name}."name"})
+      expect(column.full_name).to eq(%(#{Model.quoted_table_name}."name"))
     end
   end
 
@@ -23,7 +23,7 @@ describe PgSearch::Configuration::Column do
 
     it "returns an expression that casts the column to text and coalesces it with an empty string" do
       column = described_class.new("name", nil, Model)
-      expect(column.to_sql).to eq(%Q{coalesce(#{Model.quoted_table_name}."name"::text, '')})
+      expect(column.to_sql).to eq(%{coalesce(#{Model.quoted_table_name}."name"::text, '')})
     end
   end
 end

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

@@ -24,8 +24,8 @@ describe PgSearch::Configuration::ForeignColumn do
 
     it "returns a consistent string" do
       association = PgSearch::Configuration::Association.new(Model,
-                                                             :another_model,
-                                                             :title)
+        :another_model,
+        :title)
       foreign_column = described_class.new("title", nil, Model, association)
 
       column_alias = foreign_column.alias

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

@@ -21,7 +21,7 @@ describe PgSearch::Features::DMetaphone do
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.rank.to_sql).to eq(
-        %Q{(ts_rank((to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."name"::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."content"::text, '')))), (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')), 0))}
+        %{(ts_rank((to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."name"::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."content"::text, '')))), (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')), 0))}
       )
     end
   end
@@ -46,7 +46,7 @@ describe PgSearch::Features::DMetaphone do
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.conditions.to_sql).to eq(
-        %Q{((to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."name"::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."content"::text, '')))) @@ (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')))}
+        %{((to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."name"::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."content"::text, '')))) @@ (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')))}
       )
     end
   end

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

@@ -5,10 +5,12 @@ describe PgSearch::Features::Trigram do
   subject(:feature) { described_class.new(query, options, columns, Model, normalizer) }
   let(:query) { 'lolwut' }
   let(:options) { {} }
-  let(:columns) {[
-    PgSearch::Configuration::Column.new(:name, nil, Model),
-    PgSearch::Configuration::Column.new(:content, nil, Model)
-  ]}
+  let(:columns) {
+    [
+      PgSearch::Configuration::Column.new(:name, nil, Model),
+      PgSearch::Configuration::Column.new(:content, nil, Model)
+    ]
+  }
   let(:normalizer) { PgSearch::Normalizer.new(config) }
   let(:config) { OpenStruct.new(:ignore => [], :postgresql_version => 90000) }
 
@@ -59,7 +61,6 @@ describe PgSearch::Features::Trigram do
           coalesced_column = "coalesce(#{Model.quoted_table_name}.\"name\"::text, '')"
           expect(feature.conditions.to_sql).to eq("((#{coalesced_column}) % '#{query}')")
         end
-
       end
       context 'multiple columns' do
         let(:options) { { only: [:name, :content] } }
@@ -70,7 +71,6 @@ describe PgSearch::Features::Trigram do
         end
       end
     end
-
   end
 
   describe '#rank' do

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

@@ -21,7 +21,7 @@ describe PgSearch::Features::TSearch do
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.rank.to_sql).to eq(
-        %Q{(ts_rank((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 0))}
+        %{(ts_rank((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 0))}
       )
     end
   end
@@ -46,7 +46,7 @@ describe PgSearch::Features::TSearch do
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.conditions.to_sql).to eq(
-        %Q{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+        %{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
       )
     end
 
@@ -63,7 +63,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %Q{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', '!' || ''' ' || 'query' || ' ''')))}
+          %{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', '!' || ''' ' || 'query' || ' ''')))}
         )
       end
     end
@@ -81,7 +81,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %Q{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || '!query' || ' ''')))}
+          %{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || '!query' || ' ''')))}
         )
       end
     end
@@ -99,7 +99,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %Q{((#{Model.quoted_table_name}.\"my_tsvector\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+          %{((#{Model.quoted_table_name}.\"my_tsvector\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
         )
       end
     end
@@ -117,7 +117,7 @@ describe PgSearch::Features::TSearch do
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %Q{((#{Model.quoted_table_name}.\"tsvector1\" || #{Model.quoted_table_name}.\"tsvector2\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+          %{((#{Model.quoted_table_name}.\"tsvector1\" || #{Model.quoted_table_name}.\"tsvector2\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
         )
       end
     end

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

@@ -83,7 +83,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
           it "should execute the default SQL" do
             time = DateTime.parse("2001-01-01")
-            rebuilder = PgSearch::Multisearch::Rebuilder.new(Model, lambda { time } )
+            rebuilder = PgSearch::Multisearch::Rebuilder.new(Model, ->{ time } )
 
             # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
             # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
@@ -114,8 +114,8 @@ describe PgSearch::Multisearch::Rebuilder do
 
             executed_sql = []
 
-            notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
-              executed_sql << payload[:sql] if payload[:sql].include?(%Q{INSERT INTO "pg_search_documents"})
+            notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |_name, _start, _finish, _id, payload|
+              executed_sql << payload[:sql] if payload[:sql].include?(%(INSERT INTO "pg_search_documents"))
             end
 
             rebuilder.rebuild
@@ -139,7 +139,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
             it "generates SQL with the correct primary key" do
               time = DateTime.parse("2001-01-01")
-              rebuilder = PgSearch::Multisearch::Rebuilder.new(ModelWithNonStandardPrimaryKey, lambda { time } )
+              rebuilder = PgSearch::Multisearch::Rebuilder.new(ModelWithNonStandardPrimaryKey, ->{ time } )
 
               # Handle change in precision of DateTime objects in SQL in Active Record 4.0.1
               # https://github.com/rails/rails/commit/17f5d8e062909f1fcae25351834d8e89967b645e
@@ -170,8 +170,8 @@ describe PgSearch::Multisearch::Rebuilder do
 
               executed_sql = []
 
-              notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
-                executed_sql << payload[:sql] if payload[:sql].include?(%Q{INSERT INTO "pg_search_documents"})
+              notifier = ActiveSupport::Notifications.subscribe("sql.active_record") do |_name, _start, _finish, _id, payload|
+                executed_sql << payload[:sql] if payload[:sql].include?(%(INSERT INTO "pg_search_documents"))
               end
 
               rebuilder.rebuild

data/spec/lib/pg_search/multisearchable_spec.rb

@@ -105,7 +105,7 @@ describe PgSearch::Multisearchable do
 
         model do
           include PgSearch
-          multisearchable :if => lambda { |record| record.multisearchable? }
+          multisearchable :if => ->(record) { record.multisearchable? }
         end
       end
 
@@ -233,7 +233,7 @@ describe PgSearch::Multisearchable do
 
         model do
           include PgSearch
-          multisearchable :unless => lambda { |record| record.not_multisearchable? }
+          multisearchable :unless => ->(record) { record.not_multisearchable? }
         end
       end
 
@@ -309,7 +309,6 @@ describe PgSearch::Multisearchable do
                   expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
                 end
               end
-
             end
           end
 

data/spec/lib/pg_search_spec.rb

@@ -17,7 +17,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 { PgSearch.multisearch(query).map(&:searchable) }
 
       with_model :MultisearchableModel do
@@ -94,16 +94,13 @@ describe PgSearch do
         end
 
         it "returns only results for that subclass" do
-          included = [
-            SearchableSubclassModel.create!(:content => "foo bar")
-          ]
-          excluded = [
-            SearchableSubclassModel.create!(:content => "baz"),
-            SuperclassModel.create!(:content => "foo bar"),
-            SuperclassModel.create!(:content => "baz"),
-            NonSearchableSubclassModel.create!(:content => "foo bar"),
-            NonSearchableSubclassModel.create!(:content => "baz")
-          ]
+          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")
 
           expect(SuperclassModel.count).to be 6
           expect(SearchableSubclassModel.count).to be 2
@@ -112,9 +109,7 @@ describe PgSearch do
 
           results = PgSearch.multisearch("foo bar")
 
-          expect(results.length).to be 1
-          expect(results.first.searchable.class).to be SearchableSubclassModel
-          expect(results.first.searchable).to eq included.first
+          expect(results).to eq [included.pg_search_document]
         end
 
         it "updates an existing STI model does not create a new pg_search document" do
@@ -151,8 +146,8 @@ describe PgSearch do
         end
 
         it "reindexing searchable STI doesn't clobber other related STI models" do
-          searchable_s = SearchableSubclassModel.create!(:content => "baz")
-          searchable_a = AnotherSearchableSubclassModel.create!(:content => "baz")
+          SearchableSubclassModel.create!(:content => "baz")
+          AnotherSearchableSubclassModel.create!(:content => "baz")
 
           expect(PgSearch::Document.count).to be 2
           PgSearch::Multisearch.rebuild(SearchableSubclassModel)
@@ -187,16 +182,13 @@ describe PgSearch do
         end
 
         it "returns only results for that subclass" do
-          included = [
-            SearchableSubclassModel.create!(:content => "foo bar")
-          ]
-          excluded = [
-            SearchableSubclassModel.create!(:content => "baz"),
-            SuperclassModel.create!(:content => "foo bar"),
-            SuperclassModel.create!(:content => "baz"),
-            NonSearchableSubclassModel.create!(:content => "foo bar"),
-            NonSearchableSubclassModel.create!(:content => "baz")
-          ]
+          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")
 
           expect(SuperclassModel.count).to be 6
           expect(SearchableSubclassModel.count).to be 2
@@ -205,9 +197,7 @@ describe PgSearch do
 
           results = PgSearch.multisearch("foo bar")
 
-          expect(results.length).to be 1
-          expect(results.first.searchable.class).to be SearchableSubclassModel
-          expect(results.first.searchable).to eq included.first
+          expect(results).to eq [included.pg_search_document]
         end
       end
     end
@@ -233,7 +223,7 @@ describe PgSearch do
           @multisearch_enabled_inside = PgSearch.multisearch_enabled?
           raise
         end
-      rescue # rubocop:disable Lint/HandleExceptions
+      rescue
       end
 
       @multisearch_enabled_after = PgSearch.multisearch_enabled?

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require "bundler/setup"
 require "pg_search"
 
@@ -9,6 +12,8 @@ RSpec.configure do |config|
   config.mock_with :rspec do |c|
     c.syntax = :expect
   end
+
+  config.example_status_persistence_file_path = 'tmp/examples.txt'
 end
 
 require 'support/database'

data/spec/support/database.rb

@@ -38,12 +38,12 @@ if ENV["LOGGER"]
   ActiveRecord::Base.logger = Logger.new(STDOUT)
 end
 
-def install_extension_if_missing(name, query, expected_result)
+def install_extension_if_missing(name, query, expected_result) # rubocop:disable Metrics/AbcSize
   connection = ActiveRecord::Base.connection
   postgresql_version = connection.send(:postgresql_version)
   result = connection.select_value(query)
   raise "Unexpected output for #{query}: #{result.inspect}" unless result.downcase == expected_result.downcase
-rescue => e
+rescue
   begin
     if postgresql_version >= 90100
       ActiveRecord::Base.connection.execute "CREATE EXTENSION #{name};"
@@ -52,13 +52,13 @@ rescue => e
       ActiveRecord::Base.connection.execute File.read(File.join(share_path, 'contrib', "#{name}.sql"))
       puts $!.message
     end
-  rescue => e2
+  rescue => exception
     at_exit do
       puts "-" * 80
       puts "Please install the #{name} contrib module"
       puts "-" * 80
     end
-    raise e2
+    raise exception
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,16 +85,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: with_model
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ extra_rdoc_files: []
 files:
 - ".autotest"
 - ".bundle/config"
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -175,6 +176,7 @@ files:
 - lib/pg_search/tasks.rb
 - lib/pg_search/version.rb
 - pg_search.gemspec
+- spec/.rubocop.yml
 - spec/integration/associations_spec.rb
 - spec/integration/pagination_spec.rb
 - spec/integration/pg_search_spec.rb