rgeo 0.4.0 → 0.5.0

data/test/geos_capi/tc_line_string.rb

@@ -4,29 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/line_string_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/line_string_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestLineString < ::Test::Unit::TestCase  # :nodoc:
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestLineString < ::Test::Unit::TestCase # :nodoc:
+        include ::RGeo::Tests::Common::LineStringTests
 
         def setup
           @factory = ::RGeo::Geos.factory
         end
-
-
-        include ::RGeo::Tests::Common::LineStringTests
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/tc_misc.rb

@@ -4,65 +4,57 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
+require "test/unit"
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestMisc < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestMisc < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geos.factory(:srid => 4326)
+          @factory = ::RGeo::Geos.factory(srid: 4326)
         end
 
-
         def test_marshal_dump_with_geos
           @factory = ::RGeo::Geos.factory(
-            :srid => 4326,
-            :wkt_generator => :geos,
-            :wkb_generator => :geos,
-            :wkt_parser => :geos,
-            :wkb_parser => :geos
+            srid: 4326,
+            wkt_generator: :geos,
+            wkb_generator: :geos,
+            wkt_parser: :geos,
+            wkb_parser: :geos
           )
 
           dump = nil
           assert_nothing_raised { dump = @factory.marshal_dump }
-          assert_equal({}, dump['wktg'])
-          assert_equal({}, dump['wkbg'])
-          assert_equal({}, dump['wktp'])
-          assert_equal({}, dump['wkbp'])
+          assert_equal({}, dump["wktg"])
+          assert_equal({}, dump["wkbg"])
+          assert_equal({}, dump["wktp"])
+          assert_equal({}, dump["wkbp"])
         end
 
-
         def test_encode_with_geos
           @factory = ::RGeo::Geos.factory(
-            :srid => 4326,
-            :wkt_generator => :geos,
-            :wkb_generator => :geos,
-            :wkt_parser => :geos,
-            :wkb_parser => :geos
+            srid: 4326,
+            wkt_generator: :geos,
+            wkb_generator: :geos,
+            wkt_parser: :geos,
+            wkb_parser: :geos
           )
-          coder = Psych::Coder.new('test')
+          coder = Psych::Coder.new("test")
 
           assert_nothing_raised { @factory.encode_with(coder) }
-          assert_equal({}, coder['wkt_generator'])
-          assert_equal({}, coder['wkb_generator'])
-          assert_equal({}, coder['wkt_parser'])
-          assert_equal({}, coder['wkb_parser'])
+          assert_equal({}, coder["wkt_generator"])
+          assert_equal({}, coder["wkb_generator"])
+          assert_equal({}, coder["wkt_parser"])
+          assert_equal({}, coder["wkb_parser"])
         end
 
-
         def test_uninitialized
           geom_ = ::RGeo::Geos::CAPIGeometryImpl.new
           assert_equal(false, geom_.initialized?)
           assert_nil(geom_.geometry_type)
         end
 
-
         def test_empty_geometries_equal
           geom1_ = @factory.collection([])
           geom2_ = @factory.line_string([])
@@ -70,7 +62,6 @@ module RGeo
           assert(geom1_.equals?(geom2_))
         end
 
-
         def test_prepare
           p1_ = @factory.point(1, 2)
           p2_ = @factory.point(3, 4)
@@ -81,7 +72,6 @@ module RGeo
           assert_equal(true, polygon_.prepared?)
         end
 
-
         def test_auto_prepare
           p1_ = @factory.point(1, 2)
           p2_ = @factory.point(3, 4)
@@ -93,7 +83,7 @@ module RGeo
           polygon_.intersects?(p2_)
           assert_equal(true, polygon_.prepared?)
 
-          factory_no_auto_prepare_ = ::RGeo::Geos.factory(:srid => 4326, :auto_prepare => :disabled)
+          factory_no_auto_prepare_ = ::RGeo::Geos.factory(srid: 4326, auto_prepare: :disabled)
           polygon2_ = factory_no_auto_prepare_.polygon(
             factory_no_auto_prepare_.linear_ring([p1_, p2_, p3_, p1_]))
           assert_equal(false, polygon2_.prepared?)
