georuby 2.2.1 → 2.3.0

data/spec/geo_ruby/simple_features/geometry_collection_spec.rb

@@ -6,24 +6,24 @@ describe GeoRuby::SimpleFeatures::GeometryCollection do
     geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection::new(256)
     geometry_collection << GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256)
 
-    geometry_collection.length.should eql(1)
-    geometry_collection[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256)
+    expect(geometry_collection.length).to eql(1)
+    expect(geometry_collection[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256))
 
     geometry_collection[0]=GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
     geometry_collection << 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)
-    geometry_collection.length.should eql(2)
-    geometry_collection[0].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
+    expect(geometry_collection.length).to eql(2)
+    expect(geometry_collection[0]).to eq(GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256))
 
     geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
-    geometry_collection.class.should eql(GeoRuby::SimpleFeatures::GeometryCollection)
-    geometry_collection.srid.should eql(256)
-    geometry_collection.length.should eql(2)
-    geometry_collection[1].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
+    expect(geometry_collection.class).to eql(GeoRuby::SimpleFeatures::GeometryCollection)
+    expect(geometry_collection.srid).to eql(256)
+    expect(geometry_collection.length).to eql(2)
+    expect(geometry_collection[1]).to eq(GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256))
 
     bbox = geometry_collection.bounding_box
-    bbox.length.should eql(2)
-    bbox[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(4.67,12.45)
-    bbox[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(67.55,54)
+    expect(bbox.length).to eql(2)
+    expect(bbox[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(4.67,12.45))
+    expect(bbox[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(67.55,54))
   end
 
   it "test_geometry_collection_equal" do
@@ -31,25 +31,25 @@ describe GeoRuby::SimpleFeatures::GeometryCollection do
     geometry_collection2 = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256),GeoRuby::SimpleFeatures::Polygon.from_coordinates([[[0,0,2],[4,0,2],[4,4,2],[0,4,2],[0,0,2]],[[1,1,2],[3,1,2],[3,3,2],[1,3,2],[1,1,2]]],256)],256,true)
     line_string=GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
 
-    geometry_collection1.should == GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
-    geometry_collection2.should_not == geometry_collection1
-    line_string.should_not == geometry_collection1
+    expect(geometry_collection1).to eq(GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256))
+    expect(geometry_collection2).not_to eq(geometry_collection1)
+    expect(line_string).not_to eq(geometry_collection1)
   end
 
   it "test_geometry_collection_binary" do
     geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
-    geometry_collection.as_hex_ewkb.should eql("010700002000010000020000000101000000AE47E17A14AE12403333333333B34640010200000002000000CDCCCCCCCCCC16406666666666E628403333333333E350400000000000004B40")
+    expect(geometry_collection.as_hex_ewkb).to eql("010700002000010000020000000101000000AE47E17A14AE12403333333333B34640010200000002000000CDCCCCCCCCCC16406666666666E628403333333333E350400000000000004B40")
 
     geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y_z_m(4.67,45.4,45.67,2.3,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45,4.56,98.3],[67.55,54,12.2,3.4]],256,true, true)],256,true, true)
-    geometry_collection.as_hex_ewkb.should eql("01070000E0000100000200000001010000C0AE47E17A14AE12403333333333B34640F6285C8FC2D54640666666666666024001020000C002000000CDCCCCCCCCCC16406666666666E628403D0AD7A3703D124033333333339358403333333333E350400000000000004B4066666666666628403333333333330B40")
+    expect(geometry_collection.as_hex_ewkb).to eql("01070000E0000100000200000001010000C0AE47E17A14AE12403333333333B34640F6285C8FC2D54640666666666666024001020000C002000000CDCCCCCCCCCC16406666666666E628403D0AD7A3703D124033333333339358403333333333E350400000000000004B4066666666666628403333333333330B40")
   end
 
   it "should test_geometry_collection_text" do
     geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y(4.67,45.4,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)],256)
