rcap 2.1.0 → 2.2.0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+## 2.2.0 - 2 February 2013
+
+* Better whitespace handling on parsing
+
 ## 2.1.0 - 12 January 2013
 
 * RCAP.attribute_values_to_hash now does not filter out values that are empty, only nil.

data/lib/rcap/base/alert.rb

@@ -230,26 +230,29 @@ module RCAP
         self.new do |alert|
           alert.identifier  = RCAP.xpath_text( alert_xml_element, IDENTIFIER_XPATH, alert.xmlns )
           alert.sender      = RCAP.xpath_text( alert_xml_element, SENDER_XPATH, alert.xmlns )
-          alert.sent        = (( sent = RCAP.xpath_first( alert_xml_element, SENT_XPATH, alert.xmlns )) ? DateTime.parse( sent.text ) : nil )
+          alert.sent        = RCAP.parse_datetime( RCAP.xpath_text( alert_xml_element, SENT_XPATH, alert.xmlns ))
           alert.status      = RCAP.xpath_text( alert_xml_element, STATUS_XPATH, alert.xmlns )
           alert.msg_type    = RCAP.xpath_text( alert_xml_element, MSG_TYPE_XPATH, alert.xmlns )
           alert.source      = RCAP.xpath_text( alert_xml_element, SOURCE_XPATH, alert.xmlns )
           alert.scope       = RCAP.xpath_text( alert_xml_element, SCOPE_XPATH, alert.xmlns )
           alert.restriction = RCAP.xpath_text( alert_xml_element, RESTRICTION_XPATH, alert.xmlns )
 
-          (( address = RCAP.xpath_text( alert_xml_element, ADDRESSES_XPATH, alert.xmlns )) ? address.unpack_cap_list : [] ).each do |address|
-            alert.addresses << address
+          RCAP.unpack_if_given( RCAP.xpath_text( alert_xml_element, ADDRESSES_XPATH, alert.xmlns )).each do |address|
+            alert.addresses << address.strip
           end
+
           RCAP.xpath_match( alert_xml_element, CODE_XPATH, alert.xmlns ).each do |element|
-            alert.codes << element.text
+            alert.codes << element.text.strip
           end
-          alert.note        = RCAP.xpath_text( alert_xml_element, NOTE_XPATH, alert.xmlns )
-          (( references = RCAP.xpath_text( alert_xml_element, REFERENCES_XPATH, alert.xmlns )) ? references.split( ' ' ) : []).each do |reference|
-            alert.references << reference
+
+          alert.note = RCAP.xpath_text( alert_xml_element, NOTE_XPATH, alert.xmlns )
+
+          RCAP.unpack_if_given( RCAP.xpath_text( alert_xml_element, REFERENCES_XPATH, alert.xmlns )).each do |reference|
+            alert.references << reference.strip
           end
 
-          (( incidents = RCAP.xpath_text( alert_xml_element, INCIDENTS_XPATH, alert.xmlns )) ? incidents.split( ' ' ) : []).each do |incident|
-            alert.incidents << incident
+          RCAP.unpack_if_given( RCAP.xpath_text( alert_xml_element, INCIDENTS_XPATH, alert.xmlns )).each do |incident|
+            alert.incidents << incident.strip
           end
 
           RCAP.xpath_match( alert_xml_element, Info::XPATH, alert.xmlns ).each do |element|
@@ -323,26 +326,26 @@ module RCAP
       # @return [Alert]
       def self.from_yaml_data( alert_yaml_data )
         self.new do |alert|
