nofxx-georuby 1.7.1 → 1.7.3

data/Rakefile

@@ -9,28 +9,27 @@ begin
     gem.description = "GeoRuby provides geometric data types from the OGC 'Simple Features' specification."
     gem.email = "x@nofxx.com"
     gem.homepage = "http://github.com/nofxx/georuby"
-    gem.authors = ["Guilhem Vellut", "Marcos Augusto"]
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.authors = ["Guilhem Vellut", "Marcos Piccinini"]
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "dbf", ">= 1.1.2"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+# require 'spec/rake/spectask'
+# Spec::Rake::SpecTask.new(:spec) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.spec_files = FileList['spec/**/*_spec.rb']
+# end
 
+# Spec::Rake::SpecTask.new(:rcov) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.pattern = 'spec/**/*_spec.rb'
+#   spec.rcov = true
+# end
 
-task :default => :spec
+# task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.3

data/lib/geo_ruby/gpx4r/gpx.rb

@@ -31,7 +31,7 @@ module GeoRuby
         gpxfile = GpxFile.new(file, *opts)
         if block_given?
           yield gpxfile
-          gpxfile.close
+          # gpxfile.close
         else
           gpxfile
         end
@@ -67,7 +67,7 @@ module GeoRuby
 
       # Return the GPX file as LineString
       def as_line_string
-        LineString.from_points(@points)
+        GeoRuby::SimpleFeatures::LineString.from_points(@points)
       end
       alias :as_polyline :as_line_string
 
@@ -75,7 +75,7 @@ module GeoRuby
       # If the GPX isn't closed, a line from the first
       # to the last point will be created to close it.
       def as_polygon
-        Polygon.from_points([@points[0] == @points[-1] ?  @points : @points.push(@points[0].clone)])
+        GeoRuby::SimpleFeatures::Polygon.from_points([@points[0] == @points[-1] ?  @points : @points.push(@points[0].clone)])
       end
 
       # Return GPX Envelope
@@ -94,14 +94,15 @@ module GeoRuby
       # trk(pt) => track /
       def parse_file(with_z, with_m)
         data = @gpx.read
-        @file_mode = data =~ /trkpt/ ? "//trkpt" : "//rtept"
+        @file_mode = data =~ /trkpt/ ? "//trkpt" : (data =~ /wpt/ ? "//wpt" : "//rtept")
         Nokogiri.HTML(data).search(@file_mode).each do |tp|
-          z = z.inner_text.to_i if with_z && z = tp.at("ele")
+          z = z.inner_text.to_f if with_z && z = tp.at("ele")
           m = m.inner_text if with_m && m = tp.at("time")
-          @points << Point.from_coordinates([tp["lon"].to_f, tp["lat"].to_f, z, m],nil,with_z, with_m)
+          @points << GeoRuby::SimpleFeatures::Point.from_coordinates([tp["lon"].to_f, tp["lat"].to_f, z, m],4326,with_z, with_m)
         end
         close
         @record_count = @points.length
+        self.envelope
       rescue => e
         raise MalformedGpxException.new("Bad GPX. Error: #{e}")
         # trackpoint.at("gpxdata:hr").nil? # heartrate

data/lib/geo_ruby/shp4r/dbf.rb

@@ -4,7 +4,8 @@ require 'rubygems'
 begin
   require 'dbf'
 rescue LoadError
-  puts "Unable to find gem 'dbf'. Please install."
+  puts "You've loaded GeoRuby SHP Support."
+  puts "Please install the gem 'dbf' to use it. `gem install dbf`"
 end
 
 module GeoRuby

data/lib/geo_ruby/simple_features/line_string.rb

@@ -166,6 +166,28 @@ module GeoRuby
         pos_list.join(" ")
       end
 
+      # Simplify linestring (Douglas Peucker Algorithm)
+      # http://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
+      def simplify(epsilon=1)
+        LineString.from_points(do_simplify(@points, epsilon))
+      end
+
+      def do_simplify(list, epsilon)
+        index = dmax = 0
+        2.upto(list.length - 1) do |i|
+          d = list[i].orthogonal_distance(list[0], list[-1])
+          index, dmax = i, d if d > dmax
+        end
+
+        if dmax >= epsilon
+          res1 = do_simplify(list[0..index], epsilon)
+          res2 = do_simplify(list[index..-1], epsilon)
+          res1[0..-2] + res2[0..-1]
+        else
+          [list[0], list[-1]]
+        end
+      end
+
       #Creates a new line string. Accept an array of points as argument
       def self.from_points(points,srid=DEFAULT_SRID,with_z=false,with_m=false)
         line_string = new(srid,with_z,with_m)

