activerecord-postgis-adapter 0.6.3 → 0.6.4

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 0.6.4 / 2013-05-28
+
+* Fixed a crash with array conversions in Rails 4. (Contributed by Christopher Bull)
+* The gis setup task was broken in any Rails other than 3.2.x. Fixed (I think). (Reports by Rupert de Guzman and slbug)
+* Raise a more useful exception for the (as yet) unsupported combination of Rails 4 and JRuby.
+
 === 0.6.3 / 2013-05-04
 
 * Several fixes for compatibility with changes to Rails 4.0.0 rc1. (Reports by slbug and Victor Costan)

data/README.rdoc

@@ -26,7 +26,7 @@ The adapter has the following requirements.
 * \ActiveRecord 3.0.3 or later. Earlier versions will not work. Rails 4.0 is supported on an experimental basis.
 * The rgeo and rgeo-activerecord gems are also required.
 
-As of this writing, the JDBC Postgres driver is not yet compatible with Rails 4, so the combination of JRuby/JDBC/Rails 4 is not yet supported. Similarly, Rubinius receives limited testing and support.
+As of this writing, the design of the JDBC Postgres driver for Rails 4 still appears to be in flux. Accordingly, I'm holding off on supporting Rails 4 on JRuby for now. Similarly, Rubinius receives limited testing and support.
 
 === Installation and Configuration
 

data/Version

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -74,6 +74,12 @@ when 3
   require 'active_record/connection_adapters/postgis_adapter/shared/setup.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails3/create_connection'
 when 4
+
+  # TEMP
+  if defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby'
+    raise "**** Sorry, activerecord-postgis-adapter does not yet support Rails 4 on JRuby ****"
+  end
+
   require 'active_record/connection_adapters/postgis_adapter/shared/version.rb'
   require 'active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails4/main_adapter.rb'

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

@@ -50,7 +50,14 @@ namespace :db do
   namespace :gis do
     desc "Setup PostGIS data in the database"
     task :setup => [:load_config, :rails_env] do
-      configs_for_environment.each { |config| setup_gis(config) }
+      if self.respond_to?(:configs_for_environment)
+        configs_ = configs_for_environment
+      else
+        environments_ = [::Rails.env]
+        environments_ << 'test' if ::Rails.env.development?
+        configs_ ::ActiveRecord::Base.configurations.values_at(*environments_).compact.reject{ |config_| config_['database'].blank? }
+      end
+      configs_.each { |config_| setup_gis(config_) }
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter/rails3/main_adapter.rb

@@ -63,6 +63,15 @@ module ActiveRecord  # :nodoc:
         end
 
 
+        def type_cast(value_, column_)
+          if ::RGeo::Feature::Geometry.check_type(value_)
+            ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)
+          else
+            super
+          end
+        end
+
+
         def columns(table_name_, name_=nil)
           # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           # We needed to return a spatial column subclass.

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

@@ -40,8 +40,11 @@
 namespace :db do
   namespace :gis do
     desc "Setup PostGIS data in the database"
-    task :setup => [:load_config, :rails_env] do
-      configs_for_environment.each do |config_|
+    task :setup => [:load_config] do
+      environments_ = [::Rails.env]
+      environments_ << 'test' if ::Rails.env.development?
+      configs_ ::ActiveRecord::Base.configurations.values_at(*environments_).compact.reject{ |config_| config_['database'].blank? }
+      configs_.each do |config_|
         ::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks.new(config_).setup_gis
       end
     end

data/lib/active_record/connection_adapters/postgis_adapter/rails4/main_adapter.rb

@@ -64,6 +64,15 @@ module ActiveRecord  # :nodoc:
         end
 
 
+        def type_cast(value_, column_, array_member_=false)
+          if ::RGeo::Feature::Geometry.check_type(value_)
+            ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)
+          else
+            super
+          end
+        end
+
+
         def columns(table_name_, name_=nil)
           # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           # We needed to return a spatial column subclass.

data/lib/active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb

@@ -103,15 +103,6 @@ module ActiveRecord  # :nodoc:
         end
 
 
-        def type_cast(value_, column_)
-          if ::RGeo::Feature::Geometry.check_type(value_)
-            ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)
-          else
-            super
-          end
-        end
-
-
       end
 
 

data/test/tc_basic.rb

@@ -110,7 +110,7 @@ module RGeo
               obj_.save!
               id_ = obj_.id
               obj2_ = klass_.find(id_)
-              assert_equal(@factory.point(1, 2), obj2_.latlon)
+              assert_equal(@factory.point(1.0, 2.0), obj2_.latlon)
               assert_equal(3785, obj2_.latlon.srid)
               assert_equal(true, ::RGeo::Geos.is_geos?(obj2_.latlon))
             end
@@ -123,7 +123,7 @@ module RGeo
               obj_.save!
               id_ = obj_.id
               obj2_ = klass_.find(id_)
-              assert_equal(@geographic_factory.point(1, 2), obj2_.latlon)
+              assert_equal(@geographic_factory.point(1.0, 2.0), obj2_.latlon)
               assert_equal(4326, obj2_.latlon.srid)
               assert_equal(false, ::RGeo::Geos.is_geos?(obj2_.latlon))
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord