rcap 2.7.0 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3989e1ef1431735820a46c8295073aa0d75f77c8
-  data.tar.gz: 0502cea583eb69357a53af06f6c7041dd51c3f43
+SHA256:
+  metadata.gz: f9d35572f21978f5fff7370828a4c146daf2c2abe960e1c508bcbee6f5713319
+  data.tar.gz: b998e0210707386d1d0de2d1157e7296900be5b79c1191e02741524f3ac3fe20
 SHA512:
-  metadata.gz: 8be3379ad98b95acf9d98693af1557318b90ec6d7a225b97c22e37d8b392c52c741b4bf4043db2ff4048fa9d137cf8a6d75a72b8e315a41951e7fd5a6ba32311
-  data.tar.gz: 2ee22fe04a3efd413473ceaa667d2f9b8aba3931bbb25a4f9c0e52e2398651ffa75b2e7660c7847b2645defe296c1e60acd236fecc4bce1a241a51bbc6c7b3b2
+  metadata.gz: 33705a6c22c94be4b61d469f1f5a7c727cd92e968ef639dd947d51a65ba012d70eda684af771960c10816dace76804fb341696709fb039a1b16c1b71be98c09c
+  data.tar.gz: a332b8e3b2f155545afbd53bf319d862f1b2e51c692bebf728646b759d5fc97ef2f0b293df81e65987ae0a999662a436a4298172b4a368d743aab0ca7a956911

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.5.0

data/lib/rcap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # System and require libs
 require 'date'
 require 'uuidtools'

data/lib/rcap/alert.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RCAP
   module Alert
     XMLNS_KEY            = 'xmlns'
     YAML_CAP_VERSION_KEY = 'CAP Version'
     JSON_CAP_VERSION_KEY = 'cap_version'
 
-    CAP_NAMESPACES = [RCAP::CAP_1_0::Alert::XMLNS, RCAP::CAP_1_1::Alert::XMLNS, RCAP::CAP_1_2::Alert::XMLNS]
+    CAP_NAMESPACES = [RCAP::CAP_1_0::Alert::XMLNS, RCAP::CAP_1_1::Alert::XMLNS, RCAP::CAP_1_2::Alert::XMLNS].freeze
 
     # Initialise a RCAP Alert from a XML document.
     #
@@ -36,7 +38,7 @@ module RCAP
     # @param [IO, String] yaml CAP Alert in YAML format. Can be a String or any IO object.
     # @return [RCAP::CAP_1_0::Alert, RCAP::CAP_1_1::Alert, RCAP::CAP_1_2::Alert ]
     def self.from_yaml(yaml)
-      yaml_data = YAML.load(yaml)
+      yaml_data = YAML.safe_load(yaml, [Time, DateTime])
 
       case yaml_data[YAML_CAP_VERSION_KEY]
       when CAP_1_0::Alert::CAP_VERSION

data/lib/rcap/base/alert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Alert
@@ -8,7 +10,7 @@ module RCAP
       STATUS_SYSTEM   = 'System'
       STATUS_TEST     = 'Test'
       # Valid values for status
-      VALID_STATUSES = [STATUS_ACTUAL, STATUS_EXERCISE, STATUS_SYSTEM, STATUS_TEST]
+      VALID_STATUSES = [STATUS_ACTUAL, STATUS_EXERCISE, STATUS_SYSTEM, STATUS_TEST].freeze
 
       MSG_TYPE_ALERT  = 'Alert'
       MSG_TYPE_UPDATE = 'Update'
@@ -16,13 +18,13 @@ module RCAP
       MSG_TYPE_ACK    = 'Ack'
       MSG_TYPE_ERROR  = 'Error'
       # Valid values for msg_type
-      VALID_MSG_TYPES = [MSG_TYPE_ALERT, MSG_TYPE_UPDATE, MSG_TYPE_CANCEL, MSG_TYPE_ACK, MSG_TYPE_ERROR]
+      VALID_MSG_TYPES = [MSG_TYPE_ALERT, MSG_TYPE_UPDATE, MSG_TYPE_CANCEL, MSG_TYPE_ACK, MSG_TYPE_ERROR].freeze
 
       SCOPE_PUBLIC     = 'Public'
       SCOPE_RESTRICTED = 'Restricted'
       SCOPE_PRIVATE    = 'Private'
       # Valid values for scope
