GeoRuby 1.3.3 → 1.3.4

data/lib/geo_ruby/simple_features/geometry.rb

@@ -73,9 +73,7 @@ module GeoRuby#:nodoc:
 
       #Outputs the geometry as a HexEWKB string. It is almost the same as a WKB string, except that each byte of a WKB string is replaced by its hexadecimal 2-character representation in a HexEWKB string.
       def as_hex_ewkb(allow_srid=true,allow_z=true,allow_m=true)
-        str = ""
-        as_ewkb(allow_srid,allow_z,allow_m).each_byte {|char| str << sprintf("%02x",char).upcase}
-        str
+      	as_ewkb(allow_srid, allow_z, allow_m).unpack('H*').join('').upcase
       end
       #Outputs the geometry as a strict HexWKB string
       def as_hex_wkb

data/rakefile.rb

@@ -24,7 +24,7 @@ spec = Gem::Specification::new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name = 'GeoRuby'
-  s.version = "1.3.3"
+  s.version = "1.3.4"
   s.summary = "Ruby data holder for OGC Simple Features"
   s.description = <<EOF
 GeoRuby is intended as a holder for data returned from PostGIS and MySQL Spatial queries. The data model roughly follows the OGC "Simple Features for SQL" specification (see www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections)

data/tools/lib/spatial_adapter/lib/mysql_spatial_adapter.rb

@@ -7,7 +7,7 @@ include GeoRuby::SimpleFeatures
 #add a method to_yaml to the Geometry class which will transform a geometry in a form suitable to be used in a YAML file (such as in a fixture)
 GeoRuby::SimpleFeatures::Geometry.class_eval do
   def to_fixture_format
-    "!binary | #{[(255.chr * 4) + as_wkb].pack('m')}"
+    "!binary | #{[(255.chr * 4) + as_wkb].pack('m').gsub(/\s+/,"")}"
   end
 end
 

data/tools/lib/spatial_adapter/lib/post_gis_adapter.rb

@@ -100,6 +100,16 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     end
   end
 
