pg_search 0.7.4 → 0.7.5

data/spec/spec_helper.rb

@@ -1,105 +1,19 @@
 require "bundler/setup"
 require "pg_search"
 
-if ENV["TRAVIS"]
-  begin
-    require 'coveralls'
-    Coveralls.wear!
-  rescue LoadError
-  end
-end
-
-if defined? JRUBY_VERSION
-  require 'activerecord-jdbcpostgresql-adapter'
-  error_classes = [ActiveRecord::JDBCError]
-else
-  require "pg"
-  error_classes = [PGError]
-end
-
-error_classes << ActiveRecord::NoDatabaseError if defined? ActiveRecord::NoDatabaseError
-
-begin
-  database_user = if ENV["TRAVIS"]
-                    "postgres"
-                  else
-                    ENV["USER"]
-                  end
-
-  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
-  at_exit do
-    puts "-" * 80
-    puts "Unable to connect to database.  Please run:"
-    puts
-    puts "    createdb pg_search_test"
-    puts "-" * 80
-  end
-  raise $!
-end
-
-if ENV["LOGGER"]
-  require "logger"
-  ActiveRecord::Base.logger = Logger.new(STDOUT)
-end
-
-def install_extension_if_missing(name, query, expected_result)
-  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
-  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 $!.message
-    end
-  rescue => e2
-    at_exit do
-      puts "-" * 80
-      puts "Please install the #{name} contrib module"
-      puts "-" * 80
-    end
-    raise e2
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
   end
-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("fuzzystrmatch", "SELECT dmetaphone('foo')", "f")
-
-def load_sql(filename)
-  connection = ActiveRecord::Base.connection
-  file_contents = File.read(File.join(File.dirname(__FILE__), '..', '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")
+  config.mock_with :rspec do |c|
+    c.syntax = :expect
   end
-  load_sql("unnest.sql")
-end
-load_sql("dmetaphone.sql")
-
-require "with_model"
-
-RSpec.configure do |config|
-  config.extend WithModel
 end
 
-RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
+require 'support/coveralls'
+require 'support/database'
+require 'support/with_model'
 
 DOCUMENTS_SCHEMA = lambda do |t|
   t.belongs_to :searchable, :polymorphic => true

data/spec/support/coveralls.rb

@@ -0,0 +1,7 @@
+if ENV["TRAVIS"]
+  begin
+    require 'coveralls'
+    Coveralls.wear!
+  rescue LoadError
+  end
+end

data/spec/support/database.rb

@@ -0,0 +1,83 @@
+if defined? JRUBY_VERSION
+  require 'activerecord-jdbcpostgresql-adapter'
+  error_classes = [ActiveRecord::JDBCError]
+else
+  require "pg"
+  error_classes = [PGError]
+end
+
+error_classes << ActiveRecord::NoDatabaseError if defined? ActiveRecord::NoDatabaseError
+
+begin
+  database_user = if ENV["TRAVIS"]
+                    "postgres"
+                  else
+                    ENV["USER"]
+                  end
+
+  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
+  at_exit do
+    puts "-" * 80
+    puts "Unable to connect to database.  Please run:"
+    puts
+    puts "    createdb pg_search_test"
+    puts "-" * 80
+  end
+  raise $!
+end
+
+if ENV["LOGGER"]
+  require "logger"
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
+end
+
+def install_extension_if_missing(name, query, expected_result)
+  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
+  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 $!.message
+    end
+  rescue => e2
+    at_exit do
+      puts "-" * 80
+      puts "Please install the #{name} contrib module"
+      puts "-" * 80
+    end
+    raise e2
+  end
+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("fuzzystrmatch", "SELECT dmetaphone('foo')", "f")
+
+def load_sql(filename)
+  connection = ActiveRecord::Base.connection
+  file_contents = File.read(File.join(File.dirname(__FILE__), '..', '..', '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")

data/spec/support/with_model.rb

@@ -0,0 +1,5 @@
+require "with_model"
+
+RSpec.configure do |config|
+  config.extend WithModel
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Grant Hutchins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-07-15 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: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: with_model
   requirement: !ruby/object:Gem::Requirement
@@ -144,10 +144,11 @@ files:
 - 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
+- lib/pg_search/migration/templates/create_pg_search_documents.rb.erb
 - lib/pg_search/multisearch.rb
 - lib/pg_search/multisearch/rebuilder.rb
 - lib/pg_search/multisearchable.rb
@@ -172,6 +173,9 @@ files:
 - spec/lib/pg_search/multisearchable_spec.rb
 - spec/lib/pg_search/normalizer_spec.rb
 - spec/spec_helper.rb
+- spec/support/coveralls.rb
+- spec/support/database.rb
+- spec/support/with_model.rb
 - sql/array_agg.sql
 - sql/dmetaphone.sql
 - sql/uninstall_array_agg.sql
@@ -219,3 +223,6 @@ test_files:
 - spec/lib/pg_search/multisearchable_spec.rb
 - spec/lib/pg_search/normalizer_spec.rb
 - spec/spec_helper.rb
+- spec/support/coveralls.rb
+- spec/support/database.rb
+- spec/support/with_model.rb