@@ -103,7 +93,6 @@ module RGeo
           assert_equal(false, polygon2_.prepared?)
         end
 
-
         def test_gh_21
           # Test for GH-21 (seg fault in rgeo_convert_to_geos_geometry)
           # This seemed to fail under Ruby 1.8.7 only.
@@ -114,14 +103,10 @@ module RGeo
           loc2_.intersection(loc_)
         end
 
-
         def test_geos_version
           assert_match(/^\d+\.\d+(\.\d+)?$/, ::RGeo::Geos.version)
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/tc_multi_line_string.rb

@@ -4,29 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/multi_line_string_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/multi_line_string_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestMultiLineString < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestMultiLineString < ::Test::Unit::TestCase # :nodoc:
         def create_factory
           ::RGeo::Geos.factory
         end
 
-
         include ::RGeo::Tests::Common::MultiLineStringTests
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/tc_multi_point.rb

@@ -4,29 +4,21 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/multi_point_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/multi_point_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestMultiPoint < ::Test::Unit::TestCase  # :nodoc:
-
-
-        def create_factory(opts_={})
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestMultiPoint < ::Test::Unit::TestCase # :nodoc:
+        def create_factory(opts_ = {})
           ::RGeo::Geos.factory(opts_)
         end
 
-
         include ::RGeo::Tests::Common::MultiPointTests
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/tc_multi_polygon.rb

@@ -4,46 +4,36 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/multi_polygon_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/multi_polygon_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestMultiPolygon < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestMultiPolygon < ::Test::Unit::TestCase # :nodoc:
         def create_factories
           @factory = ::RGeo::Geos.factory
-          @lenient_factory = ::RGeo::Geos.factory(:lenient_multi_polygon_assertions => true)
+          @lenient_factory = ::RGeo::Geos.factory(lenient_multi_polygon_assertions: true)
         end
 
-
         include ::RGeo::Tests::Common::MultiPolygonTests
 
-
         # Centroid of an empty should return an empty collection rather than crash
 
         def test_empty_centroid
           assert_equal(@factory.collection([]), @factory.multi_polygon([]).centroid)
         end
 
-
         def _test_geos_bug_582
-          f_ = ::RGeo::Geos.factory(:buffer_resolution => 2)
+          f_ = ::RGeo::Geos.factory(buffer_resolution: 2)
           p1_ = f_.polygon(f_.linear_ring([]))
           p2_ = f_.polygon(f_.linear_ring([f_.point(0, 0), f_.point(0, 1), f_.point(1, 1), f_.point(1, 0)]))
           mp_ = f_.multi_polygon([p2_, p1_])
           mp_.centroid.as_text
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/tc_parsing_unparsing.rb

@@ -4,47 +4,37 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
+require "test/unit"
+require "rgeo"
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestParsingUnparsing < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestParsingUnparsing < ::Test::Unit::TestCase # :nodoc:
         def test_wkt_generator_default_floating_point
           # Bug report GH-4
           factory_ = ::RGeo::Geos.factory
           point_ = factory_.point(111.99, -40.37)
-          assert_equal('POINT (111.99 -40.37)', point_.as_text)
+          assert_equal("POINT (111.99 -40.37)", point_.as_text)
         end
 
-
         def test_wkt_generator_downcase
-          factory_ = ::RGeo::Geos.factory(:wkt_generator => {:convert_case => :lower})
+          factory_ = ::RGeo::Geos.factory(wkt_generator: { convert_case: :lower })
           point_ = factory_.point(1, 1)
-          assert_equal('point (1.0 1.0)', point_.as_text)
+          assert_equal("point (1.0 1.0)", point_.as_text)
         end
 
-
         def test_wkt_generator_geos
