rcap 2.7.0 → 2.7.3

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
@@ -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
@@ -11,12 +13,12 @@ module RCAP
       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
 
@@ -42,7 +44,7 @@ module RCAP
 
       # @return [String]
       def inspect
-        "(#{ @points.map { |point| point.inspect }.join(', ')})"
+        "(#{@points.map(&:inspect).join(', ')})"
       end
 
       # @return [REXML::Element]
@@ -83,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]
@@ -108,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)
@@ -124,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
@@ -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]

data/lib/rcap/cap_1_0/alert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # An Alert object is valid if
@@ -25,7 +27,7 @@ module RCAP
         Info
       end
 
-      PASSWORD_ELEMENT_NAME    = 'password'
+      PASSWORD_ELEMENT_NAME = 'password'
 
       # @return [REXML::Element]
       def to_xml_element
@@ -61,29 +63,29 @@ module RCAP
 
       # @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 }",
+        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("\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)
       end
 
-      PASSWORD_XPATH    = "cap:#{ PASSWORD_ELEMENT_NAME }"
+      PASSWORD_XPATH = "cap:#{PASSWORD_ELEMENT_NAME}"
 
       # @param [REXML::Element] alert_xml_element
       # @return [RCAP::CAP_1_0::Alert]
@@ -93,7 +95,7 @@ module RCAP
         end
       end
 
-      PASSWORD_YAML    = 'Password'
+      PASSWORD_YAML = 'Password'
 
       # Returns a string containing the YAML representation of the alert.
       #
@@ -125,7 +127,7 @@ module RCAP
         end
       end
 
-      PASSWORD_KEY    = 'password'
+      PASSWORD_KEY = 'password'
 
       # Returns a Hash representation of an Alert object
       #
@@ -146,7 +148,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

data/lib/rcap/cap_1_0/area.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # An Area object is valid if

data/lib/rcap/cap_1_0/circle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # A Circle object is valid if

data/lib/rcap/cap_1_0/event_code.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # Subclass of {Parameter}
     class EventCode < RCAP::Base::EventCode
       XML_ELEMENT_NAME = 'eventCode'
-      XPATH = "cap:#{ XML_ELEMENT_NAME }"
+      XPATH = "cap:#{XML_ELEMENT_NAME}"
 
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_0/geocode.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # Subclass of {Parameter}
     class Geocode < RCAP::Base::Geocode
       XML_ELEMENT_NAME = 'geocode'
-      XPATH = "cap:#{ XML_ELEMENT_NAME }"
+      XPATH = "cap:#{XML_ELEMENT_NAME}"
 
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_0/info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # In Info object is valid if
@@ -9,7 +11,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # A Parameter object is valid if
@@ -6,7 +8,7 @@ module RCAP
       # @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.add_text("#{@name}=#{@value}")
         xml_element
       end
 

data/lib/rcap/cap_1_0/point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # A Point object is valid if

data/lib/rcap/cap_1_0/polygon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # A Polygon object is valid if

data/lib/rcap/cap_1_0/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_0
     # A Resource object is valid if

data/lib/rcap/cap_1_1/alert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_1
     # An Alert object is valid if
@@ -12,9 +14,9 @@ module RCAP
       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].freeze
 
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_1/area.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_1
     # An Area object is valid if

data/lib/rcap/cap_1_1/circle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_1
     # A Circle object is valid if

data/lib/rcap/cap_1_1/event_code.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_1
     # Subclass of {Parameter}
     class EventCode < RCAP::Base::EventCode
       XML_ELEMENT_NAME = 'eventCode'
-      XPATH = "cap:#{ XML_ELEMENT_NAME }"
+      XPATH = "cap:#{XML_ELEMENT_NAME}"
 
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_1/geocode.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_1
     # Subclass of {Parameter}
     class Geocode < RCAP::Base::Geocode
       XML_ELEMENT_NAME = 'geocode'
-      XPATH = "cap:#{ XML_ELEMENT_NAME }"
+      XPATH = "cap:#{XML_ELEMENT_NAME}"
 
       def xmlns
         Alert::XMLNS

data/lib/rcap/cap_1_1/info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module CAP_1_1
     # In Info object is valid if
@@ -19,16 +21,16 @@ module RCAP
       # 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]
+                              RESPONSE_TYPE_ASSESS, RESPONSE_TYPE_NONE].freeze
 
       CERTAINTY_OBSERVED = 'Observed'
       # Valid valies for certainty
       VALID_CERTAINTIES = [CERTAINTY_OBSERVED, CERTAINTY_LIKELY,
-                           CERTAINTY_POSSIBLE, CERTAINTY_UNLIKELY, CERTAINTY_UNKNOWN]
+                           CERTAINTY_POSSIBLE, CERTAINTY_UNLIKELY, CERTAINTY_UNKNOWN].freeze
 
       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_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)
@@ -64,7 +66,7 @@ module RCAP
       # @option attributes [Array<Resource>] :resources Collection of {Resource} objects
       # @option attributes [Array<Area>] :areas Collection of {Area} objects
       def initialize
-        @response_types =  []
+        @response_types = []
         super
       end
 
@@ -89,7 +91,7 @@ module RCAP
       end
 
       RESPONSE_TYPE_ELEMENT_NAME = 'responseType'
-      RESPONSE_TYPE_XPATH = "cap:#{ RESPONSE_TYPE_ELEMENT_NAME }"
+      RESPONSE_TYPE_XPATH = "cap:#{RESPONSE_TYPE_ELEMENT_NAME}"
 
       # @return [REXML::Element]
       def to_xml_element
@@ -147,27 +149,27 @@ module RCAP
 
       # @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"
+        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
 
@@ -176,14 +178,14 @@ module RCAP
       #
       # @return [String]
       def to_s
-        "#{ @event }(#{ @urgency }/#{ @severity }/#{ @certainty })"
+        "#{@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 = ->(hash, parameter) { hash.merge(parameter.name => parameter.value) }
 
         RCAP.attribute_values_to_hash([LANGUAGE_YAML,       @language],
                                       [CATEGORIES_YAML,     @categories],
@@ -244,10 +246,10 @@ 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