-          alert.identifier  = alert_yaml_data[ IDENTIFIER_YAML ]
-          alert.sender      = alert_yaml_data[ SENDER_YAML ]
-          alert.sent        = ( sent = alert_yaml_data[ SENT_YAML ]).blank? ? nil : DateTime.parse( sent.to_s )
-          alert.status      = alert_yaml_data[ STATUS_YAML ]
-          alert.msg_type    = alert_yaml_data[ MSG_TYPE_YAML ]
-          alert.source      = alert_yaml_data[ SOURCE_YAML ]
-          alert.scope       = alert_yaml_data[ SCOPE_YAML ]
-          alert.restriction = alert_yaml_data[ RESTRICTION_YAML ]
+          alert.identifier  = RCAP.strip_if_given( alert_yaml_data[ IDENTIFIER_YAML ])
+          alert.sender      = RCAP.strip_if_given( alert_yaml_data[ SENDER_YAML ])
+          alert.sent        = RCAP.parse_datetime( alert_yaml_data[ SENT_YAML ])
+          alert.status      = RCAP.strip_if_given( alert_yaml_data[ STATUS_YAML ])
+          alert.msg_type    = RCAP.strip_if_given( alert_yaml_data[ MSG_TYPE_YAML ])
+          alert.source      = RCAP.strip_if_given( alert_yaml_data[ SOURCE_YAML ])
+          alert.scope       = RCAP.strip_if_given( alert_yaml_data[ SCOPE_YAML ])
+          alert.restriction = RCAP.strip_if_given( alert_yaml_data[ RESTRICTION_YAML ])
           Array( alert_yaml_data[ ADDRESSES_YAML ]).each do |address|
-            alert.addresses << address
+            alert.addresses << address.strip
           end
           Array( alert_yaml_data[ CODES_YAML ]).each do |code|
-            alert.codes << code
+            alert.codes << code.strip
           end
           alert.note        = alert_yaml_data[ NOTE_YAML ]
           Array( alert_yaml_data[ REFERENCES_YAML ]).each do |reference|
-            alert.references << reference
+            alert.references << reference.strip
           end
           Array( alert_yaml_data[ INCIDENTS_YAML ]).each do |incident|
-            alert.incidents << incident
+            alert.incidents << incident.strip
           end
           Array( alert_yaml_data[ INFOS_YAML ]).each do |info_yaml_data|
             alert.infos <<  alert.info_class.from_yaml_data( info_yaml_data )
@@ -393,27 +396,27 @@ module RCAP
       # @return [RCAP::CAP_1_0::Alert]
       def self.from_h( alert_hash )
         self.new do |alert|
-          alert.identifier  = alert_hash[ IDENTIFIER_KEY ]
-          alert.sender      = alert_hash[ SENDER_KEY ]
+          alert.identifier  = RCAP.strip_if_given( alert_hash[ IDENTIFIER_KEY ])
+          alert.sender      = RCAP.strip_if_given( alert_hash[ SENDER_KEY ])
           alert.sent        = RCAP.parse_datetime( alert_hash[ SENT_KEY ])
-          alert.status      = alert_hash[ STATUS_KEY ]
-          alert.msg_type    = alert_hash[ MSG_TYPE_KEY ]
-          alert.source      = alert_hash[ SOURCE_KEY ]
-          alert.scope       = alert_hash[ SCOPE_KEY ]
-          alert.restriction = alert_hash[ RESTRICTION_KEY ]
+          alert.status      = RCAP.strip_if_given( alert_hash[ STATUS_KEY ])
+          alert.msg_type    = RCAP.strip_if_given( alert_hash[ MSG_TYPE_KEY ])
+          alert.source      = RCAP.strip_if_given( alert_hash[ SOURCE_KEY ])
+          alert.scope       = RCAP.strip_if_given( alert_hash[ SCOPE_KEY ])
+          alert.restriction = RCAP.strip_if_given( alert_hash[ RESTRICTION_KEY ])
           Array( alert_hash[ ADDRESSES_KEY ]).each do |address|
-            alert.addresses << address
+            alert.addresses << address.strip
           end
           Array( alert_hash[ CODES_KEY ]).each do |code|
-            alert.codes << code
+            alert.codes << code.strip
           end
           alert.note = alert_hash[ NOTE_KEY ]
           Array( alert_hash[ REFERENCES_KEY ]).each do |reference|
-            alert.references << reference
+            alert.references << reference.strip
           end
 
           Array( alert_hash[ INCIDENTS_KEY ]).each do |incident|
-            alert.incidents << incident
+            alert.incidents << incident.strip
           end
 
           Array( alert_hash[ INFOS_KEY ]).each do |info_hash|

data/lib/rcap/base/area.rb

@@ -78,8 +78,8 @@ module RCAP
       def self.from_xml_element( area_xml_element )
         self.new do |area|
           area.area_desc = RCAP.xpath_text( area_xml_element, AREA_DESC_XPATH, area.xmlns )
