rcap 1.3.1 → 2.0.0

data/lib/rcap/cap_1_0/polygon.rb

@@ -1,104 +1,14 @@
 module RCAP
   module CAP_1_0
+
     # A Polygon object is valid if
     # * it has a minimum of three points
     # * each Point object in the points collection is valid
-    class Polygon
-      include Validation
-
-      # @return [Array<Point>] Collection of {Point} objects 
-      attr_reader( :points )
-
-      validates_collection_of( :points )
-      validates_length_of( :points, :minimum => 3 )
-      validates_equality_of_first_and_last( :points )
-
-      XML_ELEMENT_NAME = 'polygon'                   
-      XPATH            = "cap:#{ XML_ELEMENT_NAME }" 
-      
-      # @param [Hash] attributes
-      # @option attributes [Array<Point>] :points Collection of {Point} objects
-      def initialize( attributes = {})
-        @points = Array( attributes[ :points ])
-      end
-
-      # Creates a new Point object and adds it to the points array.
-      #
-      # @see Point#initialize
-      def add_point( point_attributes = {})
-        point = Point.new( point_attributes )
-        @points << point
-        point
-      end
-
-      # Returns a string representation of the polygon of the form
-      #  points[0] points[1] points[2] ...
-      # where each point is formatted with Point#to_s
-      def to_s
-        @points.join( ' ' )
-      end
-
-      # @return [String]
-      def inspect 
-        "(#{ @points.map{|point| point.inspect}.join(', ')})"
-      end
-
-      # @return [REXML::Element]
-      def to_xml_element 
-        xml_element = REXML::Element.new( XML_ELEMENT_NAME )
-        xml_element.add_text( self.to_s )
-        xml_element
-      end
-
-      # @return [String]
-      def to_xml
-        self.to_xml_element.to_s
-      end
-
-      # Two polygons are equivalent if their collection of points is equivalent.
-      # 
-      # @return [true,false]
-      def ==( other )
-        @points == other.points
-      end
-
-      # @return [Array<Array(Numeric,Numeric)>]
-      def self.parse_polygon_string( polygon_string ) 
-        polygon_string.split( ' ' ).map{ |coordinate_string| coordinate_string.split( ',' ).map{|coordinate| coordinate.to_f }}
-      end
-
-      # @return [Polygon]
-      def self.from_xml_element( polygon_xml_element ) 
-        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 )}
-          polygon = self.new( :points => points )
-        else
-          self.new
-        end
-      end
-
-
-      # @return [String]
-      def to_yaml( options = {} ) 
-        @points.map{ |point| [ point.lattitude, point.longitude ]}.to_yaml( options )
-      end
-
-      # @return [Polygon]
-      def self.from_yaml_data( polygon_yaml_data ) 
-        self.new( :points => Array( polygon_yaml_data ).map{ |lattitude, longitude| Point.new( :lattitude => lattitude, :longitude => longitude )})
-      end
-
-      POINTS_KEY  = 'points' 
-
-      # @return [Hash]
-      def to_h 
-        { POINTS_KEY => @points.map{ |point| point.to_h }}
-      end
+    class Polygon < RCAP::Base::Polygon
 
-      # @return [Polygon]
-      def self.from_h( polygon_hash ) 
-        self.new( :points => polygon_hash[ POINTS_KEY ].map{ |point_hash| Point.from_h( point_hash )})
+      # @return [Class]
+      def point_class
+        Point
       end
     end
   end

data/lib/rcap/cap_1_0/resource.rb

@@ -1,154 +1,14 @@
 module RCAP
   module CAP_1_0
 
+
     # A Resource object is valid if
     # * it has a resource description
-    class Resource
-      include Validation
-
-      # @return [String] Resource Description 
-      attr_accessor( :resource_desc )
-      # @return [String]
-      attr_accessor( :mime_type )
-      # @return [Integer] Expressed in bytes 
-      attr_accessor( :size )
-      # @return [String] Resource location 
-      attr_accessor( :uri )
-      # @return [String] SHA-1 hash of contents of resource 
-      attr_accessor( :digest )
-
-      validates_presence_of( :resource_desc )
-
-      XML_ELEMENT_NAME           = 'resource'     
-      MIME_TYPE_ELEMENT_NAME     = 'mimeType'     
-      SIZE_ELEMENT_NAME          = 'size'         
-      URI_ELEMENT_NAME           = 'uri'          
-      DIGEST_ELEMENT_NAME        = 'digest'       
-      RESOURCE_DESC_ELEMENT_NAME = 'resourceDesc' 
-
-      XPATH               = "cap:#{ XML_ELEMENT_NAME }"           
-      MIME_TYPE_XPATH     = "cap:#{ MIME_TYPE_ELEMENT_NAME }"     
-      SIZE_XPATH          = "cap:#{ SIZE_ELEMENT_NAME }"          
-      URI_XPATH           = "cap:#{ URI_ELEMENT_NAME }"           
-      DIGEST_XPATH        = "cap:#{ DIGEST_ELEMENT_NAME }"        
-      RESOURCE_DESC_XPATH = "cap:#{ RESOURCE_DESC_ELEMENT_NAME }" 
-
-      # @param [Hash{Symbol => Object}] attributes
-      # @option attributes [String] :mime_type
-      # @option attributes [Numeric] :size Size in bytes
-      # @option attributes [String] :uri
-      # @option attributes [String] :digest
-      # @option attributes [String] :resource_desc
-      def initialize( attributes = {} )
-        @mime_type     = attributes[ :mime_type ]
-        @size          = attributes[ :size ]
-        @uri           = attributes[ :uri ]
-        @digest        = attributes[ :digest ]
-        @resource_desc = attributes[ :resource_desc ]
-      end
-
-      # @return [REXML::Element]
-      def to_xml_element 
-        xml_element = REXML::Element.new( XML_ELEMENT_NAME )
-        xml_element.add_element( RESOURCE_DESC_ELEMENT_NAME ).add_text( @resource_desc )
-        xml_element.add_element( MIME_TYPE_ELEMENT_NAME ).add_text( @mime_type ) if @mime_type
-        xml_element.add_element( SIZE_ELEMENT_NAME ).add_text( @size.to_s )      if @size
-        xml_element.add_element( URI_ELEMENT_NAME ).add_text( @uri )             if @uri
-        xml_element.add_element( DIGEST_ELEMENT_NAME ).add_text( @digest )       if @digest
-        xml_element
-      end
-
-      # If size is defined returns the size in kilobytes
-      # @return [Float]
-      def size_in_kb
-        if @size
-          @size.to_f/1024
-        end
-      end
+    class Resource < RCAP::Base::Resource
 
       # @return [String]
