postgis_adapter 0.3.8 → 0.5.0

data/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+doc/*
+rdoc/*
+coverage/*
+spec/debug.log
+pkg/*
+*flymake.rb

data/MIT-LICENSE

@@ -0,0 +1,21 @@
+Spatial Adapter Copyright (c) 2006 Guilhem Vellut <guilhem.vellut+georuby@gmail.com>
+PostGis Adapter Functions (c) 2008 Marcos Piccinini <nofxx>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/nofxx/postgis_adapter"
     gem.authors = ["Marcos Augusto"]
     gem.rubyforge_project = "postgis_adapter"
+    gem.add_dependency 'geo_ruby'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
@@ -28,22 +29,15 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
-
-
 task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
+  config = YAML.load(File.read('VERSION.yml'))
+  version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "postgis_adapter #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/VERSION.yml

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

data/init.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + "/rails/init"

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/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_functions.rb

@@ -29,7 +29,7 @@ module PostgisFunctions
   private
 
   def get_column_name
-    @geo_column ||= postgis_geoms[:columns]
+    @geo_column ||= postgis_geoms[:columns][0]
   end
 
   #

data/postgis_adapter.gemspec

@@ -0,0 +1,82 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{postgis_adapter}
+  s.version = "0.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Marcos Augusto"]
+  s.date = %q{2009-05-20}
+  s.description = %q{Execute PostGIS functions on Active Record}
+  s.email = %q{x@nofxx.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "MIT-LICENSE",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "init.rb",
+     "install.rb",
+     "lib/postgis_adapter.rb",
+     "lib/postgis_adapter/acts_as_geom.rb",
+     "lib/postgis_adapter/common_spatial_adapter.rb",
+     "lib/postgis_functions.rb",
+     "lib/postgis_functions/bbox.rb",
+     "lib/postgis_functions/class.rb",
+     "lib/postgis_functions/common.rb",
+     "postgis_adapter.gemspec",
+     "rails/init.rb",
+     "script/console",
+     "script/destroy",
+     "script/generate",
+     "spec/db/database_postgis.yml",
+     "spec/db/models_postgis.rb",
+     "spec/db/schema_postgis.rb",
+     "spec/postgis_adapter/acts_as_geom_spec.rb",
+     "spec/postgis_adapter/common_spatial_adapter_spec.rb",
+     "spec/postgis_adapter_spec.rb",
+     "spec/postgis_functions/bbox_spec.rb",
+     "spec/postgis_functions/class_spec.rb",
+     "spec/postgis_functions/common_spec.rb",
+     "spec/postgis_functions_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "uninstall.rb"
+  ]
+  s.homepage = %q{http://github.com/nofxx/postgis_adapter}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{postgis_adapter}
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{PostGIS Adapter for Active Record}
+  s.test_files = [
+    "spec/postgis_functions_spec.rb",
+     "spec/postgis_functions/class_spec.rb",
+     "spec/postgis_functions/bbox_spec.rb",
+     "spec/postgis_functions/common_spec.rb",
+     "spec/db/models_postgis.rb",
+     "spec/db/schema_postgis.rb",
+     "spec/postgis_adapter_spec.rb",
+     "spec/postgis_adapter/common_spatial_adapter_spec.rb",
+     "spec/postgis_adapter/acts_as_geom_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<geo_ruby>, [">= 0"])
+    else
+      s.add_dependency(%q<geo_ruby>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<geo_ruby>, [">= 0"])
+  end
+end

data/script/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# File: script/console
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+libs =  " -r irb/completion"
+# Perhaps use a console_lib to store any extra methods I may want available in the cosole
+# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/postgis_adapter.rb'}"
+puts "Loading postgis_adapter gem"
+exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

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

@@ -1,19 +1,22 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
+class DiffColumn < ActiveRecord::Base
+  acts_as_geom :ponto
+end
+
+class NotInDb < ActiveRecord::Base
+  acts_as_geom :geom
+end
+
 describe "ActsAsGeom" do
 
-  before(:each) do
-    class DiffColumn < ActiveRecord::Base
-      acts_as_geom :ponto
-    end
-    
-    class NotInDb < ActiveRecord::Base
-      acts_as_geom :geom
-    end
+  it "should get the geom type" do
+    p City.connection.columns("cities").select { |c| c.name == "geom" }[0]
+    City.get_geom_type(:geom).should eql(:polygon)
   end
 
   it "should get the geom type" do
-    City.get_geom_type(:geom).should eql(:polygon)
+    Position.get_geom_type(:geom).should eql(:point)
   end
 
   it "should not interfere with migrations" do

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/postgis_adapter_spec.rb

@@ -127,17 +127,17 @@ describe "PostgisAdapter" do
   end
 
   describe "Find" do
-    before(:all) do
-      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,:srid=>4326
-        end
-        add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"
-      end
-      class Park < ActiveRecord::Base
+
+    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,:srid=>4326
       end
+      add_index "parks","geom",:spatial=>true,:name => "example_spatial_index"
+    end
+
+    class Park < ActiveRecord::Base
     end
 
     it "should create some points" do

data/spec/postgis_functions/class_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-describe "Class Functions" do
+describe "ClassMethods" do
   before(:all) do
     @c1 ||= City.create!(:data => "CityClass", :geom => Polygon.from_coordinates([[[12,45],[45,41],[4,1],[12,45]],[[2,5],[5,1],[14,1],[2,5]]],4326))
     @s1 ||= Street.create!(:data => "StreetClass", :geom => LineString.from_coordinates([[1,1],[99,88]],4326))
@@ -10,15 +10,15 @@ describe "Class Functions" do
   end
 
   it "should find the closest other point" do
-    Position.close_to(@p1.geom, :srid => 4326)[0].data.should == @p1.data
+    Position.close_to(Point.from_x_y(99,99,4326), :srid => 4326)[0].data.should == @p1.data
   end
 
   it "should find the closest other point and limit" do
-    Position.close_to(@p1.geom, :limit => 10).should have(10).positions
+    Position.close_to(Point.from_x_y(99,99,4326), :limit => 2).should have(2).positions
   end
 
   it "should find the closest other point" do
-    Position.closest_to(@p1.geom).data.should == @p1.data
+    Position.closest_to(Point.from_x_y(99,99,4326)).data.should == @p1.data
   end
 
   it "should sort by size" do
@@ -35,11 +35,11 @@ describe "Class Functions" do
   end
 
   it "should sort by linestring length" do
-    Street.by_length(:limit => 10).should have(10).streets
+    Street.by_length(:limit => 2).should have(2).streets
   end
 
   it "should find the longest" do
-    Street.longest.should be_instance_of(Street)
+    Street.longest.should == @s1
   end
 
   it "should find all dwithin one" do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'spec'
-require 'postgres'
+require 'pg'
 require 'activerecord'
 require 'rspec_spinner'
 
@@ -8,8 +8,9 @@ gem 'activerecord', "=2.3.2"
 
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'postgis_adapter'
-
+GeoRuby::SimpleFeatures.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: postgis_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.5.0
 platform: ruby
 authors: 
 - Marcos Augusto
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 -03:00
+date: 2009-05-20 00:00:00 -03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: geo_ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Execute PostGIS functions on Active Record
 email: x@nofxx.com
 executables: []
@@ -22,11 +31,15 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
+- MIT-LICENSE
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- init.rb
+- install.rb
 - lib/postgis_adapter.rb
 - lib/postgis_adapter/acts_as_geom.rb
 - lib/postgis_adapter/common_spatial_adapter.rb
@@ -34,7 +47,11 @@ files:
 - lib/postgis_functions/bbox.rb
 - lib/postgis_functions/class.rb
 - lib/postgis_functions/common.rb
+- postgis_adapter.gemspec
 - rails/init.rb
+- script/console
+- script/destroy
+- script/generate
 - spec/db/database_postgis.yml
 - spec/db/models_postgis.rb
 - spec/db/schema_postgis.rb
@@ -47,6 +64,7 @@ files:
 - spec/postgis_functions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- uninstall.rb
 has_rdoc: true
 homepage: http://github.com/nofxx/postgis_adapter
 licenses: []
@@ -71,18 +89,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: postgis_adapter
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: PostGIS Adapter for Active Record
 test_files: 
+- spec/postgis_functions_spec.rb
+- spec/postgis_functions/class_spec.rb
+- spec/postgis_functions/bbox_spec.rb
+- spec/postgis_functions/common_spec.rb
 - spec/db/models_postgis.rb
 - spec/db/schema_postgis.rb
-- spec/postgis_adapter/acts_as_geom_spec.rb
+- spec/postgis_adapter_spec.rb
 - spec/postgis_adapter/common_spatial_adapter_spec.rb
-- spec/postgis_functions_spec.rb
+- spec/postgis_adapter/acts_as_geom_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