+  alias :original_tables :tables
+  def tables(name = nil) #:nodoc:
+    schemas = schema_search_path.split(/,/).map { |p| quote(p.strip) }.join(',')
+    original_tables(name) + query(<<-SQL, name).map { |row| row[0] }
+      SELECT viewname
+        FROM pg_views
+        WHERE schemaname IN (#{schemas})
+    SQL
+  end
+
   def create_table(name, options = {})
     table_definition = ActiveRecord::ConnectionAdapters::PostgreSQLTableDefinition.new(self)
     table_definition.primary_key(options[:primary_key] || "id") unless options[:id] == false
@@ -125,11 +135,12 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
   end
   
   alias :original_remove_column :remove_column
-  def remove_column(table_name,column_name)
+  def remove_column(table_name,column_name, options = {})
     columns(table_name).each do |col|
       if col.name == column_name.to_s 
         #check if the column is geometric
-        unless geometry_data_types[col.type].nil?
+        unless geometry_data_types[col.type].nil? or
+               (options[:remove_using_dropgeometrycolumn] == false)
           execute "SELECT DropGeometryColumn('#{table_name}','#{column_name}')"
         else
           original_remove_column(table_name,column_name)
@@ -140,7 +151,7 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
   
   alias :original_add_column :add_column
   def add_column(table_name, column_name, type, options = {})
-    unless geometry_data_types[type].nil?
+    unless geometry_data_types[type].nil? or (options[:create_using_addgeometrycolumn] == false)
       geom_column = ActiveRecord::ConnectionAdapters::PostgreSQLColumnDefinition.new(self,column_name, type, nil,nil,options[:null],options[:srid] || -1 , options[:with_z] || false , options[:with_m] || false)
       execute geom_column.to_sql(table_name)
     else
@@ -201,12 +212,20 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     raw_geom_infos = column_spatial_info(table_name)
     
     column_definitions(table_name).collect do |name, type, default, notnull|
-      if type =~ /geometry/i and raw_geom_infos[name]
+      if type =~ /geometry/i
         raw_geom_info = raw_geom_infos[name]
         if ActiveRecord::VERSION::STRING >= "2.0.0"
-          ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default,raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
+          if raw_geom_info.nil?
+             ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.create_simplified(name,default,notnull == "f")
+          else
+            ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default,raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
+          end
         else
-          ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default_value(default), raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
+          if raw_geom_info.nil?
+            ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.create_simplified(name,default_value(default),notnull == "f")
+          else
+            ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default_value(default), raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
+          end
         end
       else
         if ActiveRecord::VERSION::STRING >= "2.0.0"
@@ -218,54 +237,41 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
       end
     end
   end
-
-  #Pete Deffendol's patch
-  alias :original_disable_referential_integrity :disable_referential_integrity
-  def disable_referential_integrity(&block) #:nodoc:
-    ignore_tables = %w{ geometry_columns spatial_ref_sys }
-    execute(tables.select { |name| !ignore_tables.include?(name) }.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
-    yield
-  ensure
-    execute(tables.select { |name| !ignore_tables.include?(name)}.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+  
+  # For version of Rails where exists disable_referential_integrity
+  if self.instance_methods.include? "disable_referential_integrity"
+    #Pete Deffendol's patch
+    alias :original_disable_referential_integrity :disable_referential_integrity
+    def disable_referential_integrity(&block) #:nodoc:
+      ignore_tables = %w{ geometry_columns spatial_ref_sys }
+      execute(tables.select { |name| !ignore_tables.include?(name) }.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
+      yield
+    ensure
+      execute(tables.select { |name| !ignore_tables.include?(name)}.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+    end
   end
       
   private
          
   def column_spatial_info(table_name)
     constr = query <<-end_sql
-    SELECT pg_get_constraintdef(oid) 
-    FROM pg_constraint
-    WHERE conrelid = '#{table_name}'::regclass
-    AND contype = 'c'
+SELECT * FROM geometry_columns WHERE f_table_name = '#{table_name}'
     end_sql
     
     raw_geom_infos = {}
     constr.each do |constr_def_a|
-      constr_def = constr_def_a[0] #only 1 column in the result
-      if constr_def =~ /geometrytype\(["']?([^"')]+)["']?\)\s*=\s*'([^']+)'/i
-        column_name,type = $1,$2
-        if type[-1] == ?M
-          with_m = true
-          type.chop!
-        else
-          with_m = false
-        end
-        raw_geom_info = raw_geom_infos[column_name] || ActiveRecord::ConnectionAdapters::RawGeomInfo.new
-        raw_geom_info.type = type
-        raw_geom_info.with_m = with_m
-        raw_geom_infos[column_name] = raw_geom_info
-      elsif constr_def =~ /ndims\(["']?([^"')]+)["']?\)\s*=\s*(\d+)/i
-        column_name,dimension = $1,$2
-        raw_geom_info = raw_geom_infos[column_name] || ActiveRecord::ConnectionAdapters::RawGeomInfo.new
-        raw_geom_info.dimension = dimension.to_i
-        raw_geom_infos[column_name] = raw_geom_info
-      elsif constr_def =~ /srid\(["']?([^"')]+)["']?\)\s*=\s*(-?\d+)/i
-        column_name,srid = $1,$2
-        raw_geom_info = raw_geom_infos[column_name] || ActiveRecord::ConnectionAdapters::RawGeomInfo.new
-        raw_geom_info.srid = srid.to_i
-        raw_geom_infos[column_name] = raw_geom_info
-      end #if constr_def
-    end #constr.each
+       raw_geom_infos[constr_def_a[3]] ||= ActiveRecord::ConnectionAdapters::RawGeomInfo.new
+      raw_geom_infos[constr_def_a[3]].type = constr_def_a[6]
+      raw_geom_infos[constr_def_a[3]].dimension = constr_def_a[4].to_i
+      raw_geom_infos[constr_def_a[3]].srid = constr_def_a[5].to_i
+
+      if raw_geom_infos[constr_def_a[3]].type[-1] == ?M
+        raw_geom_infos[constr_def_a[3]].with_m = true
+        raw_geom_infos[constr_def_a[3]].type.chop!
+      else
+        raw_geom_infos[constr_def_a[3]].with_m = false
+      end
+    end
 
     raw_geom_infos.each_value do |raw_geom_info|
       #check the presence of z and m
@@ -311,7 +317,9 @@ module ActiveRecord
       attr_reader :geom_columns
       
       def column(name, type, options = {})
-        unless @base.geometry_data_types[type.to_sym].nil?
+        unless (@base.geometry_data_types[type.to_sym].nil? or
+                (options[:create_using_addgeometrycolumn] == false))
+
           geom_column = PostgreSQLColumnDefinition.new(@base,name, type)
           geom_column.null = options[:null]
           geom_column.srid = options[:srid] || -1
@@ -392,6 +400,11 @@ module ActiveRecord
         return string unless string.is_a?(String)
         GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(string) rescue nil
       end
+      
+      def self.create_simplified(name,default,null = true)
+        new(name,default,"geometry",null,nil,nil,nil)
+      end
+
     end
   end
 end

data/tools/lib/spatial_adapter/rakefile.rb

@@ -1,3 +1,4 @@
+$:.unshift(File.join(File.dirname(__FILE__) ,'../../gems/georuby/lib/'))
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'

data/tools/lib/spatial_adapter/test/find_postgis_test.rb

@@ -11,8 +11,9 @@ class FindPostgisTest < Test::Unit::TestCase
   def setup
     ActiveRecord::Schema.define() do
       create_table "parks", :force => true do |t|
-        t.string "data", :limit => 100
-        t.point "geom", :null=>false,:srid=>123
+        t.column "data" , :string, :limit => 100
+        t.column "value", :integer
+        t.column "geom", :point,:null=>false,:srid=>123
       end
       add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"
     end

data/tools/lib/spatial_adapter/test/fixture_mysql_test.rb

@@ -0,0 +1,23 @@
+$:.unshift(File.dirname(__FILE__))
+
+require 'test/unit'
+require 'common/common_mysql'
+
+
+class FixtureMysqlTest < Test::Unit::TestCase
+  def test_long_fixture
+    assert(1,Polygon.from_coordinates([[[144.857742,13.598263], 
+[144.862362,13.589922],[144.865169,13.587336],[144.862927,13.587665], 
+[144.861292,13.587321],[144.857597,13.585299],[144.847845,13.573858], 
+[144.846225,13.571014],[144.843605,13.566047],[144.842157,13.563831], 
+[144.841202,13.561991],[144.838305,13.556465],[144.834645,13.549919], 
+[144.834352,13.549395],[144.833825,13.548454],[144.831839,13.544451], 
+[144.830845,13.54081],[144.821543,13.545695],[144.8097993,13.55186285], 
+[144.814753,13.55755],[144.816744,13.56176944],[144.818862,13.566258], 
+[144.819402,13.568565],[144.822373,13.572223], 
+[144.8242032,13.57381149],[144.82634,13.575666],[144.83416,13.590365], 
+[144.83514,13.595657],[144.834284,13.59652],[144.834024,13.598031], 
+[144.83719,13.598061],[144.857742,13.598263]]]).to_fixture_format.split(/\s+/))
+    
+  end
+end

data/tools/lib/spatial_adapter/test/fixture_postgis_test.rb

@@ -0,0 +1,23 @@
+$:.unshift(File.dirname(__FILE__))
+
+require 'test/unit'
+require 'common/common_postgis'
+
+
+class FixturePostgisTest < Test::Unit::TestCase
+  def test_long_fixture
+    assert(1,Polygon.from_coordinates([[[144.857742,13.598263], 
+[144.862362,13.589922],[144.865169,13.587336],[144.862927,13.587665], 
+[144.861292,13.587321],[144.857597,13.585299],[144.847845,13.573858], 
+[144.846225,13.571014],[144.843605,13.566047],[144.842157,13.563831], 
+[144.841202,13.561991],[144.838305,13.556465],[144.834645,13.549919], 
+[144.834352,13.549395],[144.833825,13.548454],[144.831839,13.544451], 
+[144.830845,13.54081],[144.821543,13.545695],[144.8097993,13.55186285], 
+[144.814753,13.55755],[144.816744,13.56176944],[144.818862,13.566258], 
+[144.819402,13.568565],[144.822373,13.572223], 
+[144.8242032,13.57381149],[144.82634,13.575666],[144.83416,13.590365], 
+[144.83514,13.595657],[144.834284,13.59652],[144.834024,13.598031], 
+[144.83719,13.598061],[144.857742,13.598263]]]).to_fixture_format.split(/\s+/))
+    
+  end
+end

data/tools/lib/spatial_adapter/test/migration_mysql_test.rb

@@ -147,7 +147,7 @@ class MigrationMysqlTest < Test::Unit::TestCase
         t.column  "City", :string,                :limit => 50
         t.column  "StateProvince", :string,       :limit => 50
         t.column  "PostalCode", :string,          :limit => 30
-        t.column  "Geocode", :point, :null  => false
+        t.column  "Geocode", :geometry, :null  => false #:geometry ok too : col.geometry_type test to change below
       end
     end
     
@@ -166,7 +166,7 @@ class MigrationMysqlTest < Test::Unit::TestCase
     ActiveRecord::Schema.define() do
       add_index "cx_geographiclocation", ["addressline1"], :name => "ix_cx_geographiclocation_addressline1"
       add_index "cx_geographiclocation", ["countryid"], :name => "ix_cx_geographiclocation_countryid"
-      add_index "cx_geographiclocation", "Geocode", :spatial=>true
+      add_index "cx_geographiclocation", ["Geocode"], :spatial=>true
     end
 
     #test index
@@ -174,7 +174,7 @@ class MigrationMysqlTest < Test::Unit::TestCase
     assert(connection.indexes("cx_geographiclocation")[2].spatial)    
 
     #insertion points
-    1.upto(1000) do |i|
+    1.upto(10000) do |i|
       pt = CxGeographiclocation.new("CountryID" => i, "AddressLine1" =>"Bouyoul", "Geocode" => Point.from_x_y(-180 + rand(360) + rand(),-90 + rand(180) + rand())) #insert floats
       assert(pt.save)
     end
@@ -193,7 +193,7 @@ class MigrationMysqlTest < Test::Unit::TestCase
     pts =  CxGeographiclocation.find_all_by_Geocode([[-181 + rand(),-91 + rand()],[181 + rand(),91 + rand()]]) #selects all : range limits are float
     assert(pts)
     assert(pts.is_a?(Array))
-    assert_equal(1000,pts.length)
+    assert_equal(10000,pts.length)
     assert_equal("Bouyoul",pts[0].attributes["AddressLine1"])
 
    end

data/tools/lib/spatial_adapter/test/migration_postgis_test.rb

@@ -6,6 +6,9 @@ require 'common/common_postgis'
 class Park < ActiveRecord::Base
 end
 
+class Viewpark < ActiveRecord::Base
+end
+
 
 class MigrationPostgisTest < Test::Unit::TestCase
   
@@ -140,6 +143,34 @@ class MigrationPostgisTest < Test::Unit::TestCase
   end
 
   
+  def test_view
+    ActiveRecord::Schema.define do
+      create_table "parks", :force => true do |t|
+        t.column "data" , :string, :limit => 100
+        t.column "value", :integer
+        t.column "geom", :point,:null=>false
+      end
+    end
+
+    pt = Park.new(:data => "Test", :geom => Point.from_x_y(1.2,4.5))
+    assert(pt.save)
+
+    ActiveRecord::Base.connection.execute('CREATE VIEW viewparks as SELECT * from parks')
+    #if not ActiveRecord::Base.connection.execute("select * from geometry_columns where f_table_name = 'viewparks' and f_geometry_column = 'geom'") #do not add if already there
+      #mark the geom column in the view as geometric
+      #ActiveRecord::Base.connection.execute("insert into geometry_columns values ('','public','viewparks','geom',2,-1,'POINT')")
+    #end
+
+    pt = Viewpark.find(:first)
+    assert(pt)
+    assert_equal("Test",pt.data)
+    assert_equal(Point.from_x_y(1.2,4.5),pt.geom)
+
+    ActiveRecord::Base.connection.execute('DROP VIEW viewparks')
+
+  end
+
+  
   def test_dump
     #Force the creation of a table
     ActiveRecord::Schema.define do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: GeoRuby
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Guilhem Vellut
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-02 00:00:00 +01:00
+date: 2009-03-20 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -75,6 +75,8 @@ files:
 - tools/lib/spatial_adapter/test/common/common_postgis.rb
 - tools/lib/spatial_adapter/test/find_mysql_test.rb
 - tools/lib/spatial_adapter/test/find_postgis_test.rb
+- tools/lib/spatial_adapter/test/fixture_mysql_test.rb
+- tools/lib/spatial_adapter/test/fixture_postgis_test.rb
 - tools/lib/spatial_adapter/test/migration_mysql_test.rb
 - tools/lib/spatial_adapter/test/migration_postgis_test.rb
 - tools/lib/spatial_adapter/test/models/models_mysql.rb