-      VALID_SCOPES = [SCOPE_PUBLIC, SCOPE_PRIVATE, SCOPE_RESTRICTED]
+      VALID_SCOPES = [SCOPE_PUBLIC, SCOPE_PRIVATE, SCOPE_RESTRICTED].freeze
 
       # @return [String] If not set a UUID will be set by default on object initialisation
       attr_accessor(:identifier)
@@ -162,7 +164,7 @@ module RCAP
       # @return [String]
       def to_xml(pretty_print = false)
         if pretty_print
-          xml_document = ''
+          xml_document = +''
           RCAP::XML_PRETTY_PRINTER.write(to_xml_document, xml_document)
           xml_document
         else
@@ -175,27 +177,27 @@ module RCAP
       #
       # @return [String]
       def to_reference
-        "#{ @sender },#{ @identifier },#{ RCAP.to_s_for_cap(@sent)}"
+        "#{@sender},#{@identifier},#{RCAP.to_s_for_cap(@sent)}"
       end
 
       # @return [String]
       def inspect
-        alert_inspect = ["CAP Version:  #{ self.class::CAP_VERSION }",
-                         "Identifier:   #{ @identifier }",
-                         "Sender:       #{ @sender }",
-                         "Sent:         #{ @sent }",
-                         "Status:       #{ @status }",
-                         "Message Type: #{ @msg_type }",
-                         "Source:       #{ @source }",
-                         "Scope:        #{ @scope }",
-                         "Restriction:  #{ @restriction }",
-                         "Addresses:    #{ @addresses.to_s_for_cap }",
+        alert_inspect = ["CAP Version:  #{self.class::CAP_VERSION}",
+                         "Identifier:   #{@identifier}",
+                         "Sender:       #{@sender}",
+                         "Sent:         #{@sent}",
+                         "Status:       #{@status}",
+                         "Message Type: #{@msg_type}",
+                         "Source:       #{@source}",
+                         "Scope:        #{@scope}",
+                         "Restriction:  #{@restriction}",
+                         "Addresses:    #{@addresses.to_s_for_cap}",
                          'Codes:',
                          @codes.map { |code| '  ' + code }.join("\n") + '',
-                         "Note:         #{ @note }",
-                         "References:",
-                           @references.join("\n "),
-                         "Incidents:    #{ @incidents.join(' ')}",
+                         "Note:         #{@note}",
+                         'References:',
+                         @references.join("\n "),
+                         "Incidents:    #{@incidents.join(' ')}",
                          'Information:',
                          @infos.map { |info| '  ' + info.to_s }.join("\n")].join("\n")
         RCAP.format_lines_for_inspect('ALERT', alert_inspect)
@@ -207,23 +209,23 @@ module RCAP
       #
       # @return [String]
       def to_s
-        "#{ @sender }/#{ @identifier }/#{ RCAP.to_s_for_cap(@sent)}"
+        "#{@sender}/#{@identifier}/#{RCAP.to_s_for_cap(@sent)}"
       end
 
       XPATH             = 'cap:alert'
-      IDENTIFIER_XPATH  = "cap:#{ IDENTIFIER_ELEMENT_NAME }"
-      SENDER_XPATH      = "cap:#{ SENDER_ELEMENT_NAME }"
-      SENT_XPATH        = "cap:#{ SENT_ELEMENT_NAME }"
-      STATUS_XPATH      = "cap:#{ STATUS_ELEMENT_NAME }"
-      MSG_TYPE_XPATH    = "cap:#{ MSG_TYPE_ELEMENT_NAME }"
-      SOURCE_XPATH      = "cap:#{ SOURCE_ELEMENT_NAME }"
-      SCOPE_XPATH       = "cap:#{ SCOPE_ELEMENT_NAME }"
-      RESTRICTION_XPATH = "cap:#{ RESTRICTION_ELEMENT_NAME }"
-      ADDRESSES_XPATH   = "cap:#{ ADDRESSES_ELEMENT_NAME }"
-      CODE_XPATH        = "cap:#{ CODE_ELEMENT_NAME }"
-      NOTE_XPATH        = "cap:#{ NOTE_ELEMENT_NAME }"
-      REFERENCES_XPATH  = "cap:#{ REFERENCES_ELEMENT_NAME }"
-      INCIDENTS_XPATH   = "cap:#{ INCIDENTS_ELEMENT_NAME }"
+      IDENTIFIER_XPATH  = "cap:#{IDENTIFIER_ELEMENT_NAME}"
+      SENDER_XPATH      = "cap:#{SENDER_ELEMENT_NAME}"
+      SENT_XPATH        = "cap:#{SENT_ELEMENT_NAME}"
+      STATUS_XPATH      = "cap:#{STATUS_ELEMENT_NAME}"
+      MSG_TYPE_XPATH    = "cap:#{MSG_TYPE_ELEMENT_NAME}"
+      SOURCE_XPATH      = "cap:#{SOURCE_ELEMENT_NAME}"
+      SCOPE_XPATH       = "cap:#{SCOPE_ELEMENT_NAME}"
+      RESTRICTION_XPATH = "cap:#{RESTRICTION_ELEMENT_NAME}"
+      ADDRESSES_XPATH   = "cap:#{ADDRESSES_ELEMENT_NAME}"
+      CODE_XPATH        = "cap:#{CODE_ELEMENT_NAME}"
+      NOTE_XPATH        = "cap:#{NOTE_ELEMENT_NAME}"
+      REFERENCES_XPATH  = "cap:#{REFERENCES_ELEMENT_NAME}"
+      INCIDENTS_XPATH   = "cap:#{INCIDENTS_ELEMENT_NAME}"
 
       # @param [REXML::Element] alert_xml_element
       # @return [RCAP::CAP_1_0::Alert]
@@ -318,7 +320,7 @@ module RCAP
       # @param [String] yaml
       # @return [Alert]
       def self.from_yaml(yaml)
-        from_yaml_data(YAML.load(yaml))
+        from_yaml_data(YAML.safe_load(yaml, [Time, DateTime]))
       end
 
       # Initialise an Alert object from a hash reutrned from YAML.load.
@@ -327,28 +329,28 @@ module RCAP
       # @return [Alert]
       def self.from_yaml_data(alert_yaml_data)
         new do |alert|
-          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.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.strip
           end
-          Array(alert_yaml_data[ CODES_YAML]).each do |code|
+          Array(alert_yaml_data[CODES_YAML]).each do |code|
             alert.codes << code.strip
           end
-          alert.note        = alert_yaml_data[ NOTE_YAML]
-          Array(alert_yaml_data[ REFERENCES_YAML]).each do |reference|
+          alert.note = alert_yaml_data[NOTE_YAML]
+          Array(alert_yaml_data[REFERENCES_YAML]).each do |reference|
             alert.references << reference.strip
           end
-          Array(alert_yaml_data[ INCIDENTS_YAML]).each do |incident|
+          Array(alert_yaml_data[INCIDENTS_YAML]).each do |incident|
             alert.incidents << incident.strip
           end
-          Array(alert_yaml_data[ INFOS_YAML]).each do |info_yaml_data|
+          Array(alert_yaml_data[INFOS_YAML]).each do |info_yaml_data|
             alert.infos <<  alert.info_class.from_yaml_data(info_yaml_data)
           end
         end
@@ -388,7 +390,7 @@ module RCAP
                                       [NOTE_KEY,        @note],
                                       [REFERENCES_KEY,  @references],
                                       [INCIDENTS_KEY,   @incidents],
-                                      [INFOS_KEY,       @infos.map { |info| info.to_h  }])
+                                      [INFOS_KEY,       @infos.map(&:to_h)])
       end
 
       # Initialises an Alert object from a Hash produced by Alert#to_h
