georuby 2.2.1 → 2.3.0

data/spec/geo_ruby/simple_features/multi_point_spec.rb

@@ -4,32 +4,32 @@ describe GeoRuby::SimpleFeatures::MultiPoint do
 
   it "test_multi_point_creation" do
     multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
-    multi_point.should be_instance_of(GeoRuby::SimpleFeatures::MultiPoint)
-    multi_point.length.should eql(3)
-    multi_point[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-123.3,444)
-    multi_point[2].should == GeoRuby::SimpleFeatures::Point.from_x_y(123.55555555,123,444)
+    expect(multi_point).to be_instance_of(GeoRuby::SimpleFeatures::MultiPoint)
+    expect(multi_point.length).to eql(3)
+    expect(multi_point[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-123.3,444))
+    expect(multi_point[2]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(123.55555555,123,444))
   end
 
   it "test_multi_point_binary" do
     multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
-    multi_point.as_hex_ewkb.should eql("0104000020BC010000030000000101000000CDCCCCCCCCCC28403333333333D35EC0010100000066666666664650C09A99999999D95E4001010000001F97DD388EE35E400000000000C05E40")
+    expect(multi_point.as_hex_ewkb).to eql("0104000020BC010000030000000101000000CDCCCCCCCCCC28403333333333D35EC0010100000066666666664650C09A99999999D95E4001010000001F97DD388EE35E400000000000C05E40")
 
     multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,1.2],[123.55555555,123,2.3]],444,true)
-    multi_point.as_hex_ewkb.should eql("01040000A0BC010000030000000101000080CDCCCCCCCCCC28403333333333D35EC00000000000001240010100008066666666664650C09A99999999D95E40333333333333F33F01010000801F97DD388EE35E400000000000C05E406666666666660240")
+    expect(multi_point.as_hex_ewkb).to eql("01040000A0BC010000030000000101000080CDCCCCCCCCCC28403333333333D35EC00000000000001240010100008066666666664650C09A99999999D95E40333333333333F33F01010000801F97DD388EE35E400000000000C05E406666666666660240")
   end
 
   it "test_multi_point_text" do
     multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
-    multi_point.as_ewkt.should eql("SRID=444;MULTIPOINT((12.4 -123.3),(-65.1 123.4),(123.55555555 123))")
+    expect(multi_point.as_ewkt).to eql("SRID=444;MULTIPOINT((12.4 -123.3),(-65.1 123.4),(123.55555555 123))")
 
     multi_point = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3,4.5],[-65.1,123.4,6.7],[123.55555555,123,7.8]],444,true)
-    multi_point.as_ewkt.should eql("SRID=444;MULTIPOINT((12.4 -123.3 4.5),(-65.1 123.4 6.7),(123.55555555 123 7.8))")
+    expect(multi_point.as_ewkt).to eql("SRID=444;MULTIPOINT((12.4 -123.3 4.5),(-65.1 123.4 6.7),(123.55555555 123 7.8))")
   end
 
   it "should respond to points" do
     mp = GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]],444)
-    mp.should have(3).geometries
-    mp.should have(3).points
+    expect(mp.geometries.size).to eq(3)
+    expect(mp.size).to eq(3)
   end
 
 end

data/spec/geo_ruby/simple_features/multi_polygon_spec.rb

@@ -4,32 +4,32 @@ describe GeoRuby::SimpleFeatures::MultiPolygon do
 
    it "test_multi_polygon_creation" do
     multi_polygon1 = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256)
-    multi_polygon1.should be_instance_of(GeoRuby::SimpleFeatures::MultiPolygon)
-    multi_polygon1.length.should eql(2)
-    multi_polygon1[0].should == GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256)
+    expect(multi_polygon1).to be_instance_of(GeoRuby::SimpleFeatures::MultiPolygon)
+    expect(multi_polygon1.length).to eql(2)
+    expect(multi_polygon1[0]).to eq(GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256))
 
     multi_polygon2 = GeoRuby::SimpleFeatures::MultiPolygon.from_coordinates([[[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],[[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]]],256)
-    multi_polygon1.should be_instance_of(GeoRuby::SimpleFeatures::MultiPolygon)
-    multi_polygon1.length.should eql(2)
+    expect(multi_polygon1).to be_instance_of(GeoRuby::SimpleFeatures::MultiPolygon)
+    expect(multi_polygon1.length).to eql(2)
 
-    multi_polygon2[0].should == GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256)
-    multi_polygon1.should == multi_polygon2
+    expect(multi_polygon2[0]).to eq(GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256))
+    expect(multi_polygon1).to eq(multi_polygon2)
   end
 
   it "test_multi_polygon_binary" do
     multi_polygon = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256)
