activerecord-spatial 1.0.0 → 2.0.0

data/lib/activerecord-spatial.rb

@@ -1,8 +1,6 @@
 
 require 'geos-extensions'
 
-require 'activerecord-spatial/active_record/connection_adapters/postgresql/adapter_extensions'
-
 module ActiveRecordSpatial
   BASE_PATH = File.dirname(__FILE__)
 
@@ -22,11 +20,9 @@ module ActiveRecordSpatial
     # Allows you to modify the default geometry column name for all of
     # ActiveRecordSpatial. This is useful when you have a common column name
     # for all of your geometry columns, such as +wkb+, +feature+, +geom+, etc.
-    def default_column_name=(column_name)
-      @default_column_name = column_name
-    end
+    attr_writer :default_column_name
   end
 end
 
+require 'activerecord-spatial/active_record/connection_adapters/postgresql/adapter_extensions'
 require 'activerecord-spatial/active_record'
-

data/lib/tasks/test.rake

@@ -1,14 +1,17 @@
 
 namespace :test do
-  desc "Dumps data from the geometry_columns and spatial_ref_sys tables."
-  task :postgis_dump => :environment do
+  desc 'Dumps data from the geometry_columns and spatial_ref_sys tables.'
+  task postgis_dump: :environment do
     abcs = ActiveRecord::Base.configurations
-    ENV['PGHOST']     = abcs[Rails.env]["host"] if abcs[Rails.env]["host"]
-    ENV['PGPORT']     = abcs[Rails.env]["port"].to_s if abcs[Rails.env]["port"]
-    ENV['PGPASSWORD'] = abcs[Rails.env]["password"].to_s if abcs[Rails.env]["password"]
-    search_path = abcs[Rails.env]["schema_search_path"]
+    ENV['PGHOST'] = abcs[Rails.env]['host'] if abcs[Rails.env]['host']
+    ENV['PGPORT'] = abcs[Rails.env]['port'].to_s if abcs[Rails.env]['port']
+    ENV['PGPASSWORD'] = abcs[Rails.env]['password'].to_s if abcs[Rails.env]['password']
+    search_path = abcs[Rails.env]['schema_search_path']
+
     unless search_path.blank?
-      search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
+      search_path = search_path.split(',').map { |schema|
+        "--schema=#{schema.strip}"
+      }.join(' ')
     end
 
     tables = %w{ geometry_columns spatial_ref_sys }.select do |table|
@@ -18,28 +21,27 @@ namespace :test do
 
     pp tables
 
-    unless tables.empty?
-      `pg_dump -i -U "#{abcs[Rails.env]["username"]}" --data-only -t #{tables.join(' -t ')} -x -O -f db/#{Rails.env}_postgis_tables.sql #{search_path} #{abcs[Rails.env]["database"]}`
+    if !tables.empty?
+      `pg_dump -i -U "#{abcs[Rails.env]['username']}" --data-only -t #{tables.join(' -t ')} -x -O -f db/#{Rails.env}_postgis_tables.sql #{search_path} #{abcs[Rails.env]['database']}`
     else
       File.open("db/#{Rails.env}_postgis_tables.sql", 'w') do |fp|
-        fp.puts "-- empty, do geometry_columns and spatial_ref_sys tables exist?"
+        fp.puts '-- empty, do geometry_columns and spatial_ref_sys tables exist?'
       end
     end
   end
 
-  desc "Loads the geometry_columns and spatial_ref_sys tables."
-  task :postgis_load => :environment do
+  desc 'Loads the geometry_columns and spatial_ref_sys tables.'
+  task postgis_load: :environment do
     abcs = ActiveRecord::Base.configurations
-    ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
-    ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
-    ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
+    ENV['PGHOST'] = abcs['test']['host'] if abcs['test']['host']
+    ENV['PGPORT'] = abcs['test']['port'].to_s if abcs['test']['port']
+    ENV['PGPASSWORD'] = abcs['test']['password'].to_s if abcs['test']['password']
 
-    `psql -U "#{abcs["test"]["username"]}" -f #{Rails.root}/db/#{Rails.env}_postgis_tables.sql #{abcs["test"]["database"]}`
+    `psql -U "#{abcs['test']['username']}" -f #{Rails.root}/db/#{Rails.env}_postgis_tables.sql #{abcs['test']['database']}`
   end
 
