rcap 2.4.1 → 2.5.0

data/lib/rcap/cap_1_0/alert.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_0
-
     # An Alert object is valid if
     # * it has an identifier
     # * it has a sender
@@ -10,12 +9,11 @@ module RCAP
     # * it has a valid scope value
     # * all Info objects contained in infos are valid
     class Alert < RCAP::Base::Alert
-
-      XMLNS = "http://www.incident.com/cap/1.0"
-      CAP_VERSION = "1.0"
+      XMLNS = 'http://www.incident.com/cap/1.0'
+      CAP_VERSION = '1.0'
 
       # @return [String]
-      attr_accessor( :password )
+      attr_accessor(:password)
 
       # @return [String]
       def xmlns
@@ -31,100 +29,98 @@ module RCAP
 
       # @return [REXML::Element]
       def to_xml_element
-        xml_element = REXML::Element.new( XML_ELEMENT_NAME )
-        xml_element.add_namespace( XMLNS )
-        xml_element.add_element( IDENTIFIER_ELEMENT_NAME ).add_text( @identifier )   if @identifier
-        xml_element.add_element( SENDER_ELEMENT_NAME ).add_text( @sender )           if @sender
-        xml_element.add_element( SENT_ELEMENT_NAME ).add_text( @sent.to_s_for_cap )  if @sent
-        xml_element.add_element( STATUS_ELEMENT_NAME ).add_text( @status )           if @status
-        xml_element.add_element( MSG_TYPE_ELEMENT_NAME ).add_text( @msg_type )       if @msg_type
-        xml_element.add_element( PASSWORD_ELEMENT_NAME ).add_text( @password )       if @password
-        xml_element.add_element( SOURCE_ELEMENT_NAME ).add_text( @source )           if @source
-        xml_element.add_element( SCOPE_ELEMENT_NAME ).add_text( @scope )             if @scope
-        xml_element.add_element( RESTRICTION_ELEMENT_NAME ).add_text( @restriction ) if @restriction
+        xml_element = REXML::Element.new(XML_ELEMENT_NAME)
+        xml_element.add_namespace(XMLNS)
+        xml_element.add_element(IDENTIFIER_ELEMENT_NAME).add_text(@identifier)   if @identifier
+        xml_element.add_element(SENDER_ELEMENT_NAME).add_text(@sender)           if @sender
+        xml_element.add_element(SENT_ELEMENT_NAME).add_text(@sent.to_s_for_cap)  if @sent
+        xml_element.add_element(STATUS_ELEMENT_NAME).add_text(@status)           if @status
+        xml_element.add_element(MSG_TYPE_ELEMENT_NAME).add_text(@msg_type)       if @msg_type
+        xml_element.add_element(PASSWORD_ELEMENT_NAME).add_text(@password)       if @password
+        xml_element.add_element(SOURCE_ELEMENT_NAME).add_text(@source)           if @source
+        xml_element.add_element(SCOPE_ELEMENT_NAME).add_text(@scope)             if @scope
+        xml_element.add_element(RESTRICTION_ELEMENT_NAME).add_text(@restriction) if @restriction
         if @addresses.any?
-          xml_element.add_element( ADDRESSES_ELEMENT_NAME ).add_text( @addresses.to_s_for_cap )
+          xml_element.add_element(ADDRESSES_ELEMENT_NAME).add_text(@addresses.to_s_for_cap)
         end
         @codes.each do |code|
-          xml_element.add_element( CODE_ELEMENT_NAME ).add_text( code )
+          xml_element.add_element(CODE_ELEMENT_NAME).add_text(code)
         end
-        xml_element.add_element( NOTE_ELEMENT_NAME ).add_text( @note ) if @note
+        xml_element.add_element(NOTE_ELEMENT_NAME).add_text(@note) if @note
         if @references.any?
-          xml_element.add_element( REFERENCES_ELEMENT_NAME ).add_text( @references.join( ' ' ))
+          xml_element.add_element(REFERENCES_ELEMENT_NAME).add_text(@references.join(' '))
         end
         if @incidents.any?
-          xml_element.add_element( INCIDENTS_ELEMENT_NAME ).add_text( @incidents.join( ' ' ))
+          xml_element.add_element(INCIDENTS_ELEMENT_NAME).add_text(@incidents.join(' '))
         end
         @infos.each do |info|
-          xml_element.add_element( info.to_xml_element )
+          xml_element.add_element(info.to_xml_element)
         end
         xml_element
       end
 
       # @return [String]
       def inspect