-    multi_polygon.as_hex_ewkb.should eql("0106000020000100000200000001030000000200000004000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC44406DE7FBA9F1D211403D2CD49AE61DF13FCDCCCCCCCCCC28406666666666A646C004000000333333333333034033333333333315409A999999999915408A8EE4F21FD2F63FEC51B81E85EB2C40F6285C8FC2F5F03F3333333333330340333333333333154001030000000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
+    expect(multi_polygon.as_hex_ewkb).to eql("0106000020000100000200000001030000000200000004000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC44406DE7FBA9F1D211403D2CD49AE61DF13FCDCCCCCCCCCC28406666666666A646C004000000333333333333034033333333333315409A999999999915408A8EE4F21FD2F63FEC51B81E85EB2C40F6285C8FC2F5F03F3333333333330340333333333333154001030000000200000005000000000000000000000000000000000000000000000000001040000000000000000000000000000010400000000000001040000000000000000000000000000010400000000000000000000000000000000005000000000000000000F03F000000000000F03F0000000000000840000000000000F03F00000000000008400000000000000840000000000000F03F0000000000000840000000000000F03F000000000000F03F")
 
     multi_polygon = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3,1.2],[45.4,41.6,1.2],[4.456,1.0698,1.2],[12.4,-45.3,1.2]],[[2.4,5.3,1.2],[5.4,1.4263,1.2],[14.46,1.06,1.2],[2.4,5.3,1.2]]],256,false,true),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,1.2],[4,0,1.2],[4,4,2.3],[0,4,1.2],[0,0,1.2]],[[1,1,2.2],[3,1,3.3],[3,3,1.1],[1,3,2.4],[1,1,2.2]]],256,false,true)],256,false,true)
-    multi_polygon.as_hex_ewkb.should eql("0106000020000100000200000001030000400200000004000000CDCCCCCCCCCC28406666666666A646C0333333333333F33F3333333333B34640CDCCCCCCCCCC4440333333333333F33F6DE7FBA9F1D211403D2CD49AE61DF13F333333333333F33FCDCCCCCCCCCC28406666666666A646C0333333333333F33F0400000033333333333303403333333333331540333333333333F33F9A999999999915408A8EE4F21FD2F63F333333333333F33FEC51B81E85EB2C40F6285C8FC2F5F03F333333333333F33F33333333333303403333333333331540333333333333F33F0103000040020000000500000000000000000000000000000000000000333333333333F33F00000000000010400000000000000000333333333333F33F00000000000010400000000000001040666666666666024000000000000000000000000000001040333333333333F33F00000000000000000000000000000000333333333333F33F05000000000000000000F03F000000000000F03F9A999999999901400000000000000840000000000000F03F6666666666660A40000000000000084000000000000008409A9999999999F13F000000000000F03F00000000000008403333333333330340000000000000F03F000000000000F03F9A99999999990140")
+    expect(multi_polygon.as_hex_ewkb).to eql("0106000020000100000200000001030000400200000004000000CDCCCCCCCCCC28406666666666A646C0333333333333F33F3333333333B34640CDCCCCCCCCCC4440333333333333F33F6DE7FBA9F1D211403D2CD49AE61DF13F333333333333F33FCDCCCCCCCCCC28406666666666A646C0333333333333F33F0400000033333333333303403333333333331540333333333333F33F9A999999999915408A8EE4F21FD2F63F333333333333F33FEC51B81E85EB2C40F6285C8FC2F5F03F333333333333F33F33333333333303403333333333331540333333333333F33F0103000040020000000500000000000000000000000000000000000000333333333333F33F00000000000010400000000000000000333333333333F33F00000000000010400000000000001040666666666666024000000000000000000000000000001040333333333333F33F00000000000000000000000000000000333333333333F33F05000000000000000000F03F000000000000F03F9A999999999901400000000000000840000000000000F03F6666666666660A40000000000000084000000000000008409A9999999999F13F000000000000F03F00000000000008403333333333330340000000000000F03F000000000000F03F9A99999999990140")
   end
 
   it "test_multi_polygon_text" do
     multi_polygon = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]],256)],256)