@@ -405,22 +407,22 @@ module RCAP
           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|
+          Array(alert_hash[ADDRESSES_KEY]).each do |address|
             alert.addresses << address.strip
           end
-          Array(alert_hash[ CODES_KEY]).each do |code|
+          Array(alert_hash[CODES_KEY]).each do |code|
             alert.codes << code.strip
           end
-          alert.note = alert_hash[ NOTE_KEY]
-          Array(alert_hash[ REFERENCES_KEY]).each do |reference|
+          alert.note = alert_hash[NOTE_KEY]
+          Array(alert_hash[REFERENCES_KEY]).each do |reference|
             alert.references << reference.strip
           end
 
-          Array(alert_hash[ INCIDENTS_KEY]).each do |incident|
+          Array(alert_hash[INCIDENTS_KEY]).each do |incident|
             alert.incidents << incident.strip
           end
 
-          Array(alert_hash[ INFOS_KEY]).each do |info_hash|
+          Array(alert_hash[INFOS_KEY]).each do |info_hash|
             alert.infos << alert.info_class.from_h(info_hash)
           end
         end

data/lib/rcap/base/area.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Area
@@ -25,10 +27,10 @@ module RCAP
       ALTITUDE_ELEMENT_NAME  = 'altitude'
       CEILING_ELEMENT_NAME   = 'ceiling'
 