-      def to_xml 
-        self.to_xml_element.to_s
-      end
-
-      # @return [String]
-      def inspect 
-        [ @resource_desc, @uri, @mime_type, @size ? format( "%.1fKB", @size_in_kb ) : nil ].compact.join(' - ')
-      end
-
-      # Returns a string representation of the resource of the form
-      #  resource_desc
-      #
-      # @return [String]
-      def to_s
-        @resource_desc
-      end
-
-      # @param [REXML::Element] resource_xml_element
-      # @return [Resource]
-      def self.from_xml_element( resource_xml_element ) 
-        resource = self.new( :resource_desc => RCAP.xpath_text( resource_xml_element, RESOURCE_DESC_XPATH, Alert::XMLNS ),
-                             :uri           => RCAP.xpath_text( resource_xml_element, URI_XPATH, Alert::XMLNS ),
-                             :mime_type     => RCAP.xpath_text( resource_xml_element, MIME_TYPE_XPATH, Alert::XMLNS ),
-                             :size          => RCAP.xpath_text( resource_xml_element, SIZE_XPATH, Alert::XMLNS ).to_i,
-                             :digest        => RCAP.xpath_text( resource_xml_element, DIGEST_XPATH, Alert::XMLNS ))
-      end
-
-      RESOURCE_DESC_YAML = "Resource Description" 
-      URI_YAML           = "URI"                  
-      MIME_TYPE_YAML     = "Mime Type"            
-      SIZE_YAML          = "Size"                 
-      DIGEST_YAML        = "Digest"               
-
-      # @param [Hash] options
-      # @return [String]
-      def to_yaml( options = {} ) 
-        RCAP.attribute_values_to_hash(
-          [ RESOURCE_DESC_YAML, @resource_desc ],
-          [ URI_YAML,           @uri ],
-          [ MIME_TYPE_YAML,     @mime_type ],
-          [ SIZE_YAML,          @size ],
-          [ DIGEST_YAML,        @digest ]
-        ).to_yaml( options )
-      end
-
-      # @param [Hash] resource_yaml_data
-      # @return [Resource]
-      def self.from_yaml_data( resource_yaml_data ) 
-        self.new(
-          :resource_desc => reource_yaml_data[ RESOURCE_DESC_YAML ],
-          :uri           => reource_yaml_data[ URI_YAML ],
-          :mime_type     => reource_yaml_data[ MIME_TYPE_YAML ],
-          :size          => reource_yaml_data[ SIZE_YAML ],
-          :digest        => reource_yaml_data[ DIGEST_YAML ]
-        )
-      end
-
-      RESOURCE_DESC_KEY = 'resource_desc' 
-      URI_KEY           = 'uri'           
-      MIME_TYPE_KEY     = 'mime_type'     
-      SIZE_KEY          = 'size'          
-      DIGEST_KEY        = 'digest'        
-
-      # @return [Hash]
-      def to_h 
-        RCAP.attribute_values_to_hash(
-          [ RESOURCE_DESC_KEY, @resource_desc ],
-          [ URI_KEY,           @uri],
-          [ MIME_TYPE_KEY,     @mime_type],
-          [ SIZE_KEY,          @size ],
-          [ DIGEST_KEY,        @digest ])
-      end
-
-      # @param [Hash] resource_hash
-      # @return [Resource]
-      def self.from_h( resource_hash ) 
-        self.new(
-          :resource_desc => resource_hash[ RESOURCE_DESC_KEY ],
-          :uri           => resource_hash[ URI_KEY ],
-          :mime_type     => resource_hash[ MIME_TYPE_KEY ],
-          :size          => resource_hash[ SIZE_KEY ],
-          :digest        => resource_hash[ DIGEST_KEY ])
+      def xmlns
+        Alert::XMLNS
       end
     end
   end