-    multi_polygon.as_ewkt.should eql("SRID=256;MULTIPOLYGON(((12.4 -45.3,45.4 41.6,4.456 1.0698,12.4 -45.3),(2.4 5.3,5.4 1.4263,14.46 1.06,2.4 5.3)),((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1)))")
+    expect(multi_polygon.as_ewkt).to eql("SRID=256;MULTIPOLYGON(((12.4 -45.3,45.4 41.6,4.456 1.0698,12.4 -45.3),(2.4 5.3,5.4 1.4263,14.46 1.06,2.4 5.3)),((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1)))")
 
     multi_polygon = GeoRuby::SimpleFeatures::MultiPolygon.from_polygons([GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[12.4,-45.3,2],[45.4,41.6,3],[4.456,1.0698,4],[12.4,-45.3,2]],[[2.4,5.3,1],[5.4,1.4263,3.44],[14.46,1.06,4.5],[2.4,5.3,1]]],4326,true),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,5.6],[4,0,5.4],[4,4,1],[0,4,23],[0,0,5.6]],[[1,1,2.3],[3,1,4],[3,3,5],[1,3,6],[1,1,2.3]]],4326,true)],4326,true)
-    multi_polygon.as_ewkt.should eql("SRID=4326;MULTIPOLYGON(((12.4 -45.3 2,45.4 41.6 3,4.456 1.0698 4,12.4 -45.3 2),(2.4 5.3 1,5.4 1.4263 3.44,14.46 1.06 4.5,2.4 5.3 1)),((0 0 5.6,4 0 5.4,4 4 1,0 4 23,0 0 5.6),(1 1 2.3,3 1 4,3 3 5,1 3 6,1 1 2.3)))")
+    expect(multi_polygon.as_ewkt).to eql("SRID=4326;MULTIPOLYGON(((12.4 -45.3 2,45.4 41.6 3,4.456 1.0698 4,12.4 -45.3 2),(2.4 5.3 1,5.4 1.4263 3.44,14.46 1.06 4.5,2.4 5.3 1)),((0 0 5.6,4 0 5.4,4 4 1,0 4 23,0 0 5.6),(1 1 2.3,3 1 4,3 3 5,1 3 6,1 1 2.3)))")
   end
 
   describe "Counting" do
@@ -39,11 +39,11 @@ describe GeoRuby::SimpleFeatures::MultiPolygon do
     end
 
     it "should have a points method" do
-      @mp.points[0].should be_instance_of(GeoRuby::SimpleFeatures::Point)
+      expect(@mp.points[0]).to be_instance_of(GeoRuby::SimpleFeatures::Point)
     end
 
     it "should flatten it right" do
-      @mp.should have(18).points
+      expect(@mp.points.size).to eq(18)
     end
 
   end

data/spec/geo_ruby/simple_features/point_spec.rb

@@ -6,55 +6,55 @@ describe GeoRuby::SimpleFeatures::Point do
 
   it "should instantiatember" do
     violated unless point
-    point.should be_instance_of(GeoRuby::SimpleFeatures::Point)
+    expect(point).to be_instance_of(GeoRuby::SimpleFeatures::Point)
   end
 
   it "should have a nice matcher" do
-    point.should be_a_point
+    expect(point).to be_a_point
   end
 
   it "should have a text geometry type" do
-    point.text_geometry_type.should eq("POINT")
+    expect(point.text_geometry_type).to eq("POINT")
   end
 
   it "should have a very nice matcher" do
-    point.should be_a_point(0.0, 0.0)
+    expect(point).to be_a_point(0.0, 0.0)
   end
 
   it "should have a very nice matcher" do
-    GeoRuby::SimpleFeatures::Point.from_x_y_z_m(1,2,3.33,"t").should be_a_point(1, 2, 3.33, "t")
+    expect(GeoRuby::SimpleFeatures::Point.from_x_y_z_m(1,2,3.33,"t")).to be_a_point(1, 2, 3.33, "t")
   end
 
   it "should have a dumb matcher" do
-    GeoRuby::SimpleFeatures::Point.should be_geometric
+    expect(GeoRuby::SimpleFeatures::Point).to be_geometric
   end
 
   it "should be subclassable" do
     place = Class.new(GeoRuby::SimpleFeatures::Point)
     p = place.from_x_y(1,2)
-    p.should be_a place
+    expect(p).to be_a place
   end
 
   it "should have binary_geometry_type 2" do
-    point.binary_geometry_type.should eql(1)
+    expect(point.binary_geometry_type).to eql(1)
   end
 
   it "should have the correct srid" do
-    point.srid.should eql(4326)
+    expect(point.srid).to eql(4326)
   end
 
   it "should not have z or m" do