-          area.altitude  = (( alt = RCAP.xpath_text( area_xml_element, ALTITUDE_XPATH, area.xmlns )) ? alt.to_f : nil )
-          area.ceiling   = (( ceil = RCAP.xpath_text( area_xml_element, CEILING_XPATH, area.xmlns )) ? ceil.to_f : nil )
+          area.altitude  = RCAP.to_f_if_given( RCAP.xpath_text( area_xml_element, ALTITUDE_XPATH, area.xmlns ))
+          area.ceiling   = RCAP.to_f_if_given( RCAP.xpath_text( area_xml_element, CEILING_XPATH, area.xmlns ))
 
           RCAP.xpath_match( area_xml_element, area.circle_class::XPATH, area.xmlns ).each do |circle_element|
             area.circles << area.circle_class.from_xml_element( circle_element )

data/lib/rcap/base/circle.rb

@@ -76,9 +76,9 @@ module RCAP
       def self.from_yaml_data( circle_yaml_data )
         lattitude, longitude, radius = circle_yaml_data
         self.new do |circle|
-          circle.lattitude = lattitude
-          circle.longitude = longitude
-          circle.radius    = radius
+          circle.lattitude = lattitude.to_f
+          circle.longitude = longitude.to_f
+          circle.radius    = radius.to_f
         end
       end
 
@@ -94,9 +94,9 @@ module RCAP
       # @return [Circle]
       def self.from_h( circle_hash )
         self.new do |circle|
-          circle.radius    = circle_hash[ RADIUS_KEY ]
-          circle.lattitude = circle_hash[ LATTITUDE_KEY ]
-          circle.longitude = circle_hash[ LONGITUDE_KEY ]
+          circle.radius    = circle_hash[ RADIUS_KEY ].to_f
+          circle.lattitude = circle_hash[ LATTITUDE_KEY ].to_f
+          circle.longitude = circle_hash[ LONGITUDE_KEY ].to_f
         end
       end
 
@@ -111,9 +111,9 @@ module RCAP
       # @return [Circle]
       def self.from_a( circle_array )
         self.new do |circle|
-          circle.longitude = circle_array[ LONGITUDE_INDEX ]
-          circle.lattitude = circle_array[ LATTITUDE_INDEX ]
-          circle.radius    = circle_array[ RADIUS_INDEX ]
+          circle.longitude = circle_array[ LONGITUDE_INDEX ].to_f
+          circle.lattitude = circle_array[ LATTITUDE_INDEX ].to_f
+          circle.radius    = circle_array[ RADIUS_INDEX ].to_f
         end
       end
     end

data/lib/rcap/base/info.rb

@@ -369,32 +369,32 @@ module RCAP
           Array( info_yaml_data [ CATEGORIES_YAML ]).each do |category|
             info.categories << category
           end
-          info.event       = info_yaml_data [ EVENT_YAML ]
-          info.urgency     = info_yaml_data [ URGENCY_YAML ]
-          info.severity    = info_yaml_data [ SEVERITY_YAML ]
-          info.certainty   = info_yaml_data [ CERTAINTY_YAML ]
-          info.audience    = info_yaml_data [ AUDIENCE_YAML ]
+          info.event       = RCAP.strip_if_given( info_yaml_data [ EVENT_YAML ])
+          info.urgency     = RCAP.strip_if_given( info_yaml_data [ URGENCY_YAML ])
+          info.severity    = RCAP.strip_if_given( info_yaml_data [ SEVERITY_YAML ])
+          info.certainty   = RCAP.strip_if_given( info_yaml_data [ CERTAINTY_YAML ])
+          info.audience    = RCAP.strip_if_given( info_yaml_data [ AUDIENCE_YAML ])
           info.effective   = RCAP.parse_datetime( info_yaml_data[ EFFECTIVE_YAML ])
           info.onset       = RCAP.parse_datetime( info_yaml_data[ ONSET_YAML ])
           info.expires     = RCAP.parse_datetime( info_yaml_data[ EXPIRES_YAML ])