-        alert_inspect = [ "CAP Version:  #{ CAP_VERSION }",
-                          "Identifier:   #{ @identifier }",
-                          "Sender:       #{ @sender }",
-                          "Sent:         #{ @sent }",
-                          "Status:       #{ @status }",
-                          "Message Type: #{ @msg_type }",
-                          "Password:     #{ @password }",
-                          "Source:       #{ @source }",
-                          "Scope:        #{ @scope }",
-                          "Restriction:  #{ @restriction }",
-                          "Addresses:    #{ @addresses.to_s_for_cap }",
-                          "Codes:",
-                          @codes.map{ |code| "  " + code }.join("\n"),
-                          "Note:         #{ @note }",
-                          "References:   #{ @references.join( ' ' )}",
-                          "Incidents:    #{ @incidents.join( ' ')}",
-                          "Information:",
-                          @infos.map{ |info| "  " + info.to_s }.join( "\n" )].join("\n")
-        RCAP.format_lines_for_inspect( 'ALERT', alert_inspect )
+        alert_inspect = ["CAP Version:  #{ CAP_VERSION }",
+                         "Identifier:   #{ @identifier }",
+                         "Sender:       #{ @sender }",
+                         "Sent:         #{ @sent }",
+                         "Status:       #{ @status }",
+                         "Message Type: #{ @msg_type }",
+                         "Password:     #{ @password }",
+                         "Source:       #{ @source }",
+                         "Scope:        #{ @scope }",
+                         "Restriction:  #{ @restriction }",
+                         "Addresses:    #{ @addresses.to_s_for_cap }",
+                         'Codes:',
+                         @codes.map { |code| '  ' + code }.join("\n"),
+                         "Note:         #{ @note }",
+                         "References:   #{ @references.join(' ')}",
+                         "Incidents:    #{ @incidents.join(' ')}",
+                         'Information:',
+                         @infos.map { |info| '  ' + info.to_s }.join("\n")].join("\n")
+        RCAP.format_lines_for_inspect('ALERT', alert_inspect)
       end
 
-
       PASSWORD_XPATH    = "cap:#{ PASSWORD_ELEMENT_NAME }"
 
       # @param [REXML::Element] alert_xml_element
       # @return [RCAP::CAP_1_0::Alert]
-      def self.from_xml_element( alert_xml_element )
+      def self.from_xml_element(alert_xml_element)
         super.tap do |alert|
-          alert.password = RCAP.xpath_text( alert_xml_element, PASSWORD_XPATH, Alert::XMLNS )
+          alert.password = RCAP.xpath_text(alert_xml_element, PASSWORD_XPATH, Alert::XMLNS)
         end
       end
 
-
-      PASSWORD_YAML    = "Password"
+      PASSWORD_YAML    = 'Password'
 
       # Returns a string containing the YAML representation of the alert.
       #
       # @return [String]
-      def to_yaml( options = {} )
-        RCAP.attribute_values_to_hash( [ CAP_VERSION_YAML, CAP_VERSION ],
-                                       [ IDENTIFIER_YAML,  @identifier ],
-                                       [ SENDER_YAML,      @sender ],
-                                       [ SENT_YAML,        @sent ],
-                                       [ STATUS_YAML,      @status ],
-                                       [ MSG_TYPE_YAML,    @msg_type ],
-                                       [ PASSWORD_YAML,    @password ],
-                                       [ SOURCE_YAML,      @source ],
-                                       [ SCOPE_YAML,       @scope ],
-                                       [ RESTRICTION_YAML, @restriction ],
-                                       [ ADDRESSES_YAML,   @addresses ],
-                                       [ CODES_YAML,       @codes ],
-                                       [ NOTE_YAML,        @note ],
-                                       [ REFERENCES_YAML,  @references ],
-                                       [ INCIDENTS_YAML,   @incidents ],
-                                       [ INFOS_YAML,       @infos.map( &:to_yaml_data )]).to_yaml( options )
+      def to_yaml(options = {})
+        RCAP.attribute_values_to_hash([CAP_VERSION_YAML, CAP_VERSION],
+                                      [IDENTIFIER_YAML,  @identifier],
+                                      [SENDER_YAML,      @sender],
+                                      [SENT_YAML,        @sent],
+                                      [STATUS_YAML,      @status],
+                                      [MSG_TYPE_YAML,    @msg_type],
+                                      [PASSWORD_YAML,    @password],
+                                      [SOURCE_YAML,      @source],
+                                      [SCOPE_YAML,       @scope],
+                                      [RESTRICTION_YAML, @restriction],
+                                      [ADDRESSES_YAML,   @addresses],
+                                      [CODES_YAML,       @codes],
+                                      [NOTE_YAML,        @note],
+                                      [REFERENCES_YAML,  @references],
+                                      [INCIDENTS_YAML,   @incidents],
+                                      [INFOS_YAML,       @infos.map(&:to_yaml_data)]).to_yaml(options)
       end
 
       # @param [Hash] alert_yaml_data
       # @return [RCAP::CAP_1_0::Alert]
