rcap 0.4 → 1.0.0.rc.1

metadata

@@ -1,11 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rcap
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+  - 1
+  - 0
   - 0
-  - 4
-  version: "0.4"
+  - rc
+  - 1
+  version: 1.0.0.rc.1
 platform: ruby
 authors: 
 - Farrel Lifson
@@ -13,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 +02:00
+date: 2011-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +28,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 5
+        version: 0.1.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -36,8 +41,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -49,13 +56,42 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 1
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id003
-description: A Ruby API providing parsing and generation of CAP(Common Alerting Protocol) messages.
-email: farrel.lifson@aimred.com
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hanna
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 12
+        version: 0.1.12
+  type: :development
+  version_requirements: *id005
+description: A Ruby API providing parsing, generation and validation of CAP(Common Alerting Protocol) messages.
+email: 
+- farrel.lifson@aimred.com
 executables: []
 
 extensions: []
@@ -64,21 +100,58 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG.rdoc
 files: 
+- .gitignore
+- CHANGELOG.rdoc
+- Gemfile
+- README.rdoc
+- Rakefile
 - lib/rcap.rb
-- lib/rcap/area.rb
-- lib/rcap/polygon.rb
-- lib/rcap/resource.rb
-- lib/rcap/utilities.rb
-- lib/rcap/circle.rb
-- lib/rcap/point.rb
 - lib/rcap/alert.rb
-- lib/rcap/geocode.rb
+- lib/rcap/cap_1_1/alert.rb
+- lib/rcap/cap_1_1/area.rb
+- lib/rcap/cap_1_1/circle.rb
+- lib/rcap/cap_1_1/event_code.rb
+- lib/rcap/cap_1_1/geocode.rb
+- lib/rcap/cap_1_1/info.rb
+- lib/rcap/cap_1_1/parameter.rb
+- lib/rcap/cap_1_1/point.rb
+- lib/rcap/cap_1_1/polygon.rb
+- lib/rcap/cap_1_1/resource.rb
+- lib/rcap/cap_1_2/alert.rb
+- lib/rcap/cap_1_2/area.rb
+- lib/rcap/cap_1_2/circle.rb
+- lib/rcap/cap_1_2/event_code.rb
+- lib/rcap/cap_1_2/geocode.rb
+- lib/rcap/cap_1_2/info.rb
+- lib/rcap/cap_1_2/parameter.rb
+- lib/rcap/cap_1_2/point.rb
+- lib/rcap/cap_1_2/polygon.rb
+- lib/rcap/cap_1_2/resource.rb
+- lib/rcap/utilities.rb
 - lib/rcap/validations.rb
-- lib/rcap/parameter.rb
-- lib/rcap/event_code.rb
-- lib/rcap/info.rb
-- README.rdoc
-- CHANGELOG.rdoc
+- lib/rcap/version.rb
+- rcap.gemspec
+- spec/alert_spec.rb
+- spec/cap_1_1/alert_spec.rb
+- spec/cap_1_1/area_spec.rb
+- spec/cap_1_1/circle_spec.rb
+- spec/cap_1_1/geocode_spec.rb
+- spec/cap_1_1/info_spec.rb
+- spec/cap_1_1/point_spec.rb
+- spec/cap_1_1/polygon_spec.rb
+- spec/cap_1_1/resource_spec.rb
+- spec/cap_1_2/alert_spec.rb
+- spec/cap_1_2/area_spec.rb
+- spec/cap_1_2/circle_spec.rb
+- spec/cap_1_2/geocode_spec.rb
+- spec/cap_1_2/info_spec.rb
+- spec/cap_1_2/point_spec.rb
+- spec/cap_1_2/polygon_spec.rb
+- spec/cap_1_2/resource_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/utilities_spec.rb
+- spec/validations_spec.rb
 has_rdoc: true
 homepage: http://www.aimred.com/projects/rcap
 licenses: []
@@ -97,27 +170,39 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: rcap
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: CAP(Common Alerting Protocol) API
 test_files: 
-- spec/area_spec.rb
-- spec/resource_spec.rb
-- spec/polygon_spec.rb
-- spec/info_spec.rb
-- spec/circle_spec.rb
-- spec/geocode_spec.rb
-- spec/utilities_spec.rb
 - spec/alert_spec.rb