-    point.with_z.should be_false
-    point.should_not be_with_z
-    point.with_m.should be_false
-    point.should_not be_with_m
+    expect(point.with_z).to be_falsey
+    expect(point).not_to be_with_z
+    expect(point.with_m).to be_falsey
+    expect(point).not_to be_with_m
   end
 
   it "should set params to 0.0" do
-    point.x.should eql(0.0)
-    point.y.should eql(0.0)
-    point.z.should eql(0.0)
-    point.m.should eql(0.0)
+    expect(point.x).to eql(0.0)
+    expect(point.y).to eql(0.0)
+    expect(point.z).to eql(0.0)
+    expect(point.m).to eql(0.0)
   end
 
   it "should compare ok" do
@@ -71,176 +71,176 @@ describe GeoRuby::SimpleFeatures::Point do
     point5.m=15
     geometry= GeoRuby::SimpleFeatures::Geometry::new
 
-    point1.should == point2
-    point1.should_not == point3
-    point1.should_not == point4
-    point1.should_not == point5
-    point1.should_not == geometry
+    expect(point1).to eq(point2)
+    expect(point1).not_to eq(point3)
+    expect(point1).not_to eq(point4)
+    expect(point1).not_to eq(point5)
+    expect(point1).not_to eq(geometry)
   end
 
   describe "> Instantiation" do
 
     it "should instantiate a 2d point" do
       point = GeoRuby::SimpleFeatures::Point.from_x_y(10,20,123)
-      point.x.should eql(10)
-      point.y.should eql(20)
-      point.srid.should eql(123)
-      point.z.should eql(0.0)
+      expect(point.x).to eql(10)
+      expect(point.y).to eql(20)
+      expect(point.srid).to eql(123)
+      expect(point.z).to eql(0.0)
     end
 
     it "should instantiate a 2d easily" do
       point = GeoRuby::SimpleFeatures::Point.xy(10,20,123)
-      point.x.should eql(10)
-      point.y.should eql(20)
-      point.srid.should eql(123)
+      expect(point.x).to eql(10)
+      expect(point.y).to eql(20)
+      expect(point.srid).to eql(123)
     end
 
     it "should instantiate a 3d point" do
       point = GeoRuby::SimpleFeatures::Point.from_x_y_z(-10,-20,-30)
-      point.x.should eql(-10)
-      point.y.should eql(-20)
-      point.z.should eql(-30)
+      expect(point.x).to eql(-10)
+      expect(point.y).to eql(-20)
+      expect(point.z).to eql(-30)
     end
 
     it "should store correctly a 3d point" do
       point = GeoRuby::SimpleFeatures::Point.from_x_y_z(-10,-20,-30)
-      point.to_coordinates.should eq([-10, -20, -30])
+      expect(point.to_coordinates).to eq([-10, -20, -30])
     end
 
     it "should instantiate a 3d(m) point" do
       point = GeoRuby::SimpleFeatures::Point.from_x_y_m(10,20,30)
-      point.x.should eql(10)
-      point.y.should eql(20)
-      point.m.should eql(30)
-      point.z.should eql(0.0)
+      expect(point.x).to eql(10)
+      expect(point.y).to eql(20)
+      expect(point.m).to eql(30)
+      expect(point.z).to eql(0.0)
     end
 
     it "should instantiate a 4d point" do
       point = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(10,20,30,40,123)
-      point.x.should eql(10)
-      point.y.should eql(20)
-      point.z.should eql(30)
-      point.m.should eql(40)
-      point.srid.should eql(123)
+      expect(point.x).to eql(10)
+      expect(point.y).to eql(20)
+      expect(point.z).to eql(30)
+      expect(point.m).to eql(40)
+      expect(point.srid).to eql(123)
     end
 
     it "should store correctly a 4d point" do
       point = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(-10,-20,-30, 1)
-      point.m.should eql(1)
-      point.to_coordinates.should eq([-10, -20, -30])
+      expect(point.m).to eql(1)
+      expect(point.to_coordinates).to eq([-10, -20, -30])
     end
 
     it "should instantiate a point from polar coordinates" do
       point = GeoRuby::SimpleFeatures::Point.from_r_t(1.4142,45)
-      point.y.should be_within(0.1).of(1)
-      point.x.should be_within(0.1).of(1)
+      expect(point.y).to be_within(0.1).of(1)
+      expect(point.x).to be_within(0.1).of(1)
     end
 
     it "should instantiate from coordinates x,y" do
       point = GeoRuby::SimpleFeatures::Point.from_coordinates([1.6,2.8],123)