-      def self.from_yaml_data( alert_yaml_data )
+      def self.from_yaml_data(alert_yaml_data)
         super.tap do |alert|
-          alert.password = RCAP.strip_if_given( alert_yaml_data[ PASSWORD_YAML ])
+          alert.password = RCAP.strip_if_given(alert_yaml_data[PASSWORD_YAML])
         end
       end
 
@@ -134,31 +130,31 @@ module RCAP
       #
       # @return [Hash]
       def to_h
-        RCAP.attribute_values_to_hash( [ CAP_VERSION_KEY, CAP_VERSION ],
-                                       [ IDENTIFIER_KEY,   @identifier ],
-                                       [ SENDER_KEY,       @sender ],
-                                       [ SENT_KEY,         RCAP.to_s_for_cap( @sent )],
-                                       [ STATUS_KEY,       @status ],
-                                       [ MSG_TYPE_KEY,     @msg_type ],
-                                       [ PASSWORD_KEY,     @password ],
-                                       [ SOURCE_KEY,       @source ],
-                                       [ SCOPE_KEY,        @scope ],
-                                       [ RESTRICTION_KEY,  @restriction ],
-                                       [ ADDRESSES_KEY,    @addresses ],
-                                       [ CODES_KEY,        @codes ],
-                                       [ NOTE_KEY,         @note ],
-                                       [ REFERENCES_KEY,   @references ],
-                                       [ INCIDENTS_KEY,    @incidents ],
-                                       [ INFOS_KEY,        @infos.map{ |info| info.to_h  }])
+        RCAP.attribute_values_to_hash([CAP_VERSION_KEY, CAP_VERSION],
+                                      [IDENTIFIER_KEY,   @identifier],
+                                      [SENDER_KEY,       @sender],
+                                      [SENT_KEY,         RCAP.to_s_for_cap(@sent)],
+                                      [STATUS_KEY,       @status],
+                                      [MSG_TYPE_KEY,     @msg_type],
+                                      [PASSWORD_KEY,     @password],
+                                      [SOURCE_KEY,       @source],
+                                      [SCOPE_KEY,        @scope],
+                                      [RESTRICTION_KEY,  @restriction],
+                                      [ADDRESSES_KEY,    @addresses],
+                                      [CODES_KEY,        @codes],
+                                      [NOTE_KEY,         @note],
+                                      [REFERENCES_KEY,   @references],
+                                      [INCIDENTS_KEY,    @incidents],
+                                      [INFOS_KEY,        @infos.map { |info| info.to_h  }])
       end
 
       # Initialises an Alert object from a Hash produced by Alert#to_h
       #
       # @param [Hash] alert_hash
       # @return [RCAP::CAP_1_0::Alert]
-      def self.from_h( alert_hash )
+      def self.from_h(alert_hash)
         super.tap do |alert|
-          alert.password = RCAP.strip_if_given( alert_hash[ PASSWORD_KEY ])
+          alert.password = RCAP.strip_if_given(alert_hash[PASSWORD_KEY])
         end
       end
     end

data/lib/rcap/cap_1_0/area.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_0
-
     # An Area object is valid if
     # * it has an area description
     # * all Circle objects contained in circles are valid
@@ -8,7 +7,6 @@ module RCAP
     # * all Polygon objects contained in polygons are valid
     # * altitude has a value if ceiling is set
     class Area < RCAP::Base::Area
-
       # @return [String]
       def xmlns
         Alert::XMLNS

data/lib/rcap/cap_1_0/circle.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_0
-
     # A Circle object is valid if
     # * it has a valid lattitude and longitude
     # * it has a radius with a value greater than zero

data/lib/rcap/cap_1_0/info.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_0
-
     # In Info object is valid if
     # * it has an event
     # * it has an urgency with a valid value
@@ -10,8 +9,7 @@ module RCAP
     # * all Resource objects in the resources collection are valid
     # * all Area objects in the areas collection are valid
     class Info < RCAP::Base::Info
-
-      validates_inclusion_of( :certainty, :allow_nil => true, :in => VALID_CERTAINTIES, :message => "can only be assigned the following values: #{ VALID_CERTAINTIES.join(', ') }")
+      validates_inclusion_of(:certainty, allow_nil: true, in: VALID_CERTAINTIES, message: "can only be assigned the following values: #{ VALID_CERTAINTIES.join(', ') }")
 
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_0/parameter.rb

@@ -4,31 +4,30 @@ module RCAP
     # * it has a name
     # * it has a value
     class Parameter < RCAP::Base::Parameter
-
       # @return [REXML::Element]
       def to_xml_element
-        xml_element = REXML::Element.new( self.class::XML_ELEMENT_NAME )
-        xml_element.add_text( "#{ @name }=#{ @value }")
+        xml_element = REXML::Element.new(self.class::XML_ELEMENT_NAME)
+        xml_element.add_text("#{ @name }=#{ @value }")
         xml_element
       end
 
       # @param [REXML::Element] parameter_xml_element
       # @return [Parameter]