-    geometry_collection.as_ewkt.should eql("SRID=256;GEOMETRYCOLLECTION(POINT(4.67 45.4),LINESTRING(5.7 12.45,67.55 54))")
+    expect(geometry_collection.as_ewkt).to eql("SRID=256;GEOMETRYCOLLECTION(POINT(4.67 45.4),LINESTRING(5.7 12.45,67.55 54))")
 
     geometry_collection = GeoRuby::SimpleFeatures::GeometryCollection.from_geometries([GeoRuby::SimpleFeatures::Point.from_x_y_m(4.67,45.4,45.6,256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[5.7,12.45,5.6],[67.55,54,6.7]],256,false,true)],256,false,true)
-    geometry_collection.as_ewkt.should eql("SRID=256;GEOMETRYCOLLECTIONM(POINTM(4.67 45.4 45.6),LINESTRINGM(5.7 12.45 5.6,67.55 54 6.7))")
+    expect(geometry_collection.as_ewkt).to eql("SRID=256;GEOMETRYCOLLECTIONM(POINTM(4.67 45.4 45.6),LINESTRINGM(5.7 12.45 5.6,67.55 54 6.7))")
   end
 
 end

data/spec/geo_ruby/simple_features/geometry_spec.rb

@@ -9,29 +9,29 @@ describe GeoRuby::SimpleFeatures::Geometry do
   end
 
   it "should have a default srid" do
-    subject.srid.should eql(4326) #Geometry.default_srid)
+    expect(subject.srid).to eql(4326) #Geometry.default_srid)
   end
 
   it "should change srid" do
     geo = GeoRuby::SimpleFeatures::Geometry.new(225)
-    geo.srid.should eql(225)
+    expect(geo.srid).to eql(225)
   end
 
   it "should instantiate from hex ewkb" do
     point = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb("01010000207B000000CDCCCCCCCCCC28406666666666A64640")
-    point.class.should == GeoRuby::SimpleFeatures::Point
-    point.x.should be_within(0.1).of(12.4)
+    expect(point.class).to eq(GeoRuby::SimpleFeatures::Point)
+    expect(point.x).to be_within(0.1).of(12.4)
   end
 
   it "should output as_ewkb" do
-    subject.stub(:binary_geometry_type).and_return(1)
-    subject.stub(:binary_representation).and_return(1)
-    subject.as_ewkb.should eql("\001\001\000\000 \346\020\000\000\001")
+    allow(subject).to receive(:binary_geometry_type).and_return(1)
+    allow(subject).to receive(:binary_representation).and_return(1)
+    expect(subject.as_ewkb).to eql("\001\001\000\000 \346\020\000\000\001")
   end
 
   it "should output as_ewkb (utf8 issue)" do
-    subject.stub(:binary_geometry_type).and_return(1)
-    subject.stub(:binary_representation).and_return(1)
-    subject.as_ewkb.should eql("\x01\x01\x00\x00 \xE6\x10\x00\x00\x01")
+    allow(subject).to receive(:binary_geometry_type).and_return(1)
+    allow(subject).to receive(:binary_representation).and_return(1)
+    expect(subject.as_ewkb).to eql("\x01\x01\x00\x00 \xE6\x10\x00\x00\x01")
   end
 end

data/spec/geo_ruby/simple_features/line_string_spec.rb

@@ -6,8 +6,8 @@ module LineSpecHelper
     Array.new(num) { |i| mock_point(i,i) }
   end
 
-  def mock_point(x=1,y=2)
-    double(GeoRuby::SimpleFeatures::Point, :x => x, :y => y, :text_representation => "#{x} #{y}")
+  def mock_point(x=1, y=2)
+    double(GeoRuby::SimpleFeatures::Point, :x => x, :y => y, :text_representation => "#{x} #{y}", :to_coordinates => [x, y])
   end
 end
 
@@ -24,15 +24,15 @@ describe GeoRuby::SimpleFeatures::LineString do
     end
 
     it "should have binary_geometry_type 2" do
-      line.binary_geometry_type.should eql(2)
+      expect(line.binary_geometry_type).to eql(2)
     end
 
     it "should have text_geometry_type" do
-      line.text_geometry_type.should eql("LINESTRING")
+      expect(line.text_geometry_type).to eql("LINESTRING")
     end
 
     it "should have a points array" do
-      line.points.should be_instance_of(Array)
+      expect(line.points).to be_instance_of(Array)
     end
 
   end