-      XPATH           = "cap:#{ XML_ELEMENT_NAME }"
-      AREA_DESC_XPATH = "cap:#{ AREA_DESC_ELEMENT_NAME }"
-      ALTITUDE_XPATH  = "cap:#{ ALTITUDE_ELEMENT_NAME }"
-      CEILING_XPATH   = "cap:#{ CEILING_ELEMENT_NAME }"
+      XPATH           = "cap:#{XML_ELEMENT_NAME}"
+      AREA_DESC_XPATH = "cap:#{AREA_DESC_ELEMENT_NAME}"
+      ALTITUDE_XPATH  = "cap:#{ALTITUDE_ELEMENT_NAME}"
+      CEILING_XPATH   = "cap:#{CEILING_ELEMENT_NAME}"
 
       # @example
       #   Area.new do |area|
@@ -121,16 +123,16 @@ module RCAP
       # @param [Area] other Area object to compare
       # @return [true,false]
       def ==(other)
-        comparison_attributes = lambda { |area| [area.area_desc, area.altitude, area.ceiling, area.circles, area.geocodes, area.polygons] }
+        comparison_attributes = ->(area) { [area.area_desc, area.altitude, area.ceiling, area.circles, area.geocodes, area.polygons] }
         comparison_attributes.call(self) == comparison_attributes.call(other)
       end
 
       # @return [String]
       def inspect
-        area_inspect = "Area Description: #{ @area_desc }\n"\
-                       "Polygons:\n" +                        @polygons.map { |polygon| '  ' + polygon.inspect }.join("\n") + "\n"\
-                       "Circles:          #{ @circles.inspect }\n"\
-                       "Geocodes:         #{ @geocodes.inspect }\n"
+        area_inspect = "Area Description: #{@area_desc}\n"\
+                       "Polygons:\n" + @polygons.map { |polygon| '  ' + polygon.inspect }.join("\n") + "\n"\
+                       "Circles:          #{@circles.inspect}\n"\
+                       "Geocodes:         #{@geocodes.inspect}\n"
         RCAP.format_lines_for_inspect('AREA', area_inspect)
       end
 
@@ -153,7 +155,7 @@ module RCAP
         RCAP.attribute_values_to_hash([AREA_DESC_YAML, @area_desc],
                                       [ALTITUDE_YAML,  @altitude],
                                       [CEILING_YAML,   @ceiling],
-                                      [CIRCLES_YAML,   @circles.map { |circle| circle.to_a }],
+                                      [CIRCLES_YAML,   @circles.map(&:to_a)],
                                       [GEOCODES_YAML,  @geocodes.reduce({}) { |h, geocode| h.merge(geocode.name => geocode.value) }],
                                       [POLYGONS_YAML,  @polygons.map(&:to_yaml_data)])
       end
@@ -222,9 +224,13 @@ module RCAP
         RCAP.attribute_values_to_hash([AREA_DESC_KEY, @area_desc],
                                       [ALTITUDE_KEY,  @altitude],
                                       [CEILING_KEY,   @ceiling],
-                                      [CIRCLES_KEY,   @circles.map { |circle| circle.to_a }],
-                                      [GEOCODES_KEY,  @geocodes.map { |geocode| geocode.to_h }],
-                                      [POLYGONS_KEY,  @polygons.map { |polygon| polygon.to_h }])
+                                      [CIRCLES_KEY,   @circles.map(&:to_a)],
+                                      [GEOCODES_KEY,  @geocodes.map(&:to_h)],
+                                      [POLYGONS_KEY,  @polygons.map(&:to_h)])
+      end
+
+      def map_data?
+        @circles.any? || @polygons.any?
       end
     end
   end

data/lib/rcap/base/circle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Circle < Point
@@ -35,12 +37,12 @@ module RCAP
       #
       # @return [String]
       def to_s
-        "#{ @lattitude },#{ @longitude } #{ @radius }"
+        "#{@lattitude},#{@longitude} #{@radius}"
       end
 
       # @return [String]
       def inspect
-        "(#{ self })"
+        "(#{self})"
       end
 
       # @return [REXML::Element]
