activerecord-spatial 2.0.0 → 3.0.0

data/lib/activerecord-spatial/spatial_columns.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
   # This little module helps us out with geometry columns. At least, in

data/lib/activerecord-spatial/spatial_function.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
   class SpatialFunction
@@ -81,7 +82,7 @@ module ActiveRecordSpatial
           options[:desc]
         end
 
-        ''.tap do |ret|
+        ''.dup.tap do |ret|
           ret << ' DESC' if desc
           ret << " NULLS #{options[:nulls].to_s.upcase}" if options[:nulls]
         end

data/lib/activerecord-spatial/spatial_scope_constants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
   module SpatialScopeConstants

data/lib/activerecord-spatial/spatial_scope_constants/postgis_2_0.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
   module SpatialScopeConstants

data/lib/activerecord-spatial/spatial_scope_constants/postgis_2_2.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
   module SpatialScopeConstants

data/lib/activerecord-spatial/spatial_scope_constants/postgis_legacy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
   module SpatialScopeConstants

data/lib/activerecord-spatial/spatial_scopes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
   # Creates named scopes for spatial relationships. The scopes created
@@ -142,7 +143,7 @@ module ActiveRecordSpatial
 
       SpatialScopeConstants::RELATIONSHIPS.each do |relationship|
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          scope :st_#{relationship}, lambda { |geom, options = {}|
+          scope :st_#{relationship}, ->(geom, options = {}) {
             options = {
               geom_arg: geom
             }.merge(options)
