activerecord-spatial 2.0.0 → 3.0.0

data/test/geography_column_tests.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class GeographyColumnTests < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo_geography)
   end
 

data/test/geometry_column_tests.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class GeometryColumnTests < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo)
   end
 

data/test/models/bar.rb

@@ -1,12 +1,4 @@
-
-unless ActiveRecordSpatialTestCase.table_exists?('bars')
-  ActiveRecord::Migration.create_table(:bars) do |t|
-    t.text :name
-  end
-
-  ARBC.execute(%{SELECT AddGeometryColumn('public', 'bars', 'the_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 2)})
-  ARBC.execute(%{SELECT AddGeometryColumn('public', 'bars', 'the_other_geom', 4326, 'GEOMETRY', 2)})
-end
+# frozen_string_literal: true
 
 class Bar < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns

data/test/models/blort.rb

@@ -1,10 +1,4 @@
-
-unless ActiveRecordSpatialTestCase.table_exists?('blorts')
-  ActiveRecord::Migration.create_table(:blorts) do |t|
-    t.text :name
-    t.integer :foo_id
-  end
-end
+# frozen_string_literal: true
 
 class Blort < ActiveRecord::Base
   belongs_to :foo

data/test/models/foo.rb

@@ -1,16 +1,10 @@
-
-unless ActiveRecordSpatialTestCase.table_exists?('foos')
-  ActiveRecord::Migration.create_table(:foos) do |t|
-    t.text :name
-  end
-
-  ARBC.execute(%{SELECT AddGeometryColumn('public', 'foos', 'the_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 2)})
-  ARBC.execute(%{SELECT AddGeometryColumn('public', 'foos', 'the_other_geom', 4326, 'GEOMETRY', 2)})
-end
+# frozen_string_literal: true
 
 class Foo < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns
   include ActiveRecordSpatial::SpatialScopes
 
   create_spatial_column_accessors!
+
+  has_many :blorts
 end

data/test/models/foo3d.rb

@@ -1,12 +1,4 @@
-
-unless ActiveRecordSpatialTestCase.table_exists?('foo3ds')
-  ActiveRecord::Migration.create_table(:foo3ds) do |t|
-    t.text :name
-  end
-
-  ARBC.execute(%{SELECT AddGeometryColumn('public', 'foo3ds', 'the_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 3)})
-  ARBC.execute(%{SELECT AddGeometryColumn('public', 'foo3ds', 'the_other_geom', 4326, 'GEOMETRY', 3)})
-end
+# frozen_string_literal: true
 
 class Foo3d < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns

data/test/models/foo_geography.rb

@@ -1,11 +1,4 @@
-
-unless ActiveRecordSpatialTestCase.table_exists?('foo_geographies')
-  ActiveRecord::Migration.create_table(:foo_geographies) do |t|
-    t.text :name
-    t.column :the_geom, :geography
-    t.column :the_other_geom, 'geography(Geometry, 4326)'
-  end
-end
+# frozen_string_literal: true
 
 class FooGeography < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns

data/test/models/zortable.rb

@@ -1,12 +1,4 @@
-
-unless ActiveRecordSpatialTestCase.table_exists?('zortables')
-  ActiveRecord::Migration.create_table(:zortables) do |t|
-    t.text :name
-    t.text :zortable_type
-  end
-
-  ARBC.execute(%{SELECT AddGeometryColumn('public', 'zortables', 'zortable_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 2)})
-end
+# frozen_string_literal: true
 
 class Zortable < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns

data/test/schema.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define do
+  unless ARBC.data_source_exists?(:foos)
+    create_table(:foos) do |t|
+      t.text :name
+    end
+
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'foos', 'the_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 2)})
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'foos', 'the_other_geom', 4326, 'GEOMETRY', 2)})
+  end
+
+  unless ARBC.data_source_exists?(:bars)
+    create_table(:bars) do |t|
+      t.text :name
+    end
+
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'bars', 'the_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 2)})
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'bars', 'the_other_geom', 4326, 'GEOMETRY', 2)})
+  end
+
+  unless ARBC.data_source_exists?(:blorts)
+    create_table(:blorts) do |t|
+      t.text :name
+      t.integer :foo_id
+    end
+  end
+
+  unless ARBC.data_source_exists?(:foo_geographies)
+    create_table(:foo_geographies) do |t|
+      t.text :name
+      t.column :the_geom, :geography
+      t.column :the_other_geom, 'geography(Geometry, 4326)'
+    end
+  end
+
+  unless ARBC.data_source_exists?(:foo3ds)
+    create_table(:foo3ds) do |t|
+      t.text :name
+    end
+
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'foo3ds', 'the_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 3)})
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'foo3ds', 'the_other_geom', 4326, 'GEOMETRY', 3)})
+  end
+
+  unless ARBC.data_source_exists?(:zortables)
+    create_table(:zortables) do |t|
+      t.text :name
+      t.text :zortable_type
+    end
+
+    ARBC.execute(%{SELECT AddGeometryColumn('public', 'zortables', 'zortable_geom', #{ActiveRecordSpatial::UNKNOWN_SRID}, 'GEOMETRY', 2)})
+  end
+end

data/test/spatial_function_tests.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class SpatialFunctionTests < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo)
     load_models(:blort)
   end

data/test/spatial_scopes_geographies_tests.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo_geography)
   end
 

data/test/spatial_scopes_tests.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class SpatialScopesTests < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :foo3d)
   end
 

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'simplecov'
 
@@ -34,15 +35,15 @@ puts "Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUBY_INSTAL
 puts "Geos library #{Geos::VERSION}" if defined?(Geos::VERSION)
 puts "GEOS #{Geos::GEOS_VERSION}"
 puts "GEOS extensions #{Geos::GEOS_EXTENSIONS_VERSION}"
+
 if defined?(Geos::FFIGeos)
   puts "Using #{Geos::FFIGeos.geos_library_paths.join(', ')}"
 end
 
 ActiveSupport::TestCase.test_order = :random
 ActiveRecord::Base.logger = Logger.new('debug.log') if ENV['ENABLE_LOGGER']
-ActiveRecord::Base.configurations = {
-  'arunit' => {}
-}
+
+configurations = {}
 
 %w{
   database.yml
@@ -54,15 +55,18 @@ ActiveRecord::Base.configurations = {
 
   configuration = YAML.safe_load(File.read(file))
 
+  configurations.merge!(configuration)
+
   if configuration['arunit']
-    ActiveRecord::Base.configurations['arunit'].merge!(configuration['arunit'])
+    configurations['arunit'].merge!(configuration['arunit'])
   end
 
   if defined?(JRUBY_VERSION) && configuration['jdbc']
-    ActiveRecord::Base.configurations['arunit'].merge!(configuration['jdbc'])
+    configurations['arunit'].merge!(configuration['jdbc'])
   end
 end
 
+ActiveRecord::Base.configurations = configurations
 ActiveRecord::Base.establish_connection :arunit
 ARBC = ActiveRecord::Base.connection
 
@@ -74,33 +78,17 @@ end
 
 puts 'Checking for PostGIS install'
 2.times do
-  begin
-    postgis_version = ActiveRecordSpatial::POSTGIS[:lib]
+  postgis_version = ActiveRecordSpatial::POSTGIS[:lib]
 
-    if postgis_version.present?
-      puts "PostGIS info from postgis_full_version(): #{postgis_version}"
-      break
-    end
-  rescue ActiveRecord::StatementInvalid
-    puts "Trying to install PostGIS. If this doesn't work, you'll have to do this manually!"
-
-    plpgsql = ARBC.select_rows(%{SELECT count(*) FROM pg_language WHERE lanname = 'plpgsql'}).first.first.to_i
-    ARBC.execute(%{CREATE LANGUAGE plpgsql}) if plpgsql.zero?
-
-    %w{
-      postgis.sql
-      spatial_ref_sys.sql
-    }.each do |file|
-      if !(found = Dir.glob(POSTGIS_PATHS).collect { |path|
-        File.join(path, file)
-      }.first)
-        puts "ERROR: Couldn't find #{file}. Try setting the POSTGIS_PATH to give us a hint!"
-        exit
-      else
-        ARBC.execute(File.read(found))
-      end
-    end
+  if postgis_version.present?
+    puts "PostGIS info from postgis_full_version(): #{postgis_version}"
+    break
   end
+rescue ActiveRecord::StatementInvalid, PG::UndefinedFunction
+  puts "Trying to install PostGIS. If this doesn't work, you'll have to do this manually!"
+
+  ARBC.enable_extension('plpgsql') unless ARBC.extension_enabled?('plpgsql')
+  ARBC.enable_extension('postgis') unless ARBC.extension_enabled?('postgis')
 end
 
 class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
@@ -109,26 +97,26 @@ class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
   include ActiveRecord::TestFixtures
   self.fixture_path = BASE_PATH.join('fixtures')
 
-  REGEXP_WKB_HEX = /[A-Fa-f0-9\s]+/
+  REGEXP_WKB_HEX = /[A-Fa-f0-9\s]+/.freeze
 
-  POINT_WKT = 'POINT(10 10.01)'.freeze
-  POINT_EWKT = 'SRID=4326; POINT(10 10.01)'.freeze
-  POINT_EWKT_WITH_DEFAULT = 'SRID=default; POINT(10 10.01)'.freeze
-  POINT_WKB = '0101000000000000000000244085EB51B81E052440'.freeze
-  POINT_WKB_BIN = "\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x24\x40\x85\xEB\x51\xB8\x1E\x05\x24\x40".freeze
-  POINT_EWKB = '0101000020E6100000000000000000244085EB51B81E052440'.freeze
-  POINT_EWKB_BIN = "\x01\x01\x00\x00\x20\xE6\x10\x00\x00\x00\x00\x00\x00\x00\x00\x24\x40\x85\xEB\x51\xB8\x1E\x05\x24\x40".freeze
-  POINT_G_LAT_LNG = '(10.01, 10)'.freeze
-  POINT_G_LAT_LNG_URL_VALUE = '10.01,10'.freeze
+  POINT_WKT = 'POINT(10 10.01)'
+  POINT_EWKT = 'SRID=4326; POINT(10 10.01)'
+  POINT_EWKT_WITH_DEFAULT = 'SRID=default; POINT(10 10.01)'
+  POINT_WKB = '0101000000000000000000244085EB51B81E052440'
+  POINT_WKB_BIN = "\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x24\x40\x85\xEB\x51\xB8\x1E\x05\x24\x40"
+  POINT_EWKB = '0101000020E6100000000000000000244085EB51B81E052440'
+  POINT_EWKB_BIN = "\x01\x01\x00\x00\x20\xE6\x10\x00\x00\x00\x00\x00\x00\x00\x00\x24\x40\x85\xEB\x51\xB8\x1E\x05\x24\x40"
+  POINT_G_LAT_LNG = '(10.01, 10)'
+  POINT_G_LAT_LNG_URL_VALUE = '10.01,10'
 
-  POLYGON_WKT = 'POLYGON((0 0, 1 1, 2.5 2.5, 5 5, 0 0))'.freeze
-  POLYGON_EWKT = 'SRID=4326; POLYGON((0 0, 1 1, 2.5 2.5, 5 5, 0 0))'.freeze
+  POLYGON_WKT = 'POLYGON((0 0, 1 1, 2.5 2.5, 5 5, 0 0))'
+  POLYGON_EWKT = 'SRID=4326; POLYGON((0 0, 1 1, 2.5 2.5, 5 5, 0 0))'
 
   POLYGON_WKB = '
     0103000000010000000500000000000000000000000000000000000000000000000000F
     03F000000000000F03F0000000000000440000000000000044000000000000014400000
     00000000144000000000000000000000000000000000
-  '.gsub(/\s/, '').freeze
+  '.gsub(/\s/, '')
 
   POLYGON_WKB_BIN = [
     "\x01\x03\x00\x00\x00\x01\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00",
@@ -136,13 +124,13 @@ class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
     "\x00\x00\x00\x00\x00\xF0\x3F\x00\x00\x00\x00\x00\x00\x04\x40\x00\x00\x00\x00",
     "\x00\x00\x04\x40\x00\x00\x00\x00\x00\x00\x14\x40\x00\x00\x00\x00\x00\x00\x14",
     "\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  ].join.freeze
+  ].join
 
   POLYGON_EWKB = '
     0103000020E610000001000000050000000000000000000000000000000000000000000
     0000000F03F000000000000F03F00000000000004400000000000000440000000000000
     1440000000000000144000000000000000000000000000000000
-  '.gsub(/\s/, '').freeze
+  '.gsub(/\s/, '')
 
   POLYGON_EWKB_BIN = [
     "\x01\x03\x00\x00\x20\xE6\x10\x00\x00\x01\x00\x00\x00\x05\x00\x00\x00",
@@ -151,11 +139,11 @@ class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
     "\x00\x00\x00\x00\x04\x40\x00\x00\x00\x00\x00\x00\x04\x40\x00\x00\x00",
     "\x00\x00\x00\x14\x40\x00\x00\x00\x00\x00\x00\x14\x40\x00\x00\x00\x00",
     "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-  ].join.freeze
+  ].join
 
-  POLYGON_WITH_INTERIOR_RING = 'POLYGON((0 0, 5 0, 5 5, 0 5, 0 0),(4 4, 4 1, 1 1, 1 4, 4 4))'.freeze
+  POLYGON_WITH_INTERIOR_RING = 'POLYGON((0 0, 5 0, 5 5, 0 5, 0 0),(4 4, 4 1, 1 1, 1 4, 4 4))'
 
-  LINESTRING_WKT = 'LINESTRING (0 0, 5 5, 5 10, 10 10)'.freeze
+  LINESTRING_WKT = 'LINESTRING (0 0, 5 5, 5 10, 10 10)'
 
   GEOMETRYCOLLECTION_WKT = 'GEOMETRYCOLLECTION (
     MULTIPOLYGON (
@@ -171,46 +159,28 @@ class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
     LINESTRING (0 0, 2 3),
     MULTIPOINT ((0 0), (2 3)),
     POINT (9 0)
-  )'.freeze
-
-  BOUNDS_G_LAT_LNG = '((0.1, 0.1), (5.2, 5.2))'.freeze
-  BOUNDS_G_LAT_LNG_URL_VALUE = '0.1,0.1,5.2,5.2'.freeze
+  )'
 
-  class << self
-    def load_models(*args)
-      self.fixture_table_names = args.collect do |arg|
-        arg.to_s.pluralize
-      end
+  BOUNDS_G_LAT_LNG = '((0.1, 0.1), (5.2, 5.2))'
+  BOUNDS_G_LAT_LNG_URL_VALUE = '0.1,0.1,5.2,5.2'
 
-      args.each do |model|
-        model = model.to_s
-        klass = model.classify
-        fixtures model.tableize
-
-        ActiveSupport::Dependencies.load_file(BASE_PATH.join("models/#{model}.rb"), [klass])
-      end
+  def load_models(*args)
+    args.each do |model|
+      require_dependency(BASE_PATH.join("models/#{model}.rb"))
     end
+  end
 
-    def load_default_models
-      load_models(:foo, :bar)
-
-      Foo.class_eval do
-        has_many_spatially :foos
-        has_many_spatially :bars
-      end
-
-      Bar.class_eval do
-        has_many_spatially :foos
-        has_many_spatially :bars
-      end
-    end
+  def load_default_models
+    load_models(:foo, :bar)
 
-    def after_suite
-      ActiveSupport::Dependencies.clear
+    Foo.class_eval do
+      has_many_spatially :foos
+      has_many_spatially :bars
     end
 
-    def table_exists?(table)
-      ARBC.data_source_exists?(table)
+    Bar.class_eval do
+      has_many_spatially :foos
+      has_many_spatially :bars
     end
   end
 
@@ -244,15 +214,11 @@ class ActiveRecordSpatialTestCase < ActiveRecord::TestCase
 end
 
 class SpatialTestRunner < Minitest::Reporters::SpecReporter
-  def before_suite(suite)
-    super(suite)
-    suite.before_suite if suite.respond_to?(:before_suite)
-  end
-
-  def after_suite(suite)
-    super(suite)
-    suite.after_suite if suite.respond_to?(:after_suite)
-  end
+  # no-op
 end
 
-Minitest::Reporters.use!(SpatialTestRunner.new)
+Minitest::Reporters.use!(SpatialTestRunner.new, ENV, Minitest::ExtensibleBacktraceFilter.default_filter)
+
+require './test/schema'
+
+ActiveRecord::FixtureSet.create_fixtures("#{__dir__}/fixtures", Dir.glob("#{__dir__}/fixtures/*.yml").collect { |file| File.basename(file).gsub(/.yml$/, '') })