rcap 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d35572f21978f5fff7370828a4c146daf2c2abe960e1c508bcbee6f5713319
-  data.tar.gz: b998e0210707386d1d0de2d1157e7296900be5b79c1191e02741524f3ac3fe20
+  metadata.gz: 257bbebf78d6bd1acba243fff3c24b7d52504f32acd494e395102c5a25f0108a
+  data.tar.gz: 4aad2a1c2a79a997a46e8a47f7542aa6eae55881302a76be9c8fe9bedf44965a
 SHA512:
-  metadata.gz: 33705a6c22c94be4b61d469f1f5a7c727cd92e968ef639dd947d51a65ba012d70eda684af771960c10816dace76804fb341696709fb039a1b16c1b71be98c09c
-  data.tar.gz: a332b8e3b2f155545afbd53bf319d862f1b2e51c692bebf728646b759d5fc97ef2f0b293df81e65987ae0a999662a436a4298172b4a368d743aab0ca7a956911
+  metadata.gz: 7274c4ad7f92bc6c9df731880ba73d77b8a11ba39f250ad6844fe8f2a3e044b8fbf35ec819ad64a0cc473c493a0b5f39df07361a52364af38ded56217817ce4d
+  data.tar.gz: a8d8e973dc56197011383b83f7923cb5856cdc5da32152bfd4929ad0e860add185be4389fda09f106482f25a58f00f5aa5e15567e4931a971078a795ddd54018

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.7.1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+## 2.7.3 - 14 July 2020
+
+* Added `Avoid` and `All Clear` response types for CAP 1.2 
+
 ## 2.7.0 - 22 March 2017
 
 * Coordinates of a polygon should be an array of coordinate arrays rather than a single coordinate array.  (Seth Deckard)

data/lib/rcap/base/alert.rb

@@ -123,27 +123,21 @@ module RCAP
       def to_xml_element
         xml_element = REXML::Element.new(XML_ELEMENT_NAME)
         xml_element.add_namespace(self.class::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(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)
-        end
+        xml_element.add_element(IDENTIFIER_ELEMENT_NAME).add_text(@identifier.to_s)   if @identifier
+        xml_element.add_element(SENDER_ELEMENT_NAME).add_text(@sender.to_s)           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.to_s)           if @status
+        xml_element.add_element(MSG_TYPE_ELEMENT_NAME).add_text(@msg_type.to_s)       if @msg_type
+        xml_element.add_element(SOURCE_ELEMENT_NAME).add_text(@source.to_s)           if @source
+        xml_element.add_element(SCOPE_ELEMENT_NAME).add_text(@scope.to_s)             if @scope
+        xml_element.add_element(RESTRICTION_ELEMENT_NAME).add_text(@restriction.to_s) if @restriction
+        xml_element.add_element(ADDRESSES_ELEMENT_NAME).add_text(@addresses.to_s_for_cap) if @addresses.any?
         @codes.each do |code|
-          xml_element.add_element(CODE_ELEMENT_NAME).add_text(code)
-        end
-        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(' '))
-        end
-        if @incidents.any?
-          xml_element.add_element(INCIDENTS_ELEMENT_NAME).add_text(@incidents.join(' '))
+          xml_element.add_element(CODE_ELEMENT_NAME).add_text(code.to_s)
         end
+        xml_element.add_element(NOTE_ELEMENT_NAME).add_text(@note.to_s) if @note
+        xml_element.add_element(REFERENCES_ELEMENT_NAME).add_text(@references.join(' ')) if @references.any?
+        xml_element.add_element(INCIDENTS_ELEMENT_NAME).add_text(@incidents.join(' ')) if @incidents.any?
         @infos.each do |info|
           xml_element.add_element(info.to_xml_element)
         end

data/lib/rcap/base/info.rb

@@ -197,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

data/lib/rcap/base/parameter.rb

@@ -30,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
 

data/lib/rcap/base/resource.rb

@@ -46,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
 

data/lib/rcap/cap_1_0/alert.rb

@@ -33,28 +33,22 @@ module RCAP
       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