@@ -158,7 +159,7 @@ module ActiveRecordSpatial
 
       SpatialScopeConstants::ONE_GEOMETRY_ARGUMENT_AND_ONE_ARGUMENT_RELATIONSHIPS.each do |relationship|
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          scope :st_#{relationship}, lambda { |geom, distance, options = {}|
+          scope :st_#{relationship}, ->(geom, distance, options = {}) {
             options = {
               geom_arg: geom,
               args: distance
@@ -172,7 +173,7 @@ module ActiveRecordSpatial
       end
 
       class_eval do
-        scope :st_geometry_type, lambda { |*args|
+        scope :st_geometry_type, ->(*args) {
           assert_arguments_length[args, 1]
           options = args.extract_options!
           types = args
@@ -185,7 +186,7 @@ module ActiveRecordSpatial
 
       SpatialScopeConstants::ZERO_ARGUMENT_MEASUREMENTS.each do |measurement|
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          scope :order_by_st_#{measurement}, lambda { |options = {}|
+          scope :order_by_st_#{measurement}, ->(options = {}) {
             if options.is_a?(Symbol)
               options = {
                 desc: options
@@ -195,14 +196,14 @@ module ActiveRecordSpatial
             function_call = ActiveRecordSpatial::SpatialFunction.build!(self, '#{measurement}', options).to_sql
             function_call << ActiveRecordSpatial::SpatialFunction.additional_ordering(options)
 
-            order(function_call)
+            order(Arel.sql(function_call))
           }
         RUBY
       end
 
       SpatialScopeConstants::ONE_GEOMETRY_ARGUMENT_MEASUREMENTS.each do |measurement|
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          scope :order_by_st_#{measurement}, lambda { |geom, options = {}|
+          scope :order_by_st_#{measurement}, ->(geom, options = {}) {
             if options.is_a?(Symbol)
               options = {
                 desc: options
@@ -216,14 +217,14 @@ module ActiveRecordSpatial
             function_call = ActiveRecordSpatial::SpatialFunction.build!(self, '#{measurement}', options).to_sql
             function_call << ActiveRecordSpatial::SpatialFunction.additional_ordering(options)
 
-            order(function_call)
+            order(Arel.sql(function_call))
           }
         RUBY
       end
 
       SpatialScopeConstants::ONE_ARGUMENT_MEASUREMENTS.each do |measurement|
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          scope :order_by_st_#{measurement}, lambda { |argument, options = {}|
+          scope :order_by_st_#{measurement}, ->(argument, options = {}) {
             options = {
               args: argument
             }.merge(options)
@@ -231,13 +232,13 @@ module ActiveRecordSpatial
             function_call = ActiveRecordSpatial::SpatialFunction.build!(self, '#{measurement}', options).to_sql
             function_call << ActiveRecordSpatial::SpatialFunction.additional_ordering(options)
 
-            order(function_call)
+            order(Arel.sql(function_call))
           }
         RUBY
       end
 
       class_eval do
-        scope :order_by_st_hausdorffdistance, lambda { |*args|
+        scope :order_by_st_hausdorffdistance, ->(*args) {
           assert_arguments_length[args, 1, 3]
           options = args.extract_options!
           geom, densify_frac = args
@@ -254,10 +255,10 @@ module ActiveRecordSpatial
           ).to_sql
           function_call << ActiveRecordSpatial::SpatialFunction.additional_ordering(options)
 
-          order(function_call)
+          order(Arel.sql(function_call))
         }
 
-        scope :order_by_st_distance_spheroid, lambda { |geom, spheroid, options = {}|
+        scope :order_by_st_distance_spheroid, ->(geom, spheroid, options = {}) {
           options = {
             geom_arg: geom,
             args: spheroid
@@ -274,7 +275,7 @@ module ActiveRecordSpatial
           ).to_sql
           function_call << ActiveRecordSpatial::SpatialFunction.additional_ordering(options)
 
-          order(function_call)
+          order(Arel.sql(function_call))
         }
 
         class << self

data/lib/activerecord-spatial/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 
 module ActiveRecordSpatial
-  VERSION = '2.0.0'.freeze
+  VERSION = '3.0.0'
 end

data/test/accessors_geographies_tests.rb

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

data/test/accessors_geometries_tests.rb

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

data/test/adapter_tests.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class AdapterTests < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo)
   end
 
@@ -12,8 +13,8 @@ class AdapterTests < ActiveRecordSpatialTestCase
       c.type == :geometry
     end
 
-    other_columns = Foo.columns.select do |c|
-      c.type != :geometry
+    other_columns = Foo.columns.reject do |c|
+      c.type == :geometry
     end
 
     assert_equal(2, geometry_columns.length)
@@ -23,7 +24,7 @@ end
 
 if ActiveRecordSpatial.geography_columns?
   class AdapterWithGeographyTests < ActiveRecordSpatialTestCase
-    def self.before_suite
+    def setup
       load_models(:foo_geography)
     end
 

data/test/associations_tests.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class DefaultIntersectsRelationshipTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -28,7 +29,7 @@ class DefaultIntersectsRelationshipTest < ActiveRecordSpatialTestCase
 end
 
 class RelationshipsTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
   end
 
@@ -45,7 +46,7 @@ class RelationshipsTest < ActiveRecordSpatialTestCase
     overlaps: [],
     touches: [],
     within: [3],
-    :'3dintersects' => [3]
+    '3dintersects': [3]
   }.each do |relationship, ids|
     define_method("test_#{relationship}") do
       skip("ST_#{relationship} is unavailable") unless Foo.respond_to?("st_#{relationship}")
@@ -63,8 +64,22 @@ class RelationshipsTest < ActiveRecordSpatialTestCase
   end
 end
 
+class PlainRelationshipsTest < ActiveRecordSpatialTestCase
+  def setup
+    load_models(:foo, :blort)
+  end
+
+  def test_with_eager_loading
+    values = Foo.includes(:blorts).to_a.collect do |foo|
+      foo.blorts.length
+    end
+
+    assert_equal([3, 3, 3], values)
+  end
+end
+
 class RelationshipsWithSelfTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
   end
 
@@ -81,7 +96,7 @@ class RelationshipsWithSelfTest < ActiveRecordSpatialTestCase
     overlaps: [],
     touches: [],
     within: [1, 3],
-    :'3dintersects' => [1, 3]
+    '3dintersects': [1, 3]
   }.each do |relationship, ids|
     define_method("test_#{relationship}") do
       skip("ST_#{relationship} is unavailable") unless Foo.respond_to?("st_#{relationship}")
@@ -100,7 +115,7 @@ class RelationshipsWithSelfTest < ActiveRecordSpatialTestCase
 end
 
 class RelationshipsWithForeignGeomTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
   end
 
@@ -117,7 +132,7 @@ class RelationshipsWithForeignGeomTest < ActiveRecordSpatialTestCase
     overlaps: [],
     touches: [],
     within: [3],
