rcap 1.2.1 → 1.2.2

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Change Log
 
+== 1.2.1 - 29 October 2011
+
+* Fixed polygon parsing and made it consitent across versions
+
 == 1.2.1 - 27 October 2011
 
 * Fixed bug initialising 'audience' attribute in Info class 

data/README.rdoc

@@ -8,7 +8,7 @@ RCAP currently supports CAP 1.0, 1.1 and 1.2.
 
 == Version
 
-1.2.0
+1.2.2
 
 == Dependencies
 

data/lib/rcap/cap_1_0/polygon.rb

@@ -9,8 +9,9 @@ module RCAP
       # Collection of Point objects.
       attr_reader( :points )
 
-      validates_length_of( :points, :minimum => 3 )
       validates_collection_of( :points )
+      validates_length_of( :points, :minimum => 3 )
+      validates_equality_of_first_and_last( :points )
 
       XML_ELEMENT_NAME = 'polygon'                   # :nodoc:
       XPATH            = "cap:#{ XML_ELEMENT_NAME }" # :nodoc:
@@ -28,10 +29,10 @@ module RCAP
       end
 
       # Returns a string representation of the polygon of the form
-      #  points[0] points[1] points[2] ... points[n-1] points[0]
+      #  points[0] points[1] points[2] ...
       # where each point is formatted with Point#to_s
       def to_s
-        (@points + [ @points.first ]).join( ' ' )
+        @points.join( ' ' )
       end
 
       def inspect # :nodoc:
@@ -56,7 +57,7 @@ module RCAP
       def self.from_xml_element( polygon_xml_element ) # :nodoc:
         if !polygon_xml_element.text.nil? && !polygon_xml_element.text.empty?
           coordinates = self.parse_polygon_string( polygon_xml_element.text )
-          points = coordinates.map{ |lattitude, longitude| Point.new( :lattitude => lattitude, :longitude => longitude )}[0..-2]
+          points = coordinates.map{ |lattitude, longitude| Point.new( :lattitude => lattitude, :longitude => longitude )}
           polygon = self.new( :points => points )
         else
           self.new

data/lib/rcap/cap_1_1/polygon.rb

@@ -9,8 +9,9 @@ module RCAP
       # Collection of Point objects.
       attr_reader( :points )
 
-      validates_length_of( :points, :minimum => 3 )
       validates_collection_of( :points )
+      validates_length_of( :points, :minimum => 3 )
+      validates_equality_of_first_and_last( :points )
 
       XML_ELEMENT_NAME = 'polygon'                   # :nodoc:
       XPATH            = "cap:#{ XML_ELEMENT_NAME }" # :nodoc:
@@ -28,10 +29,10 @@ module RCAP
       end
 
       # Returns a string representation of the polygon of the form
-      #  points[0] points[1] points[2] ... points[n-1] points[0]
+      #  points[0] points[1] points[2] ... 
       # where each point is formatted with Point#to_s
       def to_s
-        (@points + [ @points.first ]).join( ' ' )
+        @points.join( ' ' )
       end
 
       def inspect # :nodoc:
@@ -56,7 +57,7 @@ module RCAP
       def self.from_xml_element( polygon_xml_element ) # :nodoc:
         if !polygon_xml_element.text.nil? && !polygon_xml_element.text.empty?
           coordinates = self.parse_polygon_string( polygon_xml_element.text )
-          points = coordinates.map{ |lattitude, longitude| Point.new( :lattitude => lattitude, :longitude => longitude )}[0..-2]
+          points = coordinates.map{ |lattitude, longitude| Point.new( :lattitude => lattitude, :longitude => longitude )}
           polygon = self.new( :points => points )
         else
           self.new

data/lib/rcap/cap_1_2/polygon.rb

@@ -29,7 +29,7 @@ module RCAP
       end
 
       # Returns a string representation of the polygon of the form
-      #  points[0] points[1] points[2] ... points[n-1] points[0]
+      #  points[0] points[1] points[2] ...
       # where each point is formatted with Point#to_s
       def to_s
         @points.join( ' ' )

data/lib/rcap/version.rb

@@ -1,3 +1,3 @@
 module RCAP
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/spec/cap_1_0/area_spec.rb

@@ -167,7 +167,7 @@ describe( RCAP::CAP_1_0::Area ) do
         @polygon = RCAP::CAP_1_0::Polygon.new
         @polygon.points.push( RCAP::CAP_1_0::Point.new( :lattitude => 0, :longitude => 0 ),
                              RCAP::CAP_1_0::Point.new( :lattitude => 0, :longitude => 1 ),
-                             RCAP::CAP_1_0::Point.new( :lattitude => 1, :longitude => 0 ))
+                             RCAP::CAP_1_0::Point.new( :lattitude => 0, :longitude => 0 ))
         @area.polygons << @polygon
         @area.should( be_valid )
       end

data/spec/cap_1_1/area_spec.rb

@@ -167,7 +167,7 @@ describe( RCAP::CAP_1_1::Area ) do
         @polygon = RCAP::CAP_1_1::Polygon.new
         @polygon.points.push( RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 ),
                              RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 1 ),
-                             RCAP::CAP_1_1::Point.new( :lattitude => 1, :longitude => 0 ))
+                             RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 ))
         @area.polygons << @polygon
         @area.should( be_valid )
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rcap
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Farrel Lifson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assistance