-      point.x.should eql(1.6)
-      point.y.should eql(2.8)
-      point.should_not be_with_z
-      point.z.should eql(0.0)
-      point.srid.should eql(123)
+      expect(point.x).to eql(1.6)
+      expect(point.y).to eql(2.8)
+      expect(point).not_to be_with_z
+      expect(point.z).to eql(0.0)
+      expect(point.srid).to eql(123)
     end
 
     it "should instantiate from coordinates x,y,z" do
       point = GeoRuby::SimpleFeatures::Point.from_coordinates([1.6,2.8,3.4],123, true)
-      point.x.should eql(1.6)
-      point.y.should eql(2.8)
-      point.z.should eql(3.4)
-      point.should be_with_z
-      point.srid.should eql(123)
+      expect(point.x).to eql(1.6)
+      expect(point.y).to eql(2.8)
+      expect(point.z).to eql(3.4)
+      expect(point).to be_with_z
+      expect(point.srid).to eql(123)
     end
 
     it "should instantiate from coordinates x,y,z,m" do
       point = GeoRuby::SimpleFeatures::Point.from_coordinates([1.6,2.8,3.4,15],123, true, true)
-      point.x.should eql(1.6)
-      point.y.should eql(2.8)
-      point.z.should eql(3.4)
-      point.m.should eql(15)
-      point.should be_with_z
-      point.should be_with_m
-      point.srid.should eql(123)
+      expect(point.x).to eql(1.6)
+      expect(point.y).to eql(2.8)
+      expect(point.z).to eql(3.4)
+      expect(point.m).to eql(15)
+      expect(point).to be_with_z
+      expect(point).to be_with_m
+      expect(point.srid).to eql(123)
     end
 
     it "should have a bbox" do
       bbox = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(-1.6,2.8,-3.4,15,123).bounding_box
-      bbox.length.should eql(2)
-      bbox[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(-1.6,2.8,-3.4)
-      bbox[1].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(-1.6,2.8,-3.4)
+      expect(bbox.length).to eql(2)
+      expect(bbox[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(-1.6,2.8,-3.4))
+      expect(bbox[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(-1.6,2.8,-3.4))
     end
 
     it "should parse lat long" do
-      GeoRuby::SimpleFeatures::Point.from_latlong("-20° 47' 26.37","-20° 47' 26.37").x.should be_within(0.00001).of(-20.790658)
-      GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.378","20° 47' 26.378").y.should be_within(0.00001).of(20.790658)
+      expect(GeoRuby::SimpleFeatures::Point.from_latlong("-20° 47' 26.37","-20° 47' 26.37").x).to be_within(0.00001).of(-20.790658)
+      expect(GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.378","20° 47' 26.378").y).to be_within(0.00001).of(20.790658)
     end
 
     it "should parse lat long w/o sec" do
-      GeoRuby::SimpleFeatures::Point.from_latlong("-20°47′26″","-20°47′26″").x.should be_within(0.00001).of(-20.790555)
-      GeoRuby::SimpleFeatures::Point.from_latlong("20°47′26″","20°47′26″").y.should be_within(0.00001).of(20.790555)
+      expect(GeoRuby::SimpleFeatures::Point.from_latlong("-20°47′26″","-20°47′26″").x).to be_within(0.00001).of(-20.790555)
+      expect(GeoRuby::SimpleFeatures::Point.from_latlong("20°47′26″","20°47′26″").y).to be_within(0.00001).of(20.790555)
     end
 
     it "should accept with W or S notation" do
-      GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").x.should be_within(0.00001).of(-20.790658)
-      GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").y.should be_within(0.00001).of(-20.790658)
+      expect(GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").x).to be_within(0.00001).of(-20.790658)
+      expect(GeoRuby::SimpleFeatures::Point.from_latlong("20° 47' 26.37 W","20° 47' 26.37 S").y).to be_within(0.00001).of(-20.790658)
     end
 
     it "should instantiate a point from positive degrees" do
       point = GeoRuby::SimpleFeatures::Point.from_latlong('47`20 06.09E','22`50 77.35N')
-      point.y.should be_within(0.000001).of(22.8548194)
-      point.x.should be_within(0.000001).of(47.335025)
+      expect(point.y).to be_within(0.000001).of(22.8548194)
+      expect(point.x).to be_within(0.000001).of(47.335025)
     end
 
     it "should instantiate a point from negative degrees" do
       point = GeoRuby::SimpleFeatures::Point.from_latlong('47`20 06.09W','22`50 77.35S')
-      point.y.should be_within(0.000001).of(-22.8548194)
-      point.x.should be_within(0.000001).of(-47.335025)
+      expect(point.y).to be_within(0.000001).of(-22.8548194)
+      expect(point.x).to be_within(0.000001).of(-47.335025)
     end
 
     it "should print out nicely" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(47.88, -20.1).as_latlong.should eql("47°52′48″, -20°06′00″")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(47.88, -20.1).as_latlong).to eql("47°52′48″, -20°06′00″")
     end
 
     it "should print out nicely latlong" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-20.78, 20.78).as_latlong(:full => true).should eql("-20°46′48.00″, 20°46′48.00″")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-20.78, 20.78).as_latlong(:full => true)).to eql("-20°46′48.00″, 20°46′48.00″")
     end
 
     it "should print out nicely latlong" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:full => true).should eql("47°06′36.00″, -20°11′60.00″")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:full => true)).to eql("47°06′36.00″, -20°11′60.00″")
     end
 
     it "should print out nicely latlong" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:coord => true).should eql("47°06′36″N, 20°11′60″W")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(47.11, -20.2).as_latlong(:coord => true)).to eql("47°06′36″N, 20°11′60″W")
     end
 
     it "should print out nicely latlong" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_latlong(:full => true,:coord => true).should eql("47°06′36.00″S, 20°11′60.00″E")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_latlong(:full => true,:coord => true)).to eql("47°06′36.00″S, 20°11′60.00″E")
     end
 
     it "should print out nicely lat" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat.should eql("-47°06′36″")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat).to eql("-47°06′36″")
     end
 
     it "should print out nicely lat with opts" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat(:full => true).should eql("-47°06′36.00″")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat(:full => true)).to eql("-47°06′36.00″")
     end
 
     it "should print out nicely lat with opts" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat(:full => true,:coord => true).should eql("47°06′36.00″S")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_lat(:full => true,:coord => true)).to eql("47°06′36.00″S")
     end
 
     it "should print out nicely long" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long.should eql("20°11′60″")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long).to eql("20°11′60″")
     end
 
     it "should print out nicely long with opts" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long(:full => true).should eql("20°11′60.00″")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long(:full => true)).to eql("20°11′60.00″")
     end
 
     it "should print out nicely long with opts" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long(:full => true,:coord => true).should eql("20°11′60.00″E")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_long(:full => true,:coord => true)).to eql("20°11′60.00″E")
     end
 
   end
