rcap 2.5.0 → 2.7.4

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)
 
@@ -195,27 +197,27 @@ 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.add_element(LANGUAGE_ELEMENT_NAME).add_text(@language.to_s) 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.to_s)
         end
-        xml_element.add_element(EVENT_ELEMENT_NAME).add_text(@event)
-        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(EVENT_ELEMENT_NAME).add_text(@event.to_s)
+        xml_element.add_element(URGENCY_ELEMENT_NAME).add_text(@urgency.to_s)
+        xml_element.add_element(SEVERITY_ELEMENT_NAME).add_text(@severity.to_s)
+        xml_element.add_element(CERTAINTY_ELEMENT_NAME).add_text(@certainty.to_s)
+        xml_element.add_element(AUDIENCE_ELEMENT_NAME).add_text(@audience.to_s) if @audience
         @event_codes.each do |event_code|
           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.to_s)          if @sender_name
+        xml_element.add_element(HEADLINE_ELEMENT_NAME).add_text(@headline.to_s)                if @headline
+        xml_element.add_element(DESCRIPTION_ELEMENT_NAME).add_text(@description.to_s)          if @description
+        xml_element.add_element(INSTRUCTION_ELEMENT_NAME).add_text(@instruction.to_s)          if @instruction
+        xml_element.add_element(WEB_ELEMENT_NAME).add_text(@web.to_s)                          if @web
+        xml_element.add_element(CONTACT_ELEMENT_NAME).add_text(@contact.to_s)                  if @contact
         @parameters.each do |parameter|
           xml_element.add_element(parameter.to_xml_element)
         end
@@ -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

data/lib/rcap/base/parameter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Parameter
@@ -14,9 +16,9 @@ module RCAP
       NAME_ELEMENT_NAME  = 'valueName'
       VALUE_ELEMENT_NAME = 'value'
 
-      XPATH       = "cap:#{ XML_ELEMENT_NAME }"
-      NAME_XPATH  = "cap:#{ NAME_ELEMENT_NAME }"
-      VALUE_XPATH = "cap:#{ VALUE_ELEMENT_NAME }"
+      XPATH       = "cap:#{XML_ELEMENT_NAME}"
+      NAME_XPATH  = "cap:#{NAME_ELEMENT_NAME}"
+      VALUE_XPATH = "cap:#{VALUE_ELEMENT_NAME}"
 
       # @param [Hash] attributes
       # @option attributes [Symbol] :name Parameter name
@@ -28,8 +30,8 @@ module RCAP
       # @return [REXML::Element]
       def to_xml_element
         xml_element = REXML::Element.new(self.class::XML_ELEMENT_NAME)
-        xml_element.add_element(self.class::NAME_ELEMENT_NAME).add_text(@name)
-        xml_element.add_element(self.class::VALUE_ELEMENT_NAME).add_text(@value)
+        xml_element.add_element(self.class::NAME_ELEMENT_NAME).add_text(@name.to_s)
+        xml_element.add_element(self.class::VALUE_ELEMENT_NAME).add_text(@value.to_s)
         xml_element
       end
 
@@ -40,7 +42,7 @@ module RCAP
 
       # @return [String]
       def inspect
-        "#{ @name }: #{ @value }"
+        "#{@name}: #{@value}"
       end
 
       # Returns a string representation of the parameter of the form

data/lib/rcap/base/point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Point
@@ -29,7 +31,7 @@ module RCAP
       #
       # @return [String]
       def to_s
-        "#{ lattitude },#{ longitude }"
+        "#{lattitude},#{longitude}"
       end
 
       # @return [String]
@@ -68,7 +70,7 @@ module RCAP
 
       # @return [Array(Numeric, Numeric)]
       def to_a
-        Array.new.tap do |array|
+        [].tap do |array|
           array[LATTITUDE_INDEX] = lattitude
           array[LONGITUDE_INDEX] = longitude
         end

data/lib/rcap/base/polygon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Polygon
@@ -7,16 +9,16 @@ module RCAP
       attr_reader(:points)
 
       validates_collection_of(:points)
-      validates_length_of(:points, minimum: 3)
-      validates_equality_of_first_and_last(:points)
+      validates_length_of(:points, minimum: 3, allow_blank: true)
+      validates_equality_of_first_and_last(:points, allow_empty: true)
 
       XML_ELEMENT_NAME = 'polygon'
-      XPATH            = "cap:#{ XML_ELEMENT_NAME }"
+      XPATH            = "cap:#{XML_ELEMENT_NAME}"
 
       # @param [Hash] attributes
       # @option attributes [Array<Point>] :points Collection of {Point} objects
       def initialize
-        @points =  []
+        @points = []
         yield(self) if block_given?
       end
 