data/lib/geo_ruby/simple_features/point.rb

@@ -6,6 +6,7 @@ module GeoRuby
     #Represents a point. It is in 3D if the Z coordinate is not +nil+.
     class Point < Geometry
       DEG2RAD = 0.0174532925199433
+      HALFPI  = 1.5707963267948966
       attr_accessor :x,:y,:z,:m
       attr_reader :r, :t # radium and theta
 
@@ -46,16 +47,15 @@ module GeoRuby
         Math.sqrt((point.x - x)**2 + (point.y - y)**2)
       end
 
-      #Returns the sperical distance in meters, with a radius of 6471000m, with the haversine law.
-      #Assumes x is the lon and y the lat, in degrees (Changed in version 1.1).
-      #The user has to make sure using this distance makes sense (ie she should be in latlon coordinates)
+      # Spherical distance in meters, using 'Haversine' formula.
+      # with a radius of 6471000m
+      # Assumes x is the lon and y the lat, in degrees (Changed in version 1.1).
+      # The user has to make sure using this distance makes sense (ie she should be in latlon coordinates)
       def spherical_distance(point,r=6370997.0)
-        radlat_from = lat * DEG2RAD
-        radlat_to = point.lat * DEG2RAD
         dlat = (point.lat - lat) * DEG2RAD / 2
         dlon = (point.lon - lon) * DEG2RAD / 2
 
-        a = Math.sin(dlat)**2 + Math.cos(radlat_from) * Math.cos(radlat_to) * Math.sin(dlon)**2
+        a = Math.sin(dlat)**2 + Math.cos(lat * DEG2RAD) * Math.cos(point.lat * DEG2RAD) * Math.sin(dlon)**2
         c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a))
         r * c
       end
@@ -108,6 +108,29 @@ module GeoRuby
         b*a_bis*(sigma-deltaSigma)
       end
 
+      # Orthogonal Distance
+      # Based http://www.allegro.cc/forums/thread/589720
+      def orthogonal_distance(line, tail = nil)
+        head, tail  = tail ?  [line, tail] : [line[0], line[-1]]
+        a, b = @x - head.x, @y - head.y
+        c, d = tail.x - head.x, tail.y - head.y
+
+        dot = a * c + b * d
+        len = c * c + d * d
+        res = dot / len
+
+        xx, yy = if res < 0
+                   [head.x, head.y]
+                 elsif res > 1
+                   [tail.x, tail.y]
+                 else
+                   [head.x + res * c, head.y + res * d]
+                 end
+        # todo benchmark if worth creating an instance
+        # euclidian_distance(Point.from_x_y(xx, yy))
+        Math.sqrt((@x - xx) ** 2 + (@y - yy) ** 2)
+      end
+
       #Bearing from a point to another, in degrees.
       def bearing_to(other)
         return 0 if self == other
@@ -146,21 +169,19 @@ module GeoRuby
       end
 
       #tests the equality of the position of points + m
-      def ==(other_point)
-        if other_point.class != self.class
-          false
-        else
-          @x == other_point.x and @y == other_point.y and @z == other_point.z and @m == other_point.m
-        end
+      def ==(other)
+        return false unless other.kind_of?(Point)
+        @x == other.x and @y == other.y and @z == other.z and @m == other.m
       end
 
       #binary representation of a point. It lacks some headers to be a valid EWKB representation.
       def binary_representation(allow_z=true,allow_m=true) #:nodoc:
-        bin_rep = [@x,@y].pack("EE")
-        bin_rep += [@z].pack("E") if @with_z and allow_z #Default value so no crash
-        bin_rep += [@m].pack("E") if @with_m and allow_m #idem
+        bin_rep = [@x.to_f,@y.to_f].pack("EE")
+        bin_rep += [@z.to_f].pack("E") if @with_z and allow_z #Default value so no crash
+        bin_rep += [@m.to_f].pack("E") if @with_m and allow_m #idem
         bin_rep
       end
+
       #WKB geometry type of a point
       def binary_geometry_type#:nodoc:
         1
@@ -173,6 +194,7 @@ module GeoRuby
         tex_rep += " #{@m}" if @with_m and allow_m
         tex_rep
       end
+
       #WKT geometry type of a point
       def text_geometry_type #:nodoc:
         "POINT"