-          info.sender_name = info_yaml_data [ SENDER_NAME_YAML ]
-          info.headline    = info_yaml_data [ HEADLINE_YAML ]
-          info.description = info_yaml_data [ DESCRIPTION_YAML ]
-          info.instruction = info_yaml_data [ INSTRUCTION_YAML ]
-          info.web         = info_yaml_data [ WEB_YAML ]
-          info.contact     = info_yaml_data [ CONTACT_YAML ]
+          info.sender_name = RCAP.strip_if_given( info_yaml_data [ SENDER_NAME_YAML ])
+          info.headline    = RCAP.strip_if_given( info_yaml_data [ HEADLINE_YAML ])
+          info.description = RCAP.strip_if_given( info_yaml_data [ DESCRIPTION_YAML ])
+          info.instruction = RCAP.strip_if_given( info_yaml_data [ INSTRUCTION_YAML ])
+          info.web         = RCAP.strip_if_given( info_yaml_data [ WEB_YAML ])
+          info.contact     = RCAP.strip_if_given( info_yaml_data [ CONTACT_YAML ])
 
           Array( info_yaml_data [ EVENT_CODES_YAML ]).each do  |name,value|
             info.add_event_code do |event_code|
-              event_code.name = name
-              event_code.value = value
+              event_code.name  = RCAP.strip_if_given( name )
+              event_code.value = RCAP.strip_if_given( value )
             end
           end
 
           Array( info_yaml_data [ PARAMETERS_YAML ]).each do |name,value|
             info.add_parameter do |parameter|
-              parameter.name = name
-              parameter.value = value
+              parameter.name  = RCAP.strip_if_given( name )
+              parameter.value = RCAP.strip_if_given( value )
             end
           end
 
@@ -459,22 +459,22 @@ module RCAP
         self.new do |info|
           info.language       = info_hash[ LANGUAGE_KEY ]
           Array( info_hash[ CATEGORIES_KEY ]).each do |category|
-            info.categories << category
+            info.categories << RCAP.strip_if_given( category )
           end
-          info.event          = info_hash[ EVENT_KEY ]
-          info.urgency        = info_hash[ URGENCY_KEY ]
-          info.severity       = info_hash[ SEVERITY_KEY ]
-          info.certainty      = info_hash[ CERTAINTY_KEY ]
-          info.audience       = info_hash[ AUDIENCE_KEY ]
+          info.event          = RCAP.strip_if_given( info_hash[ EVENT_KEY ])
+          info.urgency        = RCAP.strip_if_given( info_hash[ URGENCY_KEY ])
+          info.severity       = RCAP.strip_if_given( info_hash[ SEVERITY_KEY ])
+          info.certainty      = RCAP.strip_if_given( info_hash[ CERTAINTY_KEY ])
+          info.audience       = RCAP.strip_if_given( info_hash[ AUDIENCE_KEY ])
           info.effective      = RCAP.parse_datetime( info_hash[ EFFECTIVE_KEY ])
           info.onset          = RCAP.parse_datetime( info_hash[ ONSET_KEY ])
           info.expires        = RCAP.parse_datetime( info_hash[ EXPIRES_KEY ])
-          info.sender_name    = info_hash[ SENDER_NAME_KEY ]
-          info.headline       = info_hash[ HEADLINE_KEY ]
-          info.description    = info_hash[ DESCRIPTION_KEY ]
-          info.instruction    = info_hash[ INSTRUCTION_KEY ]
-          info.web            = info_hash[ WEB_KEY ]
-          info.contact        = info_hash[ CONTACT_KEY ]
+          info.sender_name    = RCAP.strip_if_given( info_hash[ SENDER_NAME_KEY ])
+          info.headline       = RCAP.strip_if_given( info_hash[ HEADLINE_KEY ])
+          info.description    = RCAP.strip_if_given( info_hash[ DESCRIPTION_KEY ])
+          info.instruction    = RCAP.strip_if_given( info_hash[ INSTRUCTION_KEY ])
+          info.web            = RCAP.strip_if_given( info_hash[ WEB_KEY ])
+          info.contact        = RCAP.strip_if_given( info_hash[ CONTACT_KEY ])
 
           Array( info_hash[ RESOURCES_KEY ]).each do |resource_hash|
             info.resources << info.resource_class.from_h( resource_hash )

data/lib/rcap/base/parameter.rb

@@ -78,8 +78,8 @@ module RCAP
       def self.from_h( hash )
         key = hash.keys.first
         self.new do |parameter|
