rgeo-activerecord 0.4.6 → 0.5.0.beta1

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.5.0.beta1 / 2013-02-04
+
+* Updates for compatibility with Rails 4 and support of Rails 4 oriented adapters.
+* Testing tool is better factored to allow customization of cleanup
+
 === 0.4.6 / 2012-12-11
 
 * You can now provide both a default and an override database config file in the test helper.

data/README.rdoc

@@ -27,6 +27,9 @@ RGeo::ActiveRecord has the following requirements:
   Should be compatible with Rails versions through 3.2.x.
 * arel 2.0.6 or later. Earlier versions will not work.
 
+This version of rgeo-activerecord also includes experimental support for
+the (unreleased as of this writing) version 4.0 of Rails.
+
 Generally, \ActiveRecord adapters which depend on this module should be
 installed as gems, and they will install this module automatically as
 a dependency. However, you can also install it manually as a gem:
@@ -37,17 +40,6 @@ a dependency. However, you can also install it manually as a gem:
 See the README for the "rgeo" gem, a required dependency, for further
 installation information.
 
-=== To-do list
-
-We consider this gem to be in a late alpha state. There are a still a
-few holes in the intended functionality, but it is now being tested in a
-variety of contexts, and we know of several successful production
-deployments.
-
-We are also currently working on a mechanism for constructing complex
-spatial queries via extensions to Arel. This work is in the experimental
-stage.
-
 === Development and support
 
 Documentation is available at http://dazuma.github.com/rgeo-activerecord/rdoc
@@ -70,7 +62,7 @@ Development is supported by Pirq. (http://pirq.com).
 
 === License
 
-Copyright 2010-2012 Daniel Azuma
+Copyright 2010-2013 Daniel Azuma
 
 All rights reserved.
 

data/Version

@@ -1 +1 @@
-0.4.6
+0.5.0.beta1

data/lib/rgeo/active_record/adapter_test_helper.rb

@@ -67,7 +67,7 @@ module RGeo
         database_config_ = ::YAML.load_file(klass_.const_get(:OVERRIDE_DATABASE_CONFIG_PATH)) rescue nil
         database_config_ ||= ::YAML.load_file(klass_.const_get(:DATABASE_CONFIG_PATH)) rescue nil
         if database_config_
-          database_config_.symbolize_keys!
+          database_config_.stringify_keys!
           if klass_.respond_to?(:before_open_database)
             klass_.before_open_database(:config => database_config_)
           end
@@ -112,6 +112,7 @@ module RGeo
         @factory = ::RGeo::Cartesian.preferred_factory(:srid => 3785)
         @geographic_factory = ::RGeo::Geographic.spherical_factory(:srid => 4326)
         cleanup_tables
+        cleanup_caches
       end
 
 
@@ -119,6 +120,7 @@ module RGeo
 
       def teardown
         cleanup_tables
+        cleanup_caches
       end
 
 
@@ -132,21 +134,30 @@ module RGeo
         if klass_.connection.tables.include?('spatial_test')
           klass_.connection.drop_table(:spatial_test)
         end
+      end
+
+
+      # Utility method that cleans up any schema info that was cached by
+      # ActiveRecord during a test. Normally called automatically at setup
+      # and teardown. If you override those methods, you'll need to call
+      # this from your method.
+
+      def cleanup_caches
+        klass_ = self.class.const_get(:DEFAULT_AR_CLASS)
         # Clear any RGeo factory settings.
         klass_.connection_pool.rgeo_factory_settings.clear!
         # Clear out any ActiveRecord caches that are present.
-        # Different 3.x versions use different types of caches.
-        if klass_.connection_pool.respond_to?(:clear_cache!)
-          if klass_.connection.respond_to?(:schema_cache)
-            # 3.2.x
-            klass_.connection_pool.with_connection do |c_|
-              c_.schema_cache.clear!
-            end
-          else
-            # 3.1.x
-            klass_.connection_pool.clear_cache!
+        # Different Rails versions use different types of caches.
+        klass_.connection_pool.with_connection do |c_|
+          if c_.respond_to?(:schema_cache)
+            # 3.2.x and 4.0.x
+            c_.schema_cache.clear!
           end
         end
+        if klass_.connection_pool.respond_to?(:clear_cache!)
+          # 3.1.x
+          klass_.connection_pool.clear_cache!
+        end
         if klass_.connection.respond_to?(:clear_cache!)
           # 3.1 and above
           klass_.connection.clear_cache!

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -65,7 +65,8 @@ module RGeo
 
     # Index definition struct with a spatial flag field.
 
-    class SpatialIndexDefinition < ::Struct.new(:table, :name, :unique, :columns, :lengths, :spatial)
+    class SpatialIndexDefinition < ::ActiveRecord::ConnectionAdapters::IndexDefinition
+      attr_accessor :spatial
     end
 
 
@@ -92,7 +93,9 @@ module RGeo
     # Provide methods for each geometric subtype during table definitions.
 
     ::ActiveRecord::ConnectionAdapters::TableDefinition.class_eval do
+
       alias_method :method_missing_without_rgeo_modification, :method_missing
+
       def method_missing(method_name_, *args_, &block_)
         if @base.respond_to?(:spatial_column_constructor) && (info_ = @base.spatial_column_constructor(method_name_))
           info_ = info_.dup
@@ -105,13 +108,16 @@ module RGeo
           method_missing_without_rgeo_modification(method_name_, *args_, &block_)
         end
       end
+
     end
 
 
     # Provide methods for each geometric subtype during table changes.
 
     ::ActiveRecord::ConnectionAdapters::Table.class_eval do
+
       alias_method :method_missing_without_rgeo_modification, :method_missing
+
       def method_missing(method_name_, *args_, &block_)
         if @base.respond_to?(:spatial_column_constructor) && (info_ = @base.spatial_column_constructor(method_name_))
           info_ = info_.dup
@@ -124,14 +130,18 @@ module RGeo
           method_missing_without_rgeo_modification(method_name_, *args_, &block_)
         end
       end
+
     end
 
 
     # Hack schema dumper to output spatial index flag
 
     ::ActiveRecord::SchemaDumper.class_eval do
+
       private
+
       alias_method :_old_indexes_method, :indexes
+
       def indexes(table_, stream_)
         if (indexes_ = @connection.indexes(table_)).any?
           add_index_statements_ = indexes_.map do |index_|
@@ -150,6 +160,7 @@ module RGeo
           stream_.puts
         end
       end
+
     end
 
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.6
-  prerelease: 
+  version: 0.5.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -59,6 +59,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.6
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RGeo is a geospatial data library for Ruby. RGeo::ActiveRecord is an
   optional RGeo module providing some spatial extensions to ActiveRecord, as well
   as common tools used by RGeo-based spatial adapters.
@@ -103,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An RGeo module providing spatial extensions to ActiveRecord.