-      def self.from_xml_element( parameter_xml_element )
-        parameter_hash = self.parse_parameter( parameter_xml_element.text )
-        self.new do |parameter|
-          parameter.name   = RCAP.strip_if_given( parameter_hash[ :name ])
-          parameter.value  = RCAP.strip_if_given( parameter_hash[ :value ])
+      def self.from_xml_element(parameter_xml_element)
+        parameter_hash = parse_parameter(parameter_xml_element.text)
+        new do |parameter|
+          parameter.name   = RCAP.strip_if_given(parameter_hash[:name])
+          parameter.value  = RCAP.strip_if_given(parameter_hash[:value])
         end
       end
 
       # @param [String] parameter_string
       # @return [Hash]
-      def self.parse_parameter( parameter_string )
-        name, value = parameter_string.split("=")
+      def self.parse_parameter(parameter_string)
+        name, value = parameter_string.split('=')
         if name && value
-          { :name  => RCAP.strip_if_given( name ),
-            :value => RCAP.strip_if_given( value )}
+          { name: RCAP.strip_if_given(name),
+            value: RCAP.strip_if_given(value) }
         end
       end
     end

data/lib/rcap/cap_1_0/point.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_0
-
     # A Point object is valid if
     # * it has a lattitude within the minimum and maximum lattitude values
     # * it has a longitude within the minimum and maximum longitude values

data/lib/rcap/cap_1_0/polygon.rb

@@ -1,11 +1,9 @@
 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 < RCAP::Base::Polygon
-
       # @return [Class]
       def point_class
         Point

data/lib/rcap/cap_1_0/resource.rb

@@ -1,11 +1,8 @@
 module RCAP
   module CAP_1_0
-
-
     # A Resource object is valid if
     # * it has a resource description
     class Resource < RCAP::Base::Resource
-
       # @return [String]
       def xmlns
         Alert::XMLNS

data/lib/rcap/cap_1_1/alert.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_1
-
     # An Alert object is valid if
     # * it has an identifier
     # * it has a sender
@@ -10,13 +9,12 @@ module RCAP
     # * it has a valid scope value
     # * all Info objects contained in infos are valid
     class Alert < RCAP::Base::Alert
+      XMLNS = 'urn:oasis:names:tc:emergency:cap:1.1'
+      CAP_VERSION = '1.1'
 
-      XMLNS = "urn:oasis:names:tc:emergency:cap:1.1"
-      CAP_VERSION = "1.1"
-
-      STATUS_DRAFT    = "Draft"
+      STATUS_DRAFT    = 'Draft'
       # Valid values for status
-      VALID_STATUSES = [ STATUS_ACTUAL, STATUS_EXERCISE, STATUS_SYSTEM, STATUS_TEST, STATUS_DRAFT ]
+      VALID_STATUSES = [STATUS_ACTUAL, STATUS_EXERCISE, STATUS_SYSTEM, STATUS_TEST, STATUS_DRAFT]
 
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_1/area.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_1
-
     # An Area object is valid if
     # * it has an area description
     # * all Circle objects contained in circles are valid
@@ -8,7 +7,6 @@ module RCAP
     # * all Polygon objects contained in polygons are valid
     # * altitude has a value if ceiling is set
     class Area < RCAP::Base::Area
-
       # @return [String]
       def xmlns
         Alert::XMLNS

data/lib/rcap/cap_1_1/circle.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_1
-
     # A Circle object is valid if
     # * it has a valid lattitude and longitude
     # * it has a radius with a value greater than zero

data/lib/rcap/cap_1_1/info.rb

@@ -1,6 +1,5 @@
 module RCAP
   module CAP_1_1
-
     # In Info object is valid if
     # * it has an event
     # * it has an urgency with a valid value
@@ -10,40 +9,37 @@ module RCAP
     # * all Resource objects in the resources collection are valid
     # * all Area objects in the areas collection are valid
     class Info < RCAP::Base::Info
-
-      RESPONSE_TYPE_SHELTER  = "Shelter"
-      RESPONSE_TYPE_EVACUATE = "Evacuate"
-      RESPONSE_TYPE_PREPARE  = "Prepare"
-      RESPONSE_TYPE_EXECUTE  = "Execute"
-      RESPONSE_TYPE_MONITOR  = "Monitor"
-      RESPONSE_TYPE_ASSESS   = "Assess"
-      RESPONSE_TYPE_NONE     = "None"
+      RESPONSE_TYPE_SHELTER  = 'Shelter'
+      RESPONSE_TYPE_EVACUATE = 'Evacuate'
+      RESPONSE_TYPE_PREPARE  = 'Prepare'
+      RESPONSE_TYPE_EXECUTE  = 'Execute'
+      RESPONSE_TYPE_MONITOR  = 'Monitor'
+      RESPONSE_TYPE_ASSESS   = 'Assess'
+      RESPONSE_TYPE_NONE     = 'None'
       # Valid values for response_type
