activerecord-postgis-adapter 0.3.3 → 0.3.4

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.3.4 / 2011-04-11
+
+* A .gemspec file is now available for gem building and bundler git integration.
+
 === 0.3.3 / 2011-02-28
 
 * INCOMPATIBLE CHANGE: the default SRID for non-geography columns is now -1, rather than 4326. (Geography columns still default to 4326.)

data/README.rdoc

@@ -114,8 +114,8 @@ This adapter has the following requirements:
 * PostGIS 1.5 or later.
 * pg gem 0.10 or later.
 * \ActiveRecord 3.0.3 or later. Earlier versions will not work.
-* rgeo gem 0.2.4 or later.
-* rgeo-activerecord gem 0.3.1 or later.
+* rgeo gem 0.2.8 or later.
+* rgeo-activerecord gem 0.3.3 or later.
 
 Install this adapter as a gem:
 
@@ -276,7 +276,7 @@ source gave us a head start on the implementation.
 
 === License
 
-Copyright 2010 Daniel Azuma
+Copyright 2010-2011 Daniel Azuma
 
 All rights reserved.
 

data/Version

@@ -1 +1 @@
-0.3.3
+0.3.4

metadata

@@ -2,7 +2,7 @@
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
-default_executable: 
+date: 2011-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rgeo-activerecord
@@ -21,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.3.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -53,14 +52,12 @@ files:
 - lib/active_record/connection_adapters/postgis_adapter/version.rb
 - lib/active_record/connection_adapters/postgis_adapter.rb
 - lib/rgeo/active_record/postgis_adapter/railtie.rb
-- lib/active_record/connection_adapters/postgis_adapter/databases.rake
-- History.rdoc
-- README.rdoc
 - test/tc_basic.rb
 - test/tc_ddl.rb
 - test/tc_spatial_queries.rb
+- History.rdoc
+- README.rdoc
 - Version
-has_rdoc: true
 homepage: http://virtuoso.rubyforge.org/activerecord-postgis-adapter
 licenses: []
 
@@ -78,13 +75,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: virtuoso
-rubygems_version: 1.5.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord adapter for PostGIS, based on RGeo.

data/lib/active_record/connection_adapters/postgis_adapter/databases.rake