@@ -27,6 +29,12 @@ module RCAP
         point
       end
 
+      # Returns GeoJSON representation of the polygon
+      def to_geojson
+        coordinates = @points.map { |point| [point.longitude, point.lattitude] }
+        { 'type' => 'Polygon', 'coordinates' => [coordinates] }.to_json
+      end
+
       # Returns a string representation of the polygon of the form
       #  points[0] points[1] points[2] ...
       # where each point is formatted with Point#to_s
@@ -36,7 +44,7 @@ module RCAP
 
       # @return [String]
       def inspect
-        "(#{ @points.map { |point| point.inspect }.join(', ')})"
+        "(#{@points.map(&:inspect).join(', ')})"
       end
 
       # @return [REXML::Element]
@@ -77,7 +85,7 @@ module RCAP
 
       # @return [Array<Array(Numeric,Numeric)>]
       def self.parse_polygon_string(polygon_string)
-        polygon_string.split(' ').map { |coordinate_string| coordinate_string.split(',').map { |coordinate| coordinate.to_f } }
+        polygon_string.split(' ').map { |coordinate_string| coordinate_string.split(',').map(&:to_f) }
       end
 
       # @return [Polygon]
@@ -102,7 +110,7 @@ module RCAP
         to_yaml_data.to_yaml(options)
       end
 
-      POINTS_KEY  = 'points'
+      POINTS_KEY = 'points'
 
       # @return [Polygon]
       def self.from_h(polygon_hash)
@@ -118,7 +126,7 @@ module RCAP
 
       # @return [Hash]
       def to_h
-        { POINTS_KEY => @points.map { |point| point.to_a } }
+        { POINTS_KEY => @points.map(&:to_a) }
       end
     end
   end

data/lib/rcap/base/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Resource
@@ -23,12 +25,12 @@ module RCAP
       DIGEST_ELEMENT_NAME        = 'digest'
       RESOURCE_DESC_ELEMENT_NAME = 'resourceDesc'
 
-      XPATH               = "cap:#{ XML_ELEMENT_NAME }"
-      MIME_TYPE_XPATH     = "cap:#{ MIME_TYPE_ELEMENT_NAME }"
-      SIZE_XPATH          = "cap:#{ SIZE_ELEMENT_NAME }"
-      URI_XPATH           = "cap:#{ URI_ELEMENT_NAME }"
-      DIGEST_XPATH        = "cap:#{ DIGEST_ELEMENT_NAME }"
-      RESOURCE_DESC_XPATH = "cap:#{ RESOURCE_DESC_ELEMENT_NAME }"
+      XPATH               = "cap:#{XML_ELEMENT_NAME}"
+      MIME_TYPE_XPATH     = "cap:#{MIME_TYPE_ELEMENT_NAME}"
+      SIZE_XPATH          = "cap:#{SIZE_ELEMENT_NAME}"
+      URI_XPATH           = "cap:#{URI_ELEMENT_NAME}"
+      DIGEST_XPATH        = "cap:#{DIGEST_ELEMENT_NAME}"
+      RESOURCE_DESC_XPATH = "cap:#{RESOURCE_DESC_ELEMENT_NAME}"
 
       # @param [Hash{Symbol => Object}] attributes
       # @option attributes [String] :mime_type
@@ -44,10 +46,10 @@ module RCAP
       def to_xml_element
         xml_element = REXML::Element.new(XML_ELEMENT_NAME)
         xml_element.add_element(RESOURCE_DESC_ELEMENT_NAME).add_text(@resource_desc)
-        xml_element.add_element(MIME_TYPE_ELEMENT_NAME).add_text(@mime_type) if @mime_type
-        xml_element.add_element(SIZE_ELEMENT_NAME).add_text(@size.to_s)      if @size
-        xml_element.add_element(URI_ELEMENT_NAME).add_text(@uri)             if @uri
-        xml_element.add_element(DIGEST_ELEMENT_NAME).add_text(@digest)       if @digest
+        xml_element.add_element(MIME_TYPE_ELEMENT_NAME).add_text(@mime_type.to_s) if @mime_type
+        xml_element.add_element(SIZE_ELEMENT_NAME).add_text(@size.to_s)           if @size
+        xml_element.add_element(URI_ELEMENT_NAME).add_text(@uri.to_s)             if @uri
+        xml_element.add_element(DIGEST_ELEMENT_NAME).add_text(@digest.to_s)       if @digest
         xml_element
       end
 
@@ -86,9 +88,7 @@ module RCAP
       # If size is defined returns the size in kilobytes
       # @return [Float]
       def size_in_kb
-        if @size
-          @size.to_f / 1024
-        end
+        @size.to_f / 1024 if @size
       end
 
       # @return [String]