@@ -42,12 +42,12 @@ describe GeoRuby::SimpleFeatures::LineString do
     let(:line) { GeoRuby::SimpleFeatures::LineString.from_points([GeoRuby::SimpleFeatures::Point.xy(1,1), GeoRuby::SimpleFeatures::Point.xy(2,2), GeoRuby::SimpleFeatures::Point.xy(3,3)]) }
 
     it "should check orientation" do
-      line.should_not be_clockwise
+      expect(line).not_to be_clockwise
     end
 
     it "should check orientation" do
       l = GeoRuby::SimpleFeatures::LineString.from_points([GeoRuby::SimpleFeatures::Point.from_x_y(20,20), GeoRuby::SimpleFeatures::Point.from_x_y(10,10), GeoRuby::SimpleFeatures::Point.from_x_y(-10,10)])
-      l.should be_clockwise
+      expect(l).to be_clockwise
     end
 
   end
@@ -58,51 +58,51 @@ describe GeoRuby::SimpleFeatures::LineString do
       line_string = GeoRuby::SimpleFeatures::LineString::new
       line_string.concat([GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3),GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)])
 
-      line_string.length.should eql(2)
-      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3)
+      expect(line_string.length).to eql(2)
+      expect(line_string[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(12.4,45.3))
 
       point=GeoRuby::SimpleFeatures::Point.from_x_y(123,45.8777)
       line_string[0]=point
-      line_string[0].should == point
+      expect(line_string[0]).to eq(point)
 
       points=[GeoRuby::SimpleFeatures::Point.from_x_y(123,45.8777),GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)]
-      line_string.each_index {|i| line_string[i].should == points[i] }
+      line_string.each_index {|i| expect(line_string[i]).to eq(points[i]) }
 
       point=GeoRuby::SimpleFeatures::Point.from_x_y(22.4,13.56)
       line_string << point
-      line_string.length.should eql(3)
-      line_string[2].should eql(point)
+      expect(line_string.length).to eql(3)
+      expect(line_string[2]).to eql(point)
     end
 
     it "should create" do
       line_string = GeoRuby::SimpleFeatures::LineString.from_points([GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3),GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)],123)
-      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
-      line_string.length.should eql(2)
-      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3)
-      line_string[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)
+      expect(line_string.class).to eql(GeoRuby::SimpleFeatures::LineString)
+      expect(line_string.length).to eql(2)
+      expect(line_string[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3))
+      expect(line_string[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6))
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
-      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
-      line_string.length.should eql(3)
-      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3)
-      line_string[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6)
+      expect(line_string.class).to eql(GeoRuby::SimpleFeatures::LineString)
+      expect(line_string.length).to eql(3)
+      expect(line_string[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3))
+      expect(line_string[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6))
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true)
-      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
-      line_string.length.should eql(3)
-      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,-45.3,123,123)
+      expect(line_string.class).to eql(GeoRuby::SimpleFeatures::LineString)
+      expect(line_string.length).to eql(3)
+      expect(line_string[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,-45.3,123,123))
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true)
-      line_string.class.should eql(GeoRuby::SimpleFeatures::LineString)
-      line_string.length.should eql(3)
-      line_string[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,-45.3,123,123)
+      expect(line_string.class).to eql(GeoRuby::SimpleFeatures::LineString)
+      expect(line_string.length).to eql(3)
+      expect(line_string[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(12.4,-45.3,123,123))
     end
 
     it "should bbox it" do
       bbox = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,123],[45.4,41.6,333],[4.456,1.0698,987]],123,true).bounding_box
-      bbox.length.should eql(2)
-      bbox[0].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(4.456,-45.3,123)
-      bbox[1].should == GeoRuby::SimpleFeatures::Point.from_x_y_z(45.4,41.6,987)
+      expect(bbox.length).to eql(2)
+      expect(bbox[0]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(4.456,-45.3,123))
+      expect(bbox[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y_z(45.4,41.6,987))
     end
 
     it "should test_line_string_equal" do
@@ -110,56 +110,56 @@ describe GeoRuby::SimpleFeatures::LineString do
       line_string2 = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],123)
       point = GeoRuby::SimpleFeatures::Point.from_x_y(12.4,-45.3,123)
 