-      VALID_RESPONSE_TYPES = [ RESPONSE_TYPE_SHELTER, RESPONSE_TYPE_EVACUATE,
-        RESPONSE_TYPE_PREPARE, RESPONSE_TYPE_EXECUTE, RESPONSE_TYPE_MONITOR,
-        RESPONSE_TYPE_ASSESS, RESPONSE_TYPE_NONE ]
-
+      VALID_RESPONSE_TYPES = [RESPONSE_TYPE_SHELTER, RESPONSE_TYPE_EVACUATE,
+                              RESPONSE_TYPE_PREPARE, RESPONSE_TYPE_EXECUTE, RESPONSE_TYPE_MONITOR,
+                              RESPONSE_TYPE_ASSESS, RESPONSE_TYPE_NONE]
 
-      CERTAINTY_OBSERVED = "Observed"
+      CERTAINTY_OBSERVED = 'Observed'
       # Valid valies for certainty
-      VALID_CERTAINTIES = [ CERTAINTY_OBSERVED, CERTAINTY_LIKELY,
-        CERTAINTY_POSSIBLE, CERTAINTY_UNLIKELY, CERTAINTY_UNKNOWN ]
+      VALID_CERTAINTIES = [CERTAINTY_OBSERVED, CERTAINTY_LIKELY,
+                           CERTAINTY_POSSIBLE, CERTAINTY_UNLIKELY, CERTAINTY_UNKNOWN]
 
-
-      validates_length_of( :categories, :minimum => 1 )
-      validates_inclusion_of_members_of( :response_types, :in  => VALID_RESPONSE_TYPES, :allow_blank => true )
-      validates_inclusion_of( :certainty, :allow_nil => true, :in => VALID_CERTAINTIES, :message => "can only be assigned the following values: #{ VALID_CERTAINTIES.join(', ') }")
+      validates_length_of(:categories, minimum: 1)
+      validates_inclusion_of_members_of(:response_types, in: VALID_RESPONSE_TYPES, allow_blank: true)
+      validates_inclusion_of(:certainty, allow_nil: true, in: VALID_CERTAINTIES, message: "can only be assigned the following values: #{ VALID_CERTAINTIES.join(', ') }")
 
       # @return [Array<String>] Collection of textual response types; elements must be from {VALID_RESPONSE_TYPES}
-      attr_reader( :response_types )
+      attr_reader(:response_types)
       # @return [Array<EventCode>] Collection of {EventCode} objects
-      attr_reader( :event_codes )
+      attr_reader(:event_codes)
       # @return [Array<Parameter>] Collection of {Parameter} objects
-      attr_reader( :parameters )
+      attr_reader(:parameters)
       # @return [Array<Resource> Collection of {Resource} objects
-      attr_reader( :resources )
+      attr_reader(:resources)
       # @return [Array<Area>] Collection of {Area} objects
-      attr_reader( :areas )
+      attr_reader(:areas)
 
       # @param [Hash] attributes
       # @option attributes [String] :language Defaults to {DEFAULT_LANGUAGE}
@@ -97,86 +93,82 @@ module RCAP
 
       # @return [REXML::Element]
       def to_xml_element
-        xml_element = REXML::Element.new( XML_ELEMENT_NAME )
-        xml_element.add_element( LANGUAGE_ELEMENT_NAME ).add_text( @language ) if @language
+        xml_element = REXML::Element.new(XML_ELEMENT_NAME)
+        xml_element.add_element(LANGUAGE_ELEMENT_NAME).add_text(@language) if @language
         @categories.each do |category|
-          xml_element.add_element( CATEGORY_ELEMENT_NAME ).add_text( category )
+          xml_element.add_element(CATEGORY_ELEMENT_NAME).add_text(category)
         end
-        xml_element.add_element( EVENT_ELEMENT_NAME ).add_text( @event )
+        xml_element.add_element(EVENT_ELEMENT_NAME).add_text(@event)
         @response_types.each do |response_type|
-          xml_element.add_element( RESPONSE_TYPE_ELEMENT_NAME ).add_text( response_type )
+          xml_element.add_element(RESPONSE_TYPE_ELEMENT_NAME).add_text(response_type)
         end