@@ -184,11 +206,13 @@ module GeoRuby
         geom_attr = options[:geom_attr]
         "<#{georss_ns}:point#{geom_attr}>#{y} #{x}</#{georss_ns}:point>\n"
       end
+
       #georss w3c representation
       def georss_w3cgeo_representation(options) #:nodoc:
         w3cgeo_ns = options[:w3cgeo_ns] || "geo"
         "<#{w3cgeo_ns}:lat>#{y}</#{w3cgeo_ns}:lat>\n<#{w3cgeo_ns}:long>#{x}</#{w3cgeo_ns}:long>\n"
       end
+
       #georss gml representation
       def georss_gml_representation(options) #:nodoc:
         georss_ns = options[:georss_ns] || "georss"
@@ -235,29 +259,32 @@ module GeoRuby
         val.join(", ")
       end
 
-      #Polar stuff
-      #http://www.engineeringtoolbox.com/converting-cartesian-polar-coordinates-d_1347.html
-      #http://rcoordinate.rubyforge.org/svn/point.rb
+      # Polar stuff
+      #
+      # http://www.engineeringtoolbox.com/converting-cartesian-polar-coordinates-d_1347.html
+      # http://rcoordinate.rubyforge.org/svn/point.rb
       # outputs radium
-      def r;        Math.sqrt(x**2 + y**2);      end
+      def r;      Math.sqrt(@x**2 + @y**2);      end
 
-      #outputs theta
+      # outputs theta
       def theta_rad
         if @x.zero?
-          @y < 0 ? 3 * Math::PI / 2 : Math::PI / 2
+          @y < 0 ? 3 * HALFPI : HALFPI
         else
           th = Math.atan(@y/@x)
           th += 2 * Math::PI if r > 0
         end
       end
 
-      def theta_deg
-        theta_rad / DEG2RAD
-      end
+      # outputs theta in degrees
+      def theta_deg;        theta_rad / DEG2RAD;      end
+
+      # outputs an array containing polar distance and theta
+      def as_polar;        [r,t];      end
 
-      #outputs an array containing polar distance and theta
-      def as_polar
-        [r,t]
+      # invert signal of all coordinates
+      def -@
+        set_x_y_z(-@x, -@y, -@z)
       end
 
       #creates a point from an array of coordinates
@@ -323,11 +350,14 @@ module GeoRuby
 
       #aliasing the constructors in case you want to use lat/lon instead of y/x
       class << self
-        alias :from_lon_lat :from_x_y
-        alias :from_lon_lat_z :from_x_y_z
-        alias :from_lon_lat_m :from_x_y_m
+        alias :xy               :from_x_y
+        alias :xyz              :from_x_y_z
+        alias :from_lon_lat_z   :from_x_y_z
+        alias :from_lon_lat     :from_x_y
+        alias :from_lon_lat_z   :from_x_y_z
+        alias :from_lon_lat_m   :from_x_y_m
         alias :from_lon_lat_z_m :from_x_y_z_m
-        alias :from_rad_tet :from_r_t
+        alias :from_rad_tet     :from_r_t
       end
     end
   end

data/nofxx-georuby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nofxx-georuby}
-  s.version = "1.7.1"
+  s.version = "1.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Guilhem Vellut", "Marcos Augusto"]
-  s.date = %q{2010-01-28}
+  s.authors = ["Guilhem Vellut", "Marcos Piccinini"]
+  s.date = %q{2010-09-20}
   s.description = %q{GeoRuby provides geometric data types from the OGC 'Simple Features' specification.}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -85,43 +85,48 @@ Gem::Specification.new do |s|
      "spec/geo_ruby/simple_features/point_spec.rb",
      "spec/geo_ruby/simple_features/polygon_spec.rb",
      "spec/geo_ruby_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/nofxx/georuby}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby data holder for OGC Simple Features}
   s.test_files = [
-    "spec/geo_ruby/gpx4r/gpx_spec.rb",
+    "spec/geo_ruby_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/geo_ruby/gpx4r/gpx_spec.rb",
      "spec/geo_ruby/shp4r/shp_spec.rb",
-     "spec/geo_ruby/simple_features/envelope_spec.rb",
-     "spec/geo_ruby/simple_features/ewkb_parser_spec.rb",
-     "spec/geo_ruby/simple_features/ewkt_parser_spec.rb",
-     "spec/geo_ruby/simple_features/geometry_collection_spec.rb",
+     "spec/geo_ruby/simple_features/point_spec.rb",
      "spec/geo_ruby/simple_features/geometry_factory_spec.rb",
-     "spec/geo_ruby/simple_features/geometry_spec.rb",
-     "spec/geo_ruby/simple_features/georss_parser_spec.rb",
+     "spec/geo_ruby/simple_features/envelope_spec.rb",
+     "spec/geo_ruby/simple_features/polygon_spec.rb",
      "spec/geo_ruby/simple_features/line_string_spec.rb",
-     "spec/geo_ruby/simple_features/linear_ring_spec.rb",
      "spec/geo_ruby/simple_features/multi_line_string_spec.rb",
-     "spec/geo_ruby/simple_features/multi_point_spec.rb",
+     "spec/geo_ruby/simple_features/ewkt_parser_spec.rb",
+     "spec/geo_ruby/simple_features/ewkb_parser_spec.rb",
+     "spec/geo_ruby/simple_features/linear_ring_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_collection_spec.rb",
      "spec/geo_ruby/simple_features/multi_polygon_spec.rb",
-     "spec/geo_ruby/simple_features/point_spec.rb",
-     "spec/geo_ruby/simple_features/polygon_spec.rb",
-     "spec/geo_ruby_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/geo_ruby/simple_features/multi_point_spec.rb",
+     "spec/geo_ruby/simple_features/georss_parser_spec.rb",
+     "spec/geo_ruby/simple_features/geometry_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<dbf>, [">= 1.1.2"])
     else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<dbf>, [">= 1.1.2"])
     end
   else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<dbf>, [">= 1.1.2"])
   end
 end
 