-      line_string1.should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123)
-      line_string1.should_not == line_string2
-      line_string1.should_not == point
+      expect(line_string1).to eq(GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]],123))
+      expect(line_string1).not_to eq(line_string2)
+      expect(line_string1).not_to eq(point)
     end
 
     it "should test_line_string_binary" do
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
-      line_string.as_hex_ewkb.should eql("01020000200001000002000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC4440")
+      expect(line_string.as_hex_ewkb).to eql("01020000200001000002000000CDCCCCCCCCCC28406666666666A646C03333333333B34640CDCCCCCCCCCC4440")
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
-      line_string.as_hex_ewkb.should eql("01020000A00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A641403333333333B34640CDCCCCCCCCCC44409A99999999992840")
+      expect(line_string.as_hex_ewkb).to eql("01020000A00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A641403333333333B34640CDCCCCCCCCCC44409A99999999992840")
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3,45.1],[45.4,41.6,12.3,40.23]],256,true,true)
-      line_string.as_hex_ewkb.should eql("01020000E00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A64140CDCCCCCCCC8C46403333333333B34640CDCCCCCCCCCC44409A999999999928403D0AD7A3701D4440")
+      expect(line_string.as_hex_ewkb).to eql("01020000E00001000002000000CDCCCCCCCCCC28406666666666A646C06666666666A64140CDCCCCCCCC8C46403333333333B34640CDCCCCCCCCCC44409A999999999928403D0AD7A3701D4440")
     end
 
     it "test_line_string_text" do
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3],[45.4,41.6]],256)
-      line_string.as_ewkt.should eql("SRID=256;LINESTRING(12.4 -45.3,45.4 41.6)")
+      expect(line_string.as_ewkt).to eql("SRID=256;LINESTRING(12.4 -45.3,45.4 41.6)")
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,true)
-      line_string.as_ewkt.should eql("SRID=256;LINESTRING(12.4 -45.3 35.3,45.4 41.6 12.3)")
+      expect(line_string.as_ewkt).to eql("SRID=256;LINESTRING(12.4 -45.3 35.3,45.4 41.6 12.3)")
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3],[45.4,41.6,12.3]],256,false,true)
-      line_string.as_ewkt.should eql("SRID=256;LINESTRINGM(12.4 -45.3 35.3,45.4 41.6 12.3)")
+      expect(line_string.as_ewkt).to eql("SRID=256;LINESTRINGM(12.4 -45.3 35.3,45.4 41.6 12.3)")
 
       line_string = GeoRuby::SimpleFeatures::LineString.from_coordinates([[12.4,-45.3,35.3,25.2],[45.4,41.6,12.3,13.75]],256,true,true)
-      line_string.as_ewkt.should eql("SRID=256;LINESTRING(12.4 -45.3 35.3 25.2,45.4 41.6 12.3 13.75)")
+      expect(line_string.as_ewkt).to eql("SRID=256;LINESTRING(12.4 -45.3 35.3 25.2,45.4 41.6 12.3 13.75)")
     end
 
     it "should test_linear_ring_creation" do
       #testing just the constructor helpers since the rest is the same as for line_string
       linear_ring = GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],345)
-      linear_ring.class.should eql(GeoRuby::SimpleFeatures::LinearRing)
-      linear_ring.length.should eql(4)
-      linear_ring.should be_closed
-      linear_ring[1].should == GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6,345)
+      expect(linear_ring.class).to eql(GeoRuby::SimpleFeatures::LinearRing)
+      expect(linear_ring.length).to eql(4)
+      expect(linear_ring).to be_closed
+      expect(linear_ring[1]).to eq(GeoRuby::SimpleFeatures::Point.from_x_y(45.4,41.6,345))
     end
   end
 
   describe "> Coordinates" do
 
     before(:each) do
-      GeoRuby::SimpleFeatures::Point.should_receive(:from_coordinates).
+      expect(GeoRuby::SimpleFeatures::Point).to receive(:from_coordinates).
         exactly(4).with(anything, 4326, false, false).and_return(mock_point)
       @line = GeoRuby::SimpleFeatures::LineString.from_coordinates([1.2,2.5,2.2,4.5])
     end
 
     it "should instantiate from coordinates" do