-        xml_element.add_element( URGENCY_ELEMENT_NAME ).add_text( @urgency )
-        xml_element.add_element( SEVERITY_ELEMENT_NAME ).add_text( @severity )
-        xml_element.add_element( CERTAINTY_ELEMENT_NAME ).add_text( @certainty )
-        xml_element.add_element( AUDIENCE_ELEMENT_NAME ).add_text( @audience ) if @audience
+        xml_element.add_element(URGENCY_ELEMENT_NAME).add_text(@urgency)
+        xml_element.add_element(SEVERITY_ELEMENT_NAME).add_text(@severity)
+        xml_element.add_element(CERTAINTY_ELEMENT_NAME).add_text(@certainty)
+        xml_element.add_element(AUDIENCE_ELEMENT_NAME).add_text(@audience) if @audience
         @event_codes.each do |event_code|
-          xml_element.add_element( event_code.to_xml_element )
+          xml_element.add_element(event_code.to_xml_element)
         end
-        xml_element.add_element( EFFECTIVE_ELEMENT_NAME ).add_text( @effective.to_s_for_cap ) if @effective
-        xml_element.add_element( ONSET_ELEMENT_NAME ).add_text( @onset.to_s_for_cap )         if @onset
-        xml_element.add_element( EXPIRES_ELEMENT_NAME ).add_text( @expires.to_s_for_cap )     if @expires
-        xml_element.add_element( SENDER_NAME_ELEMENT_NAME ).add_text( @sender_name )          if @sender_name
-        xml_element.add_element( HEADLINE_ELEMENT_NAME ).add_text( @headline )                if @headline
-        xml_element.add_element( DESCRIPTION_ELEMENT_NAME ).add_text( @description )          if @description
-        xml_element.add_element( INSTRUCTION_ELEMENT_NAME ).add_text( @instruction )          if @instruction
-        xml_element.add_element( WEB_ELEMENT_NAME ).add_text( @web )                          if @web
-        xml_element.add_element( CONTACT_ELEMENT_NAME ).add_text( @contact )                  if @contact
+        xml_element.add_element(EFFECTIVE_ELEMENT_NAME).add_text(@effective.to_s_for_cap) if @effective
+        xml_element.add_element(ONSET_ELEMENT_NAME).add_text(@onset.to_s_for_cap)         if @onset
+        xml_element.add_element(EXPIRES_ELEMENT_NAME).add_text(@expires.to_s_for_cap)     if @expires
+        xml_element.add_element(SENDER_NAME_ELEMENT_NAME).add_text(@sender_name)          if @sender_name
+        xml_element.add_element(HEADLINE_ELEMENT_NAME).add_text(@headline)                if @headline
+        xml_element.add_element(DESCRIPTION_ELEMENT_NAME).add_text(@description)          if @description
+        xml_element.add_element(INSTRUCTION_ELEMENT_NAME).add_text(@instruction)          if @instruction
+        xml_element.add_element(WEB_ELEMENT_NAME).add_text(@web)                          if @web
+        xml_element.add_element(CONTACT_ELEMENT_NAME).add_text(@contact)                  if @contact
         @parameters.each do |parameter|
-          xml_element.add_element( parameter.to_xml_element )
+          xml_element.add_element(parameter.to_xml_element)
         end
         @resources.each do |resource|
-          xml_element.add_element( resource.to_xml_element )
+          xml_element.add_element(resource.to_xml_element)
         end
         @areas.each do |area|
-          xml_element.add_element( area.to_xml_element )
+          xml_element.add_element(area.to_xml_element)
         end
         xml_element
       end
 
       # @return [String]
       def to_xml
-        self.to_xml_element.to_s
+        to_xml_element.to_s
       end
 
       # @param [REXML::Element] info_xml_element
       # @return [Info]
-      def self.from_xml_element( info_xml_element )
+      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 << RCAP.strip_if_given( element.text )
+          RCAP.xpath_match(info_xml_element, RESPONSE_TYPE_XPATH, info.xmlns).each do |element|
+            info.response_types << RCAP.strip_if_given(element.text)
           end
         end
       end
 
       # @return [String]
       def inspect