data/spec/geo_ruby/gpx4r/gpx_spec.rb

@@ -25,7 +25,7 @@ describe Gpx4r do
     end
 
     it "should open and parse no trkpt one" do
-      @gpxfile2.record_count.should eql(46)
+      @gpxfile2.record_count.should eql(86)
     end
 
     it "should open and parse 3" do
@@ -38,18 +38,18 @@ describe Gpx4r do
     end
 
     it "should read Z and M" do
-      @gpxfile[0].z.should eql(468)
+      @gpxfile[0].z.should eql(468.0)
       @gpxfile[0].m.should eql("2008-09-07T17:36:57Z")
     end
 
     it "should read X and Y 2" do
-      @gpxfile2[0].x.should be_close(-71.107628, 0.0001)
-      @gpxfile2[0].y.should be_close(42.43095, 0.0001)
+      @gpxfile2[0].x.should be_close(-71.119277, 0.0001)
+      @gpxfile2[0].y.should be_close(42.438878, 0.0001)
     end
 
     it "should read Z and M 2" do
-      @gpxfile2[0].z.should eql(23)
-      @gpxfile2[0].m.should eql("2001-06-02T00:18:15Z")
+      @gpxfile2[0].z.should eql(44.586548)
+      @gpxfile2[0].m.should eql("2001-11-28T21:05:28Z")
     end
 
     it "should read X and Y 3" do
@@ -58,7 +58,7 @@ describe Gpx4r do
     end
 
     it "should read Z and M 3" do
-      @gpxfile3[0].z.should eql(88)
+      @gpxfile3[0].z.should eql(88.5787354)
       @gpxfile3[0].m.should eql(0.0)
     end
 

data/spec/geo_ruby/simple_features/georss_parser_spec.rb

@@ -45,18 +45,18 @@ describe GeorssParser do
   end
 
   it "test_envelope" do
-    linear_ring1 = LinearRing.from_coordinates([[12.4,-45.3,5],[45.4,41.6,6],[4.456,1.0698,8],[12.4,-45.3,3.5]],256,true)
-    linear_ring2 = LinearRing.from_coordinates([[2.4,5.3,9.0],[5.4,1.4263,-5.4],[14.46,1.06,34],[2.4,5.3,3.14]],256,true)
+    linear_ring1 = LinearRing.from_coordinates([[12,-45,5],[45,41,6],[4,1,8],[12.4,-45,3]],256,true)
+    linear_ring2 = LinearRing.from_coordinates([[2,5,9],[5.4,1,-5.4],[14,1,34],[2,5,3]],256,true)
     polygon = Polygon.from_linear_rings([linear_ring1,linear_ring2],256,true)
 
     e = polygon.envelope
 
-    e.as_georss(:dialect => :simple).gsub("\n","").should eql("<georss:box>-45.3 4.456 41.6 45.4</georss:box>")
+    e.as_georss(:dialect => :simple).gsub("\n","").should eql("<georss:box>-45 4 41 45</georss:box>")
     #center