@@ -251,18 +251,18 @@ describe GeoRuby::SimpleFeatures::Point do
     let(:p2) { GeoRuby::SimpleFeatures::Point.from_x_y(2,2) }
 
     it "and a 3th grade child should calculate euclidian distance" do
-      p1.euclidian_distance(p2).
-        should be_within(0.00000001).of(1.4142135623731)
+      expect(p1.euclidian_distance(p2)).
+        to be_within(0.00000001).of(1.4142135623731)
     end
 
     it "should calculate spherical distance" do
-      p1.spherical_distance(p2).
-        should be_within(0.00000001).of(157225.358003181)
+      expect(p1.spherical_distance(p2)).
+        to be_within(0.00000001).of(157225.358003181)
     end
 
     it "should calculate ellipsoidal distance" do
-      p1.ellipsoidal_distance(p2).
-        should be_within(0.00000001).of(156876.149400742)
+      expect(p1.ellipsoidal_distance(p2)).
+        to be_within(0.00000001).of(156876.149400742)
     end
 
     describe "Orthogonal Distance" do
@@ -270,62 +270,62 @@ describe GeoRuby::SimpleFeatures::Point do
       let(:line2) { GeoRuby::SimpleFeatures::LineString.from_coordinates([[1,1],[1,2]], 4326) }
 
       it "should calcula orthogonal distance from a line (90 deg)" do
-        p1.orthogonal_distance(line).should be_within(0.001).of(1.414)
+        expect(p1.orthogonal_distance(line)).to be_within(0.001).of(1.414)
       end
 
       it "should calcula orthogonal distance very close..." do
-        p1.orthogonal_distance(line2).should be_zero
+        expect(p1.orthogonal_distance(line2)).to be_zero
       end
 
       it "should calcula orthogonal distance from a line (90 deg)" do
-        p2.orthogonal_distance(line).should be_within(0.001).of(2.828)
+        expect(p2.orthogonal_distance(line)).to be_within(0.001).of(2.828)
       end
 
       it "should calcula orthogonal distance from a line (0 deg)" do