-  desc "Dumps and loads the geometry_columns and spatial_ref_sys tables."
-  task :postgis_clone => [ :postgis_dump, :postgis_load ]
+  desc 'Dumps and loads the geometry_columns and spatial_ref_sys tables.'
+  task postgis_clone: [:postgis_dump, :postgis_load]
 end
 
 Rake::Task['test:prepare'].enhance(['test:postgis_clone'])
-

data/test/.rubocop.yml

@@ -0,0 +1,35 @@
+
+inherit_from:
+  - ../.rubocop.yml
+
+Metrics/BlockLength:
+  Description: 'Avoid long blocks with many lines.'
+  Enabled: false
+
+Metrics/ClassLength:
+  Description: 'Avoid classes longer than 300 lines of code.'
+  Enabled: false
+  Max: 300
+
+Lint/EmptyInterpolation:
+  Description: 'Checks for empty string interpolation.'
+  Enabled: false
+
+Style/StringLiterals:
+  Description: 'Checks if uses of quotes match the configured preference.'
+  StyleGuide: '#consistent-string-literals'
+  Enabled: false
+
+Style/BlockComments:
+  Description: 'Do not use block comments.'
+  StyleGuide: '#no-block-comments'
+  Enabled: false
+
+Style/BlockDelimiters:
+  Description: >-
+                Avoid using {...} for multi-line blocks (multiline chaining is
+                always ugly).
+                Prefer {...} over do...end for single-line blocks.
+  StyleGuide: '#single-line-blocks'
+  Enabled: false
+  EnforcedStyle: braces_for_chaining

data/test/accessors_geographies_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
@@ -62,8 +62,8 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_geos_create
     foo = FooGeography.create!(
-      :name => 'test_geos_create',
-      :the_geom => Geos.read(POINT_WKT)
+      name: 'test_geos_create',
+      the_geom: Geos.read(POINT_WKT)
     )
 
     foo.reload
@@ -72,8 +72,8 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_wkt_create
     foo = FooGeography.create!(
-      :name => 'test_wkt_create',
-      :the_geom => POINT_WKT
+      name: 'test_wkt_create',
+      the_geom: POINT_WKT
     )
 
     foo.reload
@@ -82,8 +82,8 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_wkb_create
     foo = FooGeography.create!(
-      :name => 'test_wkb_create',
-      :the_geom => POINT_WKB
+      name: 'test_wkb_create',
+      the_geom: POINT_WKB
     )
 
     foo.reload
@@ -92,8 +92,8 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_ewkt_create_with_srid_4326
     foo = FooGeography.create!(
-      :name => 'test_ewkt_create_with_srid_4326',
-      :the_other_geom => POINT_EWKT
+      name: 'test_ewkt_create_with_srid_4326',
+      the_other_geom: POINT_EWKT
     )
 
     foo.reload
@@ -102,8 +102,8 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_create_with_no_srid_converting_to_4326
     foo = FooGeography.create!(
-      :name => 'test_ewkt_create_with_no_srid_converting_to_4326',
-      :the_other_geom => POINT_WKT
+      name: 'test_ewkt_create_with_no_srid_converting_to_4326',
+      the_other_geom: POINT_WKT
     )
 
     foo.reload
@@ -112,8 +112,8 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_create_with_no_srid_converting_to_minus_1
     foo = FooGeography.create!(
-      :name => 'test_ewkt_create_with_no_srid_converting_to_minus_1',
-      :the_geom => POINT_EWKT
+      name: 'test_ewkt_create_with_no_srid_converting_to_minus_1',
+      the_geom: POINT_EWKT
     )
 
     foo.reload
@@ -122,15 +122,15 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_create_with_converting_from_900913_to_4326
     FooGeography.create!(
-      :name => 'test_create_with_converting_from_900913_to_4326',
-      :the_other_geom => "SRID=900913; #{POINT_WKT}"
+      name: 'test_create_with_converting_from_900913_to_4326',
+      the_other_geom: "SRID=900913; #{POINT_WKT}"
     )
   end
 
   def test_ewkt_create_with_srid_default
     foo = FooGeography.create!(
-      :name => 'test_ewkt_create_with_srid_default',
-      :the_other_geom => POINT_EWKT_WITH_DEFAULT
+      name: 'test_ewkt_create_with_srid_default',
+      the_other_geom: POINT_EWKT_WITH_DEFAULT
     )
 
     foo.reload