-        if @addresses.any?
-          xml_element.add_element(ADDRESSES_ELEMENT_NAME).add_text(@addresses.to_s_for_cap)
-        end
+        xml_element.add_element(IDENTIFIER_ELEMENT_NAME).add_text(@identifier.to_s)   if @identifier
+        xml_element.add_element(SENDER_ELEMENT_NAME).add_text(@sender.to_s)           if @sender
+        xml_element.add_element(SENT_ELEMENT_NAME).add_text(@sent.to_s_for_cap.to_s)  if @sent
+        xml_element.add_element(STATUS_ELEMENT_NAME).add_text(@status.to_s)           if @status
+        xml_element.add_element(MSG_TYPE_ELEMENT_NAME).add_text(@msg_type.to_s)       if @msg_type
+        xml_element.add_element(PASSWORD_ELEMENT_NAME).add_text(@password.to_s)       if @password
+        xml_element.add_element(SOURCE_ELEMENT_NAME).add_text(@source.to_s)           if @source
+        xml_element.add_element(SCOPE_ELEMENT_NAME).add_text(@scope.to_s)             if @scope
+        xml_element.add_element(RESTRICTION_ELEMENT_NAME).add_text(@restriction.to_s) if @restriction
+        xml_element.add_element(ADDRESSES_ELEMENT_NAME).add_text(@addresses.to_s_for_cap) if @addresses.any?
         @codes.each do |code|
-          xml_element.add_element(CODE_ELEMENT_NAME).add_text(code)
-        end
-        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(' '))
-        end
-        if @incidents.any?
-          xml_element.add_element(INCIDENTS_ELEMENT_NAME).add_text(@incidents.join(' '))
+          xml_element.add_element(CODE_ELEMENT_NAME).add_text(code.to_s)
         end
+        xml_element.add_element(NOTE_ELEMENT_NAME).add_text(@note.to_s) if @note
+        xml_element.add_element(REFERENCES_ELEMENT_NAME).add_text(@references.join(' ')) if @references.any?
+        xml_element.add_element(INCIDENTS_ELEMENT_NAME).add_text(@incidents.join(' ')) if @incidents.any?
         @infos.each do |info|
           xml_element.add_element(info.to_xml_element)
         end

data/lib/rcap/cap_1_1/info.rb