-        p2.orthogonal_distance(line2).should be_within(0.1).of(1.0)
+        expect(p2.orthogonal_distance(line2)).to be_within(0.1).of(1.0)
       end
 
       it "should calcula orthogonal distance from a line (0 deg)" do
-        p2.orthogonal_distance(line2).should be_within(0.1).of(1.0)
+        expect(p2.orthogonal_distance(line2)).to be_within(0.1).of(1.0)
       end
 
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      p1.bearing_to(p2).should be_within(0.01).of(45.0)
+      expect(p1.bearing_to(p2)).to be_within(0.01).of(45.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = GeoRuby::SimpleFeatures::Point.from_x_y(1,-1)
-      p1.bearing_to(p3).should be_within(0.01).of(180.0)
+      expect(p1.bearing_to(p3)).to be_within(0.01).of(180.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = GeoRuby::SimpleFeatures::Point.from_x_y(-1,-1)
-      p1.bearing_to(p3).should be_within(0.01).of(225.0)
+      expect(p1.bearing_to(p3)).to be_within(0.01).of(225.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = GeoRuby::SimpleFeatures::Point.from_x_y(-1,1)
-      p1.bearing_to(p3).should be_within(0.01).of(270.0)
+      expect(p1.bearing_to(p3)).to be_within(0.01).of(270.0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = GeoRuby::SimpleFeatures::Point.from_x_y(2,-1)
-      p1.bearing_to(p3).should be_within(0.0001).of(153.4349488)
+      expect(p1.bearing_to(p3)).to be_within(0.0001).of(153.4349488)
     end
 
     it "should calculate a clone point bearing to 0" do
-      p1.bearing_to(p1).should eql(0)
+      expect(p1.bearing_to(p1)).to eql(0)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
-      p1.bearing_text(p2).should eql(:ne)
+      expect(p1.bearing_text(p2)).to eql(:ne)
     end
 
     it "should calculate the bearing from apoint to another in degrees" do
       p3 = GeoRuby::SimpleFeatures::Point.from_x_y(-1,1)
-      p1.bearing_text(p3).should eql(:w)
+      expect(p1.bearing_text(p3)).to eql(:w)
     end
 
   end
@@ -339,80 +339,88 @@ describe GeoRuby::SimpleFeatures::Point do
     end
 
     it "should print nicely" do
-      point.text_representation.should eql("-11.2431 32.3141")
+      expect(point.text_representation).to eql("-11.2431 32.3141")
     end
 
     it "should printoout as binary" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3,123).as_hex_ewkb.should eql("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3,123).as_hex_ewkb).to eql("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
       point = GeoRuby::SimpleFeatures::Point.from_x_y_z_m(12.4,45.3,-3.5,15,123)
-      point.as_hex_ewkb.should eql("01010000E07B000000CDCCCCCCCCCC28406666666666A646400000000000000CC00000000000002E40")
-      point.as_hex_wkb.should eql("0101000000CDCCCCCCCCCC28406666666666A64640")
+      expect(point.as_hex_ewkb).to eql("01010000E07B000000CDCCCCCCCCCC28406666666666A646400000000000000CC00000000000002E40")
+      expect(point.as_hex_wkb).to eql("0101000000CDCCCCCCCCCC28406666666666A64640")
     end
 
     it "should printoout as text" do
-      GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3,123).as_ewkt.should eql("SRID=123;POINT(12.4 45.3)")
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3,123).as_ewkt).to eql("SRID=123;POINT(12.4 45.3)")
       point = GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,45.3,-3.5,123)
-      point.as_ewkt.should eql("SRID=123;POINT(12.4 45.3 -3.5)")
-      point.as_wkt.should eql("POINT(12.4 45.3)")
-      point.as_ewkt(false,true).should eql("POINT(12.4 45.3 -3.5)")
+      expect(point.as_ewkt).to eql("SRID=123;POINT(12.4 45.3 -3.5)")
+      expect(point.as_wkt).to eql("POINT(12.4 45.3)")
+      expect(point.as_ewkt(false,true)).to eql("POINT(12.4 45.3 -3.5)")
       point = GeoRuby::SimpleFeatures::Point.from_x_y_m(12.4,45.3,-3.5,123)
-      point.as_ewkt.should eql("SRID=123;POINTM(12.4 45.3 -3.5)")
-      point.as_ewkt(true,true,false).should eql("SRID=123;POINT(12.4 45.3)")
+      expect(point.as_ewkt).to eql("SRID=123;POINTM(12.4 45.3 -3.5)")
+      expect(point.as_ewkt(true,true,false)).to eql("SRID=123;POINT(12.4 45.3)")
     end
 
     it "should have a nice bounding box" do