-          parameter.name = key
-          parameter.value = hash[ key ]
+          parameter.name  = RCAP.strip_if_given( key )
+          parameter.value = RCAP.strip_if_given( hash[ key ])
         end
       end
     end

data/lib/rcap/base/point.rb

@@ -58,8 +58,8 @@ module RCAP
       # @return [Point]
       def self.from_h( point_hash )
         self.new do |point|
-          point.lattitude = point_hash[ LATTITUDE_KEY ]
-          point.longitude = point_hash[ LONGITUDE_KEY ]
+          point.lattitude = point_hash[ LATTITUDE_KEY ].to_f
+          point.longitude = point_hash[ LONGITUDE_KEY ].to_f
         end
       end
 
@@ -78,8 +78,8 @@ module RCAP
       # @return [Point]
       def self.from_a( point_array )
         self.new do |point|
-          point.lattitude = point_array[ LATTITUDE_INDEX ]
-          point.longitude = point_array[ LONGITUDE_INDEX ]
+          point.lattitude = point_array[ LATTITUDE_INDEX ].to_f
+          point.longitude = point_array[ LONGITUDE_INDEX ].to_f
         end
       end
     end

data/lib/rcap/base/polygon.rb

@@ -53,8 +53,8 @@ module RCAP
           self.new do |polygon|
             coordinates.each do |lattitude, longitude|
               polygon.add_point do |point|
-                point.lattitude = lattitude
-                point.longitude = longitude
+                point.lattitude = lattitude.to_f
+                point.longitude = longitude.to_f
               end
             end
           end
@@ -85,8 +85,8 @@ module RCAP
         self.new do |polygon|
           Array( polygon_yaml_data ).each do |lattitude, longitude|
             polygon.add_point do |point|
-              point.lattitude = lattitude
-              point.longitude = longitude
+              point.lattitude = lattitude.to_f
+              point.longitude = longitude.to_f
             end
           end
         end
@@ -104,8 +104,8 @@ module RCAP
         self.new do |polygon|
           Array( polygon_hash[ POINTS_KEY ]).each do |point_array|
             polygon.add_point do |point|
-              point.lattitude = point_array[ Point::LATTITUDE_INDEX ]
-              point.longitude = point_array[ Point::LONGITUDE_INDEX ]
+              point.lattitude = point_array[ Point::LATTITUDE_INDEX ].to_f
+              point.longitude = point_array[ Point::LONGITUDE_INDEX ].to_f
             end
           end
         end

data/lib/rcap/base/resource.rb

@@ -156,11 +156,11 @@ module RCAP
       # @return [Resource]
       def self.from_h( resource_hash )
         self.new do |resource|
-          resource.resource_desc = resource_hash[ RESOURCE_DESC_KEY ]
-          resource.uri           = resource_hash[ URI_KEY ]
-          resource.mime_type     = resource_hash[ MIME_TYPE_KEY ]
-          resource.size          = resource_hash[ SIZE_KEY ]
-          resource.digest        = resource_hash[ DIGEST_KEY ]
+          resource.resource_desc = RCAP.strip_if_given( resource_hash[ RESOURCE_DESC_KEY ])
+          resource.uri           = RCAP.strip_if_given( resource_hash[ URI_KEY ])
+          resource.mime_type     = RCAP.strip_if_given( resource_hash[ MIME_TYPE_KEY ])
+          resource.size          = RCAP.to_i_if_given( resource_hash[ SIZE_KEY ])
+          resource.digest        = RCAP.strip_if_given( resource_hash[ DIGEST_KEY ])
         end
       end
     end

data/lib/rcap/cap_1_0/alert.rb

@@ -124,7 +124,7 @@ module RCAP
       # @return [RCAP::CAP_1_0::Alert]
       def self.from_yaml_data( alert_yaml_data )
         super.tap do |alert|
-          alert.password    = alert_yaml_data[ PASSWORD_YAML ]
+          alert.password = RCAP.strip_if_given( alert_yaml_data[ PASSWORD_YAML ])
         end
       end
 
@@ -158,7 +158,7 @@ module RCAP
       # @return [RCAP::CAP_1_0::Alert]
       def self.from_h( alert_hash )
         super.tap do |alert|
-          alert.password = alert_hash[ PASSWORD_KEY ]
+          alert.password = RCAP.strip_if_given( alert_hash[ PASSWORD_KEY ])
         end
       end
     end