@@ -63,7 +65,7 @@ module RCAP
       def self.parse_circle_string(circle_string)
         coordinates, radius = circle_string.split(' ')
         lattitude, longitude = coordinates.split(',')
-        [lattitude, longitude, radius].map { |e| e.to_f }
+        [lattitude, longitude, radius].map(&:to_f)
       end
 
       # @param [REXML::Element] circle_xml_element
@@ -91,7 +93,7 @@ module RCAP
         end
       end
 
-      RADIUS_KEY    = 'radius'
+      RADIUS_KEY = 'radius'
       # @return [Hash]
       def to_h
         RCAP.attribute_values_to_hash([RADIUS_KEY,    @radius],

data/lib/rcap/base/event_code.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class EventCode < Parameter

data/lib/rcap/base/geocode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Geocode < Parameter

data/lib/rcap/base/info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Info
@@ -17,9 +19,9 @@ module RCAP
       CATEGORY_OTHER     = 'Other'
       # Valid values for categories
       VALID_CATEGORIES = [CATEGORY_GEO, CATEGORY_MET, CATEGORY_SAFETY,
-                          CATEGORY_SECURITY, CATEGORY_RESCUE,   CATEGORY_FIRE, CATEGORY_HEALTH,
+                          CATEGORY_SECURITY, CATEGORY_RESCUE, CATEGORY_FIRE, CATEGORY_HEALTH,
                           CATEGORY_ENV, CATEGORY_TRANSPORT, CATEGORY_INFRA, CATEGORY_CBRNE,
-                          CATEGORY_OTHER]
+                          CATEGORY_OTHER].freeze
 
       URGENCY_IMMEDIATE = 'Immediate'
       URGENCY_EXPECTED  = 'Expected'
@@ -28,7 +30,7 @@ module RCAP
       URGENCY_UNKNOWN   = 'Unknown'
       # Valid values for urgency
       VALID_URGENCIES = [URGENCY_IMMEDIATE, URGENCY_EXPECTED, URGENCY_FUTURE,
-                         URGENCY_PAST, URGENCY_UNKNOWN]
+                         URGENCY_PAST, URGENCY_UNKNOWN].freeze
 
       SEVERITY_EXTREME  = 'Extreme'
       SEVERITY_SEVERE   = 'Severe'
@@ -37,7 +39,7 @@ module RCAP
       SEVERITY_UNKNOWN  = 'Unknown'
       # Valid values for severity
       VALID_SEVERITIES = [SEVERITY_EXTREME, SEVERITY_SEVERE, SEVERITY_MODERATE,
-                          SEVERITY_MINOR, SEVERITY_UNKNOWN]
+                          SEVERITY_MINOR, SEVERITY_UNKNOWN].freeze
 
       CERTAINTY_VERY_LIKELY = 'Very Likely'
       CERTAINTY_LIKELY      = 'Likely'
@@ -46,7 +48,7 @@ module RCAP
       CERTAINTY_UNKNOWN     = 'Unknown'
       # Valid valies for certainty
       VALID_CERTAINTIES = [CERTAINTY_VERY_LIKELY, CERTAINTY_LIKELY,
-                           CERTAINTY_POSSIBLE, CERTAINTY_UNLIKELY, CERTAINTY_UNKNOWN]
+                           CERTAINTY_POSSIBLE, CERTAINTY_UNLIKELY, CERTAINTY_UNKNOWN].freeze
 
       XML_ELEMENT_NAME           = 'info'
       LANGUAGE_ELEMENT_NAME      = 'language'
@@ -67,24 +69,24 @@ module RCAP
       WEB_ELEMENT_NAME           = 'web'
       CONTACT_ELEMENT_NAME       = 'contact'
 
