rgeo 0.3.5 → 0.3.6

data/test/common/geometry_collection_tests.rb

@@ -245,6 +245,31 @@ module RGeo
         end
 
 
+        def test_each_block
+          geom1_ = @factory.collection([@point1, @line1])
+          i_ = 0
+          geom1_.each do |g_|
+            if i_ == 0
+              assert_equal(@point1, g_)
+            else
+              assert_equal(@line1, g_)
+            end
+            i_ += 1
+          end
+        end
+
+
+        def test_each_enumerator
+          geom1_ = @factory.collection([@point1, @line1])
+          enum_ = geom1_.each
+          assert_equal(@point1, enum_.next)
+          assert_equal(@line1, enum_.next)
+          assert_raise(::StopIteration) do
+            enum_.next
+          end
+        end
+
+
       end
 
     end

data/test/coord_sys/tc_active_record_table.rb

@@ -62,11 +62,10 @@ module RGeo
 
             class TestPostGIS < ::Test::Unit::TestCase  # :nodoc:
 
-              class ARBase < ::ActiveRecord::Base
-                establish_connection(PostGIS_CONFIG)
-              end
-
-              @@db = ::RGeo::CoordSys::SRSDatabase::ActiveRecordTable.new(:ar_base_class => ARBase, :auth_name_column => 'auth_name', :auth_srid_column => 'auth_srid', :srtext_column => 'srtext', :proj4text_column => 'proj4text')
+              @@db = ::RGeo::CoordSys::SRSDatabase::ActiveRecordTable.new(
+                :database_config => PostGIS_CONFIG,
+                :auth_name_column => 'auth_name', :auth_srid_column => 'auth_srid',
+                :srtext_column => 'srtext', :proj4text_column => 'proj4text')
 
 
               def test_4326

data/test/coord_sys/tc_ogc_cs.rb

@@ -371,7 +371,6 @@ module RGeo
 
         if ::RGeo.yaml_supported?
 
-
           def test_yaml_roundtrip
             input_ = 'COMPD_CS["OSGB36 / British National Grid + ODN",PROJCS["OSGB 1936 / British National Grid",GEOGCS["OSGB 1936",DATUM["OSGB 1936",SPHEROID["Airy 1830",6377563.396,299.3249646,AUTHORITY["EPSG","7001"]],TOWGS84[446.448,-125.157,542.06,0.15,0.247,0.842,-4.2261596151967575],AUTHORITY["EPSG","6277"]],PRIMEM["Greenwich",0.0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.017453292519943295],AXIS["Geodetic latitude",NORTH],AXIS["Geodetic longitude",EAST],AUTHORITY["EPSG","4277"]],PROJECTION["Transverse Mercator",AUTHORITY["EPSG","9807"]],PARAMETER["central_meridian",-2.0],PARAMETER["latitude_of_origin",49.0],PARAMETER["scale_factor",0.9996012717],PARAMETER["false_easting",400000.0],PARAMETER["false_northing",-100000.0],UNIT["m",1.0],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","27700"]],VERT_CS["Newlyn",VERT_DATUM["Ordnance Datum Newlyn",2005,AUTHORITY["EPSG","5101"]],UNIT["m",1.0],AXIS["Gravity-related height",UP],AUTHORITY["EPSG","5701"]],AUTHORITY["EPSG","7405"]]'
             obj1_ = ::RGeo::CoordSys::CS.create_from_wkt(input_)
@@ -380,11 +379,6 @@ module RGeo
             assert_equal(obj1_, obj2_)
           end
 
-
-        else
-
-          puts "WARNING: Psych not installed. Skipping YAML tests."
-
         end
 
 

data/test/coord_sys/tc_proj4.rb

@@ -170,7 +170,6 @@ module RGeo
 
         if ::RGeo.yaml_supported?
 
-
           def test_yaml_roundtrip
             obj1_ = ::RGeo::CoordSys::Proj4.create('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')
             dump_ = ::Psych.dump(obj1_)
