pg_search 1.0.6 → 2.0.0

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

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

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

@@ -1,5 +1,10 @@
 require "spec_helper"
 
+def has_microsecond_precision?
+  (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1) ||
+    (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::TINY >= 1)
+end
+
 describe PgSearch::Multisearch::Rebuilder do
   with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
 
@@ -96,22 +101,11 @@ describe PgSearch::Multisearch::Rebuilder do
 
           it "should execute the default SQL" do
             time = DateTime.parse("2001-01-01")
-            rebuilder = PgSearch::Multisearch::Rebuilder.new(Model, ->{ 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
-            version_4_0_1_or_newer = (
-            (ActiveRecord::VERSION::MAJOR > 4) ||
-              (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1) ||
-              (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::TINY >= 1)
-            )
-
-            expected_timestamp =
-              if version_4_0_1_or_newer
-                "2001-01-01 00:00:00.000000"
-              else
-                "2001-01-01 00:00:00"
-              end
+            expected_timestamp = has_microsecond_precision? ? "2001-01-01 00:00:00.000000" : "2001-01-01 00:00:00"
 
             expected_sql = <<-SQL.strip_heredoc
             INSERT INTO "pg_search_documents" (searchable_type, searchable_id, content, created_at, updated_at)
@@ -152,22 +146,11 @@ 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, ->{ 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
-              version_4_0_1_or_newer = (
-              (ActiveRecord::VERSION::MAJOR > 4) ||
-                (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1) ||
-                (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::TINY >= 1)
-              )
-
-              expected_timestamp =
-                if version_4_0_1_or_newer
-                  "2001-01-01 00:00:00.000000"
-                else
-                  "2001-01-01 00:00:00"
-                end
+              expected_timestamp = has_microsecond_precision? ? "2001-01-01 00:00:00.000000" : "2001-01-01 00:00:00"
 
               expected_sql = <<-SQL.strip_heredoc
               INSERT INTO "pg_search_documents" (searchable_type, searchable_id, content, created_at, updated_at)
@@ -248,8 +231,8 @@ describe PgSearch::Multisearch::Rebuilder do
           end
 
           it "calls update_pg_search_document on each record" do
-            record1 = Model.create!(:active => true)
-            record2 = Model.create!(:active => false)
+            record_1 = Model.create!(:active => true)
+            record_2 = Model.create!(:active => false)
 
             rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
 
@@ -266,8 +249,8 @@ describe PgSearch::Multisearch::Rebuilder do
 
             rebuilder.rebuild
 
-            expect(record1.pg_search_document).to be_present
-            expect(record2.pg_search_document).not_to be_present
+            expect(record_1.pg_search_document).to be_present
+            expect(record_2.pg_search_document).not_to be_present
           end
         end
 
@@ -284,8 +267,8 @@ describe PgSearch::Multisearch::Rebuilder do
           end
 
           it "calls update_pg_search_document on each record" do
-            record1 = Model.create!(:inactive => true)
-            record2 = Model.create!(:inactive => false)
+            record_1 = Model.create!(:inactive => true)
+            record_2 = Model.create!(:inactive => false)
 
             rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
 
@@ -302,8 +285,8 @@ describe PgSearch::Multisearch::Rebuilder do
 
             rebuilder.rebuild
 
-            expect(record1.pg_search_document).not_to be_present
-            expect(record2.pg_search_document).to be_present
+            expect(record_1.pg_search_document).not_to be_present
+            expect(record_2.pg_search_document).to be_present
           end
         end
       end

data/spec/lib/pg_search/normalizer_spec.rb

@@ -2,80 +2,56 @@ require "spec_helper"
 
 describe PgSearch::Normalizer do
   describe "#add_normalization" do
-    context "for PostgreSQL 9.0 and above" 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], :postgresql_version => 90000)
-            node = Arel::Nodes::NamedFunction.new("foo", [PgSearch::Compatibility.build_quoted("bar")])
+    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])
+          node = Arel::Nodes::NamedFunction.new("foo", [Arel::Nodes.build_quoted("bar")])
 