-      @line.points.length.should eql(4)
+      expect(@line.points.length).to eql(4)
     end
 
   end
@@ -170,35 +170,44 @@ describe GeoRuby::SimpleFeatures::LineString do
 
     it "should be closed if the last point equals the first" do
       line.push(line.first)
-      line.should be_closed
-      line.length.should eql(8)
+      expect(line).to be_closed
+      expect(line.length).to eql(8)
     end
 
     it "should print the text representation" do
-      line.text_representation.should eql("0 0,1 1,2 2,3 3,4 4,5 5,6 6")
+      expect(line.text_representation).to eql("0 0,1 1,2 2,3 3,4 4,5 5,6 6")
     end
 
     it "should print the georss_simple_representation" do
-      line.georss_simple_representation({:geom_attr => nil}).
-        should eql("<georss:line>0 0 1 1 2 2 3 3 4 4 5 5 6 6</georss:line>\n")
+      expect(line.georss_simple_representation({:geom_attr => nil})).
+        to eql("<georss:line>0 0 1 1 2 2 3 3 4 4 5 5 6 6</georss:line>\n")
     end
 
     it "should map the georss_poslist" do
-      line.georss_poslist.should eql("0 0 1 1 2 2 3 3 4 4 5 5 6 6")
+      expect(line.georss_poslist).to eql("0 0 1 1 2 2 3 3 4 4 5 5 6 6")
     end
 
     it "should print the kml_representation" do
-      line.kml_representation.should
-        eql("<LineString>\n<coordinates>0,0 1,1 2,2 3,3 4,4 5,5 6,6</coordinates>\n</LineString>\n")
+      expect(line.kml_representation).
+        to eql("<LineString>\n<coordinates>0,0 1,1 2,2 3,3 4,4 5,5 6,6</coordinates>\n</LineString>\n")
     end
 
     it "should print the kml_poslist without reverse or z" do
-      line.kml_poslist({}).should eql("0,0 1,1 2,2 3,3 4,4 5,5 6,6")
+      expect(line.kml_poslist({})).to eql("0,0 1,1 2,2 3,3 4,4 5,5 6,6")
     end
 
     it "should print the kml_poslist reverse" do
-      line.kml_poslist({:reverse => true}).should eql("6,6 5,5 4,4 3,3 2,2 1,1 0,0")
+      expect(line.kml_poslist({:reverse => true})).to eql("6,6 5,5 4,4 3,3 2,2 1,1 0,0")
     end
+
+    it "should print out nicely as json/geojson" do
+      expect(line.as_json).to eql({:type=>"LineString", :coordinates=>[[0, 0], [1, 1], [2, 2], [3, 3], [4, 4], [5, 5], [6, 6]]})
+    end
+
+    it "should print out nicely to json/geojson" do
+      expect(line.to_json).to eql("{\"type\":\"LineString\",\"coordinates\":[[0,0],[1,1],[2,2],[3,3],[4,4],[5,5],[6,6]]}")
+    end
+
   end
 
   describe "> Distances..." do
@@ -210,15 +219,15 @@ describe GeoRuby::SimpleFeatures::LineString do
     end
 
     it "should print the length with haversine" do
-      @p1.should_receive(:spherical_distance).with(@p2).and_return(10)
-      @p2.should_receive(:spherical_distance).with(@p3).and_return(10)
-      @line.spherical_distance.should eql(20)
+      expect(@p1).to receive(:spherical_distance).with(@p2).and_return(10)
+      expect(@p2).to receive(:spherical_distance).with(@p3).and_return(10)
+      expect(@line.spherical_distance).to eql(20)
     end
 
     it "should print lenght as euclidian" do
-      @p1.should_receive(:euclidian_distance).with(@p2).and_return(10)
-      @p2.should_receive(:euclidian_distance).with(@p3).and_return(10)
-      @line.euclidian_distance.should eql(20)
+      expect(@p1).to receive(:euclidian_distance).with(@p2).and_return(10)
+      expect(@p2).to receive(:euclidian_distance).with(@p3).and_return(10)
+      expect(@line.euclidian_distance).to eql(20)
     end
   end
 