-        info_inspect = "Language:       #{ @language }\n"+
-        "Categories:     #{ @categories.to_s_for_cap }\n"+
-        "Event:          #{ @event }\n"+
-        "Response Types: #{ @response_types.to_s_for_cap }\n"+
-        "Urgency:        #{ @urgency }\n"+
-        "Severity:       #{ @severity }\n"+
-        "Certainty:      #{ @certainty }\n"+
-        "Audience:       #{ @audience }\n"+
-        "Event Codes:    #{ @event_codes.inspect }\n"+
-        "Effective:      #{ @effective }\n"+
-        "Onset:          #{ @onset }\n"+
-        "Expires:        #{ @expires }\n"+
-        "Sender Name:    #{ @sender_name }\n"+
-        "Headline:       #{ @headline }\n"+
-        "Description:\n"+
-          @description.to_s.lines.map{ |line| "  " + line }.join( "\n")+"\n"+
-          "Instruction:    #{ @instruction }\n"+
-        "Web:            #{ @web }\n"+
-        "Contact:        #{ @contact }\n"+
-        "Parameters:\n"+
-          @parameters.map{ |parameter| "  " + parameter.inspect }.join( "\n" )+"\n"+
-          "Resources:\n"+
-          @resources.map{ |resource| "  " + resource.inspect }.join( "\n" )+"\n"+
-          "Area:\n"+
-          @areas.map{ |area| "  #{ area }" }.join( "\n" )+"\n"
-        RCAP.format_lines_for_inspect( 'INFO', info_inspect )
+        info_inspect = "Language:       #{ @language }\n"\
+        "Categories:     #{ @categories.to_s_for_cap }\n"\
+        "Event:          #{ @event }\n"\
+        "Response Types: #{ @response_types.to_s_for_cap }\n"\
+        "Urgency:        #{ @urgency }\n"\
+        "Severity:       #{ @severity }\n"\
+        "Certainty:      #{ @certainty }\n"\
+        "Audience:       #{ @audience }\n"\
+        "Event Codes:    #{ @event_codes.inspect }\n"\
+        "Effective:      #{ @effective }\n"\
+        "Onset:          #{ @onset }\n"\
+        "Expires:        #{ @expires }\n"\
+        "Sender Name:    #{ @sender_name }\n"\
+        "Headline:       #{ @headline }\n"\
+        "Description:\n" +           @description.to_s.lines.map { |line| '  ' + line }.join("\n") + "\n"\
+          "Instruction:    #{ @instruction }\n"\
+        "Web:            #{ @web }\n"\
+        "Contact:        #{ @contact }\n"\
+        "Parameters:\n" +           @parameters.map { |parameter| '  ' + parameter.inspect }.join("\n") + "\n"\
+          "Resources:\n" +           @resources.map { |resource| '  ' + resource.inspect }.join("\n") + "\n"\
+          "Area:\n" +           @areas.map { |area| "  #{ area }" }.join("\n") + "\n"
+        RCAP.format_lines_for_inspect('INFO', info_inspect)
       end
 
       # Returns a string representation of the event of the form
@@ -187,47 +179,46 @@ module RCAP
         "#{ @event }(#{ @urgency }/#{ @severity }/#{ @certainty })"
       end
 
-
       RESPONSE_TYPES_YAML = 'Response Types'
 
       # @return [Hash]
       def to_yaml_data
-         parameter_to_hash = lambda{ |hash, parameter| hash.merge( parameter.name => parameter.value )}
+        parameter_to_hash = lambda { |hash, parameter| hash.merge(parameter.name => parameter.value) }
 
-        RCAP.attribute_values_to_hash( [ LANGUAGE_YAML,       @language ],
-                                       [ CATEGORIES_YAML,     @categories ],
-                                       [ EVENT_YAML,          @event ],
-                                       [ RESPONSE_TYPES_YAML, @response_types ],
-                                       [ URGENCY_YAML,        @urgency ],
-                                       [ SEVERITY_YAML,       @severity ],
-                                       [ CERTAINTY_YAML,      @certainty ],
-                                       [ AUDIENCE_YAML,       @audience ],
-                                       [ EFFECTIVE_YAML,      @effective ],
-                                       [ ONSET_YAML,          @onset ],
-                                       [ EXPIRES_YAML,        @expires ],
-                                       [ SENDER_NAME_YAML,    @sender_name ],
-                                       [ HEADLINE_YAML,       @headline ],
-                                       [ DESCRIPTION_YAML,    @description ],
-                                       [ INSTRUCTION_YAML,    @instruction ],
-                                       [ WEB_YAML,            @web ],
-                                       [ CONTACT_YAML,        @contact ],
-                                       [ EVENT_CODES_YAML,    @event_codes.inject({}, &parameter_to_hash )],
-                                       [ PARAMETERS_YAML,     @parameters.inject({}, &parameter_to_hash )],
-                                       [ RESOURCES_YAML,      @resources.map( &:to_yaml_data )],
-                                       [ AREAS_YAML,          @areas.map( &:to_yaml_data )])
+        RCAP.attribute_values_to_hash([LANGUAGE_YAML,       @language],
+                                      [CATEGORIES_YAML,     @categories],
+                                      [EVENT_YAML,          @event],
+                                      [RESPONSE_TYPES_YAML, @response_types],
+                                      [URGENCY_YAML,        @urgency],
+                                      [SEVERITY_YAML,       @severity],
+                                      [CERTAINTY_YAML,      @certainty],
+                                      [AUDIENCE_YAML,       @audience],
+                                      [EFFECTIVE_YAML,      @effective],
+                                      [ONSET_YAML,          @onset],
+                                      [EXPIRES_YAML,        @expires],
+                                      [SENDER_NAME_YAML,    @sender_name],
+                                      [HEADLINE_YAML,       @headline],
+                                      [DESCRIPTION_YAML,    @description],
+                                      [INSTRUCTION_YAML,    @instruction],
+                                      [WEB_YAML,            @web],
+                                      [CONTACT_YAML,        @contact],
+                                      [EVENT_CODES_YAML,    @event_codes.inject({}, &parameter_to_hash)],
+                                      [PARAMETERS_YAML,     @parameters.inject({}, &parameter_to_hash)],
+                                      [RESOURCES_YAML,      @resources.map(&:to_yaml_data)],
+                                      [AREAS_YAML,          @areas.map(&:to_yaml_data)])
       end
 
       # @return [String]