-- spec/validations_spec.rb
+- spec/cap_1_1/alert_spec.rb
+- spec/cap_1_1/area_spec.rb
+- spec/cap_1_1/circle_spec.rb
+- spec/cap_1_1/geocode_spec.rb
+- spec/cap_1_1/info_spec.rb
+- spec/cap_1_1/point_spec.rb
+- spec/cap_1_1/polygon_spec.rb
+- spec/cap_1_1/resource_spec.rb
+- spec/cap_1_2/alert_spec.rb
+- spec/cap_1_2/area_spec.rb
+- spec/cap_1_2/circle_spec.rb
+- spec/cap_1_2/geocode_spec.rb
+- spec/cap_1_2/info_spec.rb
+- spec/cap_1_2/point_spec.rb
+- spec/cap_1_2/polygon_spec.rb
+- spec/cap_1_2/resource_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
-- spec/point_spec.rb
+- spec/utilities_spec.rb
+- spec/validations_spec.rb

data/lib/rcap/area.rb

@@ -1,156 +0,0 @@
-module RCAP
-	# An Area object is valid if
-	# * it has an area description
-	# * all Circle objects contained in circles are valid
-	# * all Geocode objects contained in geocodes are valid
-	# * all Polygon objects contained in polygons are valid
-	# * altitude has a value if ceiling is set
-  class Area
-    include Validation
-		
-		# Area Description - Textual description of area.
-		attr_accessor( :area_desc ) 
-		# Expressed in feet above sea level 
-    attr_accessor( :altitude )
-		# Expressed in feet above sea level.
-		attr_accessor( :ceiling )
-		# Collection of Circle objects
-    attr_reader( :circles )
-		# Collection of Geocode objects
-		attr_reader( :geocodes )
-		# Collection of Polygon objects
-		attr_reader( :polygons )
-
-    validates_presence_of( :area_desc )
-    validates_collection_of( :circles, :geocodes, :polygons )
-    validates_dependency_of( :ceiling, :on => :altitude )
-
-    XML_ELEMENT_NAME       = 'area'     # :nodoc: 
-    AREA_DESC_ELEMENT_NAME = 'areaDesc' # :nodoc: 
-    ALTITUDE_ELEMENT_NAME  = 'altitude' # :nodoc: 
-    CEILING_ELEMENT_NAME   = 'ceiling'  # :nodoc: 
-
-    XPATH           = "cap:#{ XML_ELEMENT_NAME }"       # :nodoc: 
-    AREA_DESC_XPATH = "cap:#{ AREA_DESC_ELEMENT_NAME }" # :nodoc: 
-    ALTITUDE_XPATH  = "cap:#{ ALTITUDE_ELEMENT_NAME }"  # :nodoc: 
-    CEILING_XPATH   = "cap:#{ CEILING_ELEMENT_NAME }"   # :nodoc: 
-
-    def initialize( attributes = {})
-      @area_desc = attributes[ :area_desc ]
-      @altitude  = attributes[ :altitude ]
-      @ceiling   = attributes[ :ceiling ]
-      @circles   = Array( attributes[ :circles ])
-      @geocodes  = Array( attributes[ :geocodes ])
-      @polygons  = Array( attributes[ :polygons ])
-    end
-
-    def to_xml_element # :nodoc:
-      xml_element = REXML::Element.new( XML_ELEMENT_NAME )
-      xml_element.add_element( AREA_DESC_ELEMENT_NAME ).add_text( @area_desc.to_s )
-      add_to_xml_element = lambda do |element, object|
-        element.add_element( object.to_xml_element )
-        element
-      end
-      @polygons.inject( xml_element, &add_to_xml_element )
-      @circles.inject( xml_element, &add_to_xml_element )
-      @geocodes.inject( xml_element, &add_to_xml_element )
-      xml_element.add_element( ALTITUDE_ELEMENT_NAME ).add_text( @altitude.to_s ) unless self.altitude.blank?
-      xml_element.add_element( CEILING_ELEMENT_NAME ).add_text( @ceiling.to_s )   unless self.altitude.blank?
-      xml_element
-    end
-
-    def to_xml # :nodoc:
-      self.to_xml_element.to_s
-    end
-
-		# Implements an equality operator for the Area object. Two Area objects are equal if all their attributes are equal.
-		def ==( other )  
-			comparison_attributes = lambda{ |area| [ area.area_desc, area.altitude, area.ceiling, area.circles, area.geocodes, area.polygons ]}
-			comparison_attributes.call( self ) == comparison_attributes.call( other )
-		end
-
-		def inspect # :nodoc:
-      area_inspect =  <<EOF
-Area Description: #{ self.area_desc }
-Polygons:
-#{ self.polygons.map{ |polygon| "  " + polygon.inspect }.join("\n" )}
-Circles:          #{ self.circles.inspect }
-Geocodes:         #{ self.geocodes.inspect }
-EOF
-      RCAP.format_lines_for_inspect( 'AREA', area_inspect )
-		end
-
-		# Returns a string representation of the area of the form
-		#  area_desc
-    def to_s 
-      self.area_desc
-    end
-
-    def self.from_xml_element( area_xml_element ) # :nodoc:
-      RCAP::Area.new( :area_desc => RCAP.xpath_text( area_xml_element, AREA_DESC_XPATH ),
-											:altitude  => (( alt = RCAP.xpath_text( area_xml_element, ALTITUDE_XPATH )) ? alt.to_f : nil ),
-											:ceiling   => (( ceil = RCAP.xpath_text( area_xml_element, CEILING_XPATH )) ? ceil.to_f : nil ),
-											:circles   => RCAP.xpath_match( area_xml_element, RCAP::Circle::XPATH ).map{ |circle_element| RCAP::Circle.from_xml_element( circle_element )},
-											:geocodes  => RCAP.xpath_match( area_xml_element, RCAP::Geocode::XPATH ).map{ |geocode_element| RCAP::Geocode.from_xml_element( geocode_element )},
-											:polygons  => RCAP.xpath_match( area_xml_element, RCAP::Polygon::XPATH ).map{ |polygon_element| RCAP::Polygon.from_xml_element( polygon_element )})
-    end
-
-     AREA_DESC_YAML = 'Area Description' # :nodoc:
-     ALTITUDE_YAML  = 'Altitude'         # :nodoc:
-     CEILING_YAML   = 'Ceiling'          # :nodoc:
-     CIRCLES_YAML   = 'Circles'          # :nodoc:
-     GEOCODES_YAML  = 'Geocodes'         # :nodoc:
-     POLYGONS_YAML  = 'Polygons'         # :nodoc:
-
-     def to_yaml( options = {} ) # :nodoc:
-       circles_yaml = self.circles.map{ |circle| [ circle.lattitude, circle.longitude, circle.radius ]}
-       def circles_yaml.to_yaml_style; :inline; end
-
-       RCAP.attribute_values_to_hash(
-         [ AREA_DESC_YAML,  self.area_desc ],
-         [ ALTITUDE_YAML,   self.altitude ],
-         [ CEILING_YAML,    self.ceiling ],
-         [ CIRCLES_YAML,    circles_yaml ],
-         [ GEOCODES_YAML,   self.geocodes.inject({}){|h,geocode| h.merge( geocode.name => geocode.value )}],
-         [ POLYGONS_YAML,   self.polygons ]
-       ).to_yaml( options )
-     end
-
-     def from_yaml_data( area_yaml_data )  # :nodoc:
-       Area.new(
-         :area_desc => area_yaml_data[ AREA_DESC_YAML ],
-         :altitude  => area_yaml_data[ ALTITUDE_YAML ],
-         :ceiling   => area_yaml_data[ CEILING_YAML ],
-         :circles   => Array( area_yaml_data[ CIRCLES_YAML ]).map{ |circle_yaml_data| RCAP::Circle.from_yaml_data( circle_yaml_data )},
-         :geocodes  => Array( area_yaml_data[ GEOCODES_YAML ]).map{ |name, value| RCAP::Geocode.new( :name => name, :value => value )},
-         :polygons  => Array( area_yaml_data[ POLYGONS_YAML ]).map{ |polyon_yaml_data| RCAP::Polygon.from_yaml_data( polyon_yaml_data )}
-       )
-     end
-
-     AREA_DESC_KEY = 'area_desc'  # :nodoc:
-     ALTITUDE_KEY  = 'altitude'   # :nodoc:
-     CEILING_KEY   = 'ceiling'    # :nodoc:
-     CIRCLES_KEY   = 'circles'    # :nodoc:
-     GEOCODES_KEY  = 'geocodes'   # :nodoc:
-     POLYGONS_KEY  = 'polygons'   # :nodoc:
-
-     def to_h # :nodoc:
-       { AREA_DESC_KEY => self.area_desc,
-         ALTITUDE_KEY  => self.altitude,
-         CEILING_KEY   => self.ceiling,
-         CIRCLES_KEY   => self.circles.map{ |circle| circle.to_h },
-         GEOCODES_KEY  => self.geocodes.map{ |geocode| geocode.to_h },
-         POLYGONS_KEY  => self.polygons.map{ |polygon| polygon.to_h }}
-     end
-
-     def self.from_h( area_hash ) # :nodoc:
-       self.new(
-        :area_desc => area_hash[ AREA_DESC_KEY ],
-        :altitude  => area_hash[ ALTITUDE_KEY ],
-        :ceiling   => area_hash[ CEILING_KEY ],
-        :circles   => area_hash[ CIRCLES_KEY ].map{ |circle_hash| RCAP::Circle.from_h( circle_hash )},
-        :geocodes  => area_hash[ GEOCODES_KEY ].map{ |geocode_hash| RCAP::Geocode.from_h( geocode_hash )},
-        :polygons  => area_hash[ POLYGONS_KEY ].map{ |polygon_hash| RCAP::Polygon.from_h( polygon_hash )})
-     end
-  end
-end