-      XPATH               = "cap:#{ XML_ELEMENT_NAME }"
-      LANGUAGE_XPATH      = "cap:#{ LANGUAGE_ELEMENT_NAME }"
-      EVENT_XPATH         = "cap:#{ EVENT_ELEMENT_NAME }"
-      URGENCY_XPATH       = "cap:#{ URGENCY_ELEMENT_NAME }"
-      CATEGORY_XPATH      = "cap:#{ CATEGORY_ELEMENT_NAME }"
-      SEVERITY_XPATH      = "cap:#{ SEVERITY_ELEMENT_NAME }"
-      CERTAINTY_XPATH     = "cap:#{ CERTAINTY_ELEMENT_NAME }"
-      AUDIENCE_XPATH      = "cap:#{ AUDIENCE_ELEMENT_NAME }"
-      EVENT_CODE_XPATH    = "cap:#{ EVENT_CODE_ELEMENT_NAME }"
-      EFFECTIVE_XPATH     = "cap:#{ EFFECTIVE_ELEMENT_NAME }"
-      ONSET_XPATH         = "cap:#{ ONSET_ELEMENT_NAME }"
-      EXPIRES_XPATH       = "cap:#{ EXPIRES_ELEMENT_NAME }"
-      SENDER_NAME_XPATH   = "cap:#{ SENDER_NAME_ELEMENT_NAME }"
-      HEADLINE_XPATH      = "cap:#{ HEADLINE_ELEMENT_NAME }"
-      DESCRIPTION_XPATH   = "cap:#{ DESCRIPTION_ELEMENT_NAME }"
-      INSTRUCTION_XPATH   = "cap:#{ INSTRUCTION_ELEMENT_NAME }"
-      WEB_XPATH           = "cap:#{ WEB_ELEMENT_NAME }"
-      CONTACT_XPATH       = "cap:#{ CONTACT_ELEMENT_NAME }"
+      XPATH               = "cap:#{XML_ELEMENT_NAME}"
+      LANGUAGE_XPATH      = "cap:#{LANGUAGE_ELEMENT_NAME}"
+      EVENT_XPATH         = "cap:#{EVENT_ELEMENT_NAME}"
+      URGENCY_XPATH       = "cap:#{URGENCY_ELEMENT_NAME}"
+      CATEGORY_XPATH      = "cap:#{CATEGORY_ELEMENT_NAME}"
+      SEVERITY_XPATH      = "cap:#{SEVERITY_ELEMENT_NAME}"
+      CERTAINTY_XPATH     = "cap:#{CERTAINTY_ELEMENT_NAME}"
+      AUDIENCE_XPATH      = "cap:#{AUDIENCE_ELEMENT_NAME}"
+      EVENT_CODE_XPATH    = "cap:#{EVENT_CODE_ELEMENT_NAME}"
+      EFFECTIVE_XPATH     = "cap:#{EFFECTIVE_ELEMENT_NAME}"
+      ONSET_XPATH         = "cap:#{ONSET_ELEMENT_NAME}"
+      EXPIRES_XPATH       = "cap:#{EXPIRES_ELEMENT_NAME}"
+      SENDER_NAME_XPATH   = "cap:#{SENDER_NAME_ELEMENT_NAME}"
+      HEADLINE_XPATH      = "cap:#{HEADLINE_ELEMENT_NAME}"
+      DESCRIPTION_XPATH   = "cap:#{DESCRIPTION_ELEMENT_NAME}"
+      INSTRUCTION_XPATH   = "cap:#{INSTRUCTION_ELEMENT_NAME}"
+      WEB_XPATH           = "cap:#{WEB_ELEMENT_NAME}"
+      CONTACT_XPATH       = "cap:#{CONTACT_ELEMENT_NAME}"
 
       DEFAULT_LANGUAGE = 'en-US'
 
@@ -92,8 +94,8 @@ module RCAP
       validates_presence_of(:urgency)
       validates_presence_of(:severity)
       validates_presence_of(:certainty)
-      validates_inclusion_of(:severity, allow_nil: true, in: VALID_SEVERITIES,  message: "can only be assigned the following values: #{ VALID_SEVERITIES.join(', ') }")
-      validates_inclusion_of(:urgency, allow_nil: true, in: VALID_URGENCIES,   message: "can only be assigned the following values: #{ VALID_URGENCIES.join(', ') }")
+      validates_inclusion_of(:severity, allow_nil: true, in: VALID_SEVERITIES, message: "can only be assigned the following values: #{VALID_SEVERITIES.join(', ')}")
+      validates_inclusion_of(:urgency, allow_nil: true, in: VALID_URGENCIES, message: "can only be assigned the following values: #{VALID_URGENCIES.join(', ')}")
       validates_inclusion_of_members_of(:categories, in: VALID_CATEGORIES, allow_blank: true)
       validates_collection_of(:resources, :areas, :event_codes, :parameters)
 
@@ -237,7 +239,7 @@ module RCAP
       # @return [Info]
       def self.from_xml_element(info_xml_element)
         new do |info|