data/lib/rcap/cap_1_0/parameter.rb

@@ -17,8 +17,8 @@ module RCAP
       def self.from_xml_element( parameter_xml_element )
         parameter_hash = self.parse_parameter( parameter_xml_element.text )
         self.new do |parameter|
-          parameter.name = parameter_hash[ :name ]
-          parameter.value  = parameter_hash[ :value ]
+          parameter.name   = RCAP.strip_if_given( parameter_hash[ :name ])
+          parameter.value  = RCAP.strip_if_given( parameter_hash[ :value ])
         end
       end
 
@@ -27,8 +27,8 @@ module RCAP
       def self.parse_parameter( parameter_string )
         name, value = parameter_string.split("=")
         if name && value
-          { :name  => name,
-            :value => value }
+          { :name  => RCAP.strip_if_given( name ),
+            :value => RCAP.strip_if_given( value )}
         end
       end
     end

data/lib/rcap/cap_1_1/info.rb

@@ -144,7 +144,7 @@ module RCAP
       def self.from_xml_element( info_xml_element )
         super.tap do |info|
           RCAP.xpath_match( info_xml_element, RESPONSE_TYPE_XPATH, info.xmlns ).each do |element|
-            info.response_types << element.text
+            info.response_types << RCAP.strip_if_given( element.text )
           end
         end
       end
@@ -222,7 +222,7 @@ module RCAP
       def self.from_yaml_data( info_yaml_data )
         super.tap do |info|
           Array( info_yaml_data [ RESPONSE_TYPES_YAML ] ).each do |response_type|
-            info.response_types << response_type
+            info.response_types << RCAP.strip_if_given( response_type )
           end
         end
       end
@@ -259,7 +259,7 @@ module RCAP
       def self.from_h( info_hash )
         super.tap do |info|
           Array( info_hash[ RESPONSE_TYPES_KEY ]).each do |response_type|
-            info.response_types << response_type
+            info.response_types << RCAP.strip_if_given( response_type )
           end
         end
       end

data/lib/rcap/cap_1_1/resource.rb

@@ -70,7 +70,7 @@ module RCAP
       # @return [Resource]
       def self.from_yaml_data( resource_yaml_data )
         super.tap do |resource|
-          resource.deref_uri = resource_yaml_data[ DEREF_URI_YAML ]
+          resource.deref_uri = RCAP.strip_if_given( resource_yaml_data[ DEREF_URI_YAML ])
         end
       end
 
@@ -90,7 +90,7 @@ module RCAP
       # @return [Resource]
       def self.from_h( resource_hash )
         super.tap do |resource|
-          resource.deref_uri = resource_hash[ DEREF_URI_KEY ]
+          resource.deref_uri = RCAP.strip_if_given( resource_hash[ DEREF_URI_KEY ])
         end
       end
     end

data/lib/rcap/cap_1_2/info.rb

@@ -157,7 +157,7 @@ module RCAP
       def self.from_xml_element( info_xml_element )
         super.tap do |info|
           RCAP.xpath_match( info_xml_element, RESPONSE_TYPE_XPATH, Alert::XMLNS ).each do |element|
-            info.response_types << element.text
+            info.response_types << RCAP.strip_if_given( element.text )
           end
         end
       end
@@ -196,7 +196,7 @@ module RCAP
       def self.from_yaml_data( info_yaml_data )
         super.tap do |info|
           Array( info_yaml_data [ RESPONSE_TYPES_YAML ]).each do |response_type|
-            info.response_types << response_type
+            info.response_types << RCAP.strip_if_given( response_type )
           end
         end
       end
@@ -233,7 +233,7 @@ module RCAP
       def self.from_h( info_hash )
         super.tap do |info|
           Array( info_hash[ RESPONSE_TYPES_KEY ]).each do |response_type|
-            info.response_types << response_type
+            info.response_types << RCAP.strip_if_given( response_type )
           end
         end
       end

data/lib/rcap/cap_1_2/resource.rb

@@ -75,7 +75,7 @@ module RCAP
       # @return [Resource]
       def self.from_yaml_data( resource_yaml_data )
         super.tap do |resource|