@@ -178,11 +177,6 @@ module RGeo
             assert_equal(obj1_, obj2_)
           end
 
-
-        else
-
-          puts "WARNING: Psych not installed. Skipping YAML tests."
-
         end
 
 
@@ -191,3 +185,7 @@ module RGeo
     end
   end
 end if ::RGeo::CoordSys::Proj4.supported?
+
+unless ::RGeo::CoordSys::Proj4.supported?
+  puts "WARNING: Proj4 support not available. Related tests skipped."
+end

data/test/geos_capi/tc_factory.rb

@@ -37,6 +37,8 @@
 require 'test/unit'
 require 'rgeo'
 
+require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+
 
 module RGeo
   module Tests  # :nodoc:
@@ -46,42 +48,12 @@ module RGeo
 
 
         def setup
-          @factory = ::RGeo::Geos.factory(:srid => 4326)
-        end
-
-
-        def test_srid_preserved_through_factory
-          geom_ = @factory.point(-10, 20)
-          assert_equal(4326, geom_.srid)
-          factory_ = geom_.factory
-          assert_equal(4326, factory_.srid)
-          geom2_ = factory_.point(-20, 25)
-          assert_equal(4326, geom2_.srid)
+          @factory = ::RGeo::Geos.factory(:srid => 1000)
+          @srid = 1000
         end
 
 
-        def test_srid_preserved_through_geom_operations
-          geom1_ = @factory.point(-10, 20)
-          geom2_ = @factory.point(-20, 25)
-          geom3_ = geom1_.union(geom2_)
-          assert_equal(4326, geom3_.srid)
-          assert_equal(4326, geom3_.geometry_n(0).srid)
-          assert_equal(4326, geom3_.geometry_n(1).srid)
-        end
-
-
-        def test_srid_preserved_through_geom_functions
-          geom1_ = @factory.point(-10, 20)
-          geom2_ = geom1_.boundary
-          assert_equal(4326, geom2_.srid)
-        end
-
-
-        def test_srid_preserved_through_dup
-          geom1_ = @factory.point(-10, 20)
-          geom2_ = geom1_.clone
-          assert_equal(4326, geom2_.srid)
-        end
+        include ::RGeo::Tests::Common::FactoryTests
 
 
       end

data/test/geos_capi/tc_zmfactory.rb

@@ -37,6 +37,8 @@
 require 'test/unit'
 require 'rgeo'
 
+require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+
 
 module RGeo
   module Tests  # :nodoc:
@@ -47,9 +49,13 @@ module RGeo
 
         def setup
           @factory = ::RGeo::Geos.factory(:has_z_coordinate => true, :has_m_coordinate => true, :srid => 1000, :buffer_resolution => 2)
+          @srid = 1000
         end
 
 
+        include ::RGeo::Tests::Common::FactoryTests
+
+
         def test_factory_parts
           assert_equal(1000, @factory.srid)
           assert_equal(1000, @factory.z_factory.srid)

data/test/geos_ffi/tc_factory.rb

@@ -37,6 +37,8 @@
 require 'test/unit'
 require 'rgeo'
 
+require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+
 
 module RGeo
   module Tests  # :nodoc:
@@ -46,42 +48,12 @@ module RGeo
 
 
         def setup
-          @factory = ::RGeo::Geos.factory(:srid => 4326, :native_interface => :ffi)
-        end
-
-
-        def test_srid_preserved_through_factory
-          geom_ = @factory.point(-10, 20)
-          assert_equal(4326, geom_.srid)
-          factory_ = geom_.factory
-          assert_equal(4326, factory_.srid)
-          geom2_ = factory_.point(-20, 25)
-          assert_equal(4326, geom2_.srid)
+          @factory = ::RGeo::Geos.factory(:srid => 1000, :native_interface => :ffi)
+          @srid = 1000
         end
 
 