-      def to_yaml( options = {} )
-        self.to_yaml_data.to_yaml( options )
+      def to_yaml(options = {})
+        to_yaml_data.to_yaml(options)
       end
 
       # @param [Hash] info_yaml_data
       # @return [Info]
-      def self.from_yaml_data( info_yaml_data )
+      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 << RCAP.strip_if_given( response_type )
+          Array(info_yaml_data [RESPONSE_TYPES_YAML]).each do |response_type|
+            info.response_types << RCAP.strip_if_given(response_type)
           end
         end
       end
@@ -236,35 +227,35 @@ module RCAP
 
       # @return [Hash]
       def to_h
-        RCAP.attribute_values_to_hash( [ LANGUAGE_KEY,       @language ],
-                                       [ CATEGORIES_KEY,     @categories ],
-                                       [ EVENT_KEY,          @event ],
-                                       [ RESPONSE_TYPES_KEY, @response_types ],
-                                       [ URGENCY_KEY,        @urgency ],
-                                       [ SEVERITY_KEY,       @severity ],
-                                       [ CERTAINTY_KEY,      @certainty ],
-                                       [ AUDIENCE_KEY,       @audience ],
-                                       [ EFFECTIVE_KEY,      RCAP.to_s_for_cap( @effective )],
-                                       [ ONSET_KEY,          RCAP.to_s_for_cap( @onset )],
-                                       [ EXPIRES_KEY,        RCAP.to_s_for_cap( @expires )],
-                                       [ SENDER_NAME_KEY,    @sender_name ],
-                                       [ HEADLINE_KEY,       @headline ],
-                                       [ DESCRIPTION_KEY,    @description ],
-                                       [ INSTRUCTION_KEY,    @instruction ],
-                                       [ WEB_KEY,            @web ],
-                                       [ CONTACT_KEY,        @contact ],
-                                       [ RESOURCES_KEY,      @resources.map{ |resource| resource.to_h } ],
-                                       [ EVENT_CODES_KEY,    @event_codes.map{ |event_code| event_code.to_h } ],
-                                       [ PARAMETERS_KEY,     @parameters.map{ |parameter| parameter.to_h } ],
-                                       [ AREAS_KEY,          @areas.map{ |area| area.to_h }])
+        RCAP.attribute_values_to_hash([LANGUAGE_KEY,       @language],
+                                      [CATEGORIES_KEY,     @categories],
+                                      [EVENT_KEY,          @event],
+                                      [RESPONSE_TYPES_KEY, @response_types],
+                                      [URGENCY_KEY,        @urgency],
+                                      [SEVERITY_KEY,       @severity],
+                                      [CERTAINTY_KEY,      @certainty],
+                                      [AUDIENCE_KEY,       @audience],
+                                      [EFFECTIVE_KEY,      RCAP.to_s_for_cap(@effective)],
+                                      [ONSET_KEY,          RCAP.to_s_for_cap(@onset)],
+                                      [EXPIRES_KEY,        RCAP.to_s_for_cap(@expires)],
+                                      [SENDER_NAME_KEY,    @sender_name],
+                                      [HEADLINE_KEY,       @headline],
+                                      [DESCRIPTION_KEY,    @description],
+                                      [INSTRUCTION_KEY,    @instruction],
+                                      [WEB_KEY,            @web],
+                                      [CONTACT_KEY,        @contact],
+                                      [RESOURCES_KEY,      @resources.map { |resource| resource.to_h }],
+                                      [EVENT_CODES_KEY,    @event_codes.map { |event_code| event_code.to_h }],
+                                      [PARAMETERS_KEY,     @parameters.map { |parameter| parameter.to_h }],
+                                      [AREAS_KEY,          @areas.map { |area| area.to_h }])
       end
 
       # @param [Hash] info_hash
       # @return [Info]
-      def self.from_h( info_hash )
+      def self.from_h(info_hash)
         super.tap do |info|
-          Array( info_hash[ RESPONSE_TYPES_KEY ]).each do |response_type|
-            info.response_types << RCAP.strip_if_given( response_type )
+          Array(info_hash[RESPONSE_TYPES_KEY]).each do |response_type|
+            info.response_types << RCAP.strip_if_given(response_type)
           end
         end
       end