-      point.should have(2).bounding_box
+      expect(point.bounding_box.size).to eq(2)
       point.bounding_box.each do |point|
-        point.x.should eql(point.x)
-        point.y.should eql(point.y)
+        expect(point.x).to eql(point.x)
+        expect(point.y).to eql(point.y)
       end
     end
 
     it "should print as kml too" do
-      point.kml_representation.should eql("<Point>\n<coordinates>-11.2431,32.3141</coordinates>\n</Point>\n")
+      expect(point.kml_representation).to eql("<Point>\n<coordinates>-11.2431,32.3141</coordinates>\n</Point>\n")
     end
 
     it "should print as html too" do
-      point.html_representation.should eql("<span class='geo'><abbr class='latitude' title='-11.2431'>11°14′35″S</abbr><abbr class='longitude' title='32.3141'>32°18′51″E</abbr></span>")
+      expect(point.html_representation).to eql("<span class='geo'><abbr class='latitude' title='-11.2431'>11°14′35″S</abbr><abbr class='longitude' title='32.3141'>32°18′51″E</abbr></span>")
     end
 
     it "should print as html too with opts" do
-      point.html_representation(coord: false).should eql("<span class='geo'><abbr class='latitude' title='-11.2431'>-11°14′35″</abbr><abbr class='longitude' title='32.3141'>32°18′51″</abbr></span>")
+      expect(point.html_representation(coord: false)).to eql("<span class='geo'><abbr class='latitude' title='-11.2431'>-11°14′35″</abbr><abbr class='longitude' title='32.3141'>32°18′51″</abbr></span>")
     end
 
     it "should print as html too with opts" do
-      point.html_representation(full: true).should eql("<span class='geo'><abbr class='latitude' title='-11.2431'>11°14′35.16″S</abbr><abbr class='longitude' title='32.3141'>32°18′50.76″E</abbr></span>")
+      expect(point.html_representation(full: true)).to eql("<span class='geo'><abbr class='latitude' title='-11.2431'>11°14′35.16″S</abbr><abbr class='longitude' title='32.3141'>32°18′50.76″E</abbr></span>")
     end
 
     it "should print as georss" do
-      point.georss_simple_representation(:georss_ns => 'hey').should eql("<hey:point>32.3141 -11.2431</hey:point>\n")
+      expect(point.georss_simple_representation(:georss_ns => 'hey')).to eql("<hey:point>32.3141 -11.2431</hey:point>\n")
     end
 
     it "should print r (polar coords)" do
-      point.r.should be_within(0.000001).of(34.214154)
+      expect(point.r).to be_within(0.000001).of(34.214154)
     end
 
     it "should print theta as degrees" do
-      point.theta_deg.should be_within(0.0001).of(289.184406352127)
+      expect(point.theta_deg).to be_within(0.0001).of(289.184406352127)
     end
 
     it "should print theta as radians" do
-      point.theta_rad.should be_within(0.0001).of(5.04722003626982)
+      expect(point.theta_rad).to be_within(0.0001).of(5.04722003626982)
     end
 
     it "should print theta when x is zero y > 0" do
       pt = GeoRuby::SimpleFeatures::Point.from_x_y(0.0, 32.3141)
-      pt.theta_rad.should be_within(0.0001).of(1.5707963267948966)
+      expect(pt.theta_rad).to be_within(0.0001).of(1.5707963267948966)
     end
 
     it "should print theta when x is zero y < 0" do
       pt = GeoRuby::SimpleFeatures::Point.from_x_y(0.0, -32.3141)
-      pt.theta_rad.should be_within(0.0001).of(4.71238898038469)
+      expect(pt.theta_rad).to be_within(0.0001).of(4.71238898038469)
     end
 
     it "should output as polar" do
-      point.as_polar.should be_instance_of(Array)
-      point.should have(2).as_polar #.length.should eql(2)
+      expect(point.as_polar).to be_instance_of(Array)
+      expect(point.as_polar.size).to eq(2) #.length.should eql(2)
+    end
+
+    it "should print out nicely as json/geojson" do
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).as_json).to eql({:type=>"Point", :coordinates=>[-47.11, 20.2]})
+    end
+
+    it "should print out nicely to json/geojson" do
+      expect(GeoRuby::SimpleFeatures::Point.from_x_y(-47.11, 20.2).to_json).to eql("{\"type\":\"Point\",\"coordinates\":[-47.11,20.2]}")
     end
 
   end