@@ -96,30 +96,30 @@ 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(EVENT_ELEMENT_NAME).add_text(@event.to_s)
         @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.to_s)
         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.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(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

data/lib/rcap/cap_1_1/resource.rb

@@ -14,12 +14,12 @@ module RCAP
       # @return [REXML::Element]
       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(DEREF_URI_ELEMENT_NAME).add_text(@deref_uri) if @deref_uri
-        xml_element.add_element(DIGEST_ELEMENT_NAME).add_text(@digest)       if @digest
+        xml_element.add_element(RESOURCE_DESC_ELEMENT_NAME).add_text(@resource_desc.to_s)
+        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(DEREF_URI_ELEMENT_NAME).add_text(@deref_uri.to_s) if @deref_uri
+        xml_element.add_element(DIGEST_ELEMENT_NAME).add_text(@digest.to_s)       if @digest
         xml_element
       end
 

data/lib/rcap/cap_1_2/info.rb

@@ -74,30 +74,30 @@ 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(EVENT_ELEMENT_NAME).add_text(@event.to_s)
         @response_types.each do |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.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(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

data/lib/rcap/cap_1_2/resource.rb

@@ -18,12 +18,12 @@ module RCAP
       # @return [REXML::Element]
       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(DEREF_URI_ELEMENT_NAME).add_text(@deref_uri) if @deref_uri
-        xml_element.add_element(DIGEST_ELEMENT_NAME).add_text(@digest)       if @digest
+        xml_element.add_element(RESOURCE_DESC_ELEMENT_NAME).add_text(@resource_desc.to_s)
+        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(DEREF_URI_ELEMENT_NAME).add_text(@deref_uri.to_s) if @deref_uri
+        xml_element.add_element(DIGEST_ELEMENT_NAME).add_text(@digest.to_s)       if @digest
         xml_element
       end
 

data/lib/rcap/custom_validators.rb

@@ -14,9 +14,8 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, value|
         next if  value.nil? && options[:allow_nil]
-        unless options[:in].include?(value)
-          object.errors[attribute] << options[:message]
-        end
+
+        object.errors[attribute] << options[:message] unless options[:in].include?(value)
       end
     end
 
@@ -30,9 +29,8 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, collection|
         next if (collection.nil? && options[:allow_nil]) || (collection.empty? && options[:allow_empty])
-        unless collection.all? { |member| options[:in].include?(member) }
-          object.errors[attribute] << options[:message]
-        end
+
+        object.errors[attribute] << options[:message] unless collection.all? { |member| options[:in].include?(member) }
       end
     end
 
@@ -43,9 +41,8 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, collection|
         next if (collection.nil? && options[:allow_nil]) || (collection.empty? && options[:allow_empty])
-        unless options[:minimum] && collection.length >= options[:minimum]
-          object.errors[attribute] << options[:message]
-        end
+
+        object.errors[attribute] << options[:message] unless options[:minimum] && collection.length >= options[:minimum]
       end
     end
 
@@ -56,6 +53,7 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, value|
         next if  value.nil? && options[:allow_nil]
+
         object.errors[attribute] << options[:message] unless value&.valid?
       end
     end
@@ -67,9 +65,8 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, collection|
         next if (collection.nil? && options[:allow_nil]) || (collection.empty? && options[:allow_empty])
-        unless collection.all?(&:valid?)
-          object.errors[attribute] << options[:message]
-        end
+
+        object.errors[attribute] << options[:message] unless collection.all?(&:valid?)
       end
     end
 
@@ -80,6 +77,7 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, value|
         next if value.blank?
+
         contingent_on_attribute = object.send(options[:on])
         contingent_on_attribute_value = options[:with_value]
 
@@ -98,7 +96,10 @@ module Validation
         contingent_attribute_value = object.send(options[:when])
         required_contingent_attribute_value = options[:is]
 
-        next if contingent_attribute_value.nil? || contingent_attribute_value != required_contingent_attribute_value && !options[:is].blank?
+        if contingent_attribute_value.nil? || contingent_attribute_value != required_contingent_attribute_value && !options[:is].blank?
+          next
+        end
+
         if value.blank?
           object.errors[attribute] << options[:message].gsub(/:contingent_attribute/, options[:whenn].to_s)
         end
@@ -114,6 +115,7 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, value|
         next if value.nil? && options[:allow_nil]
+
         unless (value.to_s =~ re) &&
                (options[:greater_than].nil? || value && value > options[:greater_than]) &&
                (options[:greater_than_or_equal].nil? || value && value >= options[:greater_than_or_equal])
@@ -129,6 +131,7 @@ module Validation
 
       validates_each(*attributes) do |object, attribute, _value|
         next if  collection.nil? && options[:allow_nil]
+
         unless options[:to].all? { |method_name| object.respond_to?(method_name) }
           object.errors[attribute] << options [:message]
         end
@@ -143,9 +146,8 @@ module Validation
       validates_each(*attributes) do |object, attribute, collection|
         next if collection.nil? && options[:allow_nil]
         next if collection.empty? && options[:allow_empty]
-        unless collection.first == collection.last
-          object.errors[attribute] << options[:message]
-        end
+
+        object.errors[attribute] << options[:message] unless collection.first == collection.last
       end
     end
   end

data/lib/rcap/utilities.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ALLOWED_CHARACTERS = /[^\s&<]+/
+ALLOWED_CHARACTERS = /[^\s&<]+/.freeze
 
 module RCAP
   # Returns a randomly generated UUID string

data/lib/rcap/validation.rb

@@ -130,9 +130,7 @@ module Validation
 
     # Validates the given instance.
     def validate(o)
-      if superclass.respond_to?(:validate) && !@skip_superclass_validations
-        superclass.validate(o)
-      end
+      superclass.validate(o) if superclass.respond_to?(:validate) && !@skip_superclass_validations
       validations.each do |att, procs|
         v = o.send(att)
         procs.each { |p| p[o, att, v] }
@@ -164,6 +162,7 @@ module Validation
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         o.errors[a] << opts[:message] unless v == opts[:accept]
       end
     end
@@ -176,6 +175,7 @@ module Validation
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         c = o.send(:"#{a}_confirmation")
         o.errors[a] << opts[:message] unless v == c
       end
@@ -193,6 +193,7 @@ module Validation
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         o.errors[a] << opts[:message] unless v.to_s =~ opts[:with]
       end
     end
@@ -207,6 +208,7 @@ module Validation
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         if m = opts[:maximum]
           o.errors[a] << (opts[:message] || opts[:too_long]) unless v && v.size <= m
         end
@@ -222,8 +224,8 @@ module Validation
       end
     end
 
-    NUMBER_RE = /^\d*\.{0,1}\d+$/
-    INTEGER_RE = /\A[+-]?\d+\Z/
+    NUMBER_RE = /^\d*\.{0,1}\d+$/.freeze
+    INTEGER_RE = /\A[+-]?\d+\Z/.freeze
 
     # Validates whether an attribute is a number.
     def validates_numericality_of(*atts)
@@ -235,6 +237,7 @@ module Validation
 
       validates_each(*atts) do |o, a, v|
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
+
         o.errors[a] << opts[:message] unless v.to_s =~ re
       end
     end