@@ -228,31 +237,31 @@ describe GeoRuby::SimpleFeatures::LineString do
 
     it "should simplify a simple linestring" do
       line =  GeoRuby::SimpleFeatures::LineString.from_coordinates([[12,15],[14,17],[17, 20]], 4326)
-      line.simplify.should have(2).points
+      expect(line.simplify.points.size).to eq(2)
     end
 
     it "should simplify a harder linestring" do
-      line.simplify(6).should have(6).points
-      line.simplify(9).should have(4).points
-      line.simplify(10).should have(3).points
+      expect(line.simplify(6).points.size).to eq(6)
+      expect(line.simplify(9).size).to eq(4)
+      expect(line.simplify(10).size).to eq(3)
     end
 
     it "should barely touch it" do
-      line.simplify(1).should have(7).points
+      expect(line.simplify(1).points.size).to eq(7)
     end
 
     it "should simplify to five points" do
-      line.simplify(7).should have(5).points
+      expect(line.simplify(7).points.size).to eq(5)
     end
 
     it "should flatten it" do
-      line.simplify(11).should have(2).points
+      expect(line.simplify(11).points.size).to eq(2)
     end
 
     it "should be the first and last in a flatten" do
       l = line.simplify(11)
-      l[0].should be_a_point(6, 0)
-      l[1].should be_a_point(6, 15)
+      expect(l[0]).to be_a_point(6, 0)
+      expect(l[1]).to be_a_point(6, 15)
     end
 
   end

data/spec/geo_ruby/simple_features/linear_ring_spec.rb

@@ -4,7 +4,7 @@ describe GeoRuby::SimpleFeatures::LinearRing do
 
   it "should instantiate" do
     lr = GeoRuby::SimpleFeatures::LinearRing.new(4326)
-    lr.should be_instance_of(GeoRuby::SimpleFeatures::LinearRing)
+    expect(lr).to be_instance_of(GeoRuby::SimpleFeatures::LinearRing)
   end
 
   describe "Instance" do
@@ -12,11 +12,11 @@ describe GeoRuby::SimpleFeatures::LinearRing do
     let(:lr) { GeoRuby::SimpleFeatures::LinearRing.from_coordinates([[10,10],[20,45],[45,10],[10, 10]],256) }
 
     it "should test if contains a point" do
-      lr.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(21,21)).should be_true
+      expect(lr.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(21,21))).to be_truthy
     end
 
     it "should test if not contains a point" do
-      lr.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(21,51)).should be_false
+      expect(lr.contains_point?(GeoRuby::SimpleFeatures::Point.from_x_y(21,51))).to be_falsey
     end
 
   end

data/spec/geo_ruby/simple_features/multi_line_string_spec.rb

@@ -4,32 +4,32 @@ describe GeoRuby::SimpleFeatures::MultiLineString do
 
  it "test_multi_line_string_creation" do
     multi_line_string1 = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings([GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]],256)],256)
-    multi_line_string1.should be_instance_of(GeoRuby::SimpleFeatures::MultiLineString)
-    multi_line_string1.length.should eql(2)
-    multi_line_string1[0].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256)
+    expect(multi_line_string1).to be_instance_of(GeoRuby::SimpleFeatures::MultiLineString)
+    expect(multi_line_string1.length).to eql(2)
+    expect(multi_line_string1[0]).to eq(GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256))
 
     multi_line_string2= GeoRuby::SimpleFeatures::MultiLineString.from_coordinates([[[1.5,45.2],[-54.12312,-0.012]],[[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]]],256);
-    multi_line_string1.should be_instance_of(GeoRuby::SimpleFeatures::MultiLineString)
-    multi_line_string1.length.should eql(2)
-    multi_line_string2[0].should == GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256)
+    expect(multi_line_string1).to be_instance_of(GeoRuby::SimpleFeatures::MultiLineString)
+    expect(multi_line_string1.length).to eql(2)
+    expect(multi_line_string2[0]).to eq(GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256))
 
-    multi_line_string2.should == multi_line_string2
+    expect(multi_line_string2).to eq(multi_line_string2)
   end
 
   it "test_multi_line_string_binary" do
     multi_line_string = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings([GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]],256)],256)
