geos-extensions 0.0.5 → 0.0.6

data/Rakefile

@@ -12,7 +12,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "geos-extensions"
-    gem.version = "0.0.5"
+    gem.version = "0.0.6"
     gem.summary = "Extensions for the GEOS library."
     gem.description = gem.summary
     gem.email = "code@zoocasa.com"

data/geos-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geos-extensions}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = %q{2011-03-15}
+  s.date = %q{2011-03-17}
   s.description = %q{Extensions for the GEOS library.}
   s.email = %q{code@zoocasa.com}
   s.extra_rdoc_files = [

data/lib/active_record_extensions/connection_adapters/postgresql_adapter.rb

@@ -14,6 +14,8 @@ module ActiveRecord
     class PostgreSQLAdapter < AbstractAdapter
       # Returns the geometry columns for the table.
       def geometry_columns(table_name, name = nil)
+        return [] if !table_exists?(table_name)
+
         columns(table_name, name).select { |c| c.sql_type == 'geometry' }.collect do |c|
           res = execute(
             "SELECT * FROM geometry_columns WHERE f_table_name = #{quote(table_name)} AND f_geometry_column = #{quote(c.name)}",

data/lib/active_record_extensions/geometry_columns.rb

@@ -41,6 +41,12 @@ module Geos
         end
       end
 
+      class CantConvertSRID < ::ActiveRecord::ActiveRecordError
+        def initialize(table_name, column, from_srid, to_srid)
+          super("Couldn't convert SRID for #{table_name}.#{column} from #{from_srid} to #{to_srid}")
+        end
+      end
+
       def self.included(base) #:nodoc:
         base.extend(ClassMethods)
         base.send(:include, Geos::ActiveRecord::GeospatialScopes)
@@ -122,26 +128,30 @@ module Geos
             create_these.each do |k|
               src, line = <<-EOF, __LINE__ + 1
                 def #{k.name}=(geom)
-                  geos = case geom
-                    when /^SRID=default;/i
-                      if srid = self.class.srid_for(#{k.name.inspect})
-                        geom = geom.sub(/default/i, srid.to_s)
-                        Geos.from_wkt(geom)
-                      else
-                        raise SRIDNotFound.new(self.class.table_name, #{k.name.inspect})
-                      end
-                    else
-                      Geos.read(geom)
+                  column_srid = self.class.srid_for(#{k.name.inspect})
+
+                  if geom =~ /^SRID=default;/i
+                    geom = geom.sub(/default/i, column_srid.to_s)
                   end
 
-                  self['#{k.name}'] = if geos
-                    if geos.srid == 0
-                      geos.to_wkb
+                  geos = Geos.read(geom)
+
+                  geom_srid = if geos.srid == 0
+                    -1
+                  else
+                    geos.srid
+                  end
+
+                  if column_srid != geom_srid
+                    if column_srid == -1 || geom_srid == -1
+                      geos.srid = column_srid
                     else
-                      geos.to_ewkb
+                      raise CantConvertSRID.new(self.class.table_name, #{k.name.inspect}, geom_srid, column_srid)
                     end
                   end
 
+                  self['#{k.name}'] = geos.to_ewkb
+
                   GEOMETRY_COLUMN_OUTPUT_FORMATS.each do |f|
                     instance_variable_set("@#{k.name}_\#{f}", nil)
                   end

data/lib/active_record_extensions/geospatial_scopes.rb

@@ -87,7 +87,7 @@ module Geos
               column_srid = self.srid_for(options[:column])
 
               geom = if args.first.is_a?(String) && args.first =~ /^SRID=default;/
-                args.first.sub(/default/, (column_srid || -1).to_s)
+                args.first.sub(/default/, column_srid.to_s)
               else
                 args.first
               end

data/test/geometry_columns_test.rb

@@ -126,6 +126,35 @@ if ENV['TEST_ACTIVERECORD']
       assert_saneness_of_point(foo.the_other_geom_geos)
     end
 
+    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
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_other_geom_geos)
+    end
+
+    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
+      )
+
+      foo.reload
+      assert_saneness_of_point(foo.the_geom_geos)
+    end
+
+    def test_create_with_converting_from_900913_to_4326
+      assert_raise(Geos::ActiveRecord::GeometryColumns::CantConvertSRID) do
+        foo = Foo.create!(
+          :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',
@@ -134,7 +163,6 @@ if ENV['TEST_ACTIVERECORD']
 
       foo.reload
       assert_saneness_of_point(foo.the_other_geom_geos)
-      foo.the_other_geom_geos
     end
 
     def test_ewkb_create

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geos-extensions
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - J Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
+date: 2011-03-17 00:00:00 -04:00
 default_executable: 
 dependencies: []