rgeo-activerecord 0.4.1 → 0.4.2

data/lib/rgeo/active_record/version.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Version of rgeo-activerecord
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -41,16 +41,16 @@ end
 
 
 module RGeo
-  
+
   module ActiveRecord
-    
+
     # Current version of RGeo::ActiveRecord as a frozen string
     VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../Version').strip.freeze
-    
+
     # Current version of RGeo::ActiveRecord as a Versionomy object, if the
     # Versionomy gem is available; otherwise equal to VERSION_STRING.
     VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING) : VERSION_STRING
-    
+
   end
-  
+
 end

data/test/tc_basic.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for basic ActiveRecord extensions
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -41,66 +41,70 @@ require 'rgeo/active_record'
 module RGeo
   module ActiveRecord
     module Tests  # :nodoc:
-      
+
       class TestBasic < ::Test::Unit::TestCase  # :nodoc:
-        
-        
+
+
+        class MyTable < ::ActiveRecord::Base
+        end
+
+
         def test_has_version
           assert_not_nil(::RGeo::ActiveRecord::VERSION)
         end
-        
-        
+
+
         def test_default_factory_generator
-          ::ActiveRecord::Base.rgeo_factory_generator = nil
-          factory_ = ::ActiveRecord::Base.rgeo_factory_for_column(:hello).call(:has_z_coordinate => true, :srid => 4326)
+          MyTable.rgeo_factory_generator = nil
+          factory_ = MyTable.rgeo_factory_for_column(:hello).call(:has_z_coordinate => true, :srid => 4326)
           assert_equal(true, factory_.property(:has_z_coordinate))
           assert_equal(true, factory_.property(:is_cartesian))
           assert_nil(factory_.property(:is_geographic))
           assert_equal(4326, factory_.srid)
         end
-        
-        
+
+
         def test_set_factory_generator
-          ::ActiveRecord::Base.rgeo_factory_generator = ::RGeo::Geographic.method(:spherical_factory)
-          factory_ = ::ActiveRecord::Base.rgeo_factory_for_column(:hello, :has_z_coordinate => true, :srid => 4326)
+          MyTable.rgeo_factory_generator = ::RGeo::Geographic.method(:spherical_factory)
+          factory_ = MyTable.rgeo_factory_for_column(:hello, :has_z_coordinate => true, :srid => 4326)
           assert_equal(true, factory_.property(:has_z_coordinate))
           assert_equal(true, factory_.property(:is_geographic))
           assert_nil(factory_.property(:is_cartesian))
           assert_equal(false, factory_.has_projection?)
           assert_equal(4326, factory_.srid)
         end
-        
-        
+
+
         def test_specific_factory_for_column
-          ::ActiveRecord::Base.rgeo_factory_generator = nil
-          ::ActiveRecord::Base.set_rgeo_factory_for_column(:foo, ::RGeo::Geographic.simple_mercator_factory(:has_z_coordinate => true))
-          factory_ = ::ActiveRecord::Base.rgeo_factory_for_column(:foo)
+          MyTable.rgeo_factory_generator = nil
+          MyTable.set_rgeo_factory_for_column(:foo, ::RGeo::Geographic.simple_mercator_factory(:has_z_coordinate => true))
+          factory_ = MyTable.rgeo_factory_for_column(:foo)
           assert_equal(true, factory_.property(:has_z_coordinate))
           assert_equal(true, factory_.property(:is_geographic))
           assert_nil(factory_.property(:is_cartesian))
           assert_equal(true, factory_.has_projection?)
           assert_equal(4326, factory_.srid)
         end
-        
-        
+
+
         def test_default_as_json_wkt
           GeometryMixin.set_json_generator(nil)
           factory_ = ::RGeo::Cartesian.preferred_factory
           p_ = factory_.point(1, 2)
           assert_equal("POINT (1.0 2.0)", p_.as_json)
         end
-        
-        
+
+
         def test_default_as_json_geojson
           GeometryMixin.set_json_generator(:geojson)
           factory_ = ::RGeo::Cartesian.preferred_factory
           p_ = factory_.point(1, 2)
           assert_equal({'type' => 'Point', 'coordinates' => [1.0, 2.0]}, p_.as_json)
         end
-        
-        
+
+
       end
-    
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &2160521800 !ruby/object:Gem::Requirement
+  requirement: &2164456360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160521800
+  version_requirements: *2164456360
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2160521000 !ruby/object:Gem::Requirement
+  requirement: &2164455600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160521000
+  version_requirements: *2164455600
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &2160520440 !ruby/object:Gem::Requirement
+  requirement: &2164455040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2160520440
+  version_requirements: *2164455040
 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.
@@ -63,6 +63,7 @@ files:
 - lib/rgeo/active_record/task_hacker.rb
 - lib/rgeo/active_record/version.rb
 - lib/rgeo/active_record.rb
+- lib/rgeo-activerecord.rb
 - test/tc_basic.rb
 - History.rdoc
 - README.rdoc
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.7
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: An RGeo module providing spatial extensions to ActiveRecord.