-    e.as_georss(:dialect => :w3cgeo).gsub("\n","").should eql("<geo:lat>-1.85</geo:lat><geo:long>24.928</geo:long>")
-    e.as_georss(:dialect => :gml).gsub("\n","").should eql("<georss:where><gml:Envelope><gml:LowerCorner>-45.3 4.456</gml:LowerCorner><gml:UpperCorner>41.6 45.4</gml:UpperCorner></gml:Envelope></georss:where>")
+    e.as_georss(:dialect => :w3cgeo).gsub("\n","").should eql("<geo:lat>-2</geo:lat><geo:long>24</geo:long>")
+    e.as_georss(:dialect => :gml).gsub("\n","").should eql("<georss:where><gml:Envelope><gml:LowerCorner>-45 4</gml:LowerCorner><gml:UpperCorner>41 45</gml:UpperCorner></gml:Envelope></georss:where>")
 
-    e.as_kml.gsub("\n","").should eql("<LatLonAltBox><north>41.6</north><south>-45.3</south><east>45.4</east><west>4.456</west><minAltitude>-5.4</minAltitude><maxAltitude>34</maxAltitude></LatLonAltBox>")
+    e.as_kml.gsub("\n","").should eql("<LatLonAltBox><north>41</north><south>-45</south><east>45</east><west>4</west><minAltitude>-5.4</minAltitude><maxAltitude>34</maxAltitude></LatLonAltBox>")
   end
 
   it "test_point_georss_read" do

data/spec/geo_ruby/simple_features/line_string_spec.rb

@@ -205,4 +205,41 @@ describe LineString do
       @line.euclidian_distance.should eql(20)
     end
   end
+
+  describe "Simplify" do
+
+    before do
+      @line = LineString.from_coordinates([[6,0],[4,1],[3,4],[4,6],[5,8],[5,9],[4,10],[6,15]], 4326)
+    end
+
+    it "should simplify a simple linestring" do
+      line =  LineString.from_coordinates([[12,15],[14,17],[17, 20]], 4326)
+      line.simplify.should have(2).points
+    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
+    end
+
+    it "should barely touch it" do
+      @line.simplify(1).should have(7).points
+    end
+
+    it "should simplify to five points" do
+      @line.simplify(7).should have(5).points
+    end
+
+    it "should flatten it" do
+      @line.simplify(11).should have(2).points
+    end
+
+    it "should be the first and last in a flatten" do
+      line = @line.simplify(11)
+      line[0].should be_a_point(6, 0)
+      line[1].should be_a_point(6, 15)
+    end
+
+  end
 end

data/spec/geo_ruby/simple_features/point_spec.rb

@@ -11,6 +11,22 @@ describe Point do
     @point.should be_instance_of(Point)
   end
 
+  it "should have a nice matcher" do
+    @point.should be_a_point
+  end
+
+  it "should have a very nice matcher" do
+    @point.should be_a_point(0.0, 0.0)
+  end
+
+  it "should have a very nice matcher" do
+    Point.from_x_y_z_m(1,2,3.33,"t").should be_a_point(1, 2, 3.33, "t")
+  end
+
+  it "should have a dumb matcher" do
+    Point.should be_geometric
+  end
+
   it "should be subclassable" do
     place = Class.new(Point)
     p = place.from_x_y(1,2)
@@ -207,6 +223,34 @@ describe Point do
         should be_close(156876.149400742, 0.00000001)
     end
 
+    describe "Orthogonal Distance" do
+      before do
+        @line = LineString.from_coordinates([[0,0],[1,3]], 4326)
+        @line2 = LineString.from_coordinates([[1,1],[1,2]], 4326)
+      end
+
+      it "should calcula orthogonal distance from a line (90 deg)" do
+        @p1.orthogonal_distance(@line).should be_close(1.414, 0.001)
+      end
+
+      it "should calcula orthogonal distance very close..." do
+        @p1.orthogonal_distance(@line2).should be_zero
+      end
+
+      it "should calcula orthogonal distance from a line (90 deg)" do
+        @p2.orthogonal_distance(@line).should be_close(2.828, 0.001)
+      end
+
+      it "should calcula orthogonal distance from a line (0 deg)" do
+        @p2.orthogonal_distance(@line2).should be_close(1.0, 0.1)
+      end
+
+      it "should calcula orthogonal distance from a line (0 deg)" do
+        @p2.orthogonal_distance(@line2).should be_close(1.0, 0.1)
+      end
+
+    end
+
     it "should calculate the bearing from apoint to another in degrees" do
       @p1.bearing_to(@p2).should be_close(45.0, 0.01)
     end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 begin