-          resource.deref_uri = resource_yaml_data[ DEREF_URI_YAML ]
+          resource.deref_uri = resource_yaml_data[ DEREF_URI_YAML ].strip if resource_yaml_data[ DEREF_URI_YAML ]
         end
       end
 
@@ -95,7 +95,7 @@ module RCAP
       # @return [Resource]
       def self.from_h( resource_hash )
         super.tap do |resource|
-          resource.deref_uri = resource_hash[ DEREF_URI_KEY ]
+          resource.deref_uri = resource_hash[ DEREF_URI_KEY ].strip if resource_hash[ DEREF_URI_KEY ]
         end
       end
     end

data/lib/rcap/utilities.rb

@@ -17,7 +17,7 @@ module RCAP
   # @return [String,nil] Text content of element matching XPath query or nil
   def self.xpath_text( xml_element, xpath, namespace )
     element = self.xpath_first( xml_element, xpath, namespace )
-    element.text if element
+    element.text.strip if element && element.text
   end
 
   # Returns first descendent that matches the given XPath expression.
@@ -57,11 +57,11 @@ module RCAP
   #  # | three |
   #  # '-------'
   def self.format_lines_for_inspect( header, inspect_string )
-    max_line_length = inspect_string.lines.map{ |line| line.chomp.length }.max
+    max_line_length = inspect_string.lines.map{ |line| line.strip.length }.max
     "\n." + '-' * (max_line_length + 2) + ".\n"+
       '| ' + header.ljust( max_line_length ) + " |\n"+
       '|' + '-' * ( max_line_length + 2 ) + "|\n"+
-      inspect_string.lines.map{ |line| '| ' + line.chomp.ljust( max_line_length ) +' |'}.join( "\n" ) + "\n" +
+      inspect_string.lines.map{ |line| '| ' + line.strip.ljust( max_line_length ) +' |'}.join( "\n" ) + "\n" +
       "'" + '-' * ( max_line_length + 2 ) + "'\n"
   end
 
@@ -90,13 +90,77 @@ module RCAP
     end
   end
 
-  # If the parameter is a string the datetime is parsed out of it, otherwise returns nil.
+  # If the parameter is a string and not empty the datetime is parsed out of it, otherwise returns nil.
   #
-  # @param [String] date_string String to parse
+  # @param [String] date String to parse
   # @return [String,nil]
-  def self.parse_datetime( date_string )
-    if date_string.is_a?( String )
-      DateTime.parse( date_string )
+  def self.parse_datetime( date )
+    case date
+    when String
+      if  !date.empty?
+        DateTime.parse( date.strip )
+      end
+    when DateTime, Time, Date
+      date.to_datetime
+    end
+  end
+
+  # If the list is given will split it with the separator parameter otherwise
+  # retun an empty array.
+  #
+  # @param [String] list List to split
+  # @return [Array]
+  def RCAP.unpack_if_given( list )
+    if list
+      list.unpack_cap_list
+    else
+      []
+    end
+  end
+
+  # If the string given is not nil, String#strip is called otherwise nil is returned
+  #
+  # @param [String] string
+  # @return [String,nil]
+  def RCAP.strip_if_given( string )
+    if string
+      string.strip
+    end
+  end
+
+  # if the string is given, String#strip and then String#to_f are applied
+  # otherwise nil is returned.
+  #
+  # @param [String] string
+  # @return [Float,nil]
+  def RCAP.to_f_if_given( number )
+    if number
+      case number
+      when String
+        number.strip.to_f
+      when Numeric
+        number.to_f
+      else
+        number.to_s.strip.to_f
+      end
+    end
+  end
+  
+  # if the string is given, String#strip and then String#to_i are applied
+  # otherwise nil is returned.
+  #
+  # @param [String] string
+  # @return [Integer,nil]
+  def RCAP.to_i_if_given( number )
+    if number
+      case number
+      when String
+        number.strip.to_i
+      when Numeric
+        number.to_i
+      else
+        number.to_s.to_i
+      end
     end
   end
 end

data/lib/rcap/version.rb

@@ -1,3 +1,3 @@
 module RCAP
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

metadata

@@ -2,7 +2,7 @@
 name: rcap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Farrel Lifson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-12 00:00:00 Z
+date: 2013-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assistance
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rcap
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: CAP(Common Alerting Protocol) API