-          factory_ = ::RGeo::Geos.factory(:wkt_generator => :geos)
+          factory_ = ::RGeo::Geos.factory(wkt_generator: :geos)
           point_ = factory_.point(1, 1)
-          assert_equal('POINT (1.0000000000000000 1.0000000000000000)', point_.as_text)
+          assert_equal("POINT (1.0000000000000000 1.0000000000000000)", point_.as_text)
         end
 
-
         def test_wkt_parser_default_with_non_geosable_input
           factory_ = ::RGeo::Geos.factory
-          assert_not_nil(factory_.parse_wkt('Point (1 1)'))
+          assert_not_nil(factory_.parse_wkt("Point (1 1)"))
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?

data/test/geos_capi/tc_point.rb

@@ -4,30 +4,24 @@
 #
 # -----------------------------------------------------------------------------
 
-require 'test/unit'
-require 'rgeo'
-
-require ::File.expand_path('../common/point_tests.rb', ::File.dirname(__FILE__))
+require "test/unit"
+require "rgeo"
 
+require ::File.expand_path("../common/point_tests.rb", ::File.dirname(__FILE__))
 
 module RGeo
-  module Tests  # :nodoc:
-    module GeosCAPI  # :nodoc:
-
-      class TestPoint < ::Test::Unit::TestCase  # :nodoc:
-
-
+  module Tests # :nodoc:
+    module GeosCAPI # :nodoc:
+      class TestPoint < ::Test::Unit::TestCase # :nodoc:
         def setup
-          @factory = ::RGeo::Geos.factory(:buffer_resolution => 8)
-          @zfactory = ::RGeo::Geos.factory(:has_z_coordinate => true)
-          @mfactory = ::RGeo::Geos.factory(:has_m_coordinate => true)
-          @zmfactory = ::RGeo::Geos.factory(:has_z_coordinate => true, :has_m_coordinate => true)
+          @factory = ::RGeo::Geos.factory(buffer_resolution: 8)
+          @zfactory = ::RGeo::Geos.factory(has_z_coordinate: true)
+          @mfactory = ::RGeo::Geos.factory(has_m_coordinate: true)
+          @zmfactory = ::RGeo::Geos.factory(has_z_coordinate: true, has_m_coordinate: true)
         end
 
-
         include ::RGeo::Tests::Common::PointTests
 
-
         def test_is_geos
           point_ = @factory.point(21, -22)
           assert_equal(true, ::RGeo::Geos.is_geos?(point_))
@@ -39,19 +33,16 @@ module RGeo
           assert_equal(false, ::RGeo::Geos.is_ffi_geos?(point2_))
         end
 
-
         def test_has_no_projection
           point_ = @factory.point(21, -22)
           assert(!point_.respond_to?(:projection))
         end
 
-
         def test_srid
           point_ = @factory.point(11, 12)
           assert_equal(0, point_.srid)
         end
 
-
         def test_distance
           point1_ = @factory.point(11, 12)
           point2_ = @factory.point(11, 12)
@@ -60,27 +51,22 @@ module RGeo
           assert_equal(2, point1_.distance(point3_))
         end
 
-
         if defined?(::Encoding)
 
           def test_as_text_encoding
-            factory_ = ::RGeo::Geos.factory(:wkt_generator => :geos)
+            factory_ = ::RGeo::Geos.factory(wkt_generator: :geos)
             point_ = factory_.point(11, 12)
             assert_equal(::Encoding::US_ASCII, point_.as_text.encoding)
           end
 
-
           def test_as_binary_encoding
-            factory_ = ::RGeo::Geos.factory(:wkb_generator => :geos)
+            factory_ = ::RGeo::Geos.factory(wkb_generator: :geos)
             point_ = factory_.point(11, 12)
             assert_equal(::Encoding::ASCII_8BIT, point_.as_binary.encoding)
           end
 
         end
-
-
       end
-
     end
   end
 end if ::RGeo::Geos.capi_supported?