-    :'3dintersects' => [3]
+    '3dintersects': [3]
   }.each do |relationship, ids|
     define_method("test_#{relationship}") do
       skip("ST_#{relationship} is unavailable") unless Foo.respond_to?("st_#{relationship}")
@@ -140,7 +155,7 @@ class RelationshipsWithForeignGeomTest < ActiveRecordSpatialTestCase
 end
 
 class RelationshipsWithGeomTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
   end
 
@@ -157,7 +172,7 @@ class RelationshipsWithGeomTest < ActiveRecordSpatialTestCase
     overlaps: [],
     touches: [3],
     within: [],
-    :'3dintersects' => [3]
+    '3dintersects': [3]
   }.each do |relationship, ids|
     define_method("test_#{relationship}") do
       skip("ST_#{relationship} is unavailable") unless Foo.respond_to?("st_#{relationship}")
@@ -180,7 +195,7 @@ class RelationshipsWithGeomTest < ActiveRecordSpatialTestCase
 end
 
 class CountsTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_default_models
   end
 
@@ -191,7 +206,7 @@ class CountsTest < ActiveRecordSpatialTestCase
 end
 
 class WithCounterSqlTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
   end
 
@@ -207,7 +222,7 @@ class WithCounterSqlTest < ActiveRecordSpatialTestCase
 end
 
 class ScopeOptionsTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -227,7 +242,7 @@ class ScopeOptionsTest < ActiveRecordSpatialTestCase
 end
 
 class PreloadTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_default_models
   end
 
@@ -259,7 +274,7 @@ class PreloadTest < ActiveRecordSpatialTestCase
 end
 
 class PreloadWithOtherGeomTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -297,7 +312,7 @@ class PreloadWithOtherGeomTest < ActiveRecordSpatialTestCase
 end
 
 class PolymorphicAssociationsTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar, :zortable)
 
     Foo.class_eval do
@@ -364,7 +379,7 @@ class PolymorphicAssociationsTest < ActiveRecordSpatialTestCase
 end
 
 class PolymorphicAssociationsWithRelationshipsTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar, :zortable)
   end
 
@@ -381,7 +396,7 @@ class PolymorphicAssociationsWithRelationshipsTest < ActiveRecordSpatialTestCase
     overlaps: [],
     touches: [],
     within: [1, 7],
-    :'3dintersects' => [1, 7]
+    '3dintersects': [1, 7]
   }.each do |relationship, ids|
     define_method("test_#{relationship}") do
       skip("ST_#{relationship} is unavailable") unless Foo.respond_to?("st_#{relationship}")
@@ -401,7 +416,7 @@ class PolymorphicAssociationsWithRelationshipsTest < ActiveRecordSpatialTestCase
 end
 
 class ClassNameOptionTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -417,7 +432,7 @@ class ClassNameOptionTest < ActiveRecordSpatialTestCase
 end
 
 class ScopesTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -453,7 +468,7 @@ class ScopesTest < ActiveRecordSpatialTestCase
 end
 
 class GeomWrapperTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -487,7 +502,7 @@ class GeomWrapperTest < ActiveRecordSpatialTestCase
 end
 
 class ForeignGeomWrapperTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -521,7 +536,7 @@ class ForeignGeomWrapperTest < ActiveRecordSpatialTestCase
 end
 
 class BothGeomWrapperTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -558,7 +573,7 @@ class BothGeomWrapperTest < ActiveRecordSpatialTestCase
 end
 
 class BothGeomWrapperWithMixedSRIDsTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -596,7 +611,7 @@ class BothGeomWrapperWithMixedSRIDsTest < ActiveRecordSpatialTestCase
 end
 
 class BothGeomWrapperAndOptionsWithMixedSRIDsTest < ActiveRecordSpatialTestCase
-  def self.before_suite
+  def setup
     load_models(:foo, :bar)
 
     Foo.class_eval do
@@ -636,7 +651,7 @@ class BothGeomWrapperAndOptionsWithMixedSRIDsTest < ActiveRecordSpatialTestCase
 
   class ScopeArgumentTest < ActiveRecordSpatialTestCase
     def setup
-      self.class.load_models(:foo, :bar, :blort)
+      load_models(:foo, :bar)
     end
 
     def test_foo