-    multi_line_string.as_hex_ewkb.should eql("01050000200001000002000000010200000002000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF010200000003000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF39B4C876BE8F46403333333333D35E40")
+    expect(multi_line_string.as_hex_ewkb).to eql("01050000200001000002000000010200000002000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF010200000003000000000000000000F83F9A99999999994640E4BD6A65C20F4BC0FA7E6ABC749388BF39B4C876BE8F46403333333333D35E40")
 
     multi_line_string = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings([GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2,1.3,1.2],[-54.12312,-0.012,1.2,4.5]],256,true,true),GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2,5.1,-4.5],[-54.12312,-0.012,-6.8,3.4],[45.123,123.3,4.5,-5.3]],256,true,true)],256,true,true)
-    multi_line_string.as_hex_ewkb.should eql("0105000020000100000200000001020000C002000000000000000000F83F9A99999999994640CDCCCCCCCCCCF43F333333333333F33FE4BD6A65C20F4BC0FA7E6ABC749388BF333333333333F33F000000000000124001020000C003000000000000000000F83F9A99999999994640666666666666144000000000000012C0E4BD6A65C20F4BC0FA7E6ABC749388BF3333333333331BC03333333333330B4039B4C876BE8F46403333333333D35E40000000000000124033333333333315C0")
+    expect(multi_line_string.as_hex_ewkb).to eql("0105000020000100000200000001020000C002000000000000000000F83F9A99999999994640CDCCCCCCCCCCF43F333333333333F33FE4BD6A65C20F4BC0FA7E6ABC749388BF333333333333F33F000000000000124001020000C003000000000000000000F83F9A99999999994640666666666666144000000000000012C0E4BD6A65C20F4BC0FA7E6ABC749388BF3333333333331BC03333333333330B4039B4C876BE8F46403333333333D35E40000000000000124033333333333315C0")
   end
 
   it "test_multi_line_string_text" do
     multi_line_string = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings([GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]],256),GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]],256)],256)
-    multi_line_string.as_ewkt.should eql("SRID=256;MULTILINESTRING((1.5 45.2,-54.12312 -0.012),(1.5 45.2,-54.12312 -0.012,45.123 123.3))")
+    expect(multi_line_string.as_ewkt).to eql("SRID=256;MULTILINESTRING((1.5 45.2,-54.12312 -0.012),(1.5 45.2,-54.12312 -0.012,45.123 123.3))")
 
     multi_line_string = GeoRuby::SimpleFeatures::MultiLineString.from_line_strings([GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2,1.3,1.2],[-54.12312,-0.012,1.2,4.5]],256,true,true),GeoRuby::SimpleFeatures::LineString.from_coordinates([[1.5,45.2,5.1,-4.5],[-54.12312,-0.012,-6.8,3.4],[45.123,123.3,4.5,-5.3]],256,true,true)],256,true,true)
-    multi_line_string.as_ewkt.should eql("SRID=256;MULTILINESTRING((1.5 45.2 1.3 1.2,-54.12312 -0.012 1.2 4.5),(1.5 45.2 5.1 -4.5,-54.12312 -0.012 -6.8 3.4,45.123 123.3 4.5 -5.3))")
+    expect(multi_line_string.as_ewkt).to eql("SRID=256;MULTILINESTRING((1.5 45.2 1.3 1.2,-54.12312 -0.012 1.2 4.5),(1.5 45.2 5.1 -4.5,-54.12312 -0.012 -6.8 3.4,45.123 123.3 4.5 -5.3))")
   end
 
   describe "Some More" do
@@ -38,17 +38,17 @@ describe GeoRuby::SimpleFeatures::MultiLineString do
     end
 
     it "should have a accessor to all points" do
-      @mls.points.should be_instance_of(Array)
+      expect(@mls.points).to be_instance_of(Array)
     end
 
     it "should flatten the array" do
-      @mls.should have(5).points
+      expect(@mls.points.size).to eq(5)
     end
 
     it "should simplify to linestring" do
       ls = @mls.to_line_string
-      ls.should be_instance_of(GeoRuby::SimpleFeatures::LineString)
-      ls.should have(5).points
+      expect(ls).to be_instance_of(GeoRuby::SimpleFeatures::LineString)
+      expect(ls.points.size).to eq(5)
     end
   end
 end