-        def test_srid_preserved_through_geom_operations
-          geom1_ = @factory.point(-10, 20)
-          geom2_ = @factory.point(-20, 25)
-          geom3_ = geom1_.union(geom2_)
-          assert_equal(4326, geom3_.srid)
-          assert_equal(4326, geom3_.geometry_n(0).srid)
-          assert_equal(4326, geom3_.geometry_n(1).srid)
-        end
-
-
-        def test_srid_preserved_through_geom_functions
-          geom1_ = @factory.point(-10, 20)
-          geom2_ = geom1_.boundary
-          assert_equal(4326, geom2_.srid)
-        end
-
-
-        def test_srid_preserved_through_dup
-          geom1_ = @factory.point(-10, 20)
-          geom2_ = geom1_.clone
-          assert_equal(4326, geom2_.srid)
-        end
+        include ::RGeo::Tests::Common::FactoryTests
 
 
       end

data/test/geos_ffi/tc_zmfactory.rb

@@ -37,6 +37,8 @@
 require 'test/unit'
 require 'rgeo'
 
+require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+
 
 module RGeo
   module Tests  # :nodoc:
@@ -48,9 +50,13 @@ module RGeo
         def setup
           @factory = ::RGeo::Geos.factory(:has_z_coordinate => true, :has_m_coordinate => true,
             :srid => 1000, :buffer_resolution => 2, :native_interface => :ffi)
+          @srid = 1000
         end
 
 
+        include ::RGeo::Tests::Common::FactoryTests
+
+
         def test_factory_parts
           assert_equal(1000, @factory.srid)
           assert_equal(1000, @factory.z_factory.srid)

data/test/projected_geographic/tc_factory.rb

@@ -0,0 +1,63 @@
+# -----------------------------------------------------------------------------
+#
+# Tests for the GEOS factory
+#
+# -----------------------------------------------------------------------------
+# 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,
+#   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 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module ProjectedGeographic  # :nodoc:
+
+      class TestFactory < ::Test::Unit::TestCase  # :nodoc:
+
+
+        def setup
+          @factory = ::RGeo::Geographic.projected_factory(:projection_proj4 => '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', :projection_srid => 3857)
+          @srid = 4326
+        end
+
+
+        include ::RGeo::Tests::Common::FactoryTests
+
+
+      end
+
+    end
+  end
+end if ::RGeo::CoordSys::Proj4.supported?

data/test/simple_cartesian/tc_factory.rb

@@ -0,0 +1,66 @@
+# -----------------------------------------------------------------------------
+#
+# Tests for the GEOS factory
+#
+# -----------------------------------------------------------------------------
+# 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,
+#   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 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module SimpleCartesian  # :nodoc:
+
+      class TestFactory < ::Test::Unit::TestCase  # :nodoc:
+
+
+        def setup
+          @factory = ::RGeo::Cartesian.simple_factory(:srid => 1000)
+          @srid = 1000
+        end
+
+
+        include ::RGeo::Tests::Common::FactoryTests
+
+
+        undef_method :test_srid_preserved_through_geom_operations
+
+
+      end
+
+    end
+  end
+end

data/test/simple_mercator/tc_factory.rb

@@ -0,0 +1,63 @@
+# -----------------------------------------------------------------------------
+#
+# Tests for the GEOS factory
+#
+# -----------------------------------------------------------------------------
+# 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,
+#   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 'test/unit'
+require 'rgeo'
+
+require ::File.expand_path('../common/factory_tests.rb', ::File.dirname(__FILE__))
+
+
+module RGeo
+  module Tests  # :nodoc:
+    module SimpleMercator  # :nodoc:
+
+      class TestFactory < ::Test::Unit::TestCase  # :nodoc:
+
+
+        def setup
+          @factory = ::RGeo::Geographic.simple_mercator_factory
+          @srid = 4326
+        end
+
+
+        include ::RGeo::Tests::Common::FactoryTests
+
+
+      end
+
+    end
+  end
+end