@@ -139,8 +139,8 @@ class AccessorsGeographiesTests < ActiveRecordSpatialTestCase
 
   def test_ewkb_create
     foo = FooGeography.create!(
-      :name => 'test_ewkb_create',
-      :the_other_geom => POINT_EWKB
+      name: 'test_ewkb_create',
+      the_other_geom: POINT_EWKB
     )
 
     foo.reload

data/test/accessors_geometries_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
@@ -62,8 +62,8 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
 
   def test_geos_create
     foo = Foo.create!(
-      :name => 'test_geos_create',
-      :the_geom => Geos.read(POINT_WKT)
+      name: 'test_geos_create',
+      the_geom: Geos.read(POINT_WKT)
     )
 
     foo.reload
@@ -72,8 +72,8 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
 
   def test_wkt_create
     foo = Foo.create!(
-      :name => 'test_wkt_create',
-      :the_geom => POINT_WKT
+      name: 'test_wkt_create',
+      the_geom: POINT_WKT
     )
 
     foo.reload
@@ -82,8 +82,8 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
 
   def test_wkb_create
     foo = Foo.create!(
-      :name => 'test_wkb_create',
-      :the_geom => POINT_WKB
+      name: 'test_wkb_create',
+      the_geom: POINT_WKB
     )
 
     foo.reload
@@ -92,8 +92,8 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
 
   def test_ewkt_create_with_srid_4326
     foo = Foo.create!(
-      :name => 'test_ewkt_create_with_srid_4326',
-      :the_other_geom => POINT_EWKT
+      name: 'test_ewkt_create_with_srid_4326',
+      the_other_geom: POINT_EWKT
     )
 
     foo.reload
@@ -102,8 +102,8 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
 
   def test_create_with_no_srid_converting_to_4326
     foo = Foo.create!(
-      :name => 'test_ewkt_create_with_no_srid_converting_to_4326',
-      :the_other_geom => POINT_WKT
+      name: 'test_ewkt_create_with_no_srid_converting_to_4326',
+      the_other_geom: POINT_WKT
     )
 
     foo.reload
@@ -112,8 +112,8 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
 
   def test_create_with_no_srid_converting_to_minus_1
     foo = Foo.create!(
-      :name => 'test_ewkt_create_with_no_srid_converting_to_minus_1',
-      :the_geom => POINT_EWKT
+      name: 'test_ewkt_create_with_no_srid_converting_to_minus_1',
+      the_geom: POINT_EWKT
     )
 
     foo.reload
@@ -123,16 +123,16 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
   def test_create_with_converting_from_900913_to_4326
     assert_raise(ActiveRecordSpatial::GeometryColumns::CantConvertSRID) do
       Foo.create!(
-        :name => 'test_create_with_converting_from_900913_to_4326',
-        :the_other_geom => "SRID=900913; #{POINT_WKT}"
+        name: 'test_create_with_converting_from_900913_to_4326',
+        the_other_geom: "SRID=900913; #{POINT_WKT}"
       )
     end
   end
 
   def test_ewkt_create_with_srid_default
     foo = Foo.create!(
-      :name => 'test_ewkt_create_with_srid_default',
-      :the_other_geom => POINT_EWKT_WITH_DEFAULT
+      name: 'test_ewkt_create_with_srid_default',
+      the_other_geom: POINT_EWKT_WITH_DEFAULT
     )
 
     foo.reload
@@ -141,8 +141,8 @@ class AccessorsGeometriesTests < ActiveRecordSpatialTestCase
 
   def test_ewkb_create
     foo = Foo.create!(
-      :name => 'test_ewkb_create',
-      :the_other_geom => POINT_EWKB
+      name: 'test_ewkb_create',
+      the_other_geom: POINT_EWKB
     )
 
     foo.reload

data/test/adapter_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class AdapterTests < ActiveRecordSpatialTestCase
@@ -41,4 +41,3 @@ if ActiveRecordSpatial.geography_columns?
     end
   end
 end
-