-            normalizer = PgSearch::Normalizer.new(config)
-            expect(normalizer.add_normalization(node)).to eq("unaccent(foo('bar'))")
-          end
-
-          context "when a custom unaccent function is specified" do
-            it "wraps the expression in that function" do
-              allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
-              node = Arel::Nodes::NamedFunction.new("foo", [PgSearch::Compatibility.build_quoted("bar")])
-
-              config = double("config", :ignore => [:accents], :postgresql_version => 90000)
-
-              normalizer = PgSearch::Normalizer.new(config)
-              expect(normalizer.add_normalization(node)).to eq("my_unaccent(foo('bar'))")
-            end
-          end
+          normalizer = PgSearch::Normalizer.new(config)
+          expect(normalizer.add_normalization(node)).to eq("unaccent(foo('bar'))")
         end
 
-        context "when passed a String" do
-          it "wraps the expression in unaccent()" do
-            config = double("config", :ignore => [:accents], :postgresql_version => 90000)
-
-            normalizer = PgSearch::Normalizer.new(config)
-            expect(normalizer.add_normalization("foo")).to eq("unaccent(foo)")
-          end
-
-          context "when a custom unaccent function is specified" do
-            it "wraps the expression in that function" do
-              allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
+        context "when a custom unaccent function is specified" do
+          it "wraps the expression in that function" 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], :postgresql_version => 90000)
+            config = double("config", :ignore => [:accents])
 
-              normalizer = PgSearch::Normalizer.new(config)
-              expect(normalizer.add_normalization("foo")).to eq("my_unaccent(foo)")
-            end
+            normalizer = PgSearch::Normalizer.new(config)
+            expect(normalizer.add_normalization(node)).to eq("my_unaccent(foo('bar'))")
           end
         end
       end
 
-      context "when config[:ignore] does not include :accents" do
-        it "passes the expression through" do
-          config = double("config", :ignore => [], :postgresql_version => 90000)
+      context "when passed a String" do
+        it "wraps the expression in unaccent()" do
+          config = double("config", :ignore => [:accents])
 
           normalizer = PgSearch::Normalizer.new(config)
-          expect(normalizer.add_normalization("foo")).to eq("foo")
+          expect(normalizer.add_normalization("foo")).to eq("unaccent(foo)")
         end
-      end
-    end
 
-    context "for PostgreSQL versions before 9.0" do
-      context "when config[:ignore] includes :accents" do
-        it "raises a NotSupportedForPostgresqlVersion exception" do
-          config = double("config", :ignore => [:accents], :postgresql_version => 89999)
+        context "when a custom unaccent function is specified" do
+          it "wraps the expression in that function" do
+            allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
 
-          normalizer = PgSearch::Normalizer.new(config)
-          expect {
-            normalizer.add_normalization("foo")
-          }.to raise_exception(PgSearch::NotSupportedForPostgresqlVersion)
+            config = double("config", :ignore => [:accents])
+
+            normalizer = PgSearch::Normalizer.new(config)
+            expect(normalizer.add_normalization("foo")).to eq("my_unaccent(foo)")
+          end
         end
       end
+    end
 
-      context "when config[:ignore] does not include :accents" do
-        it "passes the expression through" do
-          config = double("config", :ignore => [], :postgresql_version => 90000)
+    context "when config[:ignore] does not include :accents" do
+      it "passes the expression through" do
+        config = double("config", :ignore => [])
 
-          normalizer = PgSearch::Normalizer.new(config)
-          expect(normalizer.add_normalization("foo")).to eq("foo")
-        end
+        normalizer = PgSearch::Normalizer.new(config)
+        expect(normalizer.add_normalization("foo")).to eq("foo")
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require "bundler/setup"
 require "pg_search"

data/spec/support/database.rb

@@ -1,5 +1,5 @@
 if defined? JRUBY_VERSION
-  require 'activerecord-jdbcpostgresql-adapter'
+  require "activerecord-jdbc-adapter"
   error_classes = [ActiveRecord::JDBCError]
 else
   require "pg"
@@ -15,14 +15,13 @@ begin
                     ENV["USER"]
                   end
 