-          info.language       = RCAP.xpath_text(info_xml_element, LANGUAGE_XPATH, info.xmlns) || DEFAULT_LANGUAGE
+          info.language = RCAP.xpath_text(info_xml_element, LANGUAGE_XPATH, info.xmlns) || DEFAULT_LANGUAGE
 
           RCAP.xpath_match(info_xml_element, CATEGORY_XPATH, info.xmlns).each do |element|
             info.categories << element.text
@@ -266,8 +268,8 @@ module RCAP
             info.parameters <<  info.parameter_class.from_xml_element(element)
           end
 
-          RCAP.xpath_match(info_xml_element, info.resource_class::XPATH, info.xmlns).each do  |element|
-            info.resources <<  info.resource_class.from_xml_element(element)
+          RCAP.xpath_match(info_xml_element, info.resource_class::XPATH, info.xmlns).each do |element|
+            info.resources << info.resource_class.from_xml_element(element)
           end
 
           RCAP.xpath_match(info_xml_element, info.area_class::XPATH, info.xmlns).each do |element|
@@ -278,26 +280,26 @@ module RCAP
 
       # @return [String]
       def inspect
-        info_inspect = "Language:       #{ @language }\n"\
-        "Categories:     #{ @categories.to_s_for_cap }\n"\
-        "Event:          #{ @event }\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"
+        info_inspect = "Language:       #{@language}\n"\
+        "Categories:     #{@categories.to_s_for_cap}\n"\
+        "Event:          #{@event}\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
 
@@ -306,7 +308,7 @@ module RCAP
       #
       # @return [String]
       def to_s
-        "#{ @event }(#{ @urgency }/#{ @severity }/#{ @certainty })"
+        "#{@event}(#{@urgency}/#{@severity}/#{@certainty})"
       end
 
       LANGUAGE_YAML       = 'Language'
@@ -332,7 +334,7 @@ module RCAP
 
       # @return [Hash]
       def to_yaml_data
-        parameter_to_hash = lambda { |hash, parameter| hash.merge(parameter.name => parameter.value) }
+        parameter_to_hash = ->(hash, parameter) { hash.merge(parameter.name => parameter.value) }
 
         RCAP.attribute_values_to_hash([LANGUAGE_YAML,       @language],
                                       [CATEGORIES_YAML,     @categories],
@@ -365,7 +367,7 @@ module RCAP
       # @return [Info]
       def self.from_yaml_data(info_yaml_data)
         new do |info|
-          info.language    = info_yaml_data [LANGUAGE_YAML]
+          info.language = info_yaml_data [LANGUAGE_YAML]
           Array(info_yaml_data [CATEGORIES_YAML]).each do |category|
             info.categories << category
           end
@@ -384,7 +386,7 @@ module RCAP
           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|
+          Array(info_yaml_data [EVENT_CODES_YAML]).each do |name, value|
             info.add_event_code do |event_code|
               event_code.name  = RCAP.strip_if_given(name)
               event_code.value = RCAP.strip_if_given(value)
@@ -431,7 +433,7 @@ module RCAP
 
       # @return [Hash]
       def to_h
-        RCAP.attribute_values_to_hash([LANGUAGE_KEY,      @language],
+        RCAP.attribute_values_to_hash([LANGUAGE_KEY, @language],
                                       [CATEGORIES_KEY,     @categories],
                                       [EVENT_KEY,          @event],
                                       [URGENCY_KEY,        @urgency],
@@ -447,17 +449,17 @@ module RCAP
                                       [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 }])
+                                      [RESOURCES_KEY,      @resources.map(&:to_h)],
+                                      [EVENT_CODES_KEY,    @event_codes.map(&:to_h)],
+                                      [PARAMETERS_KEY,     @parameters.map(&:to_h)],
+                                      [AREAS_KEY,          @areas.map(&:to_h)])
       end
 
       # @param [Hash] info_hash
       # @return [Info]
       def self.from_h(info_hash)
         new do |info|
-          info.language       = info_hash[LANGUAGE_KEY]
+          info.language = info_hash[LANGUAGE_KEY]
           Array(info_hash[CATEGORIES_KEY]).each do |category|
             info.categories << RCAP.strip_if_given(category)
           end
@@ -489,10 +491,14 @@ module RCAP
           end
 
           Array(info_hash[AREAS_KEY]).each do |area_hash|
-            info.areas <<  info.area_class.from_h(area_hash)
+            info.areas << info.area_class.from_h(area_hash)
           end
         end
       end
+
+      def map_data?
+        @areas.any?(&:map_data?)
+      end
     end
   end
 end