@@ -1,147 +0,0 @@
-# -----------------------------------------------------------------------------
-# 
-# Rakefile changes for PostGIS adapter
-# 
-# -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
-require 'rgeo/active_record/task_hacker'
-
-
-class Object
-  alias_method :create_database_without_postgis, :create_database
-  alias_method :drop_database_without_postgis, :drop_database
-end
-
-
-def create_database(config_)
-  if config_['adapter'] == 'postgis'
-    @encoding = config_['encoding'] || ::ENV['CHARSET'] || 'utf8'
-    begin
-      has_su_ = config_.include?('su_username')            # Is there a distinct superuser?
-      username_ = config_['username']                      # regular user name
-      su_username_ = config_['su_username'] || username_   # superuser name
-      su_password_ = config_['su_password'] || config_['password']  # superuser password
-      
-      # Create the database. Optionally do so as the given superuser.
-      # But make sure the database is owned by the regular user.
-      ::ActiveRecord::Base.establish_connection(config_.merge('database' => 'postgres', 'schema_search_path' => 'public', 'username' => su_username_, 'password' => su_password_))
-      extra_configs_ = {'encoding' => @encoding}
-      extra_configs_['owner'] = username_ if has_su_
-      ::ActiveRecord::Base.connection.create_database(config_['database'], config_.merge(extra_configs_))
-      
-      # Initial setup of the database: Add schemas from the search path.
-      # If a superuser is given, we log in as the superuser, but we make sure
-      # the schemas are owned by the regular user.
-      ::ActiveRecord::Base.establish_connection(config_.merge('schema_search_path' => 'public', 'username' => su_username_, 'password' => su_password_))
-      conn_ = ::ActiveRecord::Base.connection
-      search_path_ = config_["schema_search_path"].to_s.strip
-      search_path_ = search_path_.split(",").map{ |sp_| sp_.strip }
-      auth_ = has_su_ ? " AUTHORIZATION #{username_}" : ''
-      search_path_.each do |schema_|
-        conn_.execute("CREATE SCHEMA #{schema_}#{auth_}") unless schema_.downcase == 'public'
-      end
-      
-      # Define the postgis stuff, if the script_dir is provided.
-      # Note: a superuser is required to run the postgis definitions.
-      # If a separate superuser is provided, we need to grant privileges on
-      # the postgis definitions over to the regular user afterwards.
-      # The schema for the postgis definitions is chosen as follows:
-      # If "postgis" is present in the search path, use it.
-      # Otherwise, use the last schema in the search path.
-      # If no search path is given, use "public".
-      if (script_dir_ = config_['script_dir'])
-        postgis_schema_ = search_path_.include?('postgis') ? 'postgis' : (search_path_.last || 'public')
-        conn_.execute("SET search_path TO #{postgis_schema_}")
-        conn_.execute(::File.read(::File.expand_path('postgis.sql', script_dir_)))
-        conn_.execute(::File.read(::File.expand_path('spatial_ref_sys.sql', script_dir_)))
-        if has_su_
-          conn_.execute("GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA #{postgis_schema_} TO #{username_}")
-          conn_.execute("GRANT ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA #{postgis_schema_} TO #{username_}")
-        end
-      end
-      
-      # Done
-      ::ActiveRecord::Base.establish_connection(config_)
-    rescue ::Exception => e_
-      $stderr.puts(e_, *(e_.backtrace))
-      $stderr.puts("Couldn't create database for #{config_.inspect}")
-    end
-  else
-    create_database_without_postgis(config_)
-  end
-end
-
-
-def drop_database(config_)
-  if config_['adapter'] == 'postgis'
-    ::ActiveRecord::Base.establish_connection(config_.merge('database' => 'postgres', 'schema_search_path' => 'public', 'username' => config_['su_username'] || config_['username'], 'password' => config_['su_password'] || config_['password']))
-    ::ActiveRecord::Base.connection.drop_database(config_['database'])
-  else
-    drop_database_without_postgis(config_)
-  end
-end
-
-
-::RGeo::ActiveRecord::TaskHacker.modify('db:charset', nil, 'postgis') do |config_|
-  ::ActiveRecord::Base.establish_connection(config_)
-  puts(::ActiveRecord::Base.connection.encoding)
-end
-
-
-::RGeo::ActiveRecord::TaskHacker.modify('db:structure:dump', nil, 'postgis') do |config_|
-  ::ENV['PGHOST'] = config_["host"] if config_["host"]
-  ::ENV['PGPORT'] = config_["port"].to_s if config_["port"]
-  ::ENV['PGPASSWORD'] = config_["password"].to_s if config_["password"]
-  search_path_ = config_["schema_search_path"].to_s.strip
-  search_path_ = search_path_.split(",").map{ |sp_| sp_.strip }
-  search_path_.delete('postgis')
-  search_path_ = ['public'] if search_path_.length == 0
-  search_path_ = search_path_.map{ |sp_| "--schema=#{sp_}" }.join(" ")
-  `pg_dump -i -U "#{config_["username"]}" -s -x -O -f db/#{::Rails.env}_structure.sql #{search_path_} #{config_["database"]}`
-  raise "Error dumping database" if $?.exitstatus == 1
-end
-
-
-::RGeo::ActiveRecord::TaskHacker.modify('db:test:clone_structure', 'test', 'postgis') do |config_|
-  ::ENV['PGHOST'] = config_["host"] if config_["host"]
-  ::ENV['PGPORT'] = config_["port"].to_s if config_["port"]
-  ::ENV['PGPASSWORD'] = config_["password"].to_s if config_["password"]
-  `psql -U "#{config_["username"]}" -f #{::Rails.root}/db/#{::Rails.env}_structure.sql #{config_["database"]}`
-end
-
-
-::RGeo::ActiveRecord::TaskHacker.modify('db:test:purge', 'test', 'postgis') do |config_|
-  ::ActiveRecord::Base.clear_active_connections!
-  drop_database(config_)
-  create_database(config_)
-end