-  ActiveRecord::Base.establish_connection(:adapter  => 'postgresql',
+  ActiveRecord::Base.establish_connection(:adapter => 'postgresql',
                                           :database => 'pg_search_test',
                                           :username => database_user,
                                           :min_messages => 'warning')
   connection = ActiveRecord::Base.connection
-  postgresql_version = connection.send(:postgresql_version)
   connection.execute("SELECT 1")
-rescue *error_classes
+rescue *error_classes => exception
   at_exit do
     puts "-" * 80
     puts "Unable to connect to database.  Please run:"
@@ -30,7 +29,7 @@ rescue *error_classes
     puts "    createdb pg_search_test"
     puts "-" * 80
   end
-  raise $ERROR_INFO
+  raise exception
 end
 
 if ENV["LOGGER"]
@@ -38,34 +37,29 @@ if ENV["LOGGER"]
   ActiveRecord::Base.logger = Logger.new(STDOUT)
 end
 
-def install_extension_if_missing(name, query, expected_result) # rubocop:disable Metrics/AbcSize
+def install_extension(name)
   connection = ActiveRecord::Base.connection
-  postgresql_version = connection.send(:postgresql_version)
-  result = connection.select_value(query)
+  extension = connection.execute "SELECT * FROM pg_catalog.pg_extension WHERE extname = '#{name}';"
+  return unless extension.none?
+  connection.execute "CREATE EXTENSION #{name};"
+rescue => exception
+  at_exit do
+    puts "-" * 80
+    puts "Please install the #{name} extension"
+    puts "-" * 80
+  end
+  raise exception
+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
-  begin
-    if postgresql_version >= 90100
-      ActiveRecord::Base.connection.execute "CREATE EXTENSION #{name};"
-    else
-      share_path = `pg_config --sharedir`.strip
-      ActiveRecord::Base.connection.execute File.read(File.join(share_path, 'contrib', "#{name}.sql"))
-      puts $ERROR_INFO.message
-    end
-  rescue => exception
-    at_exit do
-      puts "-" * 80
-      puts "Please install the #{name} contrib module"
-      puts "-" * 80
-    end
-    raise exception
-  end
+  install_extension(name)
 end
 
 install_extension_if_missing("pg_trgm", "SELECT 'abcdef' % 'cdef'", "t")
-unless postgresql_version < 90000
-  install_extension_if_missing("unaccent", "SELECT unaccent('foo')", "foo")
-end
+install_extension_if_missing("unaccent", "SELECT unaccent('foo')", "foo")
 install_extension_if_missing("fuzzystrmatch", "SELECT dmetaphone('foo')", "f")
 
 def load_sql(filename)
@@ -74,10 +68,4 @@ def load_sql(filename)
   connection.execute(file_contents)
 end
 
-if postgresql_version < 80400
-  unless connection.select_value("SELECT 1 FROM pg_catalog.pg_aggregate WHERE aggfnoid = 'array_agg'::REGPROC") == "1"
-    load_sql("array_agg.sql")
-  end
-  load_sql("unnest.sql")
-end
 load_sql("dmetaphone.sql")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.36'
+- !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: simplecov
+  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'
 description: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's
   full text search
 email:
@@ -148,23 +176,19 @@ files:
 - README.md
 - Rakefile
 - lib/pg_search.rb
-- lib/pg_search/compatibility.rb
 - lib/pg_search/configuration.rb
 - lib/pg_search/configuration/association.rb
 - lib/pg_search/configuration/column.rb
 - lib/pg_search/configuration/foreign_column.rb
 - lib/pg_search/document.rb
-- lib/pg_search/extensions/arel.rb
 - lib/pg_search/features.rb
 - lib/pg_search/features/dmetaphone.rb
 - lib/pg_search/features/feature.rb
 - lib/pg_search/features/trigram.rb
 - lib/pg_search/features/tsearch.rb
-- lib/pg_search/migration/associated_against_generator.rb
 - lib/pg_search/migration/dmetaphone_generator.rb
 - lib/pg_search/migration/generator.rb
 - lib/pg_search/migration/multisearch_generator.rb
-- lib/pg_search/migration/templates/add_pg_search_associated_against_support_functions.rb.erb
 - lib/pg_search/migration/templates/add_pg_search_dmetaphone_support_functions.rb.erb
 - lib/pg_search/migration/templates/create_pg_search_documents.rb.erb
 - lib/pg_search/multisearch.rb
@@ -195,12 +219,8 @@ files:
 - spec/spec_helper.rb
 - spec/support/database.rb
 - spec/support/with_model.rb
-- sql/array_agg.sql
 - sql/dmetaphone.sql
-- sql/uninstall_array_agg.sql
 - sql/uninstall_dmetaphone.sql
-- sql/uninstall_unnest.sql
-- sql/unnest.sql
 homepage: https://github.com/Casecommons/pg_search
 licenses:
 - MIT
@@ -213,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -221,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's