data/lib/rcap/circle.rb

@@ -1,78 +0,0 @@
-module RCAP
-	# A Circle object is valid if
-  # * it has a valid lattitude and longitude
-	# * it has a radius with a value greater than zero
-  class Circle < Point
-    include Validation
-
-		# Expresed in kilometers 
-		attr_accessor( :radius )
-
-    validates_presence_of( :radius )
-    validates_numericality_of( :radius , :greater_than => 0 )
-
-    XML_ELEMENT_NAME = 'circle' # :nodoc:
-
-    XPATH = 'cap:circle' # :nodoc:
-
-    def initialize( attributes = {} )
-      super( attributes )
-      @radius = attributes[ :radius ]
-    end
-
-		# Returns a string representation of the circle of the form
-		#  lattitude,longitude,radius
-    def to_s  # :nodoc:
-      "#{ self.lattitude },#{ self.longitude },#{ self.radius }"
-    end
-
-    def inspect # :nodoc:
-      "(#{ self.lattitude},#{ self.longitude },#{ self.radius })"
-    end
-
-    def to_xml_element # :nodoc:
-      xml_element = REXML::Element.new( XML_ELEMENT_NAME )
-      xml_element.add_text( self.to_s )
-      xml_element
-    end
-
-    def to_xml # :nodoc:
-      self.to_xml_element.to_s
-    end
-
-    def self.parse_circle_string( circle_string ) # :nodoc:
-      lattitude, longitude, radius = circle_string.split( ',' )
-      [ lattitude, longitude, radius ].map{ |e| e.to_f }
-    end
-
-    def self.from_xml_element( circle_xml_element ) # :nodoc:
-      lattitude, longitude, radius = self.parse_circle_string( circle_xml_element.text )
-      circle = self.new( :lattitude => lattitude,
-                         :longitude => longitude,
-                         :radius => radius )
-    end
-
-		# Two circles are equivalent if their lattitude, longitude and radius are equal.
-    def ==( other )
-      [ self.lattitude, self.longitude, self.radius ] == [ other.lattitude, other.longitude, other.radius ]
-    end
-
-    def self.from_yaml_data( circle_yaml_data ) # :nodoc:
-      lattitude, longitude,radius = circle_yaml_data
-      self.new( :lattitude => lattitude, :longitude => longitude, :radius => radius )
-    end
-
-    RADIUS_KEY    = 'radius' # :nodoc:
-    LATTITUDE_KEY = 'lattitude' # :nodoc:
-    LONGITUDE_KEY = 'longitude' # :nodoc:
-    def to_h # :nodoc:
-      RCAP.attribute_values_to_hash( [ RADIUS_KEY, self.radius ],
-                                     [ LATTITUDE_KEY, self.lattitude ],
-                                     [ LONGITUDE_KEY, self.longitude ])
-    end
-
-    def self.from_h( circle_hash ) # :nodoc:
-      self.new( :radius => circle_hash[ RADIUS_KEY ], :lattitude => circle_hash[ LATTITUDE_KEY ], :longitude => circle_hash[ LONGITUDE_KEY ])
-    end
-  end
-end