nofxx-postgis_adapter 0.3.8 → 0.3.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 3
-:patch: 8
+:patch: 9

data/lib/postgis_adapter.rb

@@ -39,7 +39,7 @@ ActiveRecord::Base.class_eval do
         if columns_hash[attr].is_a?(SpatialColumn)
           if value.is_a?(Array)
             attrs[attr.to_sym]= "BOX3D(" + value[0].join(" ") + "," + value[1].join(" ") + ")"
-            "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value[2] || DEFAULT_SRID} ) "
+            "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value[2] || @@default_srid || DEFAULT_SRID} ) "
           elsif value.is_a?(Envelope)
             attrs[attr.to_sym]= "BOX3D(" + value.lower_corner.text_representation + "," + value.upper_corner.text_representation + ")"
             "#{table_name}.#{column_name} && SetSRID(?::box3d, #{value.srid} ) "

data/lib/postgis_adapter/acts_as_geom.rb

@@ -1,6 +1,5 @@
-# #
-# PostGIS Adapter
 #
+# PostGIS Adapter
 #
 # http://github.com/nofxx/postgis_adapter
 #
@@ -14,23 +13,18 @@ module PostgisFunctions
     # acts_as_geom :geom
     def acts_as_geom(*columns)
       cattr_accessor :postgis_geoms
-      geoms = columns.map do |g|
-        geom_type = get_geom_type(g)
-        case geom_type
-        when :point
-          send :include, PointFunctions
-        when :polygon
-          send :include, PolygonFunctions
-        when :line_string
-          send :include, LineStringFunctions
+      self.postgis_geoms = {:columns => columns}
+      columns.map do |g|
+        case get_geom_type(g)
+        when :point then send :include, PointFunctions
+        when :polygon then send :include, PolygonFunctions
+        when :line_string then send :include, LineStringFunctions
         end
-        g
       end
-      self.postgis_geoms = {:columns => geoms}#, :opts => options}
     end
 
     def get_geom_type(column)
-      self.columns.select { |c| c.name == column.to_s}.first.geometry_type
+      self.columns.select { |c| c.name == column.to_s }[0].geometry_type
     rescue ActiveRecord::StatementInvalid => e
       nil
     end

data/spec/db/schema_postgis.rb

@@ -1,4 +1,3 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 #add some postgis specific tables
 ActiveRecord::Schema.define() do
@@ -62,25 +61,25 @@ ActiveRecord::Schema.define() do
     t.polygon "geom", :with_m => true, :with_z => true, :srid => 4326
   end
 
-  create_table :cities do |t|
+  create_table :cities, :force => true do |t|
     t.string :data, :limit => 100
     t.integer :value
     t.polygon  :geom,:null=>false,:srid=>4326
   end
 
-  create_table :positions do |t|
+  create_table :positions, :force => true do |t|
     t.string :data, :limit => 100
     t.integer :value
     t.point  :geom,:null=>false,:srid=>4326
   end
 
-  create_table :streets do |t|
+  create_table :streets, :force => true do |t|
     t.string :data, :limit => 100
     t.integer :value
     t.line_string  :geom,:null=>false,:srid=>4326
   end
 
-  create_table :common_geos do |t|
+  create_table :common_geos, :force => true do |t|
     t.string :data, :limit => 100
     t.integer :value
     t.point  :geom,:null=>false,:srid=>4326

data/spec/postgis_adapter/acts_as_geom_spec.rb

@@ -6,7 +6,7 @@ describe "ActsAsGeom" do
     class DiffColumn < ActiveRecord::Base
       acts_as_geom :ponto
     end
-    
+
     class NotInDb < ActiveRecord::Base
       acts_as_geom :geom
     end
@@ -20,6 +20,10 @@ describe "ActsAsGeom" do
     NotInDb.get_geom_type(:geom).should be_nil
   end
 
+  it "should set the geom constant" do
+#    City::GEOMS[City].should eql([:geom])
+  end
+
   it "should query a diff column name" do
    # DiffColumn
   end

data/spec/postgis_adapter/common_spatial_adapter_spec.rb

@@ -13,7 +13,7 @@ describe "CommonSpatialAdapter" do
         create_table "parks", :force => true do |t|
           t.string "data",  :limit => 100
           t.integer "value"
-          t.polygon "geom", :null=>false, :srid => 555 , :with_z => true,:with_m => true
+          t.polygon "geom", :null=>false, :srid => 4326 , :with_z => true,:with_m => true
         end
       end
     end
@@ -29,7 +29,7 @@ describe "CommonSpatialAdapter" do
           col.geometry_type.should eql(:polygon)
           col.type.should eql(:geometry)
           col.null.should be_false
-          col.srid.should eql(555)
+          col.srid.should eql(4326)
           col.with_z.should be_true
           col.with_m.should be_true
         end
@@ -125,7 +125,7 @@ describe "CommonSpatialAdapter" do
         t.string "data", :limit => 100
         t.integer "value"
         #location is a postgreSQL keyword and is surrounded by double-quotes ("") when appearing in constraint descriptions ; tests a bug corrected in version 39
-        t.point "location", :null=>false,:srid => 0, :with_m => true, :with_z => true
+        t.point "location", :null=>false,:srid => -1, :with_m => true, :with_z => true
       end
     end
 
@@ -190,7 +190,7 @@ describe "CommonSpatialAdapter" do
         create_table "parks", :force => true do |t|
           t.string "data" , :limit => 100
           t.integer "value"
-          t.multi_polygon "geom", :null=>false,:srid => 0, :with_m => true, :with_z => true
+          t.multi_polygon "geom", :null=>false,:srid => -1, :with_m => true, :with_z => true
         end
       add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"
       end
@@ -217,7 +217,7 @@ describe "CommonSpatialAdapter" do
             col.geometry_type.should eql(:multi_polygon)
             col.type.should eql(:geometry)
             col.null.should be_false
-            col.srid.should eql(0)
+            col.srid.should eql(-1)
             col.with_z.should be_true
             col.with_m.should be_true
           end

data/spec/spec_helper.rb

@@ -8,8 +8,9 @@ gem 'activerecord', "=2.3.2"
 
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'postgis_adapter'
-
+GeoRuby::Base.srid = -1
 config = YAML.load_file(File.dirname(__FILE__) + '/db/database_postgis.yml')
 # ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config)
+#require File.dirname(__FILE__) + '/db/schema_postgis.rb'
 require File.dirname(__FILE__) + '/db/models_postgis.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Marcos Augusto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 -07:00
+date: 2009-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -76,11 +76,11 @@ summary: PostGIS Adapter for Active Record
 test_files: 
 - spec/db/models_postgis.rb
 - spec/db/schema_postgis.rb
+- spec/postgis_functions/class_spec.rb
+- spec/postgis_functions/bbox_spec.rb
+- spec/postgis_functions/common_spec.rb
+- spec/postgis_functions_spec.rb
+- spec/postgis_adapter_spec.rb
 - spec/postgis_adapter/acts_as_geom_spec.rb
 - spec/postgis_adapter/common_spatial_adapter_spec.rb
-- spec/postgis_functions_spec.rb
 - spec/spec_helper.rb
-- spec/postgis_adapter_spec.rb
-- spec/postgis_functions/class_spec.rb
-- spec/postgis_functions/common_spec.rb
-- spec/postgis_functions/bbox_spec.rb