-  require 'spec'
-rescue LoadError
   require 'rubygems'
-  gem 'rspec'
   require 'spec'
+rescue LoadError
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
@@ -13,3 +12,53 @@ require 'geo_ruby/gpx'
 
 include GeoRuby
 include SimpleFeatures
+
+module GeorubyMatchers
+
+  class BeGeometric
+
+    def matches?(actual)
+      actual.ancestors.include?(actual) || actual.kind_of?("Geometry")
+    end
+
+    def failure_message;          "expected #{@actual.inspect} to be some geom";    end
+  end
+
+  class BeAPoint
+    include RSpec::Matchers
+
+    def initialize(expect=nil)
+      @expect = expect
+    end
+
+    def matches?(actual)
+      if @expect
+        [:x, :y, :z, :m].each_with_index do |c, i|
+          next unless val = @expect[i]
+          if val.kind_of? Numeric
+            actual.send(c).should be_close(val, 0.1)
+          else
+            actual.send(c).should eql(val)
+          end
+        end
+      end
+      actual.should be_instance_of(Point)
+    end
+
+    def failure_message;          "expected #{@expect} but received #{@actual.inspect}";    end
+    def negative_failure_message; "expected something else then '#{@expect}' but got '#{@actual}'";    end
+  end
+
+  def be_a_point(*args)
+    args.empty? ? BeAPoint.new : BeAPoint.new(args)
+  end
+
+  def be_geometric
+    BeGeometric.new
+  end
+end
+
+RSpec.configure do |config|
+  config.include GeorubyMatchers
+end
+

metadata

@@ -1,19 +1,53 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-georuby
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  prerelease: false
+  segments: 
+  - 1
+  - 7
+  - 3
+  version: 1.7.3
 platform: ruby
 authors: 
 - Guilhem Vellut
-- Marcos Augusto
+- Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 -02:00
+date: 2010-09-20 00:00:00 -03:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: dbf
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :development
+  version_requirements: *id002
 description: GeoRuby provides geometric data types from the OGC 'Simple Features' specification.
 email: x@nofxx.com
 executables: []
@@ -92,7 +126,6 @@ files:
 - spec/geo_ruby/simple_features/point_spec.rb
 - spec/geo_ruby/simple_features/polygon_spec.rb
 - spec/geo_ruby_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/nofxx/georuby
@@ -104,40 +137,44 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby data holder for OGC Simple Features
 test_files: 
+- spec/geo_ruby_spec.rb
+- spec/spec_helper.rb
 - spec/geo_ruby/gpx4r/gpx_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
-- spec/geo_ruby/simple_features/envelope_spec.rb
-- spec/geo_ruby/simple_features/ewkb_parser_spec.rb
-- spec/geo_ruby/simple_features/ewkt_parser_spec.rb
-- spec/geo_ruby/simple_features/geometry_collection_spec.rb
+- spec/geo_ruby/simple_features/point_spec.rb
 - spec/geo_ruby/simple_features/geometry_factory_spec.rb
-- spec/geo_ruby/simple_features/geometry_spec.rb
-- spec/geo_ruby/simple_features/georss_parser_spec.rb
+- spec/geo_ruby/simple_features/envelope_spec.rb
+- spec/geo_ruby/simple_features/polygon_spec.rb
 - spec/geo_ruby/simple_features/line_string_spec.rb
-- spec/geo_ruby/simple_features/linear_ring_spec.rb
 - spec/geo_ruby/simple_features/multi_line_string_spec.rb
-- spec/geo_ruby/simple_features/multi_point_spec.rb
+- spec/geo_ruby/simple_features/ewkt_parser_spec.rb
+- spec/geo_ruby/simple_features/ewkb_parser_spec.rb
+- spec/geo_ruby/simple_features/linear_ring_spec.rb
+- spec/geo_ruby/simple_features/geometry_collection_spec.rb
 - spec/geo_ruby/simple_features/multi_polygon_spec.rb
-- spec/geo_ruby/simple_features/point_spec.rb
-- spec/geo_ruby/simple_features/polygon_spec.rb
-- spec/geo_ruby_spec.rb
-- spec/spec_helper.rb
+- spec/geo_ruby/simple_features/multi_point_spec.rb
+- spec/geo_ruby/simple_features/georss_parser_spec.rb
+- spec/geo_ruby/simple_features/geometry_spec.rb

data/spec/spec.opts

@@ -1,6 +0,0 @@
